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

Timestamp:

2009-04-03T15:52:14Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a7b1071

Parents:

2398ee9

Message:

represent special keystrokes (cursor arrows, page up/down, delete, etc.) as appropriate Unicode characters
do not parse ANSI control sequences in kconsole, but in serial line driver

File:

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

kernel/genarch/src/fb/fb.c

@@ -48 +48 @@
 #include <bitops.h>
 #include <print.h>
+#include <string.h>
 #include <ddi/ddi.h>
 #include <arch/types.h>
@@ -79 +80 @@
 #define FG_COLOR     0xffff00
 #define INV_COLOR    0xaaaaaa
-
-#define CURSOR       0x2588
 
 #define RED(x, bits)         ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1))
@@ -201 +200 @@
  *
  */
-static void glyph_draw(uint16_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);
@@ -210 +209 @@
                 logo_hide(silent);
         
-        backbuf[BB_POS(col, row)] = glyph;
+        if (!overlay)
+                backbuf[BB_POS(col, row)] = glyph;
         
         if (!silent) {
@@ -270 +270 @@
 static void cursor_put(bool silent)
 {
-        glyph_draw(fb_font_glyph(CURSOR), position % cols, position / cols, silent);
+        unsigned int col = position % cols;
+        unsigned int row = position / cols;
+        
+        glyph_draw(fb_font_glyph(U_CURSOR), col, row, silent, true);
 }
 
@@ -276 +279 @@
 static void cursor_remove(bool silent)
 {
-        glyph_draw(fb_font_glyph(0), position % cols, position / cols, silent);
+        unsigned int col = position % cols;
+        unsigned int row = position / cols;
+        
+        glyph_draw(backbuf[BB_POS(col, row)], col, row, silent, true);
 }
 
@@ -308 +314 @@
                 do {
                         glyph_draw(fb_font_glyph(' '), position % cols,
-                            position / cols, silent);
+                            position / cols, silent, false);
                         position++;
                 } while ((position % 8) && (position < cols * rows));
@@ -314 +320 @@
         default:
                 glyph_draw(fb_font_glyph(ch), position % cols,
-                    position / cols, silent);
+                    position / cols, silent, false);
                 position++;
         }