Changes in uspace/app/terminal/terminal.c [77ffa01:b48e680f] in mainline

File:

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

uspace/app/terminal/terminal.c

@@ -41 +41 @@
 #include <fbfont/font-8x16.h>
 #include <io/chargrid.h>
+#include <fibril.h>
 #include <gfx/bitmap.h>
 #include <gfx/context.h>
@@ -87 +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 **);
@@ -108 +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,
@@ -128 +131 @@
 };
 
+static errno_t terminal_wait_fibril(void *);
+
 static terminal_t *srv_to_terminal(con_srv_t *srv)
 {
@@ -133 +138 @@
 }
 
-static void getterm(const char *svc, const char *app)
-{
-        task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+static errno_t getterm(task_wait_t *wait, const char *svc, const char *app)
+{
+        return task_spawnl(NULL, wait, APP_GETTERM, APP_GETTERM, svc,
             LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
 }
@@ -141 +146 @@
 static pixel_t color_table[16] = {
         [COLOR_BLACK]       = PIXEL(255, 0, 0, 0),
-        [COLOR_BLUE]        = PIXEL(255, 0, 0, 240),
-        [COLOR_GREEN]       = PIXEL(255, 0, 240, 0),
-        [COLOR_CYAN]        = PIXEL(255, 0, 240, 240),
-        [COLOR_RED]         = PIXEL(255, 240, 0, 0),
-        [COLOR_MAGENTA]     = PIXEL(255, 240, 0, 240),
-        [COLOR_YELLOW]      = PIXEL(255, 240, 240, 0),
-        [COLOR_WHITE]       = PIXEL(255, 240, 240, 240),
-
-        [COLOR_BLACK + 8]   = PIXEL(255, 0, 0, 0),
-        [COLOR_BLUE + 8]    = PIXEL(255, 0, 0, 255),
-        [COLOR_GREEN + 8]   = PIXEL(255, 0, 255, 0),
-        [COLOR_CYAN + 8]    = PIXEL(255, 0, 255, 255),
-        [COLOR_RED + 8]     = PIXEL(255, 255, 0, 0),
-        [COLOR_MAGENTA + 8] = PIXEL(255, 255, 0, 255),
-        [COLOR_YELLOW + 8]  = PIXEL(255, 255, 255, 0),
+        [COLOR_BLUE]        = PIXEL(255, 0, 0, 170),
+        [COLOR_GREEN]       = PIXEL(255, 0, 170, 0),
+        [COLOR_CYAN]        = PIXEL(255, 0, 170, 170),
+        [COLOR_RED]         = PIXEL(255, 170, 0, 0),
+        [COLOR_MAGENTA]     = PIXEL(255, 170, 0, 170),
+        [COLOR_YELLOW]      = PIXEL(255, 170, 85, 0),
+        [COLOR_WHITE]       = PIXEL(255, 170, 170, 170),
+
+        [COLOR_BLACK + 8]   = PIXEL(255, 85, 85, 85),
+        [COLOR_BLUE + 8]    = PIXEL(255, 85, 85, 255),
+        [COLOR_GREEN + 8]   = PIXEL(255, 85, 255, 85),
+        [COLOR_CYAN + 8]    = PIXEL(255, 85, 255, 255),
+        [COLOR_RED + 8]     = PIXEL(255, 255, 85, 85),
+        [COLOR_MAGENTA + 8] = PIXEL(255, 255, 85, 255),
+        [COLOR_YELLOW + 8]  = PIXEL(255, 255, 255, 85),
         [COLOR_WHITE + 8]   = PIXEL(255, 255, 255, 255),
 };
@@ -165 +170 @@
                 switch (attrs.val.style) {
                 case STYLE_NORMAL:
-                        *bgcolor = color_table[COLOR_WHITE];
+                        *bgcolor = color_table[COLOR_WHITE + 8];
                         *fgcolor = color_table[COLOR_BLACK];
                         break;
                 case STYLE_EMPHASIS:
-                        *bgcolor = color_table[COLOR_WHITE];
-                        *fgcolor = color_table[COLOR_RED];
+                        *bgcolor = color_table[COLOR_WHITE + 8];
+                        *fgcolor = color_table[COLOR_RED + 8];
                         break;
                 case STYLE_INVERTED:
                         *bgcolor = color_table[COLOR_BLACK];
-                        *fgcolor = color_table[COLOR_WHITE];
+                        *fgcolor = color_table[COLOR_WHITE + 8];
                         break;
                 case STYLE_SELECTED:
-                        *bgcolor = color_table[COLOR_RED];
-                        *fgcolor = color_table[COLOR_WHITE];
+                        *bgcolor = color_table[COLOR_RED + 8];
+                        *fgcolor = color_table[COLOR_WHITE + 8];
                         break;
                 }
                 break;
         case CHAR_ATTR_INDEX:
-                *bgcolor = color_table[(attrs.val.index.bgcolor & 7) |
-                    ((attrs.val.index.attr & CATTR_BRIGHT) ? 8 : 0)];
+                *bgcolor = color_table[(attrs.val.index.bgcolor & 7)];
                 *fgcolor = color_table[(attrs.val.index.fgcolor & 7) |
                     ((attrs.val.index.attr & CATTR_BRIGHT) ? 8 : 0)];
@@ -643 +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)
 {
@@ -805 +829 @@
         terminal_t *term = (terminal_t *) arg;
 
-        (void) term;
-
-        // XXX This is not really a clean way of terminating
-        exit(0);
+        ui_quit(term->ui);
 }
 
@@ -843 +864 @@
         sysarg_t sy = -term->off.y;
 
-        if (event->type == POS_PRESS || event->type == POS_RELEASE) {
+        if (event->type == POS_PRESS || event->type == POS_RELEASE ||
+            event->type == POS_DCLICK) {
                 cevent.type = CEV_POS;
                 cevent.ev.pos.type = event->type;
@@ -888 +910 @@
 
 errno_t terminal_create(const char *display_spec, sysarg_t width,
-    sysarg_t height, terminal_flags_t flags, terminal_t **rterm)
+    sysarg_t height, terminal_flags_t flags, const char *command,
+    terminal_t **rterm)
 {
         terminal_t *term;
@@ -1013 +1036 @@
 
         list_append(&term->link, &terms);
-        getterm(vc, "/app/bdsh");
+        rc = getterm(&term->wait, vc, command);
+        if (rc != EOK)
+                goto error;
+
+        term->wfid = fibril_create(terminal_wait_fibril, term);
+        if (term->wfid == 0)
+                goto error;
+
+        fibril_add_ready(term->wfid);
 
         term->is_focused = true;
@@ -1039 +1070 @@
 }
 
+static errno_t terminal_wait_fibril(void *arg)
+{
+        terminal_t *term = (terminal_t *)arg;
+        task_exit_t texit;
+        int retval;
+
+        /*
+         * XXX There is no way to break the sleep if the task does not
+         * exit.
+         */
+        (void) task_wait(&term->wait, &texit, &retval);
+        ui_quit(term->ui);
+        return EOK;
+}
+
 /** @}
  */