Changeset 67ebf21 in mainline for uspace/srv/fb/fb.c

Timestamp:

2009-04-04T16:26:18Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

4527fb5

Parents:

7d440e3

Message:

Use Unicode font in userspace.

File:

• uspace/srv/fb/fb.c (modified) (10 diffs)

uspace/srv/fb/fb.c

@@ -389 +389 @@
         unsigned int row, col;
         unsigned int x, y;
-        uint8_t glyph;
+        uint32_t glyph;
         uint32_t fg_color;
         uint32_t bg_color;
@@ -466 +466 @@
                         for (x = 0; x < FONT_WIDTH; x++) {
                                 screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
-                                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x)))
+                                    (fb_font[glyph][y] & (1 << (7 - x)))
                                     ? 0xffffff : 0x000000);
                                 
                                 screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
-                                    (fb_font[glyph * FONT_SCANLINES + y] & (1 << (7 - x)))
+                                    (fb_font[glyph][y] & (1 << (7 - x)))
                                     ? 0x000000 : 0xffffff);
                         }
@@ -670 +670 @@
         unsigned int ww, d_add;
 
-        /* Check glyph range. */
-        if (glyph >= FONT_GLYPHS)
-                glyph = GLYPH_UNAVAIL;
-
         /*
          * Prepare a pair of words, one filled with foreground-color
@@ -734 +730 @@
         uint8_t b;
 
-        /* Check glyph range. */
-        if (glyph >= FONT_GLYPHS)
-                glyph = GLYPH_UNAVAIL;
-
         /* Pre-render 1x the foreground and background color pixels. */
         if (cursor) {
@@ -755 +747 @@
         for (yd = 0; yd < FONT_SCANLINES; yd++) {
                 /* Byte containing bits of the glyph scanline. */
-                b = fb_font[glyph * FONT_SCANLINES + yd];
+                b = fb_font[glyph][yd];
 
                 for (i = 0; i < FONT_WIDTH; i++) {
@@ -856 +848 @@
 
         bbp = &vport->backbuf[BB_POS(vport, col, row)];
-        bbp->glyph = (uint32_t) c;
+        bbp->glyph = fb_font_glyph(c);
         bbp->fg_color = vport->attr.fg_color;
         bbp->bg_color = vport->attr.bg_color;
@@ -899 +891 @@
 
                         bbp = &vport->backbuf[BB_POS(vport, col, row)];
-                        uint32_t glyph = bbp->glyph;
 
                         a = &data[j * w + i].attrs;
                         rgb_from_attr(&rgb, a);
 
-                        bbp->glyph = data[j * w + i].character;
+                        bbp->glyph = fb_font_glyph(data[j * w + i].character);
                         bbp->fg_color = rgb.fg_color;
                         bbp->bg_color = rgb.bg_color;
@@ -1520 +1511 @@
                 unsigned int i;
                 int scroll;
-                uint32_t glyph;
+                wchar_t ch;
                 unsigned int row, col;
                 
@@ -1557 +1548 @@
                 
                 case FB_PUTCHAR:
-                        glyph = IPC_GET_ARG1(call);
+                        ch = IPC_GET_ARG1(call);
                         row = IPC_GET_ARG2(call);
                         col = IPC_GET_ARG3(call);
@@ -1567 +1558 @@
                         ipc_answer_0(callid, EOK);
                         
-                        draw_char(vport, glyph, col, row);
+                        draw_char(vport, ch, col, row);
                         
                         /* Message already answered */