Changeset 2d37006 in mainline

Timestamp:

2012-04-15T01:09:11Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6484602

Parents:

d517c5b

Message:

top: make warnings more visible

• warnings stay on screen for 2–3 seconds, not immediately disappear
• warnings are shown in a different style

Location:

uspace/app/top

Files:

• screen.c (modified) (8 diffs)
• screen.h (modified) (1 diff)
• top.c (modified) (1 diff)

uspace/app/top/screen.c

@@ -37 +37 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <io/console.h>
 #include <io/style.h>
@@ -48 +49 @@
 #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 sysarg_t warning_col = 0;
+static sysarg_t warning_row = 0;
+static suseconds_t warning_timeleft = 0;
+static char *warning_text = NULL;
+
 static void screen_style_normal(void)
 {
@@ -64 +68 @@
         console_flush(console);
         console_set_style(console, STYLE_INVERTED);
+}
+
+static void screen_style_emphasis(void)
+{
+        console_flush(console);
+        console_set_style(console, STYLE_EMPHASIS);
 }
 
@@ -126 +136 @@
 void screen_done(void)
 {
+        free(warning_text);
+        warning_text = NULL;
+
         screen_restart(true);
         
@@ -484 +497 @@
 }
 
+static void print_warning(void)
+{
+        screen_get_pos(&warning_col, &warning_row);
+        if (warning_timeleft > 0) {
+                screen_style_emphasis();
+                print_string(warning_text);
+                screen_style_normal();
+        } else {
+                free(warning_text);
+                warning_text = NULL;
+        }
+        screen_newline();
+}
+
 void print_data(data_t *data)
 {
@@ -492 +519 @@
         print_cpu_info(data);
         print_physmem_info(data);
-        
-        /* Empty row for warnings */
-        screen_get_pos(&warn_col, &warn_row);
-        screen_newline();
+        print_warning();
         
         switch (op_mode) {
@@ -518 +542 @@
 }
 
-void print_warning(const char *fmt, ...)
-{
-        screen_moveto(warn_col, warn_row);
-        
+void show_warning(const char *fmt, ...)
+{
+        sysarg_t cols;
+        sysarg_t rows;
+        screen_get_size(&cols, &rows);
+
+        size_t warning_text_size = 1 + cols * sizeof(*warning_text);
+        free(warning_text);
+        warning_text = malloc(warning_text_size);
+        if (!warning_text)
+                return;
+
         va_list args;
         va_start(args, fmt);
-        vprintf(fmt, args);
+        vsnprintf(warning_text, warning_text_size, fmt, args);
         va_end(args);
         
-        screen_newline();
+        warning_timeleft = 2 * USEC_COUNT;
+
+        screen_moveto(warning_col, warning_row);
+        print_warning();
         console_flush(console);
 }
@@ -555 +590 @@
                 kbd_event_t event;
                 
+                warning_timeleft -= timeleft;
                 if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
                 }
+                warning_timeleft += timeleft;
                 
                 if (event.type == KEY_PRESS)

uspace/app/top/screen.h

@@ -43 +43 @@
 extern void screen_done(void);
 extern void print_data(data_t *);
-extern void print_warning(const char *, ...);
+extern void show_warning(const char *, ...);
 
 extern int tgetchar(unsigned int);

uspace/app/top/top.c

@@ -406 +406 @@
                                         excs_all = !excs_all;
                                         if (excs_all)
-                                                print_warning("Showing all exceptions");
+                                                show_warning("Showing all exceptions");
                                         else
-                                                print_warning("Showing only hot exceptions");
+                                                show_warning("Showing only hot exceptions");
                                         break;
                                 }
                                 /* fallthrough */
                         default:
-                                print_warning("Unknown command \"%c\", use \"h\" for help", c);
+                                show_warning("Unknown command \"%c\", use \"h\" for help", c);
                                 continue; /* don't redraw */
                 }