Changes in uspace/app/top/screen.c [ffa2c8ef:79ae36dd] in mainline

File:

• uspace/app/top/screen.c (modified) (8 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);
 }
 
@@ -254 +261 @@
         uint64_t used;
         uint64_t free;
-        char total_suffix;
-        char unavail_suffix;
-        char used_suffix;
-        char free_suffix;
-        
-        order_suffix(data->physmem->total, &total, &total_suffix);
-        order_suffix(data->physmem->unavail, &unavail, &unavail_suffix);
-        order_suffix(data->physmem->used, &used, &used_suffix);
-        order_suffix(data->physmem->free, &free, &free_suffix);
-        
-        printf("memory: %" PRIu64 "%c total, %" PRIu64 "%c unavail, %"
-            PRIu64 "%c used, %" PRIu64 "%c free", total, total_suffix,
+        const char *total_suffix;
+        const char *unavail_suffix;
+        const char *used_suffix;
+        const char *free_suffix;
+        
+        bin_order_suffix(data->physmem->total, &total, &total_suffix, false);
+        bin_order_suffix(data->physmem->unavail, &unavail, &unavail_suffix, false);
+        bin_order_suffix(data->physmem->used, &used, &used_suffix, false);
+        bin_order_suffix(data->physmem->free, &free, &free_suffix, false);
+        
+        printf("memory: %" PRIu64 "%s total, %" PRIu64 "%s unavail, %"
+            PRIu64 "%s used, %" PRIu64 "%s free", total, total_suffix,
             unavail, unavail_suffix, used, used_suffix, free, free_suffix);
         screen_newline();
@@ -295 +302 @@
                 
                 uint64_t resmem;
-                char resmem_suffix;
-                order_suffix(task->resmem, &resmem, &resmem_suffix);
+                const char *resmem_suffix;
+                bin_order_suffix(task->resmem, &resmem, &resmem_suffix, true);
                 
                 uint64_t virtmem;
-                char virtmem_suffix;
-                order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
-                
-                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c ",
+                const char *virtmem_suffix;
+                bin_order_suffix(task->virtmem, &virtmem, &virtmem_suffix, true);
+                
+                printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s ",
                     task->task_id, task->threads, resmem, resmem_suffix);
                 print_percent(perc->resmem, 2);
-                printf(" %8" PRIu64 "%c ", virtmem, virtmem_suffix);
+                printf(" %6" PRIu64 "%s ", virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);
                 puts(" ");
@@ -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;
 }