Changes in uspace/srv/hid/display/seat.c [ca9aa89:8edec53] in mainline

File:

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

uspace/srv/hid/display/seat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -90 +90 @@
 void ds_seat_set_focus(ds_seat_t *seat, ds_window_t *wnd)
 {
-        errno_t rc;
-
         if (wnd == seat->focus) {
                 /* Focus is not changing */
                 return;
-        }
-
-        if (wnd != NULL) {
-                rc = ds_window_unminimize(wnd);
-                if (rc != EOK)
-                        return;
         }
 
@@ -138 +130 @@
 /** Evacuate seat references to window.
  *
- * If seat's focus is @a wnd, it will be set to NULL.
+ * If seat's focus is @a wnd, it will be set to a different window.
  * If seat's popup window is @a wnd, it will be set to NULL.
  *
  * @param seat Seat
- * @param wnd Window to evacuate references from
+ * @param wnd Window to evacuate focus from
  */
 void ds_seat_evac_wnd_refs(ds_seat_t *seat, ds_window_t *wnd)
 {
-        if (seat->focus == wnd)
-                ds_seat_set_focus(seat, NULL);
+        ds_window_t *nwnd;
+
+        if (seat->focus == wnd) {
+                nwnd = ds_display_prev_window(wnd);
+                if (nwnd == NULL)
+                        nwnd = ds_display_last_window(wnd->display);
+                if (nwnd == wnd)
+                        nwnd = NULL;
+
+                ds_seat_set_focus(seat, nwnd);
+        }
 
         if (seat->popup == wnd)
@@ -153 +154 @@
 }
 
-/** 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)
+/** 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 != 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);
-}
-
-/** 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;
-
-        /* Find alternate window that is not a system window */
-        nwnd = ds_window_find_alt(seat->focus, ~wndf_system);
-
-        /* Only switch focus if there is another window */
+        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);
@@ -385 +364 @@
         if (event->type == PTD_PRESS || event->type == PTD_RELEASE ||
             event->type == PTD_DCLICK) {
-                pevent.pos_id = event->pos_id;
+                pevent.pos_id = 0;
                 switch (event->type) {
                 case PTD_PRESS:
@@ -416 +395 @@
                 seat->pntpos = npos;
 
-                pevent.pos_id = event->pos_id;
+                pevent.pos_id = 0;
                 pevent.type = POS_UPDATE;
                 pevent.btn_num = 0;
@@ -444 +423 @@
                 seat->pntpos = npos;
 
-                pevent.pos_id = event->pos_id;
+                pevent.pos_id = 0;
                 pevent.type = POS_UPDATE;
                 pevent.btn_num = 0;