Changeset 4a2aa91 in mainline

Timestamp:

2009-12-01T21:16:37Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

089d746

Parents:

e866806 (diff), e228280 (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 command line input improvements.

File:

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

uspace/app/bdsh/input.c

@@ -39 +39 @@
 #include <errno.h>
 #include <assert.h>
+#include <macros.h>
 #include <bool.h>
 
@@ -125 +126 @@
         int i;
 
-        console_goto(fphone(stdout), ti->col0 + start, ti->row0);
+        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)
@@ -139 +141 @@
 static void tinput_position_caret(tinput_t *ti)
 {
-        console_goto(fphone(stdout), ti->col0 + ti->pos, ti->row0);
+        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; 
 }
 
@@ -145 +161 @@
 {
         int i;
+        int new_width, new_height;
 
         if (ti->nc == INPUT_MAX)
                 return;
 
-        if (ti->col0 + ti->nc >= ti->con_cols - 1)
-                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)
@@ -161 +183 @@
 
         tinput_display_tail(ti, ti->pos - 1, 0);
+        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }
@@ -239 +262 @@
 }
 
+static void tinput_seek_vertical(tinput_t *ti, seek_dir_t dir)
+{
+        if (dir == seek_forward)
+                ti->pos = min(ti->pos + ti->con_cols, ti->nc);
+        else 
+                ti->pos = max(0, ti->pos - ti->con_cols);
+
+        tinput_position_caret(ti);
+}
+
 static void tinput_seek_max(tinput_t *ti, seek_dir_t dir)
 {
@@ -298 +331 @@
         tinput_set_str(ti, ti->history[ti->hpos]);
         tinput_display_tail(ti, 0, pad);
+        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }
@@ -322 +356 @@
         ti->pos = 0;
         ti->nc = 0;
+        ti->buffer[0] = '\0';
 
         while (true) {
@@ -340 +375 @@
                                 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;
                         }
                 }
@@ -381 +422 @@
 
 done:
+        ti->pos = ti->nc;
+        tinput_position_caret(ti);
         putchar('\n');