Changeset d530237a in mainline for fb/fb.c

Timestamp:

2006-06-04T11:28:47Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

67ec84b

Parents:

a78e273

Message:

Console graphics update.
Slight speed improvement on console redraw.

File:

• fb/fb.c (modified) (7 diffs)

fb/fb.c

@@ -267 +267 @@
 /* Character-console functions */
 
-/** Draw character at given position */
-static void draw_glyph(int vp,__u8 glyph, unsigned int sx, unsigned int sy, style_t style)
+/** Draw character at given position
+ *
+ * @param vp Viewport where the character is printed
+ * @param sx Coordinates of top-left of the character
+ * @param sy Coordinates of top-left of the character
+ * @param style Color of the character
+ * @param transparent If false, print background color
+ */
+static void draw_glyph(int vp,__u8 glyph, unsigned int sx, unsigned int sy, 
+                       style_t style, int transparent)
 {
         int i;
@@ -279 +287 @@
                         if (glline & (1 << (7 - i)))
                                 putpixel(vp, sx + i, sy + y, style.fg_color);
-                        else
+                        else if (!transparent)
                                 putpixel(vp, sx + i, sy + y, style.bg_color);
                 }
@@ -427 +435 @@
  * @param row Screen position relative to viewport
  * @param col Screen position relative to viewport
- */
-static void draw_char(int vp, char c, unsigned int row, unsigned int col, style_t style)
+ * @param transparent If false, print background color with character
+ */
+static void draw_char(int vp, char c, unsigned int row, unsigned int col, style_t style, int transparent)
 {
         viewport_t *vport = &viewports[vp];
@@ -437 +446 @@
                 invert_char(vp, vport->cur_row, vport->cur_col);
         
-        draw_glyph(vp, c, col * COL_WIDTH, row * FONT_SCANLINES, style);
+        draw_glyph(vp, c, col * COL_WIDTH, row * FONT_SCANLINES, style, transparent);
 
         vport->cur_col = col;
@@ -470 +479 @@
                 col = i % vport->cols;
                 row = i / vport->cols;
-                draw_glyph(vp, data[i].character, col * COL_WIDTH, row * FONT_SCANLINES, data[i].style);
+                draw_glyph(vp, data[i].character, col * COL_WIDTH, row * FONT_SCANLINES, 
+                           data[i].style, style_same(data[i].style,vport->style));
         }
         cursor_print(vp);
@@ -779 +789 @@
 
                 case FB_PUTCHAR:
+                case FB_TRANS_PUTCHAR:
                         c = IPC_GET_ARG1(call);
                         row = IPC_GET_ARG2(call);
@@ -788 +799 @@
                         ipc_answer_fast(callid,0,0,0);
 
-                        draw_char(vp, c, row, col, vport->style);
+                        draw_char(vp, c, row, col, vport->style, IPC_GET_METHOD(call) == FB_TRANS_PUTCHAR);
                         continue; /* msg already answered */
                 case FB_CLEAR: