Changeset b27eb71 in mainline for uspace/srv/fb/ega.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/ega.c (modified) (5 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;