Changeset a2f173b in mainline

Timestamp:

2020-10-21T21:49:13Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58a67050

Parents:

172188a

Message:

Improve close button event routing

Button event processing routine is the best place to determine whether
the event goes to the button or not. It can also 'grab' button release
events simply by claiming them.

Location:

uspace/lib/ui

Files:

• include/types/ui/event.h (added)
• include/ui/pbutton.h (modified) (2 diffs)
• src/pbutton.c (modified) (3 diffs)
• src/wdecor.c (modified) (2 diffs)
• test/pbutton.c (modified) (2 diffs)

uspace/lib/ui/include/ui/pbutton.h

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <io/pos_event.h>
+#include <types/ui/event.h>
 #include <types/ui/pbutton.h>
 #include <types/ui/resource.h>
@@ -56 +57 @@
 extern void ui_pbutton_leave(ui_pbutton_t *);
 extern void ui_pbutton_clicked(ui_pbutton_t *);
-extern void ui_pbutton_pos_event(ui_pbutton_t *, pos_event_t *);
+extern ui_evclaim_t ui_pbutton_pos_event(ui_pbutton_t *, pos_event_t *);
 
 #endif

uspace/lib/ui/src/pbutton.c

@@ -350 +350 @@
  * @param pbutton Push button
  * @param pos_event Position event
- */
-void ui_pbutton_pos_event(ui_pbutton_t *pbutton, pos_event_t *event)
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_pbutton_pos_event(ui_pbutton_t *pbutton, pos_event_t *event)
 {
         gfx_coord2_t pos;
@@ -363 +364 @@
         switch (event->type) {
         case POS_PRESS:
-                if (inside)
+                if (inside) {
                         ui_pbutton_press(pbutton);
+                        return ui_claimed;
+                }
                 break;
         case POS_RELEASE:
-                ui_pbutton_release(pbutton);
+                if (pbutton->held) {
+                        ui_pbutton_release(pbutton);
+                        return ui_claimed;
+                }
                 break;
         case POS_UPDATE:
                 if (inside && !pbutton->inside) {
                         ui_pbutton_enter(pbutton);
+                        return ui_claimed;
                 } else if (!inside && pbutton->inside) {
                         ui_pbutton_leave(pbutton);
@@ -377 +384 @@
                 break;
         }
+
+        return ui_unclaimed;
 }
 

uspace/lib/ui/src/wdecor.c

@@ -280 +280 @@
         gfx_coord2_t pos;
         ui_wdecor_geom_t geom;
+        ui_evclaim_t claim;
 
         pos.x = event->hpos;
@@ -286 +287 @@
         ui_wdecor_get_geom(wdecor, &geom);
 
-        if (gfx_pix_inside_rect(&pos, &geom.btn_close_rect)) {
-                ui_pbutton_pos_event(wdecor->btn_close, event);
+        claim = ui_pbutton_pos_event(wdecor->btn_close, event);
+        if (claim == ui_claimed)
                 return;
-        }
 
         if (event->type == POS_PRESS &&

uspace/lib/ui/test/pbutton.c

@@ -359 +359 @@
         ui_resource_t *resource = NULL;
         ui_pbutton_t *pbutton;
+        ui_evclaim_t claim;
         pos_event_t event;
         gfx_rect_t rect;
@@ -381 +382 @@
         ui_pbutton_set_rect(pbutton, &rect);
 
-        /* Press outside does nothing */
+        /* Press outside is not claimed and does nothing */
         event.type = POS_PRESS;
         event.hpos = 9;
         event.vpos = 20;
-        ui_pbutton_pos_event(pbutton, &event);
-        PCUT_ASSERT_FALSE(pbutton->held);
-
-        /* Press inside depresses button */
+        claim = ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_FALSE(pbutton->held);
+        PCUT_ASSERT_EQUALS(ui_unclaimed, claim);
+
+        /* Press inside is claimed and depresses button */
         event.type = POS_PRESS;
         event.hpos = 10;
         event.vpos = 20;
-        ui_pbutton_pos_event(pbutton, &event);
-        PCUT_ASSERT_TRUE(pbutton->held);
-
-        /* Release outside (or anywhere) relases button */
+        claim = ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_TRUE(pbutton->held);
+        PCUT_ASSERT_EQUALS(ui_claimed, claim);
+
+        /* Release outside (or anywhere) is claimed and relases button */
         event.type = POS_RELEASE;
         event.hpos = 9;
         event.vpos = 20;
-        ui_pbutton_pos_event(pbutton, &event);
-        PCUT_ASSERT_FALSE(pbutton->held);
+        claim = ui_pbutton_pos_event(pbutton, &event);
+        PCUT_ASSERT_FALSE(pbutton->held);
+        PCUT_ASSERT_EQUALS(ui_claimed, claim);
 
         ui_pbutton_destroy(pbutton);