Changeset 46a47c0 in mainline for uspace/srv

Timestamp:

2023-01-16T20:34:01Z (3 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.

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (5 diffs)
• client.h (modified) (3 diffs)
• test/client.c (modified) (6 diffs)
• window.c (modified) (4 diffs)

uspace/srv/hid/display/client.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -257 +257 @@
  * @param client Client
  * @param ewindow Window that the message is targetted to
- *
- * @return EOK on success or an error code
- */
-errno_t ds_client_post_focus_event(ds_client_t *client, ds_window_t *ewindow)
+ * @param event Focus event data
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_client_post_focus_event(ds_client_t *client, ds_window_t *ewindow,
+    display_wnd_focus_ev_t *event)
 {
         ds_window_ev_t *wevent;
@@ -270 +272 @@
         wevent->window = ewindow;
         wevent->event.etype = wev_focus;
+        wevent->event.ev.focus = *event;
         list_append(&wevent->levents, &client->events);
 
@@ -373 +376 @@
  * @param client Client
  * @param ewindow Window that the message is targetted to
- *
- * @return EOK on success or an error code
- */
-errno_t ds_client_post_unfocus_event(ds_client_t *client, ds_window_t *ewindow)
+ * @param event Unfocus event data
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ds_client_post_unfocus_event(ds_client_t *client, ds_window_t *ewindow,
+    display_wnd_unfocus_ev_t *event)
 {
         ds_window_ev_t *wevent;
@@ -386 +391 @@
         wevent->window = ewindow;
         wevent->event.etype = wev_unfocus;
+        wevent->event.ev.unfocus = *event;
         list_append(&wevent->levents, &client->events);
 

uspace/srv/hid/display/client.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -55 +55 @@
 extern void ds_client_purge_window_events(ds_client_t *, ds_window_t *);
 extern errno_t ds_client_post_close_event(ds_client_t *, ds_window_t *);
-extern errno_t ds_client_post_focus_event(ds_client_t *, ds_window_t *);
+extern errno_t ds_client_post_focus_event(ds_client_t *, ds_window_t *,
+    display_wnd_focus_ev_t *);
 extern errno_t ds_client_post_kbd_event(ds_client_t *, ds_window_t *,
     kbd_event_t *);
@@ -62 +63 @@
 extern errno_t ds_client_post_resize_event(ds_client_t *, ds_window_t *,
     gfx_rect_t *);
-extern errno_t ds_client_post_unfocus_event(ds_client_t *, ds_window_t *);
+extern errno_t ds_client_post_unfocus_event(ds_client_t *, ds_window_t *,
+    display_wnd_unfocus_ev_t *);
 
 #endif

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

@@ -240 +240 @@
         display_wnd_params_t params;
         ds_window_t *rwindow;
+        display_wnd_focus_ev_t efocus;
         display_wnd_ev_t revent;
         bool called_cb = NULL;
@@ -271 +272 @@
         PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
 
-        rc = ds_client_post_focus_event(client, wnd);
+        efocus.nfocus = 42;
+
+        rc = ds_client_post_focus_event(client, wnd, &efocus);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_TRUE(called_cb);
@@ -279 +282 @@
         PCUT_ASSERT_EQUALS(wnd, rwindow);
         PCUT_ASSERT_EQUALS(wev_focus, revent.etype);
+        PCUT_ASSERT_INT_EQUALS(efocus.nfocus, revent.ev.focus.nfocus);
 
         rc = ds_client_get_event(client, &rwindow, &revent);
@@ -504 +508 @@
         display_wnd_params_t params;
         ds_window_t *rwindow;
+        display_wnd_unfocus_ev_t eunfocus;
         display_wnd_ev_t revent;
         bool called_cb = NULL;
@@ -535 +540 @@
         PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
 
-        rc = ds_client_post_unfocus_event(client, wnd);
+        eunfocus.nfocus = 42;
+
+        rc = ds_client_post_unfocus_event(client, wnd, &eunfocus);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_TRUE(called_cb);
@@ -543 +550 @@
         PCUT_ASSERT_EQUALS(wnd, rwindow);
         PCUT_ASSERT_EQUALS(wev_unfocus, revent.etype);
+        PCUT_ASSERT_INT_EQUALS(eunfocus.nfocus, revent.ev.unfocus.nfocus);
 
         rc = ds_client_get_event(client, &rwindow, &revent);

uspace/srv/hid/display/window.c

@@ -680 +680 @@
 errno_t ds_window_post_focus_event(ds_window_t *wnd)
 {
+        display_wnd_focus_ev_t efocus;
         errno_t rc;
         ds_wmclient_t *wmclient;
@@ -685 +686 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_post_focus_event");
 
-        rc = ds_client_post_focus_event(wnd->client, wnd);
+        /* Increase focus counter */
+        ++wnd->nfocus;
+        efocus.nfocus = wnd->nfocus;
+
+        rc = ds_client_post_focus_event(wnd->client, wnd, &efocus);
         if (rc != EOK)
                 return rc;
-
-        /* Increase focus counter */
-        ++wnd->nfocus;
 
         /* Notify window managers about window information change */
@@ -709 +711 @@
 errno_t ds_window_post_unfocus_event(ds_window_t *wnd)
 {
+        display_wnd_unfocus_ev_t eunfocus;
         errno_t rc;
         ds_wmclient_t *wmclient;
@@ -714 +717 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_post_unfocus_event");
 
-        rc = ds_client_post_unfocus_event(wnd->client, wnd);
+        /* Decrease focus counter */
+        --wnd->nfocus;
+        eunfocus.nfocus = wnd->nfocus;
+
+        rc = ds_client_post_unfocus_event(wnd->client, wnd, &eunfocus);
         if (rc != EOK)
                 return rc;
-
-        /* Decrease focus counter */
-        --wnd->nfocus;
 
         /* Notify window managers about window information change */