Changeset b0ae23f in mainline for uspace/lib/ui/src

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/lib/ui/src

Files:

• wdecor.c (modified) (3 diffs)
• window.c (modified) (2 diffs)

uspace/lib/ui/src/wdecor.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -477 +477 @@
  * @param rsztype Resize type
  * @param pos Position where the button was pressed
+ * @param pos_id Positioning device ID
  */
 void ui_wdecor_resize(ui_wdecor_t *wdecor, ui_wdecor_rsztype_t rsztype,
-    gfx_coord2_t *pos)
+    gfx_coord2_t *pos, sysarg_t pos_id)
 {
         if (wdecor->cb != NULL && wdecor->cb->resize != NULL)
-                wdecor->cb->resize(wdecor, wdecor->arg, rsztype, pos);
+                wdecor->cb->resize(wdecor, wdecor->arg, rsztype, pos, pos_id);
 }
 
@@ -826 +827 @@
         /* Press on window border? */
         if (rsztype != ui_wr_none && event->type == POS_PRESS)
-                ui_wdecor_resize(wdecor, rsztype, &pos);
+                ui_wdecor_resize(wdecor, rsztype, &pos, event->pos_id);
 }
 

uspace/lib/ui/src/window.c

@@ -80 +80 @@
 static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
 static void wd_resize(ui_wdecor_t *, void *, ui_wdecor_rsztype_t,
-    gfx_coord2_t *);
+    gfx_coord2_t *, sysarg_t);
 static void wd_set_cursor(ui_wdecor_t *, void *, ui_stock_cursor_t);
 
@@ -988 +988 @@
  * @param rsztype Resize type
  * @param pos Position where the button was pressed
+ * @param pos_id Positioning device ID
  */
 static void wd_resize(ui_wdecor_t *wdecor, void *arg,
-    ui_wdecor_rsztype_t rsztype, gfx_coord2_t *pos)
-{
-        ui_window_t *window = (ui_window_t *) arg;
-
-        if (window->dwindow != NULL)
-                (void) display_window_resize_req(window->dwindow, rsztype, pos);
+    ui_wdecor_rsztype_t rsztype, gfx_coord2_t *pos, sysarg_t pos_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->dwindow != NULL) {
+                (void) display_window_resize_req(window->dwindow, rsztype,
+                    pos, pos_id);
+        }
 }