Changeset 2e6394e in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2021-06-04T10:03:24Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Children:

4055fe63

Parents:

b4b4dafe

git-author:

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

git-committer:

Jiri Svoboda <jiri@…> (2021-06-04 10:03:24)

Message:

Fix delivery of release events to popup window

File:

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

uspace/srv/hid/display/seat.c

@@ -432 +432 @@
          * below, anyway.
          */
-        if (seat->popup != wnd && seat->popup != NULL) {
+        if (seat->popup != NULL) {
                 rc = ds_window_post_pos_event(seat->popup, event);
                 if (rc != EOK)
@@ -452 +452 @@
                 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 */