Changeset 46a47c0 in mainline for uspace/srv/hid/display/window.c

Timestamp:

2023-01-16T20:34:01Z (21 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/srv/hid/display/window.c (modified) (4 diffs)

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 */