Changeset 5d380b6 in mainline for uspace/lib/display

Timestamp:

2023-01-20T11:50:41Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b1f0a14

Parents:

6828a56

git-author:

Jiri Svoboda <jiri@…> (2023-01-20 19:50:21)

git-committer:

Jiri Svoboda <jiri@…> (2023-01-20 11:50:41)

Message:

Create menu windows in the correct seat

Add a mechanism to set the seat of a new display window, UI window,
UI popup - input device ID. This is set to the ID of the device which
activated the menu (mouse, keyboard). The display server determines
the correct seat from there.

This makes sure clicking outside closes the correct pop-up window.

Location:

uspace/lib/display

Files:

• include/types/display/wndparams.h (modified) (2 diffs)
• private/params.h (modified) (3 diffs)
• src/disp_srv.c (modified) (1 diff)
• src/display.c (modified) (1 diff)
• test/display.c (modified) (6 diffs)

uspace/lib/display/include/types/display/wndparams.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -74 +74 @@
         /** Flags */
         display_wnd_flags_t flags;
+        /** Input device ID associated with window's seat (or zero) */
+        sysarg_t idev_id;
 } display_wnd_params_t;
 

uspace/lib/display/private/params.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 
 #include <gfx/coord.h>
+#include <types/common.h>
 
 /** Window resize arguments. */
@@ -61 +62 @@
         /** Flags */
         display_wnd_flags_t flags;
+        /** Input device ID associated with window's seat (or zero) */
+        sysarg_t idev_id;
 } display_wnd_params_enc_t;
 

uspace/lib/display/src/disp_srv.c

@@ -128 +128 @@
         params.pos = eparams.pos;
         params.flags = eparams.flags;
+        params.idev_id = eparams.idev_id;
 
         rc = srv->ops->window_create(srv->arg, &params, &wnd_id);

uspace/lib/display/src/display.c

@@ -176 +176 @@
         eparams.pos = params->pos;
         eparams.flags = params->flags;
+        eparams.idev_id = params->idev_id;
 
         window = calloc(1, sizeof(display_window_t));

uspace/lib/display/test/display.c

@@ -118 +118 @@
         gfx_rect_t create_rect;
         gfx_coord2_t create_min_size;
+        sysarg_t create_idev_id;
         bool window_destroy_called;
         sysarg_t destroy_wnd_id;
@@ -237 +238 @@
         params.min_size.x = 11;
         params.min_size.y = 12;
+        params.idev_id = 42;
 
         rc = display_window_create(disp, &params, &test_display_wnd_cb,
@@ -247 +249 @@
         PCUT_ASSERT_EQUALS(params.min_size.x, resp.create_min_size.x);
         PCUT_ASSERT_EQUALS(params.min_size.y, resp.create_min_size.y);
+        PCUT_ASSERT_EQUALS(params.idev_id, resp.create_idev_id);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
         PCUT_ASSERT_NULL(wnd);
@@ -289 +292 @@
         params.rect.p0.x = 100;
         params.rect.p0.y = 100;
+        params.idev_id = 42;
 
         rc = display_window_create(disp, &params, &test_display_wnd_cb,
@@ -297 +301 @@
         PCUT_ASSERT_EQUALS(params.rect.p1.x, resp.create_rect.p1.x);
         PCUT_ASSERT_EQUALS(params.rect.p1.y, resp.create_rect.p1.y);
+        PCUT_ASSERT_EQUALS(params.idev_id, resp.create_idev_id);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(wnd);
@@ -2138 +2143 @@
         resp->create_rect = params->rect;
         resp->create_min_size = params->min_size;
+        resp->create_idev_id = params->idev_id;
         if (resp->rc == EOK)
                 *rwnd_id = resp->wnd_id;