Changes in uspace/lib/display/src/disp_srv.c [cdd6fc9:35cffea] in mainline

File:

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

uspace/lib/display/src/disp_srv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -63 +63 @@
         sysarg_t wnd_id;
         ipc_call_t call;
-        display_wnd_params_enc_t eparams;
         display_wnd_params_t params;
-        char *caption;
         size_t size;
         errno_t rc;
@@ -75 +73 @@
         }
 
-        if (size != sizeof(display_wnd_params_enc_t)) {
-                async_answer_0(&call, EINVAL);
-                async_answer_0(icall, EINVAL);
-                return;
-        }
-
-        rc = async_data_write_finalize(&call, &eparams, size);
-        if (rc != EOK) {
-                async_answer_0(&call, rc);
-                async_answer_0(icall, rc);
-                return;
-        }
-
-        caption = calloc(eparams.caption_size + 1, 1);
-        if (caption == NULL) {
-                async_answer_0(icall, ENOMEM);
-                return;
-        }
-
-        if (!async_data_write_receive(&call, &size)) {
-                free(caption);
-                async_answer_0(&call, EREFUSED);
-                async_answer_0(icall, EREFUSED);
-                return;
-        }
-
-        if (size != eparams.caption_size) {
-                free(caption);
-                async_answer_0(&call, EINVAL);
-                async_answer_0(icall, EINVAL);
-                return;
-        }
-
-        rc = async_data_write_finalize(&call, caption, eparams.caption_size);
-        if (rc != EOK) {
-                free(caption);
+        if (size != sizeof(display_wnd_params_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(&call, &params, size);
+        if (rc != EOK) {
                 async_answer_0(&call, rc);
                 async_answer_0(icall, rc);
@@ -117 +87 @@
 
         if (srv->ops->window_create == NULL) {
-                free(caption);
-                async_answer_0(icall, ENOTSUP);
-                return;
-        }
-
-        /* Decode the parameters from transport */
-        params.rect = eparams.rect;
-        params.caption = caption;
-        params.min_size = eparams.min_size;
-        params.pos = eparams.pos;
-        params.flags = eparams.flags;
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
 
         rc = srv->ops->window_create(srv->arg, &params, &wnd_id);
@@ -241 +203 @@
 
         if (!async_data_read_receive(&call, &size)) {
-                async_answer_0(&call, EREFUSED);
                 async_answer_0(icall, EREFUSED);
                 return;
@@ -286 +247 @@
 
         if (!async_data_read_receive(&call, &size)) {
-                async_answer_0(&call, EREFUSED);
                 async_answer_0(icall, EREFUSED);
                 return;
@@ -393 +353 @@
 }
 
-static void display_window_minimize_srv(display_srv_t *srv, ipc_call_t *icall)
-{
-        sysarg_t wnd_id;
-        errno_t rc;
-
-        wnd_id = ipc_get_arg1(icall);
-
-        if (srv->ops->window_minimize == NULL) {
-                async_answer_0(icall, ENOTSUP);
-                return;
-        }
-
-        rc = srv->ops->window_minimize(srv->arg, wnd_id);
-        async_answer_0(icall, rc);
-}
-
 static void display_window_maximize_srv(display_srv_t *srv, ipc_call_t *icall)
 {
@@ -457 +401 @@
         rc = srv->ops->window_set_cursor(srv->arg, wnd_id, cursor);
         async_answer_0(icall, rc);
-}
-
-static void display_window_set_caption_srv(display_srv_t *srv,
-    ipc_call_t *icall)
-{
-        sysarg_t wnd_id;
-        ipc_call_t call;
-        char *caption;
-        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;
-        }
-
-        caption = calloc(size + 1, 1);
-        if (caption == NULL) {
-                async_answer_0(&call, ENOMEM);
-                async_answer_0(icall, ENOMEM);
-                return;
-        }
-
-        rc = async_data_write_finalize(&call, caption, size);
-        if (rc != EOK) {
-                free(caption);
-                async_answer_0(&call, rc);
-                async_answer_0(icall, rc);
-                return;
-        }
-
-        if (srv->ops->window_set_caption == NULL) {
-                free(caption);
-                async_answer_0(icall, ENOTSUP);
-                return;
-        }
-
-        rc = srv->ops->window_set_caption(srv->arg, wnd_id, caption);
-        async_answer_0(icall, rc);
-        free(caption);
 }
 
@@ -523 +424 @@
         /* Transfer event data */
         if (!async_data_read_receive(&call, &size)) {
-                async_answer_0(&call, EREFUSED);
                 async_answer_0(icall, EREFUSED);
                 return;
@@ -558 +458 @@
         /* Transfer information */
         if (!async_data_read_receive(&call, &size)) {
-                async_answer_0(&call, EREFUSED);
                 async_answer_0(icall, EREFUSED);
                 return;
@@ -631 +530 @@
                         display_window_resize_srv(srv, &call);
                         break;
-                case DISPLAY_WINDOW_MINIMIZE:
-                        display_window_minimize_srv(srv, &call);
-                        break;
                 case DISPLAY_WINDOW_MAXIMIZE:
                         display_window_maximize_srv(srv, &call);
@@ -642 +538 @@
                 case DISPLAY_WINDOW_SET_CURSOR:
                         display_window_set_cursor_srv(srv, &call);
-                        break;
-                case DISPLAY_WINDOW_SET_CAPTION:
-                        display_window_set_caption_srv(srv, &call);
                         break;
                 case DISPLAY_GET_EVENT: