Changeset 15d0046 in mainline for uspace/lib/gui/terminal.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/lib/gui/terminal.c

@@ -104 +104 @@
 static void getterm(const char *svc, const char *app)
 {
-        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);
+        task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+            LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
 }
 
@@ -194 +186 @@
         //        for full UTF-32 coverage.
         
-        uint16_t glyph = fb_font_glyph(field->ch);
+        uint16_t glyph = fb_font_glyph(field->ch, NULL);
         
         for (unsigned int y = 0; y < FONT_SCANLINES; y++) {
@@ -262 +254 @@
         
         bool front_visibility =
-            chargrid_get_cursor_visibility(term->frontbuf);
+            chargrid_get_cursor_visibility(term->frontbuf) &&
+            term->widget.window->is_focused;
         bool back_visibility =
             chargrid_get_cursor_visibility(term->backbuf);