Changeset 0da03df in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2020-12-10T10:27:07Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

442210e

Parents:

08f345f

git-author:

Jiri Svoboda <jiri@…> (2020-12-09 18:26:57)

git-committer:

Jiri Svoboda <jiri@…> (2020-12-10 10:27:07)

Message:

Distinguish between focus switching and evacuation

It's the same thing if there are at least two windows. With just
one window, switching focus should do nothing. Evacuation should
lead to no window being focused. (Fixes crash when pressing
Alt-Shift/Ctrl-Shift with just one window left).

File:

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

uspace/srv/hid/display/seat.c

@@ -128 +128 @@
 }
 
+/** Switch focus to another window.
+ *
+ * @param seat Seat
+ * @param wnd Window to evacuate focus from
+ */
+void ds_seat_switch_focus(ds_seat_t *seat)
+{
+        ds_window_t *nwnd;
+
+        if (seat->focus != NULL)
+                nwnd = ds_display_prev_window(seat->focus);
+        else
+                nwnd = NULL;
+
+        if (nwnd == NULL)
+                nwnd = ds_display_last_window(seat->display);
+
+        if (nwnd != NULL)
+                ds_seat_set_focus(seat, nwnd);
+}
+
 /** Post keyboard event to the seat's focused window.
  *
@@ -143 +164 @@
         if (event->type == KEY_PRESS && alt_or_shift && event->key == KC_TAB) {
                 /* On Alt-Tab or Shift-Tab, switch focus to next window */
-                ds_seat_evac_focus(seat, seat->focus);
+                ds_seat_switch_focus(seat);
                 return EOK;
         }
@@ -389 +410 @@
 
         wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
-
-        if (seat->focus != wnd) {
+        if (seat->focus != wnd && seat->focus != NULL) {
                 rc = ds_window_post_pos_event(seat->focus, event);
                 if (rc != EOK)