Changeset 3be5366 in mainline for uspace/srv

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/srv/hid/display

Files:

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

uspace/srv/hid/display/dsops.c

@@ -46 +46 @@
 static errno_t disp_window_create(void *, display_wnd_params_t *, sysarg_t *);
 static errno_t disp_window_destroy(void *, sysarg_t);
-static errno_t disp_window_move_req(void *, sysarg_t, gfx_coord2_t *);
+static errno_t disp_window_move_req(void *, sysarg_t, gfx_coord2_t *,
+    sysarg_t);
 static errno_t disp_window_move(void *, sysarg_t, gfx_coord2_t *);
 static errno_t disp_window_get_pos(void *, sysarg_t, gfx_coord2_t *);
@@ -127 +128 @@
 
 static errno_t disp_window_move_req(void *arg, sysarg_t wnd_id,
-    gfx_coord2_t *pos)
+    gfx_coord2_t *pos, sysarg_t pos_id)
 {
         ds_client_t *client = (ds_client_t *) arg;
@@ -141 +142 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_move_req()");
-        ds_window_move_req(wnd, pos);
+        ds_window_move_req(wnd, pos, pos_id);
         ds_display_unlock(client->display);
         return EOK;

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

@@ -711 +711 @@
         display_wnd_params_t params;
         gfx_coord2_t pos;
+        sysarg_t pos_id;
         errno_t rc;
 
@@ -736 +737 @@
         pos.x = 42;
         pos.y = 43;
-        ds_window_move_req(wnd, &pos);
+        pos_id = 44;
+        ds_window_move_req(wnd, &pos, pos_id);
 
         PCUT_ASSERT_INT_EQUALS(dsw_moving, wnd->state);
         PCUT_ASSERT_INT_EQUALS(pos.x, wnd->orig_pos.x);
         PCUT_ASSERT_INT_EQUALS(pos.y, wnd->orig_pos.y);
+        PCUT_ASSERT_INT_EQUALS(pos_id, wnd->orig_pos_id);
 
         ds_window_destroy(wnd);
@@ -791 +794 @@
         PCUT_ASSERT_INT_EQUALS(pos.x, wnd->orig_pos.x);
         PCUT_ASSERT_INT_EQUALS(pos.y, wnd->orig_pos.y);
+        PCUT_ASSERT_INT_EQUALS(pos_id, wnd->orig_pos_id);
 
         ds_window_destroy(wnd);

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 */
+        /** Positioning device that started the move or resize */
         sysarg_t orig_pos_id;
         /** Window resize type (if state is dsw_resizing) */

uspace/srv/hid/display/window.c

@@ -437 +437 @@
  * @param wnd Window
  * @param pos Position where mouse button was pressed
- */
-static void ds_window_start_move(ds_window_t *wnd, gfx_coord2_t *pos)
+ * @param pos_id Positioning device ID
+ */
+static void ds_window_start_move(ds_window_t *wnd, gfx_coord2_t *pos,
+    sysarg_t pos_id)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_start_move (%d, %d)",
@@ -447 +449 @@
 
         wnd->orig_pos = *pos;
+        wnd->orig_pos_id = pos_id;
         wnd->state = dsw_moving;
         wnd->preview_pos = wnd->dpos;
@@ -476 +479 @@
         wnd->dpos = nwpos;
         wnd->state = dsw_idle;
+        wnd->orig_pos_id = 0;
 
         (void) ds_display_paint(wnd->display, NULL);
@@ -569 +573 @@
                 ds_seat_set_wm_cursor(seat, NULL);
 
+        wnd->orig_pos_id = 0;
+
         (void) ds_display_paint(wnd->display, NULL);
 }
@@ -629 +635 @@
         pos_event_t tevent;
         gfx_coord2_t pos;
+        sysarg_t pos_id;
         gfx_rect_t drect;
         bool inside;
@@ -638 +645 @@
         pos.x = event->hpos;
         pos.y = event->vpos;
+        pos_id = event->pos_id;
         gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
         inside = gfx_pix_inside_rect(&pos, &drect);
@@ -643 +651 @@
         if (event->type == POS_PRESS && event->btn_num == 2 && inside &&
             (wnd->flags & wndf_maximized) == 0) {
-                ds_window_start_move(wnd, &pos);
+                ds_window_start_move(wnd, &pos, pos_id);
                 return EOK;
         }
@@ -746 +754 @@
  * @param pos Position where the pointer was when the move started
  *            relative to the window
+ * @param pos_id Positioning device ID
  * @param event Button press event
  */
-void ds_window_move_req(ds_window_t *wnd, gfx_coord2_t *pos)
+void ds_window_move_req(ds_window_t *wnd, gfx_coord2_t *pos, sysarg_t pos_id)
 {
         gfx_coord2_t orig_pos;
@@ -756 +765 @@
 
         gfx_coord2_add(&wnd->dpos, pos, &orig_pos);
-        ds_window_start_move(wnd, &orig_pos);
+        ds_window_start_move(wnd, &orig_pos, pos_id);
 }
 

uspace/srv/hid/display/window.h

@@ -63 +63 @@
 extern errno_t ds_window_post_focus_event(ds_window_t *);
 extern errno_t ds_window_post_unfocus_event(ds_window_t *);
-extern void ds_window_move_req(ds_window_t *, gfx_coord2_t *);
+extern void ds_window_move_req(ds_window_t *, gfx_coord2_t *, sysarg_t);
 extern void ds_window_move(ds_window_t *, gfx_coord2_t *);
 extern void ds_window_get_pos(ds_window_t *, gfx_coord2_t *);