WebSVN – HelenOS – Diff – /branches/network/kernel/genarch/src/fb/fb.c

 #include <panic.h>
 #include <memstr.h>
 #include <config.h>
 #include <bitops.h>
 #include <print.h>
+#include <string.h>
 #include <ddi/ddi.h>
 #include <arch/types.h>
 SPINLOCK_INITIALIZE(fb_lock);
 static uint8_t *fb_addr;
-static uint8_t *backbuf;
+static uint16_t *backbuf;
 static uint8_t *glyphs;
 static uint8_t *bgscan;
 static unsigned int xres;
 static unsigned int yres;
 static unsigned int rows;
 static unsigned int position = 0;
 #define BG_COLOR     0x000080
 #define FG_COLOR     0xffff00
-#define CURSOR       219
+#define INV_COLOR    0xaaaaaa
 #define RED(x, bits)         ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1))
 #define GREEN(x, bits)       ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
 #define BLUE(x, bits)        ((x >> (8 - bits)) & ((1 << bits) - 1))
 /** Draw character at given position
+ *
  */
-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, bool overlay)
+{
     unsigned int x = COL2X(col);
     unsigned int y = ROW2Y(row);
     unsigned int yd;
     if (y >= ytrim)
         logo_hide(silent);
+    if (!overlay)
-    backbuf[BB_POS(col, row)] = glyph;
+        backbuf[BB_POS(col, row)] = glyph;
     if (!silent) {
         for (yd = 0; yd < FONT_SCANLINES; yd++)
             memcpy(&fb_addr[FB_POS(x, y + yd + ylogo)],
                 &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
                 unsigned int x;
                 unsigned int col;
                 for (col = 0, x = 0; col < cols; col++,
                     x += FONT_WIDTH) {
-                    uint8_t glyph;
+                    uint16_t glyph;
                     if (row < rows - 1) {
                         if (backbuf[BB_POS(col, row)] ==
                             backbuf[BB_POS(col, row + 1)])
                             continue;
+                }
+            }
+        }
+    }
-    memmove(backbuf, backbuf + cols, cols * (rows - 1));
+    memmove(backbuf, &backbuf[BB_POS(0, 1)], cols * (rows - 1) * sizeof(uint16_t));
-    memsetb(&backbuf[BB_POS(0, rows - 1)], cols, 0);
+    memsetw(&backbuf[BB_POS(0, rows - 1)], cols, 0);
+}
 static void cursor_put(bool silent)
+{
+    unsigned int col = position % cols;
+    unsigned int row = position / cols;
-    glyph_draw(CURSOR, position % cols, position / cols, silent);
+    glyph_draw(fb_font_glyph(U_CURSOR), col, row, silent, true);
+}
 static void cursor_remove(bool silent)
+{
+    unsigned int col = position % cols;
+    unsigned int row = position / cols;
-    glyph_draw(0, position % cols, position / cols, silent);
+    glyph_draw(backbuf[BB_POS(col, row)], col, row, silent, true);
+}
 /** Print character to screen
+ *
  * Emulate basic terminal commands.
+ *
  */
-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);
     switch (ch) {
     case '\n':
             position--;
         break;
     case '\t':
         cursor_remove(silent);
         do {
-            glyph_draw((uint8_t) ' ', position % cols,
+            glyph_draw(fb_font_glyph(' '), position % cols,
-                position / cols, silent);
+                position / cols, silent, false);
             position++;
         } while ((position % 8) && (position < cols * rows));
         break;
     default:
-        glyph_draw((uint8_t) ch, position % cols,
+        glyph_draw(fb_font_glyph(ch), position % cols,
-            position / cols, silent);
+            position / cols, silent, false);
         position++;
+    }
     if (position >= cols * rows) {
         position -= cols;
+ *
  */
 static void glyphs_render(void)
+{
     /* Prerender glyphs */
-    unsigned int glyph;
+    uint16_t glyph;
     for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
+        uint32_t fg_color;
+        if (glyph == FONT_GLYPHS - 1)
+            fg_color = INV_COLOR;
+        else
+            fg_color = FG_COLOR;
         unsigned int y;
         for (y = 0; y < FONT_SCANLINES; y++) {
             unsigned int x;
             for (x = 0; x < FONT_WIDTH; x++) {
                 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;
+                    (1 << (7 - x))) ? fg_color : BG_COLOR;
                 rgb_conv(dst, rgb);
+            }
+        }
+    }
             unsigned int x;
             unsigned int col;
             for (col = 0, x = 0; col < cols;
                 col++, x += FONT_WIDTH) {
+                uint16_t glyph = backbuf[BB_POS(col, row)];
-                void *d = &fb_addr[FB_POS(x, y + yd)];
+                void *dst = &fb_addr[FB_POS(x, y + yd)];
-                void *s = &glyphs[GLYPH_POS(backbuf[BB_POS(col,
+                void *src = &glyphs[GLYPH_POS(glyph, yd)];
-                    row)], yd)];
-                memcpy(d, s, glyphscanline);
+                memcpy(dst, src, glyphscanline);
+            }
+        }
+    }
     if (COL2X(cols) < xres) {
     glyphscanline = FONT_WIDTH * pixelbytes;
     glyphbytes = ROW2Y(glyphscanline);
     bgscanbytes = xres * pixelbytes;
-    unsigned int fbsize = scanline * yres;
+    size_t fbsize = scanline * yres;
-    unsigned int bbsize = cols * rows;
+    size_t bbsize = cols * rows * sizeof(uint16_t);
-    unsigned int glyphsize = FONT_GLYPHS * glyphbytes;
+    size_t glyphsize = FONT_GLYPHS * glyphbytes;
-    backbuf = (uint8_t *) malloc(bbsize, 0);
+    backbuf = (uint16_t *) malloc(bbsize, 0);
     if (!backbuf)
         panic("Unable to allocate backbuffer.");
     glyphs = (uint8_t *) malloc(glyphsize, 0);
     if (!glyphs)
     bgscan = malloc(bgscanbytes, 0);
     if (!bgscan)
         panic("Unable to allocate background pixel.");
-    memsetb(backbuf, bbsize, 0);
+    memsetw(backbuf, cols * rows, 0);
     glyphs_render();
     fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);

Subversion Repositories HelenOS

(root)/branches/network/kernel/genarch/src/fb/fb.c – Rev 4153 → 4263