Changeset 025759c in mainline

Timestamp:

2009-11-29T12:47:25Z (15 years ago)

Author:

jirka <jirka@…>

Branches:

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

Children:

da2bd08

Parents:

19528516

Message:

Word seek.

File:

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

uspace/app/bdsh/input.c

@@ -56 +56 @@
 
 typedef enum {
-        seek_cell,
-        seek_max
-} seek_dist_t;
-
-typedef enum {
         seek_backward = -1,
         seek_forward = 1
@@ -183 +178 @@
 }
 
-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;
+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_max(tinput_t *ti, seek_dir_t dir)
+{
+        if (dir == seek_backward)
+                ti->pos = 0;
+        else
+                ti->pos = ti->nc;
 
         tinput_position_caret(ti);
@@ -226 +260 @@
                         continue;
 
-                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) != 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) {
+                        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;
+                        }
+                }
+
                 if (ev.c >= ' ') {
                         tinput_insert_char(ti, ev.c);