Changeset 1affcdf3 in mainline for uspace/app/top/screen.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/app/top/screen.c (modified) (6 diffs)

uspace/app/top/screen.c

@@ -46 +46 @@
 #include "top.h"
 
+#define USEC_COUNT  1000000
+
 static sysarg_t warn_col = 0;
 static sysarg_t warn_row = 0;
+static suseconds_t timeleft = 0;
+
+console_ctrl_t *console;
 
 static void screen_style_normal(void)
 {
-        fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
+        console_flush(console);
+        console_set_style(console, STYLE_NORMAL);
 }
 
 static void screen_style_inverted(void)
 {
-        fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_INVERTED);
+        console_flush(console);
+        console_set_style(console, STYLE_INVERTED);
 }
 
 static void screen_moveto(sysarg_t col, sysarg_t row)
 {
-        fflush(stdout);
-        console_set_pos(fphone(stdout), col, row);
+        console_flush(console);
+        console_set_pos(console, col, row);
 }
 
 static void screen_get_pos(sysarg_t *col, sysarg_t *row)
 {
-        fflush(stdout);
-        console_get_pos(fphone(stdout), col, row);
+        console_flush(console);
+        console_get_pos(console, col, row);
 }
 
 static void screen_get_size(sysarg_t *col, sysarg_t *row)
 {
-        fflush(stdout);
-        console_get_size(fphone(stdout), col, row);
+        console_flush(console);
+        console_get_size(console, col, row);
 }
 
@@ -84 +89 @@
         
         if (clear) {
-                fflush(stdout);
-                console_clear(fphone(stdout));
+                console_flush(console);
+                console_clear(console);
         }
         
@@ -111 +116 @@
 void screen_init(void)
 {
-        fflush(stdout);
-        console_cursor_visibility(fphone(stdout), false);
+        console = console_init(stdin, stdout);
+        
+        console_flush(console);
+        console_cursor_visibility(console, false);
         
         screen_restart(true);
@@ -121 +128 @@
         screen_restart(true);
         
-        fflush(stdout);
-        console_cursor_visibility(fphone(stdout), true);
+        console_flush(console);
+        console_cursor_visibility(console, true);
 }
 
@@ -508 +515 @@
         }
         
-        fflush(stdout);
+        console_flush(console);
 }
 
@@ -521 +528 @@
         
         screen_newline();
-        fflush(stdout);
+        console_flush(console);
+}
+
+/** Get char with timeout
+ *
+ */
+int tgetchar(unsigned int sec)
+{
+        /*
+         * Reset timeleft whenever it is not positive.
+         */
+        
+        if (timeleft <= 0)
+                timeleft = sec * USEC_COUNT;
+        
+        /*
+         * Wait to see if there is any input. If so, take it and
+         * update timeleft so that the next call to tgetchar()
+         * will not wait as long. If there is no input,
+         * make timeleft zero and return -1.
+         */
+        
+        wchar_t c = 0;
+        
+        while (c == 0) {
+                kbd_event_t event;
+                
+                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                        timeleft = 0;
+                        return -1;
+                }
+                
+                if (event.type == KEY_PRESS)
+                        c = event.c;
+        }
+        
+        return (int) c;
 }