Changeset bc52b5b in mainline for uspace/lib/gfxfont/src/text.c

Timestamp:

2021-08-15T10:02:32Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99589a9

Parents:

de0c55a

Message:

Allow the use of EGA attributes/24-bit characters alongside RGB

In a big hack (since we cannot have different pixel formats yet) we
use a pixel format that allows both 24-bit RGB (without character)
or 24-bit character with 8-bit attributes. Thus in GFX we cannot
currently have characters with any RGB color, but we can set
foreground and background individually (and it even works in EGA mode).

File:

• uspace/lib/gfxfont/src/text.c (modified) (3 diffs)

uspace/lib/gfxfont/src/text.c

@@ -110 +110 @@
         gfx_bitmap_t *bitmap;
         gfx_bitmap_alloc_t alloc;
-        uint16_t r, g, b;
+        uint8_t attr;
         pixelmap_t pmap;
         gfx_coord_t x;
         pixel_t pixel;
+        char32_t c;
+        size_t off;
         errno_t rc;
 
@@ -121 +123 @@
          */
 
-        gfx_color_get_rgb_i16(color, &r, &g, &b);
-
-        /*
-         * We are setting the *background* color, the foreground color
-         * will be set to its complement.
-         */
-        r = 0xff ^ (r >> 8);
-        g = 0xff ^ (g >> 8);
-        b = 0xff ^ (b >> 8);
+        gfx_color_get_ega(color, &attr);
 
         gfx_bitmap_params_init(&params);
@@ -156 +150 @@
         pmap.data = alloc.pixels;
 
+        off = 0;
         for (x = 0; x < params.rect.p1.x; x++) {
-                pixel = PIXEL(str[x], r, g, b);
+                c = str_decode(str, &off, STR_NO_LIMIT);
+                pixel = PIXEL(attr,
+                    (c >> 16) & 0xff,
+                    (c >> 8) & 0xff,
+                    c & 0xff);
                 pixelmap_put_pixel(&pmap, x, 0, pixel);
         }