Changes in uspace/lib/gui/terminal.c [10cb47e:3f06dae] in mainline

File:

• uspace/lib/gui/terminal.c (modified) (8 diffs)

uspace/lib/gui/terminal.c

@@ -104 +104 @@
 static void getterm(const char *svc, const char *app)
 {
-        task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
-            LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
+        char term[LOC_NAME_MAXLEN];
+        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc);
+        
+        /* Wait for the terminal service to be ready */
+        service_id_t service_id;
+        int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK)
+                return;
+        
+        task_spawnl(NULL, APP_GETTERM, APP_GETTERM, "-w", term, app, NULL);
 }
 
@@ -186 +194 @@
         //        for full UTF-32 coverage.
         
-        uint16_t glyph = fb_font_glyph(field->ch, NULL);
+        uint16_t glyph = fb_font_glyph(field->ch);
         
         for (unsigned int y = 0; y < FONT_SCANLINES; y++) {
@@ -254 +262 @@
         
         bool front_visibility =
-            chargrid_get_cursor_visibility(term->frontbuf) &&
-            term->widget.window->is_focused;
+            chargrid_get_cursor_visibility(term->frontbuf);
         bool back_visibility =
             chargrid_get_cursor_visibility(term->backbuf);
@@ -678 +685 @@
         terminal_t *term = NULL;
         
-        list_foreach(terms, link, terminal_t, cur) {
-                if (cur->dsid == (service_id_t) IPC_GET_ARG2(*icall)) {
+        list_foreach(terms, link) {
+                terminal_t *cur = list_get_instance(link, terminal_t, link);
+                
+                if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
                         term = cur;
                         break;
@@ -696 +705 @@
 }
 
-bool init_terminal(terminal_t *term, widget_t *parent, const void *data,
-    sysarg_t width, sysarg_t height)
-{
-        widget_init(&term->widget, parent, data);
+bool init_terminal(terminal_t *term, widget_t *parent, sysarg_t width,
+    sysarg_t height)
+{
+        widget_init(&term->widget, parent);
         
         link_initialize(&term->link);
@@ -744 +753 @@
         term->top_row = 0;
         
-        async_set_fallback_port_handler(term_connection, NULL);
+        async_set_client_connection(term_connection);
         con_srvs_init(&term->srvs);
         term->srvs.ops = &con_ops;
@@ -771 +780 @@
 }
 
-terminal_t *create_terminal(widget_t *parent, const void *data, sysarg_t width,
-    sysarg_t height)
+terminal_t *create_terminal(widget_t *parent, sysarg_t width, sysarg_t height)
 {
         terminal_t *term = (terminal_t *) malloc(sizeof(terminal_t));
@@ -778 +786 @@
                 return NULL;
         
-        bool ret = init_terminal(term, parent, data, width, height);
+        bool ret = init_terminal(term, parent, width, height);
         if (!ret) {
                 free(term);