Changeset 1affcdf3 in mainline for uspace/lib/clui/tinput.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/lib/clui/tinput.c (modified) (13 diffs)

uspace/lib/clui/tinput.c

@@ -54 +54 @@
 static void tinput_sel_all(tinput_t *);
 static void tinput_sel_delete(tinput_t *);
-static void tinput_key_ctrl(tinput_t *, console_event_t *);
-static void tinput_key_shift(tinput_t *, console_event_t *);
-static void tinput_key_ctrl_shift(tinput_t *, console_event_t *);
-static void tinput_key_unmod(tinput_t *, console_event_t *);
+static void tinput_key_ctrl(tinput_t *, kbd_event_t *);
+static void tinput_key_shift(tinput_t *, kbd_event_t *);
+static void tinput_key_ctrl_shift(tinput_t *, kbd_event_t *);
+static void tinput_key_unmod(tinput_t *, kbd_event_t *);
 static void tinput_pre_seek(tinput_t *, bool);
 static void tinput_post_seek(tinput_t *, bool);
@@ -88 +88 @@
         tinput_sel_get_bounds(ti, &sa, &sb);
         
-        console_set_pos(fphone(stdout), (ti->col0 + start) % ti->con_cols,
+        console_set_pos(ti->console, (ti->col0 + start) % ti->con_cols,
             ti->row0 + (ti->col0 + start) / ti->con_cols);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
+        console_set_style(ti->console, STYLE_NORMAL);
         
         size_t p = start;
@@ -101 +101 @@
         
         if (p < sb) {
-                fflush(stdout);
-                console_set_style(fphone(stdout), STYLE_SELECTED);
+                console_flush(ti->console);
+                console_set_style(ti->console, STYLE_SELECTED);
+                
                 memcpy(dbuf, ti->buffer + p,
                     (sb - p) * sizeof(wchar_t));
@@ -110 +111 @@
         }
         
-        fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
+        console_flush(ti->console);
+        console_set_style(ti->console, STYLE_NORMAL);
         
         if (p < ti->nc) {
@@ -123 +124 @@
                 putchar(' ');
         
-        fflush(stdout);
+        console_flush(ti->console);
 }
 
@@ -133 +134 @@
 static void tinput_position_caret(tinput_t *ti)
 {
-        console_set_pos(fphone(stdout), (ti->col0 + ti->pos) % ti->con_cols,
+        console_set_pos(ti->console, (ti->col0 + ti->pos) % ti->con_cols,
             ti->row0 + (ti->col0 + ti->pos) / ti->con_cols);
 }
@@ -516 +517 @@
 static void tinput_init(tinput_t *ti)
 {
+        ti->console = console_init(stdin, stdout);
         ti->hnum = 0;
         ti->hpos = 0;
@@ -533 +535 @@
 int tinput_read(tinput_t *ti, char **dstr)
 {
-        fflush(stdout);
-        if (console_get_size(fphone(stdin), &ti->con_cols, &ti->con_rows) != EOK)
+        console_flush(ti->console);
+        if (console_get_size(ti->console, &ti->con_cols, &ti->con_rows) != EOK)
                 return EIO;
         
-        if (console_get_pos(fphone(stdin), &ti->col0, &ti->row0) != EOK)
+        if (console_get_pos(ti->console, &ti->col0, &ti->row0) != EOK)
                 return EIO;
         
@@ -548 +550 @@
         
         while (!ti->done) {
-                fflush(stdout);
-                
-                console_event_t ev;
-                if (!console_get_event(fphone(stdin), &ev))
+                console_flush(ti->console);
+                
+                kbd_event_t ev;
+                if (!console_get_kbd_event(ti->console, &ev))
                         return EIO;
                 
@@ -596 +598 @@
 }
 
-static void tinput_key_ctrl(tinput_t *ti, console_event_t *ev)
+static void tinput_key_ctrl(tinput_t *ti, kbd_event_t *ev)
 {
         switch (ev->key) {
@@ -635 +637 @@
 }
 
-static void tinput_key_ctrl_shift(tinput_t *ti, console_event_t *ev)
+static void tinput_key_ctrl_shift(tinput_t *ti, kbd_event_t *ev)
 {
         switch (ev->key) {
@@ -655 +657 @@
 }
 
-static void tinput_key_shift(tinput_t *ti, console_event_t *ev)
+static void tinput_key_shift(tinput_t *ti, kbd_event_t *ev)
 {
         switch (ev->key) {
@@ -681 +683 @@
 }
 
-static void tinput_key_unmod(tinput_t *ti, console_event_t *ev)
+static void tinput_key_unmod(tinput_t *ti, kbd_event_t *ev)
 {
         switch (ev->key) {