Changeset dcdc31d in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2009-03-24T14:37:39Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4ccdcf6

Parents:

ac7c8d12

Message:

use Unicode font glyphs and mapping for framebuffer

File:

• kernel/genarch/src/fb/fb.c (modified) (14 diffs)

kernel/genarch/src/fb/fb.c

@@ -54 +54 @@
 
 static uint8_t *fb_addr;
-static uint8_t *backbuf;
+static uint16_t *backbuf;
 static uint8_t *glyphs;
 static uint8_t *bgscan;
@@ -200 +200 @@
  *
  */
-static void glyph_draw(uint8_t glyph, unsigned int col, unsigned int row, bool silent)
+static void glyph_draw(uint16_t glyph, unsigned int col, unsigned int row, bool silent)
 {
         unsigned int x = COL2X(col);
@@ -243 +243 @@
                                 for (col = 0, x = 0; col < cols; col++,
                                     x += FONT_WIDTH) {
-                                        uint8_t glyph;
+                                        uint16_t glyph;
                                         
                                         if (row < rows - 1) {
@@ -262 +262 @@
         }
         
-        memmove(backbuf, backbuf + cols, cols * (rows - 1));
-        memsetb(&backbuf[BB_POS(0, rows - 1)], cols, 0);
+        memmove(backbuf, &backbuf[BB_POS(0, 1)], cols * (rows - 1) * sizeof(uint16_t));
+        memsetw(&backbuf[BB_POS(0, rows - 1)], cols, 0);
 }
 
@@ -269 +269 @@
 static void cursor_put(bool silent)
 {
-        glyph_draw(CURSOR, position % cols, position / cols, silent);
+        glyph_draw(fb_font_glyph(CURSOR), position % cols, position / cols, silent);
 }
 
@@ -275 +275 @@
 static void cursor_remove(bool silent)
 {
-        glyph_draw(0, position % cols, position / cols, silent);
+        glyph_draw(fb_font_glyph(0), position % cols, position / cols, silent);
 }
 
@@ -284 +284 @@
  *
  */
-static void fb_putchar(outdev_t *dev, char ch, bool silent)
+static void fb_putchar(outdev_t *dev, wchar_t ch, bool silent)
 {
         spinlock_lock(&fb_lock);
@@ -306 +306 @@
                 cursor_remove(silent);
                 do {
-                        glyph_draw((uint8_t) ' ', position % cols,
+                        glyph_draw(fb_font_glyph(' '), position % cols,
                             position / cols, silent);
                         position++;
@@ -312 +312 @@
                 break;
         default:
-                glyph_draw((uint8_t) ch, position % cols,
+                glyph_draw(fb_font_glyph(ch), position % cols,
                     position / cols, silent);
                 position++;
@@ -342 +342 @@
 {
         /* Prerender glyphs */
-        unsigned int glyph;
+        uint16_t glyph;
         
         for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
@@ -353 +353 @@
                                 void *dst = &glyphs[GLYPH_POS(glyph, y) +
                                     x * pixelbytes];
-                                uint32_t rgb = (fb_font[ROW2Y(glyph) + y] &
+                                uint32_t rgb = (fb_font[glyph][y] &
                                     (1 << (7 - x))) ? FG_COLOR : BG_COLOR;
                                 rgb_conv(dst, rgb);
@@ -399 +399 @@
                         for (col = 0, x = 0; col < cols;
                             col++, x += FONT_WIDTH) {
-                                void *d = &fb_addr[FB_POS(x, y + yd)];
-                                void *s = &glyphs[GLYPH_POS(backbuf[BB_POS(col,
-                                    row)], yd)];
-                                memcpy(d, s, glyphscanline);
+                                uint16_t glyph = backbuf[BB_POS(col, row)];
+                                void *dst = &fb_addr[FB_POS(x, y + yd)];
+                                void *src = &glyphs[GLYPH_POS(glyph, yd)];
+                                memcpy(dst, src, glyphscanline);
                         }
                 }
@@ -495 +495 @@
         bgscanbytes = xres * pixelbytes;
         
-        unsigned int fbsize = scanline * yres;
-        unsigned int bbsize = cols * rows;
-        unsigned int glyphsize = FONT_GLYPHS * glyphbytes;
-        
-        backbuf = (uint8_t *) malloc(bbsize, 0);
+        size_t fbsize = scanline * yres;
+        size_t bbsize = cols * rows * sizeof(uint16_t);
+        size_t glyphsize = FONT_GLYPHS * glyphbytes;
+        
+        backbuf = (uint16_t *) malloc(bbsize, 0);
         if (!backbuf)
                 panic("Unable to allocate backbuffer.");
@@ -511 +511 @@
                 panic("Unable to allocate background pixel.");
         
-        memsetb(backbuf, bbsize, 0);
+        memsetw(backbuf, cols * rows, 0);
         
         glyphs_render();