Changeset 9f1362d4 in mainline for uspace/app/tester/console/console1.c

Timestamp:

2010-04-19T19:58:18Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

369a5f8

Parents:

caad59a

Message:

console output improvements

• define new generic styles (STYLE_INVERTED for inverted print and STYLE_SELECTION for selections), use them primarily instead of specifying colors or RGBs
• use console_set_style(fphone(stdout), STYLE_NORMAL) as the correct mean for reseting console settings (instead of specifying conrete hardcoded colors)
• rename console_goto() to console_set_pos() (consistency with console_get_pos())
• use semantically correct unsigned types for console sizes and cursor positions (instead of signed types)
• use unsigned types for sizes and positions in libclui
• top: nicer screen redrawing (do not use console_clear() which causes flickering, but repaint the screen properly — not entirely finished yet)
• initialize mouse pointer coordinates (so the mouse cursor does not behave erratic after boot, unfortunatelly this does not solve ticket #223)

File:

• uspace/app/tester/console/console1.c (modified) (6 diffs)

uspace/app/tester/console/console1.c

@@ -53 +53 @@
                 fflush(stdout);
                 console_set_style(fphone(stdout), STYLE_NORMAL);
-                printf("normal ");
+                printf(" normal ");
                 fflush(stdout);
                 console_set_style(fphone(stdout), STYLE_EMPHASIS);
-                printf("emphasized");
+                printf(" emphasized ");
+                fflush(stdout);
+                console_set_style(fphone(stdout), STYLE_INVERTED);
+                printf(" inverted ");
+                fflush(stdout);
+                console_set_style(fphone(stdout), STYLE_SELECTED);
+                printf(" selected ");
                 fflush(stdout);
                 console_set_style(fphone(stdout), STYLE_NORMAL);
-                printf(".\n");
+                printf("\n");
                 
                 unsigned int i;
@@ -73 +79 @@
                         }
                         fflush(stdout);
-                        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
+                        console_set_style(fphone(stdout), STYLE_NORMAL);
                         putchar('\n');
                 }
@@ -86 +92 @@
                         }
                         fflush(stdout);
-                        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
+                        console_set_style(fphone(stdout), STYLE_NORMAL);
                         putchar('\n');
                 }
@@ -94 +100 @@
                 for (i = 0; i < 255; i += 16) {
                         fflush(stdout);
-                        console_set_rgb_color(fphone(stdout), 0xffffff, i << 16);
+                        console_set_rgb_color(fphone(stdout), (255 - i) << 16, i << 16);
                         putchar('X');
                 }
@@ -103 +109 @@
                 for (i = 0; i < 255; i += 16) {
                         fflush(stdout);
-                        console_set_rgb_color(fphone(stdout), 0xffffff, i << 8);
+                        console_set_rgb_color(fphone(stdout), (255 - i) << 8, i << 8);
                         putchar('X');
                 }
@@ -112 +118 @@
                 for (i = 0; i < 255; i += 16) {
                         fflush(stdout);
-                        console_set_rgb_color(fphone(stdout), 0xffffff, i);
+                        console_set_rgb_color(fphone(stdout), 255 - i, i);
                         putchar('X');
                 }
                 fflush(stdout);
-                console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_style(fphone(stdout), STYLE_NORMAL);
                 putchar('\n');
         }