Changeset b0ae23f in mainline for uspace/srv/hid

Timestamp:

2023-01-17T15:21:13Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a0d4afe

Parents:

46a47c0

git-author:

Jiri Svoboda <jiri@…> (2023-01-17 18:21:02)

git-committer:

Jiri Svoboda <jiri@…> (2023-01-17 15:21:13)

Message:

Change the correct pointer's shape when resizing window

The request to resize a window originates from the client. The display
server forces the cursor to a double-arrow shape regardless of whether
it is over the window or not, until the resize is done. This is to
make sure the cursor keeps that shape even if it moves outside of
the current boundaries of the window. With multiple pointers we need
to know which one to change. This is done by passing the pos_id from
button press event that starts the resize all the way to
ds_window_start_resize(). Then it needs to be stored in the window
structure for use when it is time to restore the cursor.

Location:

uspace/srv/hid/display

Files:

• dsops.c (modified) (4 diffs)
• test/window.c (modified) (2 diffs)
• types/display/window.h (modified) (1 diff)
• window.c (modified) (4 diffs)
• window.h (modified) (1 diff)

uspace/srv/hid/display/dsops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 static errno_t disp_window_get_max_rect(void *, sysarg_t, gfx_rect_t *);
 static errno_t disp_window_resize_req(void *, sysarg_t,
-    display_wnd_rsztype_t, gfx_coord2_t *);
+    display_wnd_rsztype_t, gfx_coord2_t *, sysarg_t);
 static errno_t disp_window_resize(void *, sysarg_t, gfx_coord2_t *,
     gfx_rect_t *);
@@ -206 +206 @@
 
 static errno_t disp_window_resize_req(void *arg, sysarg_t wnd_id,
-    display_wnd_rsztype_t rsztype, gfx_coord2_t *pos)
+    display_wnd_rsztype_t rsztype, gfx_coord2_t *pos, sysarg_t pos_id)
 {
         ds_client_t *client = (ds_client_t *) arg;
@@ -223 +223 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_resize_req()");
-        ds_window_resize_req(wnd, rsztype, pos);
+        ds_window_resize_req(wnd, rsztype, pos, pos_id);
         ds_display_unlock(client->display);
         return EOK;

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

@@ -758 +758 @@
         display_wnd_params_t params;
         gfx_coord2_t pos;
+        sysarg_t pos_id;
         errno_t rc;
 
@@ -783 +784 @@
         pos.x = 42;
         pos.y = 43;
-        ds_window_resize_req(wnd, display_wr_top_right, &pos);
+        pos_id = 44;
+        ds_window_resize_req(wnd, display_wr_top_right, &pos, pos_id);
 
         PCUT_ASSERT_INT_EQUALS(dsw_resizing, wnd->state);

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

@@ -103 +103 @@
         /** Original position before started to move or resize the window */
         gfx_coord2_t orig_pos;
+        /** Positioning device that started the resize */
+        sysarg_t orig_pos_id;
         /** Window resize type (if state is dsw_resizing) */
         display_wnd_rsztype_t rsztype;

uspace/srv/hid/display/window.c

@@ -510 +510 @@
  * @param rsztype Resize type (which part of window is being dragged)
  * @param pos Position where mouse button was pressed
+ * @param pos_id Positioning device ID
  */
 static void ds_window_start_resize(ds_window_t *wnd,
-    display_wnd_rsztype_t rsztype, gfx_coord2_t *pos)
+    display_wnd_rsztype_t rsztype, gfx_coord2_t *pos, sysarg_t pos_id)
 {
         ds_seat_t *seat;
@@ -523 +524 @@
                 return;
 
+        /* Determine which seat started the resize */
+        seat = ds_display_seat_by_idev(wnd->display, pos_id);
+        if (seat == NULL)
+                return;
+
         wnd->orig_pos = *pos;
+        wnd->orig_pos_id = pos_id;
         wnd->state = dsw_resizing;
         wnd->rsztype = rsztype;
         wnd->preview_rect = wnd->rect;
 
-        // TODO Multi-seat: need client to tell us which seat started the resize!
-        seat = ds_display_first_seat(wnd->display);
         ctype = display_cursor_from_wrsz(rsztype);
         ds_seat_set_wm_cursor(seat, wnd->display->cursor[ctype]);
@@ -559 +564 @@
         ds_client_post_resize_event(wnd->client, wnd, &nrect);
 
-        // TODO Multi-seat: Need to know which seat started the resize!
-        seat = ds_display_first_seat(wnd->display);
-        ds_seat_set_wm_cursor(seat, NULL);
+        /* Determine which seat started the resize */
+        seat = ds_display_seat_by_idev(wnd->display, wnd->orig_pos_id);
+        if (seat != NULL)
+                ds_seat_set_wm_cursor(seat, NULL);
 
         (void) ds_display_paint(wnd->display, NULL);
@@ -787 +793 @@
  * @param pos Position where the pointer was when the resize started
  *            relative to the window
+ * @param pos_id Positioning device ID
  * @param event Button press event
  */
 void ds_window_resize_req(ds_window_t *wnd, display_wnd_rsztype_t rsztype,
-    gfx_coord2_t *pos)
+    gfx_coord2_t *pos, sysarg_t pos_id)
 {
         gfx_coord2_t orig_pos;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_resize_req (%d, %d, %d)",
-            (int) rsztype, (int) pos->x, (int) pos->y);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_resize_req (%d, %d, %d, %d)",
+            (int)rsztype, (int)pos->x, (int)pos->y, (int)pos_id);
 
         gfx_coord2_add(&wnd->dpos, pos, &orig_pos);
-        ds_window_start_resize(wnd, rsztype, &orig_pos);
+        ds_window_start_resize(wnd, rsztype, &orig_pos, pos_id);
 }
 

uspace/srv/hid/display/window.h

@@ -68 +68 @@
 extern void ds_window_get_max_rect(ds_window_t *, gfx_rect_t *);
 extern void ds_window_resize_req(ds_window_t *, display_wnd_rsztype_t,
-    gfx_coord2_t *);
+    gfx_coord2_t *, sysarg_t);
 extern errno_t ds_window_resize(ds_window_t *, gfx_coord2_t *, gfx_rect_t *);
 extern errno_t ds_window_minimize(ds_window_t *);