Changeset fbcfc4da in mainline for uspace/app/bdsh/input.c

Timestamp:

2009-12-03T19:25:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9510be2

Parents:

cb3d641a (diff), 22e6802 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/bdsh/input.c (modified) (4 diffs)

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"
 
-static void read_line(char *, int);
+#define HISTORY_LEN 10
+
+typedef struct {
+        wchar_t buffer[INPUT_MAX];
+        int col0, row0;
+        int con_cols, con_rows;
+        int nc;
+        int pos;
+
+        char *history[1 + HISTORY_LEN];
+        int hnum;
+        int hpos;
+} tinput_t;
+
+typedef enum {
+        seek_backward = -1,
+        seek_forward = 1
+} seek_dir_t;
+
+static tinput_t tinput;
+
+static char *tinput_read(tinput_t *ti);
 
 /* Tokenizes input from console, sees if the first word is a built-in, if so
@@ -99 +121 @@
 }
 
-static void read_line(char *buffer, int n)
+static void tinput_display_tail(tinput_t *ti, int start, int pad)
+{
+        int i;
+
+        console_goto(fphone(stdout), (ti->col0 + start) % ti->con_cols,
+            ti->row0 + (ti->col0 + start) / ti->con_cols);
+        printf("%ls", ti->buffer + start);
+        for (i = 0; i < pad; ++i)
+                putchar(' ');
+        fflush(stdout);
+}
+
+static char *tinput_get_str(tinput_t *ti)
+{
+        return wstr_to_astr(ti->buffer);
+}
+
+static void tinput_position_caret(tinput_t *ti)
+{
+        console_goto(fphone(stdout), (ti->col0 + ti->pos) % ti->con_cols,
+            ti->row0 + (ti->col0 + ti->pos) / ti->con_cols);
+}
+
+/** Update row0 in case the screen could have scrolled. */
+static void tinput_update_origin(tinput_t *ti)
+{
+        int width, rows;
+
+        width = ti->col0 + ti->nc;
+        rows = (width / ti->con_cols) + 1;
+ 
+        /* Update row0 if the screen scrolled. */
+        if (ti->row0 + rows > ti->con_rows)
+                ti->row0 = ti->con_rows - rows; 
+}
+
+static void tinput_insert_char(tinput_t *ti, wchar_t c)
+{
+        int i;
+        int new_width, new_height;
+
+        if (ti->nc == INPUT_MAX)
+                return;
+
+        new_width = ti->col0 + ti->nc + 1;
+        if (new_width % ti->con_cols == 0) {
+                /* Advancing to new line. */
+                new_height = (new_width / ti->con_cols) + 1;
+                if (new_height >= ti->con_rows)
+                        return; /* Disallow text longer than 1 page for now. */
+        }
+
+        for (i = ti->nc; i > ti->pos; --i)
+                ti->buffer[i] = ti->buffer[i - 1];
+
+        ti->buffer[ti->pos] = c;
+        ti->pos += 1;
+        ti->nc += 1;
+        ti->buffer[ti->nc] = '\0';
+
+        tinput_display_tail(ti, ti->pos - 1, 0);
+        tinput_update_origin(ti);
+        tinput_position_caret(ti);
+}
+
+static void tinput_backspace(tinput_t *ti)
+{
+        int i;
+
+        if (ti->pos == 0)
+                return;
+
+        for (i = ti->pos; i < ti->nc; ++i)
+                ti->buffer[i - 1] = ti->buffer[i];
+        ti->pos -= 1;
+        ti->nc -= 1;
+        ti->buffer[ti->nc] = '\0';
+
+        tinput_display_tail(ti, ti->pos, 1);
+        tinput_position_caret(ti);
+}
+
+static void tinput_delete(tinput_t *ti)
+{
+        if (ti->pos == ti->nc)
+                return;
+
+        ti->pos += 1;
+        tinput_backspace(ti);
+}
+
+static void tinput_seek_cell(tinput_t *ti, seek_dir_t dir)
+{
+        if (dir == seek_forward) {
+                if (ti->pos < ti->nc)
+                        ti->pos += 1;
+        } else {
+                if (ti->pos > 0)
+                        ti->pos -= 1;
+        }
+
+        tinput_position_caret(ti);
+}
+
+static void tinput_seek_word(tinput_t *ti, seek_dir_t dir)
+{
+        if (dir == seek_forward) {
+                if (ti->pos == ti->nc)
+                        return;
+
+                while (1) {
+                        ti->pos += 1;
+
+                        if (ti->pos == ti->nc)
+                                break;
+
+                        if (ti->buffer[ti->pos - 1] == ' ' &&
+                            ti->buffer[ti->pos] != ' ')
+                                break;
+                }
+        } else {
+                if (ti->pos == 0)
+                        return;
+
+                while (1) {
+                        ti->pos -= 1;
+
+                        if (ti->pos == 0)
+                                break;
+
+                        if (ti->buffer[ti->pos - 1] == ' ' &&
+                            ti->buffer[ti->pos] != ' ')
+                                break;
+                }
+
+        }
+
+        tinput_position_caret(ti);
+}
+
+static void tinput_seek_vertical(tinput_t *ti, seek_dir_t dir)
+{
+        if (dir == seek_forward) {
+                if (ti->pos + ti->con_cols <= ti->nc)
+                        ti->pos = ti->pos + ti->con_cols;
+        } else {
+                if (ti->pos - ti->con_cols >= 0)
+                        ti->pos = ti->pos - ti->con_cols;
+        }
+
+        tinput_position_caret(ti);
+}
+
+static void tinput_seek_max(tinput_t *ti, seek_dir_t dir)
+{
+        if (dir == seek_backward)
+                ti->pos = 0;
+        else
+                ti->pos = ti->nc;
+
+        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_update_origin(ti);
+        tinput_position_caret(ti);
+}
+
+static void tinput_init(tinput_t *ti)
+{
+        ti->hnum = 0;
+        ti->hpos = 0;
+        ti->history[0] = NULL;
+}
+
+static char *tinput_read(tinput_t *ti)
 {
         console_event_t ev;
-        size_t offs, otmp;
-        wchar_t dec;
-
-        offs = 0;
+        char *str;
+
+        fflush(stdout);
+
+        if (console_get_size(fphone(stdin), &ti->con_cols, &ti->con_rows) != EOK)
+                return NULL;
+        if (console_get_pos(fphone(stdin), &ti->col0, &ti->row0) != EOK)
+                return NULL;
+
+        ti->pos = 0;
+        ti->nc = 0;
+        ti->buffer[0] = '\0';
+
         while (true) {
                 fflush(stdout);
                 if (!console_get_event(fphone(stdin), &ev))
-                        return;
+                        return NULL;
                 
                 if (ev.type != KEY_PRESS)
                         continue;
-                
-                if (ev.key == KC_ENTER || ev.key == KC_NENTER)
-                        break;
-                if (ev.key == KC_BACKSPACE) {
-                        if (offs > 0) {
-                                /*
-                                 * Back up until we reach valid start of
-                                 * character.
-                                 */
-                                while (offs > 0) {
-                                        --offs; otmp = offs;
-                                        dec = str_decode(buffer, &otmp, n);
-                                        if (dec != U_SPECIAL)
-                                                break;
-                                }
-                                putchar('\b');
+
+                if ((ev.mods & KM_CTRL) != 0 &&
+                    (ev.mods & (KM_ALT | KM_SHIFT)) == 0) {
+                        switch (ev.key) {
+                        case KC_LEFT:
+                                tinput_seek_word(ti, seek_backward);
+                                break;
+                        case KC_RIGHT:
+                                tinput_seek_word(ti, seek_forward);
+                                break;
+                        case KC_UP:
+                                tinput_seek_vertical(ti, seek_backward);
+                                break;
+                        case KC_DOWN:
+                                tinput_seek_vertical(ti, seek_forward);
+                                break;
                         }
-                        continue;
                 }
+
+                if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                        switch (ev.key) {
+                        case KC_ENTER:
+                        case KC_NENTER:
+                                goto done;
+                        case KC_BACKSPACE:
+                                tinput_backspace(ti);
+                                break;
+                        case KC_DELETE:
+                                tinput_delete(ti);
+                                break;
+                        case KC_LEFT:
+                                tinput_seek_cell(ti, seek_backward);
+                                break;
+                        case KC_RIGHT:
+                                tinput_seek_cell(ti, seek_forward);
+                                break;
+                        case KC_HOME:
+                                tinput_seek_max(ti, seek_backward);
+                                break;
+                        case KC_END:
+                                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;
+                        }
+                }
+
                 if (ev.c >= ' ') {
-                        if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK)
-                                putchar(ev.c);
+                        tinput_insert_char(ti, ev.c);
                 }
         }
+
+done:
+        ti->pos = ti->nc;
+        tinput_position_caret(ti);
         putchar('\n');
-        buffer[offs] = '\0';
-}
-
-/* TODO:
- * Implement something like editline() / readline(), if even
- * just for command history and making arrows work. */
+
+        str = tinput_get_str(ti);
+        if (str_cmp(str, "") != 0)
+                tinput_history_insert(ti, str);
+
+        ti->hpos = 0;
+
+        return str;
+}
+
 void get_input(cliuser_t *usr)
 {
-        char line[INPUT_MAX];
+        char *str;
 
         fflush(stdout);
@@ -154 +447 @@
         console_set_style(fphone(stdout), STYLE_NORMAL);
 
-        read_line(line, INPUT_MAX);
-        /* Make sure we don't have rubbish or a C/R happy user */
-        if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0)
+        str = tinput_read(&tinput);
+
+        /* Check for empty input. */
+        if (str_cmp(str, "") == 0) {
+                free(str);
                 return;
-        usr->line = str_dup(line);
-
+        }
+
+        usr->line = str;
         return;
 }
 
+void input_init(void)
+{
+        tinput_init(&tinput);
+}