Changeset 3be5366 in mainline for uspace/lib/ui/src

Timestamp:

2023-01-19T12:09:34Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6828a56

Parents:

aaa3b855

git-author:

Jiri Svoboda <jiri@…> (2023-01-19 18:09:23)

git-committer:

Jiri Svoboda <jiri@…> (2023-01-19 12:09:34)

Message:

Add pos_id information to move request, too

This will become useful momentarily.

Location:

uspace/lib/ui/src

Files:

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

uspace/lib/ui/src/wdecor.c

@@ -465 +465 @@
  * @param wdecor Window decoration
  * @param pos Position where the title bar was pressed
- */
-void ui_wdecor_move(ui_wdecor_t *wdecor, gfx_coord2_t *pos)
+ * @param pos_id Positioning device ID
+ */
+void ui_wdecor_move(ui_wdecor_t *wdecor, gfx_coord2_t *pos, sysarg_t pos_id)
 {
         if (wdecor->cb != NULL && wdecor->cb->move != NULL)
-                wdecor->cb->move(wdecor, wdecor->arg, pos);
+                wdecor->cb->move(wdecor, wdecor->arg, pos, pos_id);
 }
 
@@ -812 +813 @@
 {
         gfx_coord2_t pos;
+        sysarg_t pos_id;
         ui_wdecor_rsztype_t rsztype;
         ui_stock_cursor_t cursor;
@@ -817 +819 @@
         pos.x = event->hpos;
         pos.y = event->vpos;
+        pos_id = event->pos_id;
 
         /* Set appropriate resizing cursor, or set arrow cursor */
@@ -827 +830 @@
         /* Press on window border? */
         if (rsztype != ui_wr_none && event->type == POS_PRESS)
-                ui_wdecor_resize(wdecor, rsztype, &pos, event->pos_id);
+                ui_wdecor_resize(wdecor, rsztype, &pos, pos_id);
 }
 
@@ -839 +842 @@
 {
         gfx_coord2_t pos;
+        sysarg_t pos_id;
         ui_wdecor_geom_t geom;
         ui_evclaim_t claim;
@@ -844 +848 @@
         pos.x = event->hpos;
         pos.y = event->vpos;
+        pos_id = event->pos_id;
 
         ui_wdecor_get_geom(wdecor, &geom);
@@ -870 +875 @@
                 if (event->type == POS_PRESS &&
                     gfx_pix_inside_rect(&pos, &geom.title_bar_rect)) {
-                        ui_wdecor_move(wdecor, &pos);
+                        ui_wdecor_move(wdecor, &pos, pos_id);
                         return ui_claimed;
                 }

uspace/lib/ui/src/window.c

@@ -78 +78 @@
 static void wd_unmaximize(ui_wdecor_t *, void *);
 static void wd_close(ui_wdecor_t *, void *);
-static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
+static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *, sysarg_t);
 static void wd_resize(ui_wdecor_t *, void *, ui_wdecor_rsztype_t,
     gfx_coord2_t *, sysarg_t);
@@ -973 +973 @@
  * @param arg Argument (window)
  * @param pos Position where the title bar was pressed
- */
-static void wd_move(ui_wdecor_t *wdecor, void *arg, gfx_coord2_t *pos)
+ * @param pos_id Positioning device ID
+ */
+static void wd_move(ui_wdecor_t *wdecor, void *arg, gfx_coord2_t *pos,
+    sysarg_t pos_id)
 {
         ui_window_t *window = (ui_window_t *) arg;
 
         if (window->dwindow != NULL)
-                (void) display_window_move_req(window->dwindow, pos);
+                (void) display_window_move_req(window->dwindow, pos, pos_id);
 }