Changeset 0a052b0 in mainline

Timestamp:

2020-02-19T17:04:16Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c2aba3

Parents:

b0a94854

git-author:

Jiri Svoboda <jiri@…> (2020-02-19 19:20:55)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-19 17:04:16)

Message:

Launch vterm, vlaunch, barber like before

File:

• uspace/app/init/init.c (modified) (4 diffs)

uspace/app/init/init.c

@@ -66 +66 @@
 
 #define SRV_DISPLAY  "/srv/hid/display"
+#define DISPLAY_SVC  "hid/display"
 
 #define HID_INPUT              "hid/input"
 #define HID_OUTPUT             "hid/output"
-#define HID_COMPOSITOR_SERVER  ":0"
 
 #define srv_start(path, ...) \
@@ -261 +261 @@
 }
 
-static int gui_start(const char *app)
+static int gui_start(const char *app, const char *display_svc)
 {
         printf("%s: Spawning %s\n", NAME, app);
@@ -267 +267 @@
         task_id_t id;
         task_wait_t wait;
-        errno_t rc = task_spawnl(&id, &wait, app, app, NULL);
+        errno_t rc = task_spawnl(&id, &wait, app, app, display_svc, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s (%s)\n", NAME, app,
@@ -451 +451 @@
                 if (rc == EOK) {
                         fibril_sleep(1);
-                        gui_start("/app/terminal");
+                        gui_start("/app/barber", DISPLAY_SVC);
+                        gui_start("/app/vlaunch", DISPLAY_SVC);
+                        gui_start("/app/vterm", DISPLAY_SVC);
                 }
         }