Changeset 0d62c10 in mainline for uspace/lib

Timestamp:

2020-10-09T20:27:24Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f80690a

Parents:

8bf9058

Message:

Rendering text in different colors via colorization

Location:

uspace/lib

Files:

• congfx/src/console.c (modified) (4 diffs)
• gfx/include/types/gfx/bitmap.h (modified) (1 diff)
• gfxfont/src/font.c (modified) (3 diffs)
• gfxfont/src/text.c (modified) (1 diff)
• memgfx/src/memgc.c (modified) (4 diffs)

uspace/lib/congfx/src/console.c

@@ -207 +207 @@
 
         /* Check that we support all requested flags */
-        if ((params->flags & ~bmpf_color_key) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize)) != 0)
                 return ENOTSUP;
 
@@ -296 +296 @@
 
         if ((cbm->flags & bmpf_color_key) == 0) {
+                /* Simple copy */
                 for (y = crect.p0.y; y < crect.p1.y; y++) {
                         console_set_pos(cbm->cgc->con, crect.p0.x, y);
@@ -312 +313 @@
                         }
                 }
-        } else {
+        } else if ((cbm->flags & bmpf_colorize) == 0) {
+                /* Color key */
                 for (y = crect.p0.y; y < crect.p1.y; y++) {
                         for (x = crect.p0.x; x < crect.p1.x; x++) {
@@ -332 +334 @@
                         }
                 }
+        } else {
+                /* Color key & colorize */
+                console_set_rgb_color(cbm->cgc->con, cbm->cgc->clr,
+                    cbm->cgc->clr);
+
+                for (y = crect.p0.y; y < crect.p1.y; y++) {
+                        for (x = crect.p0.x; x < crect.p1.x; x++) {
+
+                                clr = pixelmap_get_pixel(&pixelmap,
+                                    x - offs.x - cbm->rect.p0.x,
+                                    y - offs.y - cbm->rect.p0.y);
+
+                                if (clr != cbm->key_color) {
+                                        console_set_pos(cbm->cgc->con, x, y);
+                                        rv = fputc('X', cbm->cgc->fout);
+                                        if (rv < 0)
+                                                return EIO;
+
+                                        console_flush(cbm->cgc->con);
+                                }
+
+                        }
+                }
         }
 

uspace/lib/gfx/include/types/gfx/bitmap.h

@@ -47 +47 @@
 /** Bitmap flags */
 typedef enum {
+        /** Directly map GC output into this bitmap */
+        bmpf_direct_output = 0x1,
         /** Enable color key */
-        bmpf_color_key = 0x1,
-        /** Directly map GC output into this bitmap */
-        bmpf_direct_output = 0x2
+        bmpf_color_key = 0x2,
+        /** Paint non-background pixels with current drawing color */
+        bmpf_colorize = 0x4
 } gfx_bitmap_flags_t;
 

uspace/lib/gfxfont/src/font.c

@@ -122 +122 @@
         gfx_bitmap_params_init(&params);
         params.rect = font->rect;
-        params.flags = bmpf_color_key;
+        params.flags = bmpf_color_key | bmpf_colorize;
         params.key_color = PIXEL(0, 0, 0, 0);
 
@@ -366 +366 @@
         if (nrect->p1.y - nrect->p0.y > params.rect.p1.y)
                 params.rect.p1.y = nrect->p1.y - nrect->p0.y;
-        params.flags = bmpf_color_key;
+        params.flags = bmpf_color_key | bmpf_colorize;
         params.key_color = PIXEL(0, 0, 0, 0);
 
@@ -705 +705 @@
         params.rect.p1.x = width;
         params.rect.p1.y = height;
-        params.flags = bmpf_color_key;
+        params.flags = bmpf_color_key | bmpf_colorize;
         params.key_color = PIXEL(0, 0, 0, 0);
 

uspace/lib/gfxfont/src/text.c

@@ -135 +135 @@
                 case gfx_valign_bottom:
                         cpos.y -= fmetrics.descent;
-                        break;
+                        break;
                 default:
                         break;

uspace/lib/memgfx/src/memgc.c

@@ -225 +225 @@
 
         /* Check that we support all requested flags */
-        if ((params->flags & ~(bmpf_color_key | bmpf_direct_output)) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize |
+            bmpf_direct_output)) != 0)
                 return ENOTSUP;
 
@@ -367 +368 @@
                 /* Nothing to do */
         } else if ((mbm->flags & bmpf_color_key) == 0) {
+                /* Simple copy */
                 for (y = drect.p0.y; y < drect.p1.y; y++) {
                         for (x = drect.p0.x; x < drect.p1.x; x++) {
@@ -375 +377 @@
                         }
                 }
-        } else {
+        } else if ((mbm->flags & bmpf_colorize) == 0) {
+                /* Color key */
                 for (y = drect.p0.y; y < drect.p1.y; y++) {
                         for (x = drect.p0.x; x < drect.p1.x; x++) {
@@ -385 +388 @@
                         }
                 }
+        } else {
+                /* Color key & colorization */
+                for (y = drect.p0.y; y < drect.p1.y; y++) {
+                        for (x = drect.p0.x; x < drect.p1.x; x++) {
+                                pixel = pixelmap_get_pixel(&smap,
+                                    x - mbm->rect.p0.x - offs.x,
+                                    y - mbm->rect.p0.y - offs.y);
+                                if (pixel != mbm->key_color)
+                                        pixelmap_put_pixel(&dmap, x, y,
+                                            mbm->mgc->color);
+                        }
+                }
         }