Changeset 17c0f5d in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2023-01-05T19:28:22Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ededdc4

Parents:

5d86797

Message:

Switch to another window when window is minimized

And do it properly. Never switch to a minimized window. Only switch to
a system window (Task bar) when no other is available.

File:

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

uspace/srv/hid/display/seat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -142 +142 @@
  *
  * @param seat Seat
- * @param wnd Window to evacuate focus from
+ * @param wnd Window to evacuate references from
  */
 void ds_seat_evac_wnd_refs(ds_seat_t *seat, ds_window_t *wnd)
@@ -160 +160 @@
         if (seat->popup == wnd)
                 ds_seat_set_popup(seat, NULL);
+}
+
+/** Unfocus window.
+ *
+ * If seat's focus is @a wnd, it will be set to a different window
+ * that is not minimized, preferably not a system window.
+ *
+ * @param seat Seat
+ * @param wnd Window to remove focus from
+ */
+void ds_seat_unfocus_wnd(ds_seat_t *seat, ds_window_t *wnd)
+{
+        ds_window_t *nwnd;
+
+        if (seat->focus != wnd)
+                return;
+
+        /* Find alternate window that is neither system nor minimized */
+        nwnd = ds_window_find_alt(wnd, ~(wndf_minimized | wndf_system));
+
+        if (nwnd == NULL) {
+                /* Find alternate window that is not minimized */
+                nwnd = ds_window_find_alt(wnd, ~wndf_minimized);
+        }
+
+        ds_seat_set_focus(seat, nwnd);
 }