Changeset b48e680f in mainline for uspace/lib/ui

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/ui

Files:

• include/ui/wdecor.h (modified) (2 diffs)
• include/ui/window.h (modified) (1 diff)
• private/window.h (modified) (1 diff)
• src/ui.c (modified) (4 diffs)
• src/wdecor.c (modified) (1 diff)
• src/window.c (modified) (4 diffs)

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);
 }