Merge remote branches 'avuton/master' and 'jn/dev'

[ncmpc.git] / src / wreadln.c

diff --git a/src/wreadln.c b/src/wreadln.c
index 7261bba418d2e86e0d8b91e9371df255ad0cd924..be4f2667cc391732731e2ef06cf94536ddb98c4f 100644 (file)
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -1,7 +1,7 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
  * the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,7 @@
 #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
 
@@ -42,6 +42,7 @@
 #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
@@ -83,7 +84,7 @@ wrln_gcmp_post_cb_t wrln_post_completion_callback = NULL;
 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;
@@ -92,8 +93,7 @@ byte_to_screen(const gchar *data, size_t x)
 
        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);
@@ -110,7 +110,7 @@ byte_to_screen(const gchar *data, size_t x)
 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;
@@ -137,7 +137,7 @@ screen_to_bytes(const gchar *data, unsigned width)
 #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)
 {
@@ -150,7 +150,7 @@ 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;
 
@@ -192,7 +192,7 @@ right_align_bytes(const gchar *data, size_t right, unsigned width)
 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;
@@ -217,7 +217,7 @@ next_char_size(const gchar *data)
 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;
@@ -301,7 +301,7 @@ static inline void drawline(const struct wreadln *wr)
        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)
 {
@@ -322,7 +322,7 @@ static void
 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 = {
@@ -405,14 +405,14 @@ _wreadln(WINDOW *w,
 
        /* turn off echo */
        noecho();
-       /* make shure the cursor is visible */
+       /* make sure the cursor is visible */
        curs_set(1);
        /* print prompt string */
        if (prompt) {
                waddstr(w, prompt);
                waddstr(w, ": ");
        }
-       /* retrive y and x0 position */
+       /* retrieve y and x0 position */
        getyx(w, wr.y, wr.x);
        /* check the x1 value */
        if (x1 <= wr.x || x1 > (unsigned)COLS)
@@ -463,7 +463,7 @@ _wreadln(WINDOW *w,
 #ifdef HAVE_GETMOUSE
                case KEY_MOUSE: /* ignore mouse events */
 #endif
-               case ERR: /* ingnore errors */
+               case ERR: /* ignore errors */
                        break;
 
                case TAB:
@@ -525,6 +525,20 @@ _wreadln(WINDOW *w,
                                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 */