Changes in uspace/app/bdsh/input.c [da2bd08:19528516] in mainline

File:

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

uspace/app/bdsh/input.c

@@ -38 +38 @@
 #include <vfs/vfs.h>
 #include <errno.h>
-#include <assert.h>
 #include <bool.h>
 
@@ -48 +47 @@
 #include "exec.h"
 
-#define HISTORY_LEN 10
-
 typedef struct {
         wchar_t buffer[INPUT_MAX];
@@ -56 +53 @@
         int nc;
         int pos;
-
-        char *history[1 + HISTORY_LEN];
-        int hnum;
-        int hpos;
 } tinput_t;
+
+typedef enum {
+        seek_cell,
+        seek_max
+} seek_dist_t;
 
 typedef enum {
@@ -132 +130 @@
 }
 
-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)
 {
@@ -198 +183 @@
 }
 
-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;
-        }
+static void tinput_seek(tinput_t *ti, seek_dir_t dir, seek_dist_t dist)
+{
+        switch (dist) {
+        case seek_cell:
+                ti->pos += dir;
+                break;
+        case seek_max:
+                if (dir == seek_backward)
+                        ti->pos = 0;
+                else
+                        ti->pos = ti->nc;
+                break;
+        }
+                
+        if (ti->pos < 0) ti->pos = 0;
+        if (ti->pos > ti->nc) ti->pos = ti->nc;
 
         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_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_position_caret(ti);
-}
-
-static void tinput_init(tinput_t *ti)
-{
-        ti->hnum = 0;
-        ti->hpos = 0;
-        ti->history[0] = NULL;
 }
 
@@ -339 +226 @@
                         continue;
 
-                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;
-                        }
+                if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) != 0)
+                        continue;
+
+                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(ti, seek_backward, seek_cell);
+                        break;
+                case KC_RIGHT:
+                        tinput_seek(ti, seek_forward, seek_cell);
+
+                        break;
+                case KC_HOME:
+                        tinput_seek(ti, seek_backward, seek_max);
+                        break;
+                case KC_END:
+                        tinput_seek(ti, seek_forward, seek_max);
+                        break;
                 }
-
-                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 >= ' ') {
                         tinput_insert_char(ti, ev.c);
@@ -391 +261 @@
         putchar('\n');
 
-        str = tinput_get_str(ti);
-        if (str_cmp(str, "") != 0)
-                tinput_history_insert(ti, str);
-
-        ti->hpos = 0;
+        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);
 
         return str;
@@ -421 +292 @@
         return;
 }
-
-void input_init(void)
-{
-        tinput_init(&tinput);
-}