Changeset 4a62ec9 in mainline

Timestamp:

2009-01-09T21:53:36Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

42ec919

Parents:

7447572

Message:

Must check colors in draw_text_data().

File:

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

uspace/srv/fb/fb.c

@@ -186 +186 @@
 };
 
+static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
 static int rgb_from_style(attr_rgb_t *rgb, int style);
 static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
@@ -878 +879 @@
                 uint8_t glyph = bbp->glyph;
 
-                if (glyph != data[i].character) {
-                        bbp->glyph = data[i].character;
-                        a = &data[i].attrs;
-
-                        switch (a->t) {
-                        case at_style:
-                                rgb_from_style(&rgb, a->a.s.style);
-                                break;
-                        case at_idx:
-                                rgb_from_idx(&rgb, a->a.i.fg_color,
-                                    a->a.i.bg_color, a->a.i.flags);
-                                break;
-                        case at_rgb:
-                                rgb = a->a.r;
-                                break;
-                        }
+                a = &data[i].attrs;
+                rgb_from_attr(&rgb, a);
+
+                if (glyph != data[i].character ||
+                    rgb.fg_color != bbp->fg_color ||
+                    rgb.bg_color != bbp->bg_color) {
+                        bbp->glyph = data[i].character; 
 
                         bbp->fg_color = rgb.fg_color;
@@ -1443 +1435 @@
 
         return EOK;
+}
+
+static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a)
+{
+        int rc;
+
+        switch (a->t) {
+        case at_style:
+                rc = rgb_from_style(rgb, a->a.s.style);
+                break;
+        case at_idx:
+                rc = rgb_from_idx(rgb, a->a.i.fg_color,
+                    a->a.i.bg_color, a->a.i.flags);
+                break;
+        case at_rgb:
+                *rgb = a->a.r;
+                rc = EOK;
+                break;
+        }
+
+        return rc;
 }