Changeset da2bd08 in mainline

Timestamp:

2009-11-29T14:53:18Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

272f88f0, 8b5001b

Parents:

025759c

Message:

Input history.

Location:

uspace

Files:

• app/bdsh/input.c (modified) (8 diffs)
• app/bdsh/input.h (modified) (1 diff)
• app/bdsh/scli.c (modified) (1 diff)
• lib/libc/generic/string.c (modified) (1 diff)
• lib/libc/include/string.h (modified) (1 diff)

uspace/app/bdsh/input.c

@@ -38 +38 @@
 #include <vfs/vfs.h>
 #include <errno.h>
+#include <assert.h>
 #include <bool.h>
 
@@ -47 +48 @@
 #include "exec.h"
 
+#define HISTORY_LEN 10
+
 typedef struct {
         wchar_t buffer[INPUT_MAX];
@@ -53 +56 @@
         int nc;
         int pos;
+
+        char *history[1 + HISTORY_LEN];
+        int hnum;
+        int hpos;
 } tinput_t;
 
@@ -125 +132 @@
 }
 
+static char *tinput_get_str(tinput_t *ti)
+{
+        char *str;
+
+        str = malloc(STR_BOUNDS(ti->nc) + 1);
+        if (str == NULL)
+                return NULL;
+
+        wstr_nstr(str, ti->buffer, STR_BOUNDS(ti->nc) + 1);
+
+        return str;
+}
+
 static void tinput_position_caret(tinput_t *ti)
 {
@@ -235 +255 @@
 
         tinput_position_caret(ti);
+}
+
+static void tinput_history_insert(tinput_t *ti, char *str)
+{
+        int i;
+
+        if (ti->hnum < HISTORY_LEN) {
+                ti->hnum += 1;
+        } else {
+                if (ti->history[HISTORY_LEN] != NULL)
+                        free(ti->history[HISTORY_LEN]);
+        }
+
+        for (i = ti->hnum; i > 1; --i)
+                ti->history[i] = ti->history[i - 1];
+
+        ti->history[1] = str_dup(str);
+
+        if (ti->history[0] != NULL) {
+                free(ti->history[0]);
+                ti->history[0] = NULL;
+        }
+}
+
+static void tinput_set_str(tinput_t *ti, char *str)
+{
+        str_to_wstr(ti->buffer, INPUT_MAX, str);
+        ti->nc = wstr_length(ti->buffer);
+        ti->pos = ti->nc;
+}
+
+static void tinput_history_seek(tinput_t *ti, int offs)
+{
+        int pad;
+
+        if (ti->hpos + offs < 0 || ti->hpos + offs > ti->hnum)
+                return;
+
+        if (ti->history[ti->hpos] != NULL) {
+                free(ti->history[ti->hpos]);
+                ti->history[ti->hpos] = NULL;
+        }
+
+        ti->history[ti->hpos] = tinput_get_str(ti);
+        ti->hpos += offs;
+
+        pad = ti->nc - str_length(ti->history[ti->hpos]);
+        if (pad < 0) pad = 0;
+
+        tinput_set_str(ti, ti->history[ti->hpos]);
+        tinput_display_tail(ti, 0, pad);
+        tinput_position_caret(ti);
+}
+
+static void tinput_init(tinput_t *ti)
+{
+        ti->hnum = 0;
+        ti->hpos = 0;
+        ti->history[0] = NULL;
 }
 
@@ -295 +374 @@
                                 tinput_seek_max(ti, seek_forward);
                                 break;
+                        case KC_UP:
+                                tinput_history_seek(ti, +1);
+                                break;
+                        case KC_DOWN:
+                                tinput_history_seek(ti, -1);
+                                break;
                         }
                 }
@@ -306 +391 @@
         putchar('\n');
 
-        ti->buffer[ti->nc] = '\0';
-        str = malloc(STR_BOUNDS(ti->nc) + 1);
-        if (str == NULL)
-                return NULL;
-
-        wstr_nstr(str, ti->buffer, STR_BOUNDS(ti->nc) + 1);
+        str = tinput_get_str(ti);
+        if (str_cmp(str, "") != 0)
+                tinput_history_insert(ti, str);
+
+        ti->hpos = 0;
 
         return str;
@@ -337 +421 @@
         return;
 }
+
+void input_init(void)
+{
+        tinput_init(&tinput);
+}

uspace/app/bdsh/input.h

@@ -8 +8 @@
 extern void get_input(cliuser_t *);
 extern int tok_input(cliuser_t *);
+extern void input_init(void);
 
 #endif

uspace/app/bdsh/scli.c

@@ -64 +64 @@
         usr->prompt = (char *) NULL;
         usr->lasterr = 0;
+
+        input_init();
+
         return (int) cli_set_prompt(usr);
 }

uspace/lib/libc/generic/string.c

@@ -583 +583 @@
 }
 
+/** Convert string to wide string.
+ *
+ * Convert string @a src to wide string. The output is written to the
+ * buffer specified by @a dest and @a size, which must have non-zero
+ * size. The output will always be null-terminated.
+ *
+ * @param dest  Destination buffer.
+ * @param dlen  Length of destination buffer (number of wchars).
+ * @param src   Source string.
+ */
+void str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
+{
+        size_t offset;
+        size_t di;
+        wchar_t c;
+
+        assert(dlen > 0);
+
+        offset = 0;
+        di = 0;
+
+        do {
+                if (di >= dlen - 1)
+                        break;
+
+                c = str_decode(src, &offset, STR_NO_LIMIT);
+                dest[di++] = c;
+        } while (c != '\0');
+
+        dest[dlen - 1] = '\0';
+}
+
 /** Find first occurence of character in string.
  *

uspace/lib/libc/include/string.h

@@ -74 +74 @@
 
 extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
+extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);