diff --git a/src/wreadln.c b/src/wreadln.c
index dccf084b4da1f92278b5944966bed389f5d3bdf7..45c2603bd3a87ea833ed5e89e78420ceb44a4086 100644 (file)
--- a/src/wreadln.c
+++ b/src/wreadln.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "wreadln.h"
#include <string.h>
#include <glib.h>
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined(WIN32)
#include <sys/poll.h>
#endif
#define KEY_CTRL_N 14
#define KEY_CTRL_P 16
#define KEY_CTRL_U 21
+#define KEY_CTRL_W 23
#define KEY_CTRL_Z 26
#define KEY_BCKSPC 8
#define TAB 9
static unsigned
byte_to_screen(const gchar *data, size_t x)
{
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
gchar *dup;
char *p;
unsigned width;
dup = g_strdup(data);
dup[x] = 0;
- p = locale_to_utf8(dup);
- g_free(dup);
+ p = replace_locale_to_utf8(dup);
width = utf8_width(p);
g_free(p);
static size_t
screen_to_bytes(const gchar *data, unsigned width)
{
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
size_t length = strlen(data);
gchar *dup = g_strdup(data);
char *p;
#endif
}
-/** returns the screen colum where the cursor is located */
+/** returns the screen column where the cursor is located */
static unsigned
cursor_column(const struct wreadln *wr)
{
static inline size_t
right_align_bytes(const gchar *data, size_t right, unsigned width)
{
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
gchar *dup;
size_t start = 0;
static inline size_t
next_char_size(const gchar *data)
{
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
char *p = locale_to_utf8(data), *q;
gunichar c;
size_t size;
static inline size_t
prev_char_size(const gchar *data, size_t x)
{
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
char *p = locale_to_utf8(data), *q;
gunichar c;
size_t size;
doupdate();
}
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
static bool
multibyte_is_complete(const char *p, size_t length)
{
wreadln_insert_byte(struct wreadln *wr, gint key)
{
size_t rest = strlen(wr->line + wr->cursor) + 1;
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined (WIN32)
char buffer[32] = { key };
size_t length = 1;
struct pollfd pfd = {
/* turn off echo */
noecho();
- /* make shure the cursor is visible */
+ /* make sure the cursor is visible */
curs_set(1);
/* print prompt string */
- if (prompt)
+ if (prompt) {
waddstr(w, prompt);
- /* retrive y and x0 position */
+ waddstr(w, ": ");
+ }
+ /* retrieve y and x0 position */
getyx(w, wr.y, wr.x);
/* check the x1 value */
if (x1 <= wr.x || x1 > (unsigned)COLS)
#ifdef HAVE_GETMOUSE
case KEY_MOUSE: /* ignore mouse events */
#endif
- case ERR: /* ingnore errors */
+ case ERR: /* ignore errors */
break;
case TAB:
wr.line[i] = '\0';
wr.cursor = 0;
break;
+ case KEY_CTRL_W:
+ /* Firstly remove trailing spaces. */
+ for (i = wr.cursor; i > 0 && wr.line[i-1] == ' '; i--)
+ {
+ cursor_move_left(&wr);
+ wreadln_delete_char(&wr, wr.cursor);
+ }
+ /* Then remove word until next space. */
+ for (; i > 0 && wr.line[i-1] != ' '; i--)
+ {
+ cursor_move_left(&wr);
+ wreadln_delete_char(&wr, wr.cursor);
+ }
+ break;
case 127:
case KEY_BCKSPC: /* handle backspace: copy all */
case KEY_BACKSPACE: /* chars starting from curpos */