Changeset acd7ac2 in mainline for uspace/srv/hid/display/window.c

Timestamp:

2023-08-09T11:27:03Z (17 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

24be331e

Parents:

a77c722

git-author:

Jiri Svoboda <jiri@…> (2023-08-08 17:26:15)

git-committer:

Jiri Svoboda <jiri@…> (2023-08-09 11:27:03)

Message:

Switch focus to the right window when window is closed

File:

• uspace/srv/hid/display/window.c (modified) (1 diff)

uspace/srv/hid/display/window.c

@@ -1092 +1092 @@
  * @return Alternate window matching the criteria or @c NULL if there is none
  */
-ds_window_t *ds_window_find_alt(ds_window_t *wnd,
+ds_window_t *ds_window_find_prev(ds_window_t *wnd,
+    display_wnd_flags_t allowed_flags)
+{
+        ds_window_t *nwnd;
+
+        /* Try preceding windows in display order */
+        nwnd = ds_display_next_window(wnd);
+        while (nwnd != NULL && (nwnd->flags & ~allowed_flags) != 0) {
+                nwnd = ds_display_next_window(nwnd);
+        }
+
+        /* Do we already have a matching window? */
+        if (nwnd != NULL && (nwnd->flags & ~allowed_flags) == 0) {
+                return nwnd;
+        }
+
+        /* Try succeeding windows in display order */
+        nwnd = ds_display_first_window(wnd->display);
+        while (nwnd != NULL && nwnd != wnd &&
+            (nwnd->flags & ~allowed_flags) != 0) {
+                nwnd = ds_display_next_window(nwnd);
+        }
+
+        if (nwnd == wnd)
+                return NULL;
+
+        return nwnd;
+}
+
+/** Find alternate window with the allowed flags.
+ *
+ * An alternate window is a *different* window that is preferably previous
+ * in the display order and only has the @a allowed flags.
+ *
+ * @param wnd Window
+ * @param allowed_flags Bitmask of flags that the window is allowed to have
+ *
+ * @return Alternate window matching the criteria or @c NULL if there is none
+ */
+ds_window_t *ds_window_find_next(ds_window_t *wnd,
     display_wnd_flags_t allowed_flags)
 {