Changeset c9927c66 in mainline for uspace/srv/hid/display

Timestamp:

2021-06-10T13:22:33Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

9e84d2c

Parents:

c68c18b9

git-author:

Jiri Svoboda <jiri@…> (2021-05-27 17:00:30)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Set menu popup position based on parent window position

Added a method for getting the position of a display window.
This is then combined with the menu bar entry rectangle (which is
relative to the parent window) to compute a screen-relative
rectangle close to which the popup should be placed.

Location:

uspace/srv/hid/display

Files:

• dsops.c (modified) (3 diffs)
• window.c (modified) (2 diffs)
• window.h (modified) (1 diff)

uspace/srv/hid/display/dsops.c

@@ -48 +48 @@
 static errno_t disp_window_move_req(void *, sysarg_t, gfx_coord2_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 *);
 static errno_t disp_window_resize_req(void *, sysarg_t,
     display_wnd_rsztype_t, gfx_coord2_t *);
@@ -61 +62 @@
         .window_move_req = disp_window_move_req,
         .window_move = disp_window_move,
+        .window_get_pos = disp_window_get_pos,
         .window_resize_req = disp_window_resize_req,
         .window_resize = disp_window_resize,
@@ -162 +164 @@
 }
 
+static errno_t disp_window_get_pos(void *arg, sysarg_t wnd_id,
+    gfx_coord2_t *pos)
+{
+        ds_client_t *client = (ds_client_t *) arg;
+        ds_window_t *wnd;
+
+        ds_display_lock(client->display);
+
+        wnd = ds_client_find_window(client, wnd_id);
+        if (wnd == NULL) {
+                ds_display_unlock(client->display);
+                return ENOENT;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_pos()");
+        ds_window_get_pos(wnd, pos);
+        ds_display_unlock(client->display);
+        return EOK;
+}
+
 static errno_t disp_window_resize_req(void *arg, sysarg_t wnd_id,
     display_wnd_rsztype_t rsztype, gfx_coord2_t *pos)

uspace/srv/hid/display/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -658 +658 @@
 }
 
+/** Get window position.
+ *
+ * @param wnd Window
+ */
+void ds_window_get_pos(ds_window_t *wnd, gfx_coord2_t *dpos)
+{
+        *dpos = wnd->dpos;
+}
+
 /** Start resizing a window, detected by client.
  *

uspace/srv/hid/display/window.h

@@ -63 +63 @@
 extern void ds_window_move_req(ds_window_t *, gfx_coord2_t *);
 extern void ds_window_move(ds_window_t *, gfx_coord2_t *);
+extern void ds_window_get_pos(ds_window_t *, gfx_coord2_t *);
 extern void ds_window_resize_req(ds_window_t *, display_wnd_rsztype_t,
     gfx_coord2_t *);