Changeset 46a47c0 in mainline for uspace/lib/ui/test/window.c

Timestamp:

2023-01-16T20:34:01Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b0ae23f

Parents:

b3eeae5

Message:

Make sure window is only show as inactive when it loses last focus

This currently affects the title bar and also the cursor in Terminal.

File:

• uspace/lib/ui/test/window.c (modified) (12 diffs)

uspace/lib/ui/test/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 static void test_window_unmaximize(ui_window_t *, void *);
 static void test_window_close(ui_window_t *, void *);
-static void test_window_focus(ui_window_t *, void *);
+static void test_window_focus(ui_window_t *, void *, unsigned);
 static void test_window_kbd(ui_window_t *, void *, kbd_event_t *);
 static errno_t test_window_paint(ui_window_t *, void *);
 static void test_window_pos(ui_window_t *, void *, pos_event_t *);
-static void test_window_unfocus(ui_window_t *, void *);
+static void test_window_unfocus(ui_window_t *, void *, unsigned);
 
 static ui_window_cb_t test_window_cb = {
@@ -72 +72 @@
 static errno_t test_ctl_paint(void *);
 static ui_evclaim_t test_ctl_pos_event(void *, pos_event_t *);
-static void test_ctl_unfocus(void *);
+static void test_ctl_unfocus(void *, unsigned);
 
 static ui_control_ops_t test_ctl_ops = {
@@ -87 +87 @@
         bool close;
         bool focus;
+        unsigned focus_nfocus;
         bool kbd;
         kbd_event_t kbd_event;
@@ -93 +94 @@
         pos_event_t pos_event;
         bool unfocus;
+        unsigned unfocus_nfocus;
 } test_cb_resp_t;
 
@@ -102 +104 @@
         pos_event_t pos_event;
         bool unfocus;
+        unsigned unfocus_nfocus;
 } test_ctl_resp_t;
 
@@ -530 +533 @@
         resp.unfocus = false;
 
-        ui_window_def_unfocus(window);
+        ui_window_def_unfocus(window, 42);
         PCUT_ASSERT_TRUE(resp.unfocus);
+        PCUT_ASSERT_INT_EQUALS(42, resp.unfocus_nfocus);
 
         /* Need to remove first because we didn't implement the destructor */
@@ -704 +708 @@
 
         /* Focus callback with no callbacks set */
-        ui_window_send_focus(window);
+        ui_window_send_focus(window, 42);
 
         /* Focus callback with focus callback not implemented */
         ui_window_set_cb(window, &dummy_window_cb, NULL);
-        ui_window_send_focus(window);
+        ui_window_send_focus(window, 42);
 
         /* Focus callback with real callback set */
         resp.focus = false;
         ui_window_set_cb(window, &test_window_cb, &resp);
-        ui_window_send_focus(window);
+        ui_window_send_focus(window, 42);
         PCUT_ASSERT_TRUE(resp.focus);
+        PCUT_ASSERT_INT_EQUALS(42, resp.focus_nfocus);
 
         ui_window_destroy(window);
@@ -872 +877 @@
 
         /* Unfocus callback with no callbacks set */
-        ui_window_send_unfocus(window);
+        ui_window_send_unfocus(window, 42);
 
         /* Unfocus callback with unfocus callback not implemented */
         ui_window_set_cb(window, &dummy_window_cb, NULL);
-        ui_window_send_unfocus(window);
+        ui_window_send_unfocus(window, 42);
 
         /* Unfocus callback with real callback set */
         resp.close = false;
         ui_window_set_cb(window, &test_window_cb, &resp);
-        ui_window_send_unfocus(window);
+        ui_window_send_unfocus(window, 42);
         PCUT_ASSERT_TRUE(resp.unfocus);
+        PCUT_ASSERT_INT_EQUALS(42, resp.unfocus_nfocus);
 
         ui_window_destroy(window);
@@ -916 +922 @@
 }
 
-static void test_window_focus(ui_window_t *window, void *arg)
+static void test_window_focus(ui_window_t *window, void *arg, unsigned nfocus)
 {
         test_cb_resp_t *resp = (test_cb_resp_t *) arg;
 
         resp->focus = true;
+        resp->focus_nfocus = nfocus;
 }
 
@@ -949 +956 @@
 }
 
-static void test_window_unfocus(ui_window_t *window, void *arg)
+static void test_window_unfocus(ui_window_t *window, void *arg, unsigned nfocus)
 {
         test_cb_resp_t *resp = (test_cb_resp_t *) arg;
 
         resp->unfocus = true;
+        resp->unfocus_nfocus = nfocus;
 }
 
@@ -974 +982 @@
 }
 
-static void test_ctl_unfocus(void *arg)
+static void test_ctl_unfocus(void *arg, unsigned nfocus)
 {
         test_ctl_resp_t *resp = (test_ctl_resp_t *) arg;
 
         resp->unfocus = true;
+        resp->unfocus_nfocus = nfocus;
 }