Changeset ededdc4 in mainline

Timestamp:

2023-01-05T20:17:32Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ca9aa89

Parents:

17c0f5d

Message:

Use ds_window_unfocus() when destroying a window

Location:

uspace/srv/hid/display

Files:

• seat.c (modified) (2 diffs)
• test/seat.c (modified) (1 diff)
• window.c (modified) (1 diff)

uspace/srv/hid/display/seat.c

@@ -138 +138 @@
 /** Evacuate seat references to window.
  *
- * If seat's focus is @a wnd, it will be set to a different window.
+ * If seat's focus is @a wnd, it will be set to NULL.
  * If seat's popup window is @a wnd, it will be set to NULL.
  *
@@ -146 +146 @@
 void ds_seat_evac_wnd_refs(ds_seat_t *seat, ds_window_t *wnd)
 {
-        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->focus == wnd)
+                ds_seat_set_focus(seat, NULL);
 
         if (seat->popup == wnd)

uspace/srv/hid/display/test/seat.c

@@ -90 +90 @@
 }
 
-/** Evacuate focus when another window is available. */
-PCUT_TEST(evac_focus_two_windows)
-{
-        ds_display_t *disp;
-        ds_client_t *client;
-        ds_seat_t *seat;
-        ds_window_t *w0;
-        ds_window_t *w1;
-        display_wnd_params_t params;
-        bool called_cb = false;
-        errno_t rc;
-
-        rc = ds_display_create(NULL, df_none, &disp);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_client_create(disp, &test_ds_client_cb, &called_cb, &client);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_seat_create(disp, &seat);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        display_wnd_params_init(&params);
-        params.rect.p0.x = params.rect.p0.y = 0;
-        params.rect.p1.x = params.rect.p1.y = 1;
-
-        rc = ds_window_create(client, &params, &w1);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_window_create(client, &params, &w0);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ds_seat_set_focus(seat, w1);
-        PCUT_ASSERT_EQUALS(w1, seat->focus);
-        PCUT_ASSERT_TRUE(called_cb);
-        called_cb = false;
-
-        ds_seat_evac_wnd_refs(seat, w1);
-        PCUT_ASSERT_EQUALS(w0, seat->focus);
-        PCUT_ASSERT_TRUE(called_cb);
-
-        ds_window_destroy(w0);
-        ds_window_destroy(w1);
-        ds_seat_destroy(seat);
-        ds_client_destroy(client);
-        ds_display_destroy(disp);
-}
-
-/** Evacuate focus from the only existing window.
+/** Evacuate focus from window.
  *
  * After evacuating no window should be focused

uspace/srv/hid/display/window.c

@@ -183 +183 @@
         disp = wnd->display;
 
+        ds_window_unfocus(wnd);
+
         ds_client_remove_window(wnd);
         ds_display_remove_window(wnd);