Changeset 7cc30e9 in mainline for uspace/lib/display/src

Timestamp:

2022-10-24T17:50:46Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

913add60

Parents:

7a05d924

Message:

Display server needs to store window caption

Even though it does not use it itself, it needs to provide it to
window managers (e.g. Task bar). We need to be able to set caption
for a new window and to change it for an existing window.

Location:

uspace/lib/display/src

Files:

• disp_srv.c (modified) (5 diffs)
• display.c (modified) (5 diffs)

uspace/lib/display/src/disp_srv.c

@@ -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;
@@ -73 +75 @@
         }
 
-        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) {
+        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);
                 async_answer_0(&call, rc);
                 async_answer_0(icall, rc);
@@ -87 +117 @@
 
         if (srv->ops->window_create == NULL) {
-                async_answer_0(icall, ENOTSUP);
-                return;
-        }
+                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;
 
         rc = srv->ops->window_create(srv->arg, &params, &wnd_id);
@@ -401 +439 @@
         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);
 }
 
@@ -538 +619 @@
                 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:

uspace/lib/display/src/display.c

@@ -38 +38 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <str.h>
 #include "../private/display.h"
 #include "../private/params.h"
@@ -147 +148 @@
 {
         memset(params, 0, sizeof(*params));
+        params->caption = "";
 }
 
@@ -162 +164 @@
 {
         display_window_t *window;
-        async_exch_t *exch;
-        aid_t req;
-        ipc_call_t answer;
-        errno_t rc;
+        display_wnd_params_enc_t eparams;
+        async_exch_t *exch;
+        aid_t req;
+        ipc_call_t answer;
+        errno_t rc;
+
+        /* Encode the parameters for transport */
+        eparams.rect = params->rect;
+        eparams.caption_size = str_size(params->caption);
+        eparams.min_size = params->min_size;
+        eparams.pos = params->pos;
+        eparams.flags = params->flags;
 
         window = calloc(1, sizeof(display_window_t));
@@ -173 +183 @@
         exch = async_exchange_begin(display->sess);
         req = async_send_0(exch, DISPLAY_WINDOW_CREATE, &answer);
-        rc = async_data_write_start(exch, params, sizeof (display_wnd_params_t));
+
+        /* Write fixed fields */
+        rc = async_data_write_start(exch, &eparams,
+            sizeof (display_wnd_params_enc_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                free(window);
+                return rc;
+        }
+
+        /* Write caption */
+        rc = async_data_write_start(exch, params->caption,
+            eparams.caption_size);
         async_exchange_end(exch);
         if (rc != EOK) {
@@ -540 +563 @@
             cursor);
         async_exchange_end(exch);
+        return rc;
+}
+
+/** Set display window caption.
+ *
+ * @param window Window
+ * @param caption New caption
+ * @return EOK on success or an error code
+ */
+errno_t display_window_set_caption(display_window_t *window,
+    const char *caption)
+{
+        async_exch_t *exch;
+        aid_t req;
+        ipc_call_t answer;
+        size_t cap_size;
+        errno_t rc;
+
+        cap_size = str_size(caption);
+
+        exch = async_exchange_begin(window->display->sess);
+        req = async_send_1(exch, DISPLAY_WINDOW_SET_CAPTION, window->id,
+            &answer);
+
+        /* Write caption */
+        rc = async_data_write_start(exch, caption, cap_size);
+        async_exchange_end(exch);
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        async_wait_for(req, &rc);
         return rc;
 }