Changeset 0680854 in mainline for uspace/lib/display/src/disp_srv.c

Timestamp:

2020-03-20T15:42:27Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0b7e394

Parents:

aeb3037

git-author:

Jiri Svoboda <jiri@…> (2020-03-19 19:42:21)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-20 15:42:27)

Message:

Moving window by client request, emulate window placement flags

File:

• uspace/lib/display/src/disp_srv.c (modified) (3 diffs)

uspace/lib/display/src/disp_srv.c

@@ -149 +149 @@
 }
 
-static void display_window_resize_req_srv(display_srv_t *srv, ipc_call_t *icall)
-{
-        sysarg_t wnd_id;
-        ipc_call_t call;
-        display_wnd_rsztype_t rsztype;
-        gfx_coord2_t pos;
+static void display_window_move_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);
-        rsztype = (display_wnd_rsztype_t) ipc_get_arg2(icall);
 
         if (!async_data_write_receive(&call, &size)) {
@@ -173 +171 @@
         }
 
+        rc = async_data_write_finalize(&call, &dpos, size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (srv->ops->window_move == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->window_move(srv->arg, wnd_id, &dpos);
+        async_answer_0(icall, rc);
+}
+
+
+static void display_window_resize_req_srv(display_srv_t *srv, ipc_call_t *icall)
+{
+        sysarg_t wnd_id;
+        ipc_call_t call;
+        display_wnd_rsztype_t rsztype;
+        gfx_coord2_t pos;
+        size_t size;
+        errno_t rc;
+
+        wnd_id = ipc_get_arg1(icall);
+        rsztype = (display_wnd_rsztype_t) ipc_get_arg2(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) {
@@ -339 +378 @@
                 case DISPLAY_WINDOW_MOVE_REQ:
                         display_window_move_req_srv(srv, &call);
+                        break;
+                case DISPLAY_WINDOW_MOVE:
+                        display_window_move_srv(srv, &call);
                         break;
                 case DISPLAY_WINDOW_RESIZE_REQ: