Changeset 4055fe63 in mainline

Timestamp:

2021-06-04T20:02:36Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Children:

4b72e81

Parents:

2e6394e

Message:

Deliver close event to popup window when appropriate

That is, when focus changes or when user clicks outside of the
popup window.

Location:

uspace

Files:

• lib/ui/src/menu.c (modified) (2 diffs)
• lib/ui/src/menubar.c (modified) (4 diffs)
• lib/ui/src/popup.c (modified) (2 diffs)
• srv/hid/display/seat.c (modified) (4 diffs)

uspace/lib/ui/src/menu.c

@@ -61 +61 @@
 };
 
+static void ui_menu_popup_close(ui_popup_t *, void *);
 static void ui_menu_popup_pos(ui_popup_t *, void *, pos_event_t *);
 
 static ui_popup_cb_t ui_menu_popup_cb = {
+        .close = ui_menu_popup_close,
         .pos = ui_menu_popup_pos
 };
@@ -366 +368 @@
         } else {
                 /* Press outside menu - close it */
-//              if (event->type == POS_PRESS)
-//                      ui_menu_bar_select(menu->mbar, NULL, NULL);
+                if (event->type == POS_PRESS)
+                        ui_menu_bar_select(menu->mbar, NULL, NULL);
         }
 
         return ui_unclaimed;
+}
+
+/** Handle close event in menu popup window.
+ *
+ * @param popup Menu popup window
+ * @param arg Argument (ui_menu_t *)
+ */
+static void ui_menu_popup_close(ui_popup_t *popup, void *arg)
+{
+        ui_menu_t *menu = (ui_menu_t *)arg;
+
+        /* Close the menu */
+        ui_menu_bar_select(menu->mbar, NULL, NULL);
 }
 

uspace/lib/ui/src/menubar.c

@@ -61 +61 @@
 static errno_t ui_menu_bar_ctl_paint(void *);
 static ui_evclaim_t ui_menu_bar_ctl_pos_event(void *, pos_event_t *);
-static void ui_menu_bar_ctl_unfocus(void *);
 
 /** Menu bar control ops */
@@ -68 +67 @@
         .paint = ui_menu_bar_ctl_paint,
         .pos_event = ui_menu_bar_ctl_pos_event,
-        .unfocus = ui_menu_bar_ctl_unfocus
 };
 
@@ -317 +315 @@
 }
 
-/** Handle menu bar window unfocus notification.
- *
- * @param mbar Menu bar
- */
-void ui_menu_bar_unfocus(ui_menu_bar_t *mbar)
-{
-//      ui_menu_bar_select(mbar, NULL, NULL);
-}
-
 /** Destroy menu bar control.
  *
@@ -362 +351 @@
 }
 
-/** Handle menu bar control window unfocus notification.
- *
- * @param arg Argument (ui_menu_bar_t *)
- */
-void ui_menu_bar_ctl_unfocus(void *arg)
-{
-        ui_menu_bar_t *mbar = (ui_menu_bar_t *) arg;
-
-        ui_menu_bar_unfocus(mbar);
-}
-
 /** @}
  */

uspace/lib/ui/src/popup.c

@@ -46 +46 @@
 #include "../private/popup.h"
 
+static void ui_popup_window_close(ui_window_t *, void *);
 static void ui_popup_window_pos(ui_window_t *, void *, pos_event_t *);
 
 static ui_window_cb_t ui_popup_window_cb = {
+        .close = ui_popup_window_close,
         .pos = ui_popup_window_pos
 };
@@ -185 +187 @@
 }
 
+/** Handle close event in popup window.
+ *
+ * @param window Window
+ * @param arg Argument (ui_popup_t *)
+ */
+static void ui_popup_window_close(ui_window_t *window, void *arg)
+{
+        ui_popup_t *popup = (ui_popup_t *)arg;
+
+        if (popup->cb != NULL && popup->cb->close != NULL)
+                popup->cb->close(popup, popup->arg);
+}
+
 /** Handle position event in popup window.
  *

uspace/srv/hid/display/seat.c

@@ -104 +104 @@
                 ds_window_bring_to_top(wnd);
         }
+
+        /* When focus changes, popup window should be closed */
+        ds_seat_set_popup(seat, NULL);
 }
 
@@ -113 +116 @@
 void ds_seat_set_popup(ds_seat_t *seat, ds_window_t *wnd)
 {
+        if (wnd == seat->popup)
+                return;
+
+        if (seat->popup != NULL) {
+                /* Window is no longer the popup window, send close request */
+                ds_client_post_close_event(seat->popup->client,
+                    seat->popup);
+        }
+
         seat->popup = wnd;
 }
@@ -139 +151 @@
 
         if (seat->popup == wnd)
-                seat->popup = NULL;
+                ds_seat_set_popup(seat, NULL);
 }
 
@@ -427 +439 @@
 
         wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
-        /*
-         * Deliver event to popup window, unless the pointer is over
-         * it (in which case it will be delivered to that window
-         * below, anyway.
-         */
+
+        /* Click outside popup window */
+        if (event->type == POS_PRESS && wnd != seat->popup) {
+                /* Close popup window */
+                ds_seat_set_popup(seat, NULL);
+        }
+
+        /* Deliver event to popup window. */
         if (seat->popup != NULL) {
                 rc = ds_window_post_pos_event(seat->popup, event);