Changeset bea947f in mainline for uspace/drv/fb/kfb/port.c

Timestamp:

2020-05-24T17:59:02Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b3b00b6

Parents:

ef20a91

Message:

Implement bitmap color key to allow transparent cursor background

This seems to be the simplest solution of them all. It will work
on any bit depth except 1 bit per pixel (monochrome), where we would
need to extend the bitmap with a bit mask instead.

File:

• uspace/drv/fb/kfb/port.c (modified) (3 diffs)

uspace/drv/fb/kfb/port.c

@@ -90 +90 @@
         gfx_bitmap_alloc_t alloc;
         gfx_rect_t rect;
+        gfx_bitmap_flags_t flags;
+        pixel_t key_color;
         bool myalloc;
 } kfb_bitmap_t;
@@ -203 +205 @@
         gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
         kfbbm->rect = params->rect;
+        kfbbm->flags = params->flags;
+        kfbbm->key_color = params->key_color;
 
         if (alloc == NULL) {
@@ -298 +302 @@
         gfx_rect_clip(&srect, &skfbrect, &crect);
 
-        for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
-                for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
-                        gfx_coord2_subtract(&pos, &kfbbm->rect.p0, &sp);
-                        gfx_coord2_add(&pos, &offs, &dp);
-
-                        color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
-                        kfb->pixel2visual(kfb->addr +
-                            FB_POS(kfb, dp.x, dp.y), color);
+        if ((kfbbm->flags & bmpf_color_key) != 0) {
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &kfbbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                if (color != kfbbm->key_color) {
+                                        kfb->pixel2visual(kfb->addr +
+                                            FB_POS(kfb, dp.x, dp.y), color);
+                                }
+                        }
+                }
+        } else {
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &kfbbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                kfb->pixel2visual(kfb->addr +
+                                    FB_POS(kfb, dp.x, dp.y), color);
+                        }
                 }
         }