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

Timestamp:

2020-03-05T11:23:41Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1e4a937

Parents:

338d0935

git-author:

Jiri Svoboda <jiri@…> (2020-03-04 19:23:29)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-05 11:23:41)

Message:

Move windows by dragging decoration

Or dragging anywhere with button 2. Need to add Ctrl/Alt/Shift state
to pos_event_t and change the latter to Alt-drag/Shift-drag.

Location:

uspace/lib/display/src

Files:

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

uspace/lib/display/src/disp_srv.c

@@ -100 +100 @@
         wnd_id = ipc_get_arg1(icall);
 
-        if (srv->ops->window_create == NULL) {
+        if (srv->ops->window_destroy == NULL) {
                 async_answer_0(icall, ENOTSUP);
                 return;
@@ -106 +106 @@
 
         rc = srv->ops->window_destroy(srv->arg, wnd_id);
+        async_answer_0(icall, rc);
+}
+
+static void display_window_move_req_srv(display_srv_t *srv, ipc_call_t *icall)
+{
+        sysarg_t wnd_id;
+        ipc_call_t call;
+        gfx_coord2_t pos;
+        size_t size;
+        errno_t rc;
+
+        wnd_id = ipc_get_arg1(icall);
+
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(gfx_coord2_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(&call, &pos, size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (srv->ops->window_move_req == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->window_move_req(srv->arg, wnd_id, &pos);
         async_answer_0(icall, rc);
 }
@@ -215 +253 @@
                 case DISPLAY_WINDOW_DESTROY:
                         display_window_destroy_srv(srv, &call);
+                        break;
+                case DISPLAY_WINDOW_MOVE_REQ:
+                        display_window_move_req_srv(srv, &call);
                         break;
                 case DISPLAY_WINDOW_RESIZE:

uspace/lib/display/src/display.c

@@ -244 +244 @@
 }
 
+/** Request a window move.
+ *
+ * Request the display service to initiate a user window move operation
+ * (i.e. let the user move the window). Used when the client detects
+ * mouse press on the title bar or such.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+errno_t display_window_move_req(display_window_t *window, gfx_coord2_t *pos)
+{
+        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_MOVE_REQ, window->id, &answer);
+        rc = async_data_write_start(exch, (void *)pos, 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;
+}
+
 /** Resize display window.
  *
@@ -283 +315 @@
  * @param nrect New bounding rectangle
  * @param offs
- * @return EOK on success or an error code. In both cases @a window must
- *         not be accessed anymore
+ * @return EOK on success or an error code
  */
 errno_t display_window_resize(display_window_t *window, gfx_coord2_t *offs,