Changeset 171f9a1 in mainline for uspace/srv

Timestamp:

2009-04-03T20:39:33Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

cb01e1e

Parents:

7a2c479

Message:

Character encoding/decoding un uspace. Partially fix klog application.

Location:

uspace/srv

Files:

• console/console.c (modified) (2 diffs)
• fb/fb.c (modified) (4 diffs)

uspace/srv/console/console.c

@@ -49 +49 @@
 #include <sys/mman.h>
 #include <stdio.h>
+#include <string.h>
 #include <sysinfo.h>
 #include <event.h>
@@ -466 +467 @@
 {
         ipc_callid_t callid;
-        size_t len;
-        size_t i;
-
-        if (!ipc_data_write_receive(&callid, &len)) {
+        size_t size;
+        wchar_t ch;
+        size_t off;
+
+        if (!ipc_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
         }
 
-        if (len > CWRITE_BUF_SIZE)
-                len = CWRITE_BUF_SIZE;
-
-        (void) ipc_data_write_finalize(callid, cwrite_buf, len);
-
-        for (i = 0; i < len; i++) {
-                write_char(consnum, cwrite_buf[i]);
+        if (size > CWRITE_BUF_SIZE)
+                size = CWRITE_BUF_SIZE;
+
+        (void) ipc_data_write_finalize(callid, cwrite_buf, size);
+
+        off = 0;
+        while (off < size) {
+                ch = str_decode(cwrite_buf, &off, size);
+                write_char(consnum, ch);
         }
 
         gcons_notify_char(consnum);
-        ipc_answer_1(rid, EOK, len);
+        ipc_answer_1(rid, EOK, size);
 }
 

uspace/srv/fb/fb.c

@@ -69 +69 @@
 #define DEFAULT_FGCOLOR  0x000000
 
+#define GLYPH_UNAVAIL   '?'
+
 #define MAX_ANIM_LEN     8
 #define MAX_ANIMATIONS   4
@@ -79 +81 @@
 /** Function to draw a glyph. */
 typedef void (*dg_t)(unsigned int x, unsigned int y, bool cursor,
-    uint8_t *glyphs, uint8_t glyph, uint32_t fg_color, uint32_t bg_color);
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
 
 struct {
@@ -670 +672 @@
         /* Check glyph range. */
         if (glyph >= FONT_GLYPHS)
-                return;
+                glyph = GLYPH_UNAVAIL;
 
         /*
@@ -734 +736 @@
         /* Check glyph range. */
         if (glyph >= FONT_GLYPHS)
-                return;
+                glyph = GLYPH_UNAVAIL;
 
         /* Pre-render 1x the foreground and background color pixels. */