Changeset 9805cde in mainline for uspace/app

Timestamp:

2009-01-01T13:31:23Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7122bc7

Parents:

666773c

Message:

Console color support overhaul. Create C library console interface.

Location:

uspace/app

Files:

• bdsh/input.c (modified) (2 diffs)
• tester/console/console1.c (modified) (1 diff)
• tetris/screen.c (modified) (2 diffs)
• trace/trace.c (modified) (1 diff)

uspace/app/bdsh/input.c

@@ -34 +34 @@
 #include <string.h>
 #include <io/stream.h>
+#include <console.h>
 
 #include "config.h"
@@ -165 +166 @@
         size_t len = 0;
 
+        console_set_style(STYLE_EMPHASIS);
         printf("%s", usr->prompt);
+        console_set_style(STYLE_NORMAL);
+
         read_line(line, INPUT_MAX);
         len = strlen(line);

uspace/app/tester/console/console1.c

@@ -33 +33 @@
 #include "../tester.h"
 
-#include <ipc/console.h>
+#include <console.h>
 
-static void set_style(int fgcolor, int bgcolor)
-{
-        int con_phone = get_cons_phone();
-        async_msg_2(con_phone, CONSOLE_SET_STYLE, fgcolor, bgcolor);
-}
+const char *color_name[] = {
+        [COLOR_BLACK] = "black",
+        [COLOR_BLUE] = "blue",
+        [COLOR_GREEN] = "green",
+        [COLOR_CYAN] = "cyan",
+        [COLOR_RED] = "red",
+        [COLOR_MAGENTA] = "magenta",
+        [COLOR_YELLOW] = "yellow",
+        [COLOR_WHITE] = "white"
+};
 
 char * test_console1(bool quiet)
 {
-        set_style(0xff0000, 0xf0f0f0);
-        printf("Red on white background.\n");
-        set_style(0x008080, 0x000080);
-        printf("Cyan on blue background.\n");
-        set_style(0x000000, 0xf0f0f0);
-        printf("Black on white background.\n");
+        int i, j;
+
+        printf("Style test: ");
+        console_set_style(STYLE_NORMAL);
+        printf("normal ");
+        console_set_style(STYLE_EMPHASIS);
+        printf("emphasized");
+        console_set_style(STYLE_NORMAL);
+        printf(".\n");
+
+        printf("Foreground color test:\n");
+        for (j = 0; j < 2; j++) {
+                for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
+                        console_set_color(i, COLOR_WHITE,
+                            j ? CATTR_BRIGHT : 0);
+                        printf(" %s ", color_name[i]);
+                }
+                console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+                putchar('\n');
+        }
+
+        printf("Background color test:\n");
+        for (j = 0; j < 2; j++) {
+                for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
+                        console_set_color(COLOR_WHITE, i,
+                            j ? CATTR_BRIGHT : 0);
+                        printf(" %s ", color_name[i]);
+                }
+                console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+                putchar('\n');
+        }
+
+        printf("Now let's test RGB colors:\n");
+
+        for (i = 0; i < 255; i += 16) {
+                console_set_rgb_color(0xffffff, i << 16);
+                putchar('X');
+        }
+        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        putchar('\n');
+
+        for (i = 0; i < 255; i += 16) {
+                console_set_rgb_color(0xffffff, i << 8);
+                putchar('X');
+        }
+        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        putchar('\n');
+
+        for (i = 0; i < 255; i += 16) {
+                console_set_rgb_color(0xffffff, i);
+                putchar('X');
+        }
+        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        putchar('\n');
 
         printf("[press a key]\n");

uspace/app/tetris/screen.c

@@ -52 +52 @@
 #include <unistd.h>
 #include <io/stream.h>
-
+#include <console.h>
 
 #include <async.h>
@@ -77 +77 @@
 
 
-
-static void set_style(int fgcolor, int bgcolor)
-{
-        async_msg_2(con_phone, CONSOLE_SET_STYLE, fgcolor, bgcolor);
-}
-
 static void start_standout(void)
 {
-        set_style(0xf0f0f0, 0);
+        console_set_rgb_color(0xf0f0f0, 0);
 }
 
 static void resume_normal(void)
 {
-        set_style(0, 0xf0f0f0);
-}
-
+        console_set_rgb_color(0, 0xf0f0f0);
+}
 
 void clear_screen(void)

uspace/app/trace/trace.c

@@ -667 +667 @@
         proto_add_oper(p, CONSOLE_FLUSH, o);
 
+        arg_def[0] = V_INTEGER;
+        o = oper_new("set_style", 1, arg_def, V_INTEGER, 0, resp_def);
+        proto_add_oper(p, CONSOLE_SET_STYLE, o);
+        arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; arg_def[2] = V_INTEGER;
+        o = oper_new("set_color", 3, arg_def, V_INTEGER, 0, resp_def);
+        proto_add_oper(p, CONSOLE_SET_COLOR, o);
         arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER;
-        o = oper_new("set_style", 2, arg_def, V_INTEGER, 0, resp_def);
-        proto_add_oper(p, CONSOLE_SET_STYLE, o);
+        o = oper_new("set_rgb_color", 2, arg_def, V_INTEGER, 0, resp_def);
+        proto_add_oper(p, CONSOLE_SET_RGB_COLOR, o);
         o = oper_new("cursor_visibility", 1, arg_def, V_VOID, 0, resp_def);
         proto_add_oper(p, CONSOLE_CURSOR_VISIBILITY, o);