Changeset b27eb71 in mainline for uspace/srv/fb/serial_console.c

Timestamp:

2009-04-05T09:17:02Z (15 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.

File:

• uspace/srv/fb/serial_console.c (modified) (2 diffs)

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)('?');
+        }
+
 }