Changeset b48e680f in mainline

Timestamp:

2021-11-03T10:23:28Z (3 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

Files:

• app/terminal/terminal.c (modified) (3 diffs)
• lib/c/generic/io/con_srv.c (modified) (2 diffs)
• lib/c/generic/io/console.c (modified) (2 diffs)
• lib/c/include/io/con_srv.h (modified) (2 diffs)
• lib/c/include/io/console.h (modified) (1 diff)
• lib/c/include/ipc/console.h (modified) (1 diff)
• lib/ui/include/ui/wdecor.h (modified) (2 diffs)
• lib/ui/include/ui/window.h (modified) (1 diff)
• lib/ui/private/window.h (modified) (1 diff)
• lib/ui/src/ui.c (modified) (4 diffs)
• lib/ui/src/wdecor.c (modified) (1 diff)
• lib/ui/src/window.c (modified) (4 diffs)
• srv/hid/console/console.c (modified) (3 diffs)

uspace/app/terminal/terminal.c

@@ -88 +88 @@
 static void term_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void term_set_cursor_visibility(con_srv_t *, bool);
+static errno_t term_set_caption(con_srv_t *, const char *);
 static errno_t term_get_event(con_srv_t *, cons_event_t *);
 static errno_t term_map(con_srv_t *, sysarg_t, sysarg_t, charfield_t **);
@@ -109 +110 @@
         .set_rgb_color = term_set_rgb_color,
         .set_cursor_visibility = term_set_cursor_visibility,
+        .set_caption = term_set_caption,
         .get_event = term_get_event,
         .map = term_map,
@@ -645 +647 @@
 }
 
+static errno_t term_set_caption(con_srv_t *srv, const char *caption)
+{
+        terminal_t *term = srv_to_terminal(srv);
+        const char *cap;
+
+        fibril_mutex_lock(&term->mtx);
+
+        if (str_size(caption) > 0)
+                cap = caption;
+        else
+                cap = "Terminal";
+
+        ui_window_set_caption(term->window, cap);
+        fibril_mutex_unlock(&term->mtx);
+
+        term_update(term);
+        gfx_update(term->gc);
+        return EOK;
+}
+
 static errno_t term_get_event(con_srv_t *srv, cons_event_t *event)
 {

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,

uspace/lib/ui/include/ui/wdecor.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 extern void ui_wdecor_set_rect(ui_wdecor_t *, gfx_rect_t *);
 extern void ui_wdecor_set_active(ui_wdecor_t *, bool);
+extern errno_t ui_wdecor_set_caption(ui_wdecor_t *, const char *);
 extern errno_t ui_wdecor_paint(ui_wdecor_t *);
 extern ui_evclaim_t ui_wdecor_pos_event(ui_wdecor_t *, pos_event_t *);

uspace/lib/ui/include/ui/window.h

@@ -51 +51 @@
     ui_window_t **);
 extern void ui_window_set_cb(ui_window_t *, ui_window_cb_t *, void *);
+extern errno_t ui_window_set_caption(ui_window_t *, const char *);
 extern void ui_window_destroy(ui_window_t *);
 extern void ui_window_add(ui_window_t *, ui_control_t *);

uspace/lib/ui/private/window.h

@@ -95 +95 @@
         /** Current cursor */
         ui_stock_cursor_t cursor;
+        /** Window placement */
+        ui_wnd_placement_t placement;
 };
 

uspace/lib/ui/src/ui.c

@@ -50 +50 @@
 #include <ui/wdecor.h>
 #include <ui/window.h>
+#include "../private/wdecor.h"
 #include "../private/window.h"
 #include "../private/ui.h"
@@ -372 +373 @@
                 return EOK;
 
+        (void) console_set_caption(ui->console, "");
         return console_gc_suspend(ui->cgc);
 }
@@ -386 +388 @@
 {
         errno_t rc;
+        ui_window_t *awnd;
 
         if (ui->cgc == NULL)
@@ -393 +396 @@
         if (rc != EOK)
                 return rc;
+
+        awnd = ui_window_get_active(ui);
+        if (awnd != NULL)
+                (void) console_set_caption(ui->console, awnd->wdecor->caption);
 
         return gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false);

uspace/lib/ui/src/wdecor.c

@@ -157 +157 @@
 {
         wdecor->active = active;
+}
+
+/** Change caption.
+ *
+ * @param wdecor Window decoration
+ * @param caption New caption
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_set_caption(ui_wdecor_t *wdecor, const char *caption)
+{
+        char *cdup;
+
+        cdup = str_dup(caption);
+        if (cdup == NULL)
+                return ENOMEM;
+
+        free(wdecor->caption);
+        wdecor->caption = cdup;
+
+        ui_wdecor_paint(wdecor);
+        return EOK;
 }
 

uspace/lib/ui/src/window.c

@@ -262 +262 @@
                         gfx_coord2_add(&dparams.rect.p0, &scr_dims,
                             &dparams.rect.p1);
+                        (void) console_set_caption(ui->console,
+                            params->caption);
                 }
         } else {
@@ -355 +357 @@
         window->wdecor = wdecor;
         window->cursor = ui_curs_arrow;
+        window->placement = params->placement;
         *rwindow = window;
 
@@ -412 +415 @@
                 ui_paint(ui);
         }
+
+        if (ui->console != NULL &&
+            window->placement == ui_wnd_place_full_screen) {
+                (void) console_set_caption(ui->console, "");
+        }
 }
 
@@ -599 +607 @@
         window->cb = cb;
         window->arg = arg;
+}
+
+/** Change window caption.
+ *
+ * @param window Window
+ * @param caption New caption
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_set_caption(ui_window_t *window, const char *caption)
+{
+        return ui_wdecor_set_caption(window->wdecor, caption);
 }
 

uspace/srv/hid/console/console.c

@@ -151 +151 @@
 static void cons_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void cons_set_cursor_visibility(con_srv_t *, bool);
+static errno_t cons_set_caption(con_srv_t *, const char *);
 static errno_t cons_get_event(con_srv_t *, cons_event_t *);
 static errno_t cons_map(con_srv_t *, sysarg_t, sysarg_t, charfield_t **);
@@ -172 +173 @@
         .set_rgb_color = cons_set_rgb_color,
         .set_cursor_visibility = cons_set_cursor_visibility,
+        .set_caption = cons_set_caption,
         .get_event = cons_get_event,
         .map = cons_map,
@@ -669 +671 @@
 }
 
+static errno_t cons_set_caption(con_srv_t *srv, const char *caption)
+{
+        console_t *cons = srv_to_console(srv);
+
+        (void) cons;
+        (void) caption;
+        return EOK;
+}
+
 static errno_t cons_get_event(con_srv_t *srv, cons_event_t *event)
 {