Changeset bea947f in mainline for uspace/srv/hid/rfb/main.c

Timestamp:

2020-05-24T17:59:02Z (4 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/srv/hid/rfb/main.c (modified) (3 diffs)

uspace/srv/hid/rfb/main.c

@@ -72 +72 @@
         gfx_bitmap_alloc_t alloc;
         gfx_rect_t rect;
+        gfx_bitmap_flags_t flags;
+        pixel_t key_color;
         bool myalloc;
 } rfb_bitmap_t;
@@ -199 +201 @@
         gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
         rfbbm->rect = params->rect;
+        rfbbm->flags = params->flags;
+        rfbbm->key_color = params->key_color;
 
         if (alloc == NULL) {
@@ -278 +282 @@
         pbm.data = rfbbm->alloc.pixels;
 
-        for (y = srect.p0.y; y < srect.p1.y; y++) {
-                for (x = srect.p0.x; x < srect.p1.x; x++) {
-                        color = pixelmap_get_pixel(&pbm, x, y);
-                        pixelmap_put_pixel(&rfbbm->rfb->rfb.framebuffer,
-                            x + offs.x, y + offs.y, color);
+        if ((rfbbm->flags & bmpf_color_key) == 0) {
+                for (y = srect.p0.y; y < srect.p1.y; y++) {
+                        for (x = srect.p0.x; x < srect.p1.x; x++) {
+                                color = pixelmap_get_pixel(&pbm, x, y);
+                                pixelmap_put_pixel(&rfbbm->rfb->rfb.framebuffer,
+                                    x + offs.x, y + offs.y, color);
+                        }
+                }
+        } else {
+                for (y = srect.p0.y; y < srect.p1.y; y++) {
+                        for (x = srect.p0.x; x < srect.p1.x; x++) {
+                                color = pixelmap_get_pixel(&pbm, x, y);
+                                if (color != rfbbm->key_color) {
+                                        pixelmap_put_pixel(&rfbbm->rfb->rfb.framebuffer,
+                                            x + offs.x, y + offs.y, color);
+                                }
+                        }
                 }
         }