Changeset 7e38970d in mainline for uspace/lib/congfx/src/console.c

Timestamp:

2020-12-07T00:08:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/congfx/src/console.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);
+                                }
+
+                        }
+                }
         }