Changeset dcfd422 in mainline for uspace/app/terminal/terminal.c

Timestamp:

2020-10-23T13:45:18Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5a43bd0

Parents:

26653c9

git-author:

Jiri Svoboda <jiri@…> (2020-10-22 19:44:59)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-23 13:45:18)

Message:

Decorate terminal window

File:

• uspace/app/terminal/terminal.c (modified) (11 diffs)

uspace/app/terminal/terminal.c

@@ -50 +50 @@
 #include <stdlib.h>
 #include <str.h>
+#include <ui/resource.h>
+#include <ui/wdecor.h>
 
 #include "terminal.h"
@@ -100 +102 @@
 };
 
+static void terminal_close_event(void *);
+static void terminal_focus_event(void *);
 static void terminal_kbd_event(void *, kbd_event_t *);
+static void terminal_pos_event(void *, pos_event_t *);
+static void terminal_unfocus_event(void *);
 
 static display_wnd_cb_t terminal_wnd_cb = {
-        .kbd_event = terminal_kbd_event
+        .close_event = terminal_close_event,
+        .focus_event = terminal_focus_event,
+        .kbd_event = terminal_kbd_event,
+        .pos_event = terminal_pos_event,
+        .unfocus_event = terminal_unfocus_event
+};
+
+static void terminal_wd_close(ui_wdecor_t *, void *);
+static void terminal_wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
+
+static ui_wdecor_cb_t wdecor_cb = {
+        .close = terminal_wd_close,
+        .move = terminal_wd_move
 };
 
@@ -305 +323 @@
         pixelmap_t pixelmap;
         gfx_bitmap_alloc_t alloc;
+        gfx_coord2_t pos;
         errno_t rc;
 
@@ -360 +379 @@
 
         if (update) {
-                (void) gfx_bitmap_render(term->bmp, &term->update, NULL);
+                pos.x = 4;
+                pos.y = 26;
+                (void) gfx_bitmap_render(term->bmp, &term->update, &pos);
 
                 term->update.p0.x = 0;
@@ -655 +676 @@
 }
 
-/* Got key press/release event */
+/** Handle window close event. */
+static void terminal_close_event(void *arg)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        (void) term;
+
+        // XXX This is not really a clean way of terminating
+        exit(0);
+}
+
+/** Handle window focus event. */
+static void terminal_focus_event(void *arg)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        if (term->wdecor != NULL) {
+                ui_wdecor_set_active(term->wdecor, true);
+                ui_wdecor_paint(term->wdecor);
+        }
+}
+
+/** Handle window keyboard event */
 static void terminal_kbd_event(void *arg, kbd_event_t *kbd_event)
 {
@@ -665 +708 @@
 
         terminal_queue_cons_event(term, &event);
+}
+
+/** Handle window position event */
+static void terminal_pos_event(void *arg, pos_event_t *event)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        /* Make sure we don't process events until fully initialized */
+        if (term->wdecor == NULL)
+                return;
+
+        ui_wdecor_pos_event(term->wdecor, event);
+}
+
+/** Handle window unfocus event. */
+static void terminal_unfocus_event(void *arg)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        if (term->wdecor != NULL) {
+                ui_wdecor_set_active(term->wdecor, false);
+                ui_wdecor_paint(term->wdecor);
+        }
 }
 
@@ -688 +754 @@
 #endif
 
+/** Window decoration requested window closure.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ */
+static void terminal_wd_close(ui_wdecor_t *wdecor, void *arg)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        (void) term;
+
+        // XXX This is not really a clean way of terminating
+        exit(0);
+}
+
+/** Window decoration requested window move.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ * @param pos Position where the title bar was pressed
+ */
+static void terminal_wd_move(ui_wdecor_t *wdecor, void *arg, gfx_coord2_t *pos)
+{
+        terminal_t *term = (terminal_t *) arg;
+
+        if (term->window != NULL)
+                (void) display_window_move_req(term->window, pos);
+}
+
 static void term_connection(ipc_call_t *icall, void *arg)
 {
@@ -716 +811 @@
         gfx_bitmap_params_t params;
         display_wnd_params_t wparams;
+        gfx_rect_t rect;
+        gfx_coord2_t off;
+        gfx_rect_t wrect;
         errno_t rc;
 
@@ -756 +854 @@
         }
 
+        rect.p0.x = 0;
+        rect.p0.y = 0;
+        rect.p1.x = width;
+        rect.p1.y = height;
+
         display_wnd_params_init(&wparams);
-        wparams.rect.p0.x = 0;
-        wparams.rect.p0.y = 0;
-        wparams.rect.p1.x = width;
-        wparams.rect.p1.y = height;
+
+        /*
+         * Compute window rectangle such that application area corresponds
+         * to rect
+         */
+        ui_wdecor_rect_from_app(&rect, &wrect);
+        off = wrect.p0;
+        gfx_rect_rtranslate(&off, &wrect, &wparams.rect);
 
         rc = display_window_create(display, &wparams, &terminal_wnd_cb,
@@ -775 +882 @@
         }
 
+        rc = ui_resource_create(term->gc, &term->ui_res);
+        if (rc != EOK) {
+                printf("Error creating UI.\n");
+                goto error;
+        }
+
+        rc = ui_wdecor_create(term->ui_res, "Terminal", &term->wdecor);
+        if (rc != EOK) {
+                printf("Error creating window decoration.\n");
+                goto error;
+        }
+
+        ui_wdecor_set_rect(term->wdecor, &wparams.rect);
+        ui_wdecor_set_cb(term->wdecor, &wdecor_cb, (void *) term);
+
+        (void) ui_wdecor_paint(term->wdecor);
+
         gfx_bitmap_params_init(&params);
         params.rect.p0.x = 0;
@@ -827 +951 @@
         return EOK;
 error:
+        if (term->wdecor != NULL)
+                ui_wdecor_destroy(term->wdecor);
+        if (term->ui_res != NULL)
+                ui_resource_destroy(term->ui_res);
         if (term->gc != NULL)
                 gfx_context_delete(term->gc);