Changeset 7e38970d in mainline for uspace/srv

Timestamp:

2020-12-07T00:08:37Z (5 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

Location:

uspace/srv/hid

Files:

• display/seat.c (modified) (1 diff)
• display/window.c (modified) (1 diff)
• output/gfx/font-8x16.c (deleted)
• rfb/main.c (modified) (4 diffs)

uspace/srv/hid/display/seat.c

@@ -90 +90 @@
 void ds_seat_set_focus(ds_seat_t *seat, ds_window_t *wnd)
 {
+        if (wnd == seat->focus) {
+                /* Focus is not changing */
+                return;
+        }
+
         if (seat->focus != NULL)
                 ds_window_post_unfocus_event(seat->focus);

uspace/srv/hid/display/window.c

@@ -160 +160 @@
         ds_display_remove_window(wnd);
         ds_display_add_window(disp, wnd);
+        (void) ds_display_paint(wnd->display, NULL);
 }
 

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);
+                                }
+                        }
+                }
         }