Changeset fb420e48 in mainline for uspace/srv/hid/display/display.c

Timestamp:

2019-12-16T13:47:33Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8e9781f

Parents:

c2250702

git-author:

Jiri Svoboda <jiri@…> (2019-12-15 13:47:28)

git-committer:

Jiri Svoboda <jiri@…> (2019-12-16 13:47:33)

Message:

Use window dimensions for picking window to focus

File:

• uspace/srv/hid/display/display.c (modified) (1 diff)

uspace/srv/hid/display/display.c

@@ -172 +172 @@
 {
         ds_window_t *wnd;
+        gfx_rect_t drect;
 
         wnd = ds_display_first_window(display);
         while (wnd != NULL) {
-                // XXX Need to know window dimensions
-                if (pos->x >= wnd->dpos.x && pos->y >= wnd->dpos.y &&
-                    pos->x <= wnd->dpos.x + 100 && pos->y <= wnd->dpos.y + 100) {
+                /* Window bounding rectangle on display */
+                gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
+
+                if (gfx_pix_inside_rect(pos, &drect))
                         return wnd;
-                }
 
                 wnd = ds_display_next_window(wnd);