Changes in uspace/srv/hid/display/seat.c [554a5f1:d7f82635] in mainline

File:

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

uspace/srv/hid/display/seat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -104 +104 @@
                 ds_window_bring_to_top(wnd);
         }
-}
-
-/** Evacuate focus from window.
+
+        /* When focus changes, popup window should be closed */
+        ds_seat_set_popup(seat, NULL);
+}
+
+/** Set seat popup window.
+ *
+ * @param seat Seat
+ * @param wnd Popup window
+ */
+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;
+}
+
+/** Evacuate seat references to window.
  *
  * If seat's focus is @a wnd, it will be set to a different window.
+ * If seat's popup window is @a wnd, it will be set to NULL.
  *
  * @param seat Seat
  * @param wnd Window to evacuate focus from
  */
-void ds_seat_evac_focus(ds_seat_t *seat, ds_window_t *wnd)
+void ds_seat_evac_wnd_refs(ds_seat_t *seat, ds_window_t *wnd)
 {
         ds_window_t *nwnd;
 
         if (seat->focus == wnd) {
-                nwnd = ds_display_next_window(wnd);
+                nwnd = ds_display_prev_window(wnd);
                 if (nwnd == NULL)
-                        nwnd = ds_display_first_window(wnd->display);
+                        nwnd = ds_display_last_window(wnd->display);
                 if (nwnd == wnd)
                         nwnd = NULL;
@@ -126 +149 @@
                 ds_seat_set_focus(seat, nwnd);
         }
+
+        if (seat->popup == wnd)
+                ds_seat_set_popup(seat, NULL);
+}
+
+/** Switch focus to another window.
+ *
+ * @param seat Seat
+ * @param wnd Window to evacuate focus from
+ */
+void ds_seat_switch_focus(ds_seat_t *seat)
+{
+        ds_window_t *nwnd;
+
+        if (seat->focus != NULL)
+                nwnd = ds_display_prev_window(seat->focus);
+        else
+                nwnd = NULL;
+
+        if (nwnd == NULL)
+                nwnd = ds_display_last_window(seat->display);
+
+        if (nwnd != NULL)
+                ds_seat_set_focus(seat, nwnd);
 }
 
@@ -143 +190 @@
         if (event->type == KEY_PRESS && alt_or_shift && event->key == KC_TAB) {
                 /* On Alt-Tab or Shift-Tab, switch focus to next window */
-                ds_seat_evac_focus(seat, seat->focus);
+                ds_seat_switch_focus(seat);
                 return EOK;
         }
 
-        dwindow = seat->focus;
+        dwindow = seat->popup;
+        if (dwindow == NULL)
+                dwindow = seat->focus;
+
         if (dwindow == NULL)
                 return EOK;
@@ -307 +357 @@
         /* Focus window on button press */
         if (event->type == PTD_PRESS && event->btn_num == 1) {
-                if (wnd != NULL) {
+                if (wnd != NULL && (wnd->flags & wndf_popup) == 0) {
                         ds_seat_set_focus(seat, wnd);
                 }
@@ -390 +440 @@
         wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
 
-        if (seat->focus != wnd) {
+        /* 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);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (seat->focus != wnd && seat->focus != NULL) {
                 rc = ds_window_post_pos_event(seat->focus, event);
                 if (rc != EOK)
@@ -404 +467 @@
                 ds_seat_set_client_cursor(seat, wnd->cursor);
 
-                rc = ds_window_post_pos_event(wnd, event);
-                if (rc != EOK)
-                        return rc;
+                /*
+                 * Only deliver event if we didn't already deliver it
+                 * to the same window above.
+                 */
+                if (wnd != seat->popup) {
+                        rc = ds_window_post_pos_event(wnd, event);
+                        if (rc != EOK)
+                                return rc;
+                }
         } else {
                 /* Not over a window */