Changeset b27eb71 in mainline

Timestamp:

2009-04-05T09:17:02Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

9db4079

Parents:

f2b8cdc

Message:

Make ega-fb and serial-fb aware of UCS.

Location:

uspace/srv/fb

Files:

• ega.c (modified) (5 diffs)
• serial_console.c (modified) (2 diffs)

uspace/srv/fb/ega.c

@@ -84 +84 @@
 
 static unsigned attr_to_ega_style(const attrs_t *a);
+static uint8_t ega_glyph(wchar_t ch);
 
 static void clrscr(void)
@@ -144 +145 @@
 }
 
-static void printchar(char c, unsigned int row, unsigned int col)
-{
-        scr_addr[(row * scr_width + col) * 2] = c;
+static void printchar(wchar_t c, unsigned int row, unsigned int col)
+{
+        scr_addr[(row * scr_width + col) * 2] = ega_glyph(c);
         scr_addr[(row * scr_width + col) * 2 + 1] = style;
         
@@ -173 +174 @@
                         dp = &scr_addr[2 * ((y + j) * scr_width + (x + i))];
 
-                        dp[0] = field->character;
+                        dp[0] = ega_glyph(field->character);
                         dp[1] = attr_to_ega_style(&field->attrs);
                 }
@@ -249 +250 @@
 }
 
+static uint8_t ega_glyph(wchar_t ch)
+{
+        if (ch >= 0 && ch < 128)
+                return ch;
+
+        return '?';
+}
+
 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -254 +263 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        char c;
+        wchar_t c;
         unsigned int row, col, w, h;
         int bg_color, fg_color, attr;

uspace/srv/fb/serial_console.c

@@ -54 +54 @@
 
 static void serial_sgr(const unsigned int mode);
+void serial_putchar(wchar_t ch);
 
 static int scr_width;
 static int scr_height;
 static bool color = true;       /** True if producing color output. */
+static bool utf8 = false;       /** True if producing UTF8 output. */
 static putc_function_t putc_function;
 
@@ -105 +107 @@
 void serial_putchar(wchar_t ch)
 {
-        (*putc_function)(ch);
+        uint8_t buf[STR_BOUNDS(1)];
+        size_t offs;
+        size_t i;
+
+        if (utf8 != true) {
+                if (ch >= 0 && ch < 128)
+                        (*putc_function)((uint8_t) ch);
+                else 
+                        (*putc_function)('?');
+                return;
+        }
+
+        offs = 0;
+        if (chr_encode(ch, buf, &offs, STR_BOUNDS(1)) == EOK) {
+                for (i = 0; i < offs; i++)
+                        (*putc_function)(buf[i]);
+        } else {
+                (*putc_function)('?');
+        }
+
 }