Changeset fb420e48 in mainline

Timestamp:

2019-12-16T13:47:33Z (5 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

Location:

uspace

Files:

• lib/display/include/display/wndparams.h (modified) (1 diff)
• lib/gfx/include/gfx/coord.h (modified) (1 diff)
• lib/gfx/src/coord.c (modified) (1 diff)
• lib/gfx/test/coord.c (modified) (1 diff)
• srv/hid/display/display.c (modified) (1 diff)

uspace/lib/display/include/display/wndparams.h

@@ -40 +40 @@
 extern void display_wnd_params_init(display_wnd_params_t *);
 
-
 #endif
 

uspace/lib/gfx/include/gfx/coord.h

@@ -50 +50 @@
 extern void gfx_rect_points_sort(gfx_rect_t *, gfx_rect_t *);
 extern bool gfx_rect_is_empty(gfx_rect_t *);
+extern bool gfx_pix_inside_rect(gfx_coord2_t *, gfx_rect_t *);
 
 #endif

uspace/lib/gfx/src/coord.c

@@ -189 +189 @@
 }
 
+/** Return true if pixel at coordinate @a coord lies within rectangle @a rect. */
+bool gfx_pix_inside_rect(gfx_coord2_t *coord, gfx_rect_t *rect)
+{
+        gfx_rect_t sr;
+
+        gfx_rect_points_sort(rect, &sr);
+
+        if (coord->x < sr.p0.x || coord->y < sr.p0.y)
+                return false;
+
+        if (coord->x >= sr.p1.x || coord->y >= sr.p1.y)
+                return false;
+
+        return true;
+}
+
 /** @}
  */

uspace/lib/gfx/test/coord.c

@@ -524 +524 @@
 }
 
+/** gfx_pix_inside_rect for  */
+PCUT_TEST(pix_inside_rect)
+{
+        gfx_coord2_t coord;
+        gfx_rect_t rect;
+
+        rect.p0.x = 1;
+        rect.p0.y = 2;
+        rect.p1.x = 3;
+        rect.p1.y = 4;
+
+        coord.x = 0;
+        coord.y = 1;
+        PCUT_ASSERT_FALSE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 1;
+        coord.y = 1;
+        PCUT_ASSERT_FALSE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 0;
+        coord.y = 2;
+        PCUT_ASSERT_FALSE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 1;
+        coord.y = 2;
+        PCUT_ASSERT_TRUE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 2;
+        coord.y = 3;
+        PCUT_ASSERT_TRUE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 3;
+        coord.y = 3;
+        PCUT_ASSERT_FALSE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 2;
+        coord.y = 4;
+        PCUT_ASSERT_FALSE(gfx_pix_inside_rect(&coord, &rect));
+
+        coord.x = 3;
+        coord.y = 4;
+        PCUT_ASSERT_FALSE(gfx_pix_inside_rect(&coord, &rect));
+}
+
 PCUT_EXPORT(coord);

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