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

Timestamp:

2023-01-16T20:34:01Z (16 months 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/display/test/display.c (modified) (9 diffs)

uspace/lib/display/test/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 
 static void test_close_event(void *);
-static void test_focus_event(void *);
+static void test_focus_event(void *, unsigned);
 static void test_kbd_event(void *, kbd_event_t *);
 static void test_pos_event(void *, pos_event_t *);
-static void test_unfocus_event(void *);
+static void test_unfocus_event(void *, unsigned);
 
 static errno_t test_window_create(void *, display_wnd_params_t *, sysarg_t *);
@@ -166 +166 @@
         bool set_color_called;
         bool close_event_called;
+
         bool focus_event_called;
         bool kbd_event_called;
@@ -1677 +1678 @@
         resp.event_cnt = 1;
         resp.event.etype = wev_focus;
+        resp.event.ev.focus.nfocus = 42;
         resp.wnd_id = wnd->id;
         resp.focus_event_called = false;
@@ -1693 +1695 @@
         PCUT_ASSERT_INT_EQUALS(resp.event.etype,
             resp.revent.etype);
+        PCUT_ASSERT_INT_EQUALS(resp.event.ev.focus.nfocus,
+            resp.revent.ev.focus.nfocus);
 
         rc = display_window_destroy(wnd);
@@ -1896 +1900 @@
         resp.event_cnt = 1;
         resp.event.etype = wev_unfocus;
+        resp.event.ev.unfocus.nfocus = 42;
         resp.wnd_id = wnd->id;
         resp.unfocus_event_called = false;
@@ -1912 +1917 @@
         PCUT_ASSERT_INT_EQUALS(resp.event.etype,
             resp.revent.etype);
+        PCUT_ASSERT_INT_EQUALS(resp.event.ev.focus.nfocus,
+            resp.revent.ev.focus.nfocus);
 
         rc = display_window_destroy(wnd);
@@ -2057 +2064 @@
 }
 
-static void test_focus_event(void *arg)
+static void test_focus_event(void *arg, unsigned nfocus)
 {
         test_response_t *resp = (test_response_t *) arg;
 
         resp->revent.etype = wev_focus;
+        resp->revent.ev.focus.nfocus = nfocus;
 
         fibril_mutex_lock(&resp->event_lock);
@@ -2095 +2103 @@
 }
 
-static void test_unfocus_event(void *arg)
+static void test_unfocus_event(void *arg, unsigned nfocus)
 {
         test_response_t *resp = (test_response_t *) arg;
 
         resp->revent.etype = wev_unfocus;
+        resp->revent.ev.unfocus.nfocus = nfocus;
 
         fibril_mutex_lock(&resp->event_lock);