Changeset 3c54869 in mainline for uspace/srv

Timestamp:

2023-01-04T20:24:44Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5d86797

Parents:

cdd6fc9

Message:

Highlight active window in task bar

Location:

uspace/srv/hid/display

Files:

• test/window.c (modified) (2 diffs)
• types/display/window.h (modified) (2 diffs)
• window.c (modified) (3 diffs)
• wmops.c (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -623 +623 @@
 }
 
+/** Test ds_window_post_focus_event() */
+PCUT_TEST(window_post_focus_event)
+{
+        gfx_context_t *gc;
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        errno_t rc;
+
+        rc = gfx_context_new(&dummy_ops, NULL, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_display_create(gc, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &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, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_post_focus_event(wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
+/** Test ds_window_post_unfocus_event() */
+PCUT_TEST(window_post_unfocus_event)
+{
+        gfx_context_t *gc;
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        errno_t rc;
+
+        rc = gfx_context_new(&dummy_ops, NULL, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_display_create(gc, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &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, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_post_focus_event(wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 /** Test ds_window_move_req() */
 PCUT_TEST(window_move_req)

uspace/srv/hid/display/types/display/window.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -107 +107 @@
         /** Window caption */
         char *caption;
+        /** Number of foci */
+        unsigned nfocus;
 } ds_window_t;
 

uspace/srv/hid/display/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -678 +678 @@
 errno_t ds_window_post_focus_event(ds_window_t *wnd)
 {
+        errno_t rc;
+        ds_wmclient_t *wmclient;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_post_focus_event");
 
-        return ds_client_post_focus_event(wnd->client, wnd);
+        rc = ds_client_post_focus_event(wnd->client, wnd);
+        if (rc != EOK)
+                return rc;
+
+        /* Increase focus counter */
+        ++wnd->nfocus;
+
+        /* Notify window managers about window information change */
+        wmclient = ds_display_first_wmclient(wnd->display);
+        while (wmclient != NULL) {
+                ds_wmclient_post_wnd_changed_event(wmclient, wnd->id);
+                wmclient = ds_display_next_wmclient(wmclient);
+        }
+
+        return EOK;
 }
 
@@ -690 +707 @@
 errno_t ds_window_post_unfocus_event(ds_window_t *wnd)
 {
+        errno_t rc;
+        ds_wmclient_t *wmclient;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_post_unfocus_event");
 
-        return ds_client_post_unfocus_event(wnd->client, wnd);
+        rc = ds_client_post_unfocus_event(wnd->client, wnd);
+        if (rc != EOK)
+                return rc;
+
+        /* Decrease focus counter */
+        --wnd->nfocus;
+
+        /* Notify window managers about window information change */
+        wmclient = ds_display_first_wmclient(wnd->display);
+        while (wmclient != NULL) {
+                ds_wmclient_post_wnd_changed_event(wmclient, wnd->id);
+                wmclient = ds_display_next_wmclient(wmclient);
+        }
+
+        return EOK;
 }
 

uspace/srv/hid/display/wmops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -145 +145 @@
 
         info->flags = wnd->flags;
+        info->nfocus = wnd->nfocus;
 
         ds_display_unlock(wmclient->display);