Changes in uspace/app/launcher/launcher.c [552b69f:d8ddf7a] in mainline

File:

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

uspace/app/launcher/launcher.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -56 +56 @@
 #define NAME  "launcher"
 
-static const char *display_spec = UI_DISPLAY_DEFAULT;
+static char *display_spec = UI_DISPLAY_DEFAULT;
 
 static void wnd_close(ui_window_t *, void *);
@@ -70 +70 @@
 };
 
-static int app_launchl(const char *, ...);
+static int app_launch(const char *, const char *);
 
 /** Window close button was clicked.
@@ -94 +94 @@
 
         if (pbutton == launcher->pb1) {
-                app_launchl("/app/terminal", "-c", "/app/nav", NULL);
+                app_launch("/app/terminal", NULL);
         } else if (pbutton == launcher->pb2) {
-                app_launchl("/app/terminal", "-c", "/app/edit", NULL);
+                app_launch("/app/calculator", NULL);
         } else if (pbutton == launcher->pb3) {
-                app_launchl("/app/terminal", NULL);
+                app_launch("/app/uidemo", NULL);
         } else if (pbutton == launcher->pb4) {
-                app_launchl("/app/calculator", NULL);
-        } else if (pbutton == launcher->pb5) {
-                app_launchl("/app/uidemo", NULL);
-        } else if (pbutton == launcher->pb6) {
-                app_launchl("/app/gfxdemo", "ui", NULL);
-        }
-}
-
-static int app_launchl(const char *app, ...)
+                app_launch("/app/gfxdemo", "ui");
+        }
+}
+
+static int app_launch(const char *app, const char *arg)
 {
         errno_t rc;
         task_id_t id;
         task_wait_t wait;
-        va_list ap;
-        const char *arg;
-        const char **argv;
-        const char **argp;
-        int cnt = 0;
-        int i;
-
-        va_start(ap, app);
-        do {
-                arg = va_arg(ap, const char *);
-                cnt++;
-        } while (arg != NULL);
-        va_end(ap);
-
-        argv = calloc(cnt + 4, sizeof(const char *));
-        if (argv == NULL)
+
+        if (display_spec != UI_DISPLAY_DEFAULT) {
+                printf("%s: Spawning %s -d %s\n", NAME, app, display_spec);
+                rc = task_spawnl(&id, &wait, app, app, "-d", display_spec,
+                    arg, NULL);
+        } else {
+                printf("%s: Spawning %s\n", NAME, app);
+                rc = task_spawnl(&id, &wait, app, app, arg, NULL);
+        }
+
+        if (rc != EOK) {
+                printf("%s: Error spawning %s %s (%s)\n", NAME, app,
+                    display_spec != DISPLAY_DEFAULT ? display_spec :
+                    "<default>", str_error(rc));
                 return -1;
+        }
 
         task_exit_t texit;
         int retval;
-
-        argp = argv;
-        *argp++ = app;
-
-        if (str_cmp(display_spec, UI_DISPLAY_DEFAULT) != 0) {
-                *argp++ = "-d";
-                *argp++ = display_spec;
-        }
-
-        va_start(ap, app);
-        do {
-                arg = va_arg(ap, const char *);
-                *argp++ = arg;
-        } while (arg != NULL);
-        va_end(ap);
-
-        *argp++ = NULL;
-
-        printf("%s: Spawning %s", NAME, app);
-        for (i = 0; argv[i] != NULL; i++) {
-                printf(" %s", argv[i]);
-        }
-        printf("\n");
-
-        rc = task_spawnv(&id, &wait, app, argv);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", NAME, app, str_error(rc));
-                return -1;
-        }
-
         rc = task_wait(&wait, &texit, &retval);
         if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
@@ -224 +189 @@
         params.rect.p0.y = 0;
         params.rect.p1.x = 210;
-        params.rect.p1.y = 345;
+        params.rect.p1.y = 300;
 
         memset((void *) &launcher, 0, sizeof(launcher));
@@ -298 +263 @@
         }
 
-        /* Navigator */
-
-        rc = ui_pbutton_create(ui_res, "Navigator", &launcher.pb1);
+        rc = ui_pbutton_create(ui_res, "Terminal", &launcher.pb1);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -311 +274 @@
         rect.p0.y = 130;
         rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
+        rect.p1.y = 158;
         ui_pbutton_set_rect(launcher.pb1, &rect);
 
@@ -320 +283 @@
         }
 
-        /* Text Editor */
-
-        rc = ui_pbutton_create(ui_res, "Text Editor", &launcher.pb2);
+        rc = ui_pbutton_create(ui_res, "Calculator", &launcher.pb2);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -331 +292 @@
 
         rect.p0.x = 15;
-        rect.p0.y = 130 + 35;
+        rect.p0.y = 170;
         rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
+        rect.p1.y = 198;
         ui_pbutton_set_rect(launcher.pb2, &rect);
 
@@ -342 +303 @@
         }
 
-        /* Terminal */
-
-        rc = ui_pbutton_create(ui_res, "Terminal", &launcher.pb3);
+        rc = ui_pbutton_create(ui_res, "UI Demo", &launcher.pb3);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -353 +312 @@
 
         rect.p0.x = 15;
-        rect.p0.y = 130 + 2 * 35;
+        rect.p0.y = 210;
         rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
+        rect.p1.y = 238;
         ui_pbutton_set_rect(launcher.pb3, &rect);
 
@@ -364 +323 @@
         }
 
-        /* Calculator */
-
-        rc = ui_pbutton_create(ui_res, "Calculator", &launcher.pb4);
+        rc = ui_pbutton_create(ui_res, "GFX Demo", &launcher.pb4);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -375 +332 @@
 
         rect.p0.x = 15;
-        rect.p0.y = 130 + 3 * 35;
+        rect.p0.y = 250;
         rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
+        rect.p1.y = 278;
         ui_pbutton_set_rect(launcher.pb4, &rect);
 
@@ -386 +343 @@
         }
 
-        /* UI Demo */
-
-        rc = ui_pbutton_create(ui_res, "UI Demo", &launcher.pb5);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return rc;
-        }
-
-        ui_pbutton_set_cb(launcher.pb5, &pbutton_cb, (void *) &launcher);
-
-        rect.p0.x = 15;
-        rect.p0.y = 130 + 4 * 35;
-        rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
-        ui_pbutton_set_rect(launcher.pb5, &rect);
-
-        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb5));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                return rc;
-        }
-
-        /* GFX Demo */
-
-        rc = ui_pbutton_create(ui_res, "GFX Demo", &launcher.pb6);
-        if (rc != EOK) {
-                printf("Error creating button.\n");
-                return rc;
-        }
-
-        ui_pbutton_set_cb(launcher.pb6, &pbutton_cb, (void *) &launcher);
-
-        rect.p0.x = 15;
-        rect.p0.y = 130 + 5 * 35;
-        rect.p1.x = 190;
-        rect.p1.y = rect.p0.y + 28;
-        ui_pbutton_set_rect(launcher.pb6, &rect);
-
-        rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb6));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                return rc;
-        }
-
         ui_window_add(window, ui_fixed_ctl(launcher.fixed));
+
+        (void) ui_res;
+        (void) app_launch;
 
         rc = ui_window_paint(window);