Changeset 9e84d2c in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2021-06-10T13:22:33Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

5823aef3

Parents:

c9927c66

git-author:

Jiri Svoboda <jiri@…> (2021-06-02 17:00:03)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Popup windows event delivery is special

Popup windows don't get focus, yet they still receive events.

File:

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

uspace/srv/hid/display/seat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -106 +106 @@
 }
 
-/** Evacuate focus from window.
+/** Set seat popup window.
+ *
+ * @param seat Seat
+ * @param wnd Popup window
+ */
+void ds_seat_set_popup(ds_seat_t *seat, ds_window_t *wnd)
+{
+        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;
@@ -126 +137 @@
                 ds_seat_set_focus(seat, nwnd);
         }
+
+        if (seat->popup == wnd)
+                seat->popup = NULL;
 }
 
@@ -168 +182 @@
         }
 
-        dwindow = seat->focus;
+        dwindow = seat->popup;
+        if (dwindow == NULL)
+                dwindow = seat->focus;
+
         if (dwindow == NULL)
                 return EOK;
@@ -328 +345 @@
         /* 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);
                 }
@@ -410 +427 @@
 
         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.
+         */
+        if (seat->popup != wnd && 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);