Changeset 4055fe63 in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2021-06-04T20:02:36Z (4 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.

File:

• uspace/srv/hid/display/seat.c (modified) (4 diffs)

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