Changeset c9927c66 in mainline for uspace/lib/display/src

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

Files:

• disp_srv.c (modified) (3 diffs)
• display.c (modified) (2 diffs)

uspace/lib/display/src/disp_srv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -187 +187 @@
 }
 
+static void display_window_get_pos_srv(display_srv_t *srv, ipc_call_t *icall)
+{
+        sysarg_t wnd_id;
+        ipc_call_t call;
+        gfx_coord2_t dpos;
+        size_t size;
+        errno_t rc;
+
+        wnd_id = ipc_get_arg1(icall);
+
+        if (srv->ops->window_get_pos == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        rc = srv->ops->window_get_pos(srv->arg, wnd_id, &dpos);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (size != sizeof(gfx_coord2_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(&call, &dpos, size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        async_answer_0(icall, EOK);
+}
+
 static void display_window_resize_req_srv(display_srv_t *srv, ipc_call_t *icall)
 {
@@ -398 +441 @@
                 case DISPLAY_WINDOW_MOVE:
                         display_window_move_srv(srv, &call);
+                        break;
+                case DISPLAY_WINDOW_GET_POS:
+                        display_window_get_pos_srv(srv, &call);
                         break;
                 case DISPLAY_WINDOW_RESIZE_REQ:

uspace/lib/display/src/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -319 +319 @@
 }
 
+/** Get display window position.
+ *
+ * Get display window position on the display.
+ *
+ * @param window Window
+ * @param dpos Place to store position
+ * @return EOK on success or an error code
+ */
+errno_t display_window_get_pos(display_window_t *window, gfx_coord2_t *dpos)
+{
+        async_exch_t *exch;
+        aid_t req;
+        ipc_call_t answer;
+        errno_t rc;
+
+        exch = async_exchange_begin(window->display->sess);
+        req = async_send_1(exch, DISPLAY_WINDOW_GET_POS, window->id, &answer);
+        rc = async_data_read_start(exch, dpos, sizeof (gfx_coord2_t));
+        async_exchange_end(exch);
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        async_wait_for(req, &rc);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** Request a window resize.
  *