Changeset 7ce3cb2 in mainline for uspace/srv/fb

Timestamp:

2009-04-02T22:04:29Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

b888d5f

Parents:

58d5a7e7

Message:

Define wchar_t in userspace. Use it in fb and console.

Location:

uspace/srv/fb

Files:

• fb.c (modified) (12 diffs)
• serial_console.c (modified) (4 diffs)

uspace/srv/fb/fb.c

@@ -98 +98 @@
 /** Backbuffer character cell. */
 typedef struct {
-        uint8_t glyph;
+        uint32_t glyph;
         uint32_t fg_color;
         uint32_t bg_color;
@@ -195 +195 @@
 
 static void draw_glyph_aligned(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);
 static void draw_glyph_fallback(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);
 
 static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
@@ -660 +660 @@
  */
 static void draw_glyph_aligned(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)
 {
         unsigned int i, yd;
@@ -667 +667 @@
         unsigned long mask;
         unsigned int ww, d_add;
+
+        /* Check glyph range. */
+        if (glyph >= FONT_GLYPHS)
+                return;
 
         /*
@@ -679 +683 @@
         }
 
-
         /* Pointer to the current position in the mask. */
         maskp = (unsigned long *) &glyphs[GLYPH_POS(glyph, 0, cursor)];
@@ -721 +724 @@
  */
 void draw_glyph_fallback(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)
 {
         unsigned int i, j, yd;
@@ -728 +731 @@
         unsigned int d_add;
         uint8_t b;
+
+        /* Check glyph range. */
+        if (glyph >= FONT_GLYPHS)
+                return;
 
         /* Pre-render 1x the foreground and background color pixels. */
@@ -780 +787 @@
         unsigned int y = vport->y + ROW2Y(row);
 
-        uint8_t glyph;
+        uint32_t glyph;
         uint32_t fg_color;
         uint32_t bg_color;
@@ -837 +844 @@
  *
  */
-static void draw_char(viewport_t *vport, uint8_t c, unsigned int col, unsigned int row)
+static void draw_char(viewport_t *vport, wchar_t c, unsigned int col, unsigned int row)
 {
         bb_cell_t *bbp;
@@ -847 +854 @@
 
         bbp = &vport->backbuf[BB_POS(vport, col, row)];
-        bbp->glyph = c;
+        bbp->glyph = (uint32_t) c;
         bbp->fg_color = vport->attr.fg_color;
         bbp->bg_color = vport->attr.bg_color;
@@ -890 +897 @@
 
                         bbp = &vport->backbuf[BB_POS(vport, col, row)];
-                        uint8_t glyph = bbp->glyph;
+                        uint32_t glyph = bbp->glyph;
 
                         a = &data[j * w + i].attrs;
@@ -1511 +1518 @@
                 unsigned int i;
                 int scroll;
-                uint8_t glyph;
+                uint32_t glyph;
                 unsigned int row, col;
                 

uspace/srv/fb/serial_console.c

@@ -103 +103 @@
 }
 
+void serial_putchar(wchar_t ch)
+{
+        (*putc_function)(ch);
+}
+
 void serial_goto(const unsigned int row, const unsigned int col)
 {
@@ -257 +262 @@
                         if (!attrs_same(*a0, *a1))
                                 serial_set_attrs(a1);
-                        (*putc_function)(field->character);
+                        serial_putchar(field->character);
                         a0 = a1;
                 }
@@ -277 +282 @@
         size_t intersize = 0;
 
-        char c;
+        wchar_t c;
         int col, row, w, h;
         int fgcolor;
@@ -344 +349 @@
                         lastcol = col + 1;
                         lastrow = row;
-                        (*putc_function)(c);
+                        serial_putchar(c);
                         retval = 0;
                         break;