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

Timestamp:

2020-10-28T12:42:11Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8009dc27

Parents:

d284ce9

git-author:

Jiri Svoboda <jiri@…> (2020-10-28 12:41:11)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-28 12:42:11)

Message:

Convert terminal to using ui_window

File:

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

uspace/app/terminal/terminal.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -32 +32 @@
  */
 /**
- * @file Terminal application using display service for output
+ * @file Terminal application
  */
 
@@ -51 +51 @@
 #include <str.h>
 #include <ui/resource.h>
+#include <ui/ui.h>
 #include <ui/wdecor.h>
+#include <ui/window.h>
 
 #include "terminal.h"
@@ -102 +104 @@
 };
 
-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 = {
-        .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
+static void terminal_close_event(ui_window_t *, void *);
+static void terminal_focus_event(ui_window_t *, void *);
+static void terminal_kbd_event(ui_window_t *, void *, kbd_event_t *);
+static void terminal_pos_event(ui_window_t *, void *, pos_event_t *);
+static void terminal_unfocus_event(ui_window_t *, void *);
+
+static ui_window_cb_t terminal_window_cb = {
+        .close = terminal_close_event,
+        .focus = terminal_focus_event,
+        .kbd = terminal_kbd_event,
+        .pos = terminal_pos_event,
+        .unfocus = terminal_unfocus_event
 };
 
@@ -677 +671 @@
 
 /** Handle window close event. */
-static void terminal_close_event(void *arg)
+static void terminal_close_event(ui_window_t *window, void *arg)
 {
         terminal_t *term = (terminal_t *) arg;
@@ -688 +682 @@
 
 /** Handle window focus event. */
-static void terminal_focus_event(void *arg)
+static void terminal_focus_event(ui_window_t *window, void *arg)
 {
         terminal_t *term = (terminal_t *) arg;
 
-        if (term->wdecor != NULL) {
-                ui_wdecor_set_active(term->wdecor, true);
-                ui_wdecor_paint(term->wdecor);
-
-                term->is_focused = true;
-                term_update(term);
-        }
+        term->is_focused = true;
+        term_update(term);
 }
 
 /** Handle window keyboard event */
-static void terminal_kbd_event(void *arg, kbd_event_t *kbd_event)
+static void terminal_kbd_event(ui_window_t *window, void *arg,
+    kbd_event_t *kbd_event)
 {
         terminal_t *term = (terminal_t *) arg;
@@ -714 +704 @@
 
 /** Handle window position event */
-static void terminal_pos_event(void *arg, pos_event_t *event)
+static void terminal_pos_event(ui_window_t *window, void *arg, pos_event_t *event)
 {
         cons_event_t cevent;
         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);
 
         sysarg_t sx = -term->off.x;
@@ -741 +725 @@
 
 /** Handle window unfocus event. */
-static void terminal_unfocus_event(void *arg)
+static void terminal_unfocus_event(ui_window_t *window, void *arg)
 {
         terminal_t *term = (terminal_t *) arg;
 
-        if (term->wdecor != NULL) {
-                ui_wdecor_set_active(term->wdecor, false);
-                ui_wdecor_paint(term->wdecor);
-
-                term->is_focused = false;
-                term_update(term);
-        }
-}
-
-/** 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);
+        term->is_focused = false;
+        term_update(term);
 }
 
@@ -805 +755 @@
 }
 
-errno_t terminal_create(display_t *display, sysarg_t width, sysarg_t height,
-    terminal_t **rterm)
+errno_t terminal_create(const char *display_spec, sysarg_t width,
+    sysarg_t height, terminal_t **rterm)
 {
         terminal_t *term;
         gfx_bitmap_params_t params;
-        display_wnd_params_t wparams;
+        ui_wnd_params_t wparams;
         gfx_rect_t rect;
         gfx_coord2_t off;
@@ -859 +809 @@
         rect.p1.y = height;
 
-        display_wnd_params_init(&wparams);
+        ui_wnd_params_init(&wparams);
+        wparams.caption = "Terminal";
 
         /*
@@ -871 +822 @@
         term->off = off;
 
-        rc = display_window_create(display, &wparams, &terminal_wnd_cb,
-            (void *) term, &term->window);
+        rc = ui_create(display_spec, &term->ui);
+        if (rc != EOK) {
+                printf("Error creating UI on %s.\n", display_spec);
+                goto error;
+        }
+
+        rc = ui_window_create(term->ui, &wparams, &term->window);
         if (rc != EOK) {
                 printf("Error creating window.\n");
@@ -878 +834 @@
         }
 
-        rc = display_window_get_gc(term->window, &term->gc);
-        if (rc != EOK) {
-                printf("Error getting window GC.\n");
-                goto error;
-        }
-
-        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);
+        term->gc = ui_window_get_gc(term->window);
+        term->ui_res = ui_window_get_res(term->window);
+
+        ui_window_set_cb(term->window, &terminal_window_cb, (void *) term);
 
         gfx_bitmap_params_init(&params);
@@ -943 +881 @@
         getterm(vc, "/app/bdsh");
 
+        term->is_focused = true;
+
         term->update.p0.x = 0;
         term->update.p0.y = 0;
@@ -953 +893 @@
         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);
         if (term->window != NULL)
-                display_window_destroy(term->window);
+                ui_window_destroy(term->window);
+        if (term->ui != NULL)
+                ui_destroy(term->ui);
         if (term->frontbuf != NULL)
                 chargrid_destroy(term->frontbuf);