wreadln: moved code to wreadln_delete()

[ncmpc.git] / src / wreadln.c

diff --git a/src/wreadln.c b/src/wreadln.c
index 5d019d9003d3438b1287141082fa380349dbf167..608141f6414e589d6ec74aca7c2610f33694feb1 100644 (file)
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -21,6 +21,7 @@
 #include "screen_utils.h"
 #include "config.h"
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
@@ -45,20 +46,20 @@ struct wreadln {
        WINDOW *const w;
 
        /** the origin coordinates in the window */
-       gint x, y;
+       unsigned x, y;
 
        /** the screen width of the input field */
-       gint width;
+       unsigned width;
 
        /** is the input masked, i.e. characters displayed as '*'? */
        const gboolean masked;
 
        /** the byte position of the cursor */
-       gint cursor;
+       size_t cursor;
 
        /** the byte position displayed at the origin (for horizontal
            scrolling) */
-       gint start;
+       size_t start;
 
        /** the current value */
        gchar line[1024];
@@ -74,22 +75,24 @@ wrln_gcmp_post_cb_t wrln_post_completion_callback = NULL;
 /* move the cursor one step to the right */
 static inline void cursor_move_right(struct wreadln *wr)
 {
-       if (wr->cursor < (int)strlen(wr->line)) {
-               ++wr->cursor;
-               if (wr->cursor >= wr->width &&
-                   wr->start < wr->cursor - wr->width + 1)
-                       ++wr->start;
-       }
+       if (wr->line[wr->cursor] == 0)
+               return;
+
+       ++wr->cursor;
+       if (wr->cursor >= (size_t)wr->width &&
+           wr->start < wr->cursor - wr->width + 1)
+               ++wr->start;
 }
 
 /* move the cursor one step to the left */
 static inline void cursor_move_left(struct wreadln *wr)
 {
-       if (wr->cursor > 0) {
-               if (wr->cursor == wr->start && wr->start > 0)
-                       --wr->start;
-               --wr->cursor;
-       }
+       if (wr->cursor == 0)
+               return;
+
+       if (wr->cursor == wr->start && wr->start > 0)
+               --wr->start;
+       --wr->cursor;
 }
 
 /* move the cursor to the end of the line */
@@ -130,13 +133,24 @@ wreadln_insert_byte(struct wreadln *wr, gint key)
        cursor_move_right(wr);
 }
 
+static void
+wreadln_delete_char(struct wreadln *wr, size_t x)
+{
+       size_t i;
+
+       assert(x < strlen(wr->line));
+
+       for (i = x; wr->line[i] != 0; i++)
+               wr->line[i] = wr->line[i + 1];
+}
+
 /* libcurses version */
 
 static gchar *
 _wreadln(WINDOW *w,
         const gchar *prompt,
         const gchar *initial_value,
-        gint x1,
+        unsigned x1,
         GList **history,
         GCompletion *gcmp,
         gboolean masked)
@@ -148,7 +162,8 @@ _wreadln(WINDOW *w,
                .start = 0,
        };
        GList *hlist = NULL, *hcurrent = NULL;
-       gint key = 0, i;
+       gint key = 0;
+       size_t i;
 
        /* turn off echo */
        noecho();
@@ -160,7 +175,7 @@ _wreadln(WINDOW *w,
        /* retrive y and x0 position */
        getyx(w, wr.y, wr.x);
        /* check the x1 value */
-       if (x1 <= wr.x || x1 > COLS)
+       if (x1 <= wr.x || x1 > (unsigned)COLS)
                x1 = COLS;
        wr.width = x1 - wr.x;
        /* clear input area */
@@ -199,7 +214,7 @@ _wreadln(WINDOW *w,
 
                /* check if key is a function key */
                for (i = 0; i < 63; i++)
-                       if (key == KEY_F(i)) {
+                       if (key == (int)KEY_F(i)) {
                                key = KEY_F(1);
                                i = 64;
                        }
@@ -271,18 +286,15 @@ _wreadln(WINDOW *w,
                case 127:
                case KEY_BCKSPC:        /* handle backspace: copy all */
                case KEY_BACKSPACE:     /* chars starting from curpos */
-                       if (wr.cursor > 0) {/* - 1 from buf[n+1] to buf   */
-                               for (i = wr.cursor - 1; wr.line[i] != 0; i++)
-                                       wr.line[i] = wr.line[i + 1];
+                       if (wr.cursor > 0) { /* - 1 from buf[n+1] to buf   */
                                cursor_move_left(&wr);
+                               wreadln_delete_char(&wr, wr.cursor);
                        }
                        break;
                case KEY_DC:            /* handle delete key. As above */
                case KEY_CTRL_D:
-                       if (wr.cursor <= (gint)utf8_width(wr.line) - 1) {
-                               for (i = wr.cursor; wr.line[i] != 0; i++)
-                                       wr.line[i] = wr.line[i + 1];
-                       }
+                       if (wr.line[wr.cursor] != 0)
+                               wreadln_delete_char(&wr, wr.cursor);
                        break;
                case KEY_UP:
                case KEY_CTRL_P:
@@ -359,7 +371,7 @@ gchar *
 wreadln(WINDOW *w,
        const gchar *prompt,
        const gchar *initial_value,
-       gint x1,
+       unsigned x1,
        GList **history,
        GCompletion *gcmp)
 {
@@ -370,7 +382,7 @@ gchar *
 wreadln_masked(WINDOW *w,
               const gchar *prompt,
               const gchar *initial_value,
-              gint x1,
+              unsigned x1,
               GList **history,
               GCompletion *gcmp)
 {