Changeset b48e680f in mainline for uspace/lib/c

Timestamp:

2021-11-03T10:23:28Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ec8a1bf

Parents:

ce862ac

git-author:

Jiri Svoboda <jiri@…> (2021-11-02 19:19:50)

git-committer:

Jiri Svoboda <jiri@…> (2021-11-03 10:23:28)

Message:

Allow console application to set the terminal window caption

Location:

uspace/lib/c

Files:

• generic/io/con_srv.c (modified) (2 diffs)
• generic/io/console.c (modified) (2 diffs)
• include/io/con_srv.h (modified) (2 diffs)
• include/io/console.h (modified) (1 diff)
• include/ipc/console.h (modified) (1 diff)

uspace/lib/c/generic/io/con_srv.c

@@ -281 +281 @@
 }
 
+static void con_set_caption_srv(con_srv_t *srv, ipc_call_t *icall)
+{
+        char *caption;
+        errno_t rc;
+
+        rc = async_data_write_accept((void **) &caption, true, 0,
+            CON_CAPTION_MAXLEN, 0, NULL);
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (srv->srvs->ops->set_caption == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        srv->srvs->ops->set_caption(srv, caption);
+        free(caption);
+        async_answer_0(icall, EOK);
+}
+
 static void con_get_event_srv(con_srv_t *srv, ipc_call_t *icall)
 {
@@ -488 +510 @@
                         con_set_cursor_visibility_srv(srv, &call);
                         break;
+                case CONSOLE_SET_CAPTION:
+                        con_set_caption_srv(srv, &call);
+                        break;
                 case CONSOLE_GET_EVENT:
                         con_get_event_srv(srv, &call);

uspace/lib/c/generic/io/console.c

@@ -40 +40 @@
 #include <errno.h>
 #include <stdlib.h>
+#include <str.h>
 #include <vfs/vfs_sess.h>
 #include <io/console.h>
@@ -128 +129 @@
         async_req_1_0(exch, CONSOLE_SET_CURSOR_VISIBILITY, (show != false));
         async_exchange_end(exch);
+}
+
+/** Set console caption.
+ *
+ * Set caption text for the console (if the console suports captions).
+ *
+ * @param ctrl Console
+ * @param caption Caption text
+ * @return EOK on success or an error code
+ */
+errno_t console_set_caption(console_ctrl_t *ctrl, const char *caption)
+{
+        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, CONSOLE_SET_CAPTION, &answer);
+        errno_t retval = async_data_write_start(exch, caption, str_size(caption));
+
+        if (retval != EOK) {
+                async_forget(req);
+                async_exchange_end(exch);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        async_exchange_end(exch);
+        return EOK;
 }
 

uspace/lib/c/include/io/con_srv.h

@@ -51 +51 @@
 typedef struct con_ops con_ops_t;
 
+#define CON_CAPTION_MAXLEN 255
+
 /** Service setup (per sevice) */
 typedef struct {
@@ -83 +85 @@
         void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t);
         void (*set_cursor_visibility)(con_srv_t *, bool);
+        errno_t (*set_caption)(con_srv_t *, const char *);
         errno_t (*get_event)(con_srv_t *, cons_event_t *);
         errno_t (*map)(con_srv_t *, sysarg_t, sysarg_t, charfield_t **);

uspace/lib/c/include/io/console.h

@@ -83 +83 @@
 
 extern void console_cursor_visibility(console_ctrl_t *, bool);
+extern errno_t console_set_caption(console_ctrl_t *, const char *);
 extern errno_t console_get_color_cap(console_ctrl_t *, sysarg_t *);
 extern errno_t console_get_event(console_ctrl_t *, cons_event_t *);

uspace/lib/c/include/ipc/console.h

@@ -50 +50 @@
         CONSOLE_SET_RGB_COLOR,
         CONSOLE_SET_CURSOR_VISIBILITY,
+        CONSOLE_SET_CAPTION,
         CONSOLE_MAP,
         CONSOLE_UNMAP,