X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwreadln.c;h=95267e28d539d28a79b77cf734c23e1a67320fcb;hb=b3e29d017a77d1cd34bfde94bd7182422e6d695c;hp=a382fcecc2d7cbc1ddb4410fcd56c52c936b4134;hpb=521a026319775913bf828aa1c2de5ce5d717811c;p=ncmpc.git diff --git a/src/wreadln.c b/src/wreadln.c index a382fce..95267e2 100644 --- a/src/wreadln.c +++ b/src/wreadln.c @@ -1,5 +1,6 @@ -/* - * (c) 2004 by Kalle Wallin +/* ncmpc (Ncurses MPD Client) + * (c) 2004-2017 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 @@ -10,10 +11,10 @@ * 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" @@ -26,7 +27,7 @@ #include #include -#ifdef ENABLE_WIDE +#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined(WIN32) #include #endif @@ -41,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 @@ -82,19 +84,14 @@ wrln_gcmp_post_cb_t wrln_post_completion_callback = NULL; static unsigned byte_to_screen(const gchar *data, size_t x) { -#ifdef ENABLE_WIDE - gchar *dup; - char *p; - unsigned width; - +#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE) assert(x <= strlen(data)); - dup = g_strdup(data); + char *dup = g_strdup(data); dup[x] = 0; - p = locale_to_utf8(dup); - g_free(dup); + char *p = replace_locale_to_utf8(dup); - width = utf8_width(p); + unsigned width = utf8_width(p); g_free(p); return width; @@ -109,16 +106,14 @@ byte_to_screen(const gchar *data, size_t x) static size_t screen_to_bytes(const gchar *data, unsigned width) { -#ifdef ENABLE_WIDE +#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE) size_t length = strlen(data); gchar *dup = g_strdup(data); - char *p; - unsigned p_width; while (true) { dup[length] = 0; - p = locale_to_utf8(dup); - p_width = utf8_width(p); + char *p = locale_to_utf8(dup); + unsigned p_width = utf8_width(p); g_free(p); if (p_width <= width) break; @@ -136,7 +131,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) { @@ -149,7 +144,7 @@ cursor_column(const struct wreadln *wr) static inline size_t right_align_bytes(const gchar *data, size_t right, unsigned width) { -#ifdef ENABLE_WIDE +#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE) gchar *dup; size_t start = 0; @@ -161,14 +156,13 @@ right_align_bytes(const gchar *data, size_t right, unsigned width) while (dup[start] != 0) { char *p = locale_to_utf8(dup + start), *q; unsigned p_width = utf8_width(p); - gunichar c; if (p_width < width) { g_free(p); break; } - c = g_utf8_get_char(p); + gunichar c = g_utf8_get_char(p); p[g_unichar_to_utf8(c, NULL)] = 0; q = utf8_to_locale(p); g_free(p); @@ -191,17 +185,15 @@ right_align_bytes(const gchar *data, size_t right, unsigned width) static inline size_t next_char_size(const gchar *data) { -#ifdef ENABLE_WIDE +#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE) char *p = locale_to_utf8(data), *q; - gunichar c; - size_t size; - c = g_utf8_get_char(p); + gunichar c = g_utf8_get_char(p); p[g_unichar_to_utf8(c, NULL)] = 0; q = utf8_to_locale(p); g_free(p); - size = strlen(q); + size_t size = strlen(q); g_free(q); return size; @@ -216,17 +208,15 @@ next_char_size(const gchar *data) static inline size_t prev_char_size(const gchar *data, size_t x) { -#ifdef ENABLE_WIDE - char *p = locale_to_utf8(data), *q; - gunichar c; - size_t size; - +#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE) assert(x > 0); - q = p; + char *p = locale_to_utf8(data); + + char *q = p; while (true) { - c = g_utf8_get_char(q); - size = g_unichar_to_utf8(c, NULL); + gunichar c = g_utf8_get_char(q); + size_t size = g_unichar_to_utf8(c, NULL); if (size > x) size = x; x -= size; @@ -248,12 +238,10 @@ prev_char_size(const gchar *data, size_t x) /* move the cursor one step to the right */ static inline void cursor_move_right(struct wreadln *wr) { - size_t size; - if (wr->line[wr->cursor] == 0) return; - size = next_char_size(wr->line + wr->cursor); + size_t size = next_char_size(wr->line + wr->cursor); wr->cursor += size; if (cursor_column(wr) >= wr->width) wr->start = right_align_bytes(wr->line, wr->cursor, wr->width); @@ -262,12 +250,10 @@ static inline void cursor_move_right(struct wreadln *wr) /* move the cursor one step to the left */ static inline void cursor_move_left(struct wreadln *wr) { - size_t size; - if (wr->cursor == 0) return; - size = prev_char_size(wr->line, wr->cursor); + size_t size = prev_char_size(wr->line, wr->cursor); assert(wr->cursor >= size); wr->cursor -= size; if (wr->cursor < wr->start) @@ -300,7 +286,7 @@ static inline void drawline(const struct wreadln *wr) doupdate(); } -#ifdef ENABLE_WIDE +#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined(WIN32) static bool multibyte_is_complete(const char *p, size_t length) { @@ -321,14 +307,13 @@ static void wreadln_insert_byte(struct wreadln *wr, gint key) { size_t rest = strlen(wr->line + wr->cursor) + 1; -#ifdef ENABLE_WIDE +#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined (WIN32) char buffer[32] = { key }; size_t length = 1; struct pollfd pfd = { .fd = 0, .events = POLLIN, }; - int ret; /* wide version: try to complete the multibyte sequence */ @@ -339,8 +324,7 @@ wreadln_insert_byte(struct wreadln *wr, gint key) /* poll for more bytes on stdin, without timeout */ - ret = poll(&pfd, 1, 0); - if (ret <= 0) + if (poll(&pfd, 1, 0) <= 0) /* no more input from keyboard */ break; @@ -368,12 +352,10 @@ wreadln_insert_byte(struct wreadln *wr, gint key) static void wreadln_delete_char(struct wreadln *wr, size_t x) { - size_t rest, length; - assert(x < strlen(wr->line)); - length = next_char_size(&wr->line[x]); - rest = strlen(&wr->line[x + length]) + 1; + size_t length = next_char_size(&wr->line[x]); + size_t rest = strlen(&wr->line[x + length]) + 1; memmove(&wr->line[x], &wr->line[x + length], rest); } @@ -395,8 +377,6 @@ _wreadln(WINDOW *w, .start = 0, }; GList *hlist = NULL, *hcurrent = NULL; - gint key = 0; - size_t i; #ifdef NCMPC_MINI (void)gcmp; @@ -404,12 +384,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) + 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) @@ -446,21 +428,24 @@ _wreadln(WINDOW *w, drawline(&wr); } + gint key = 0; while (key != 13 && key != '\n') { key = wgetch(w); /* check if key is a function key */ - for (i = 0; i < 63; i++) + for (size_t i = 0; i < 63; i++) if (key == (int)KEY_F(i)) { key = KEY_F(1); i = 64; } switch (key) { + size_t i; + #ifdef HAVE_GETMOUSE case KEY_MOUSE: /* ignore mouse events */ #endif - case ERR: /* ingnore errors */ + case ERR: /* ignore errors */ break; case TAB: @@ -522,6 +507,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 */ @@ -593,13 +592,15 @@ _wreadln(WINDOW *w, *history = g_list_delete_link(*history, hcurrent); } - while (g_list_length(*history) > wrln_max_history_length) { + unsigned history_length = g_list_length(*history); + while (history_length > wrln_max_history_length) { GList *first = g_list_first(*history); /* remove the oldest history entry */ g_free(first->data); first->data = NULL; *history = g_list_delete_link(*history, first); + --history_length; } }