Changeset b5c7cee in mainline

Timestamp:

2020-03-16T13:23:13Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1a1271d

Parents:

b3825aa

git-author:

Jiri Svoboda <jiri@…> (2020-03-15 20:22:57)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-16 13:23:13)

Message:

Bring focused window to top and handle overlapping windows

When rendering changes to overlapping windows, properly repaint
that area of display instead of blindly rendering just that change.

Location:

uspace/srv/hid/display

Files:

• seat.c (modified) (1 diff)
• window.c (modified) (6 diffs)
• window.h (modified) (1 diff)

uspace/srv/hid/display/seat.c

@@ -90 +90 @@
         if (wnd != NULL)
                 ds_window_post_focus_event(wnd);
+
+        ds_window_bring_to_top(wnd);
 }
 

uspace/srv/hid/display/window.c

@@ -108 +108 @@
         gfx_rect_translate(&wnd->dpos, &crect, &drect);
 
-        /* Render a copy to the backbuffer */
+        /* Render into the backbuffer */
         for (y = crect.p0.y; y < crect.p1.y; y++) {
                 for (x = crect.p0.x; x < crect.p1.x; x++) {
@@ -116 +116 @@
         }
 
-        return gfx_fill_rect(ds_display_get_gc(wnd->display), &drect);
+        /* Repaint this area of the display */
+        return ds_display_paint(wnd->display, &drect);
 }
 
@@ -183 +184 @@
         gfx_rect_t swrect;
         gfx_rect_t crect;
+        gfx_rect_t drect;
         gfx_coord_t x, y;
         pixelmap_t pixelmap;
@@ -212 +214 @@
         /* Offset for rendering on screen = window pos + offs */
         gfx_coord2_add(&cbm->wnd->dpos, &offs, &doffs);
+
+        /* Resulting rectangle on the screen we are drawing into */
+        gfx_rect_translate(&doffs, &crect, &drect);
 
         rc = gfx_bitmap_get_alloc(cbm->bitmap, &alloc);
@@ -233 +238 @@
         }
 
-        return gfx_bitmap_render(cbm->bitmap, &crect, &doffs);
+        /* Repaint this area of the display */
+        return ds_display_paint(cbm->wnd->display, &drect);
 }
 
@@ -394 +400 @@
 }
 
+void ds_window_bring_to_top(ds_window_t *wnd)
+{
+        ds_display_t *disp = wnd->display;
+
+        ds_display_remove_window(wnd);
+        ds_display_add_window(disp, wnd);
+}
+
 /** Get generic graphic context from window.
  *

uspace/srv/hid/display/window.h

@@ -53 +53 @@
 extern void ds_window_destroy(ds_window_t *);
 extern errno_t ds_window_resize(ds_window_t *, gfx_coord2_t *, gfx_rect_t *);
+extern void ds_window_bring_to_top(ds_window_t *);
 extern gfx_context_t *ds_window_get_ctx(ds_window_t *);
 extern errno_t ds_window_paint(ds_window_t *, gfx_rect_t *);