Changeset 1c6c3e1d in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2023-10-22T17:55:33Z (15 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

uspace/srv/hid/display/seat.c

@@ -88 +88 @@
         seat->client_cursor = display->cursor[dcurs_arrow];
         seat->wm_cursor = NULL;
+        seat->focus = ds_display_first_window(display);
 
         *rseat = seat;
@@ -204 +205 @@
 
         /* Find alternate window that is neither system nor minimized */
-        nwnd = ds_window_find_alt(wnd, ~(wndf_minimized | wndf_system));
+        nwnd = ds_window_find_prev(wnd, ~(wndf_minimized | wndf_system));
 
         if (nwnd == NULL) {
                 /* Find alternate window that is not minimized */
-                nwnd = ds_window_find_alt(wnd, ~wndf_minimized);
+                nwnd = ds_window_find_prev(wnd, ~wndf_minimized);
         }
 
@@ -223 +224 @@
         ds_window_t *nwnd;
 
-        /* Find alternate window that is not a system window */
-        nwnd = ds_window_find_alt(seat->focus, ~wndf_system);
+        if (seat->focus != NULL) {
+                /* Find alternate window that is not a system window */
+                nwnd = ds_window_find_next(seat->focus, ~wndf_system);
+        } else {
+                /* Currently no focus. Focus topmost window. */
+                nwnd = ds_display_first_window(seat->display);
+        }
 
         /* Only switch focus if there is another window */
@@ -509 +515 @@
         wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
 
-        /* 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) {
+        if (seat->popup != NULL && event->type != POS_PRESS) {
                 rc = ds_window_post_pos_event(seat->popup, event);
                 if (rc != EOK)
@@ -540 +540 @@
                  * to the same window above.
                  */
-                if (wnd != seat->popup) {
+                if (wnd != seat->popup || event->type == POS_PRESS) {
                         rc = ds_window_post_pos_event(wnd, event);
                         if (rc != EOK)
@@ -550 +550 @@
         }
 
+        /* Click outside popup window */
+        if (event->type == POS_PRESS && wnd != seat->popup) {
+                /* Close popup window */
+                ds_seat_set_popup(seat, NULL);
+        }
+
         return EOK;
 }