Changes in uspace/srv/hid/rfb/main.c [de19d4a:0d62c10] in mainline

File:

• uspace/srv/hid/rfb/main.c (modified) (4 diffs)

uspace/srv/hid/rfb/main.c

@@ -196 +196 @@
 
         /* Check that we support all required flags */
-        if ((params->flags & ~bmpf_color_key) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize)) != 0)
                 return ENOTSUP;
 
@@ -287 +287 @@
 
         if ((rfbbm->flags & bmpf_color_key) == 0) {
+                /* Simple copy */
                 for (y = srect.p0.y; y < srect.p1.y; y++) {
                         for (x = srect.p0.x; x < srect.p1.x; x++) {
@@ -294 +295 @@
                         }
                 }
-        } else {
+        } else if ((rfbbm->flags & bmpf_colorize) == 0) {
+                /* Color key */
                 for (y = srect.p0.y; y < srect.p1.y; y++) {
                         for (x = srect.p0.x; x < srect.p1.x; x++) {
@@ -304 +306 @@
                         }
                 }
+        } else {
+                /* Color key & colorization */
+                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,
+                                            rfbbm->rfb->color);
+                                }
+                        }
+                }
         }