Changeset 0d6d527 in mainline

Timestamp:

2020-11-21T20:07:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4f64b7b8

Parents:

68698ba

Message:

Put GFX demo in launcher instead of launcher

Don't really need to launch another launcher

File:

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

uspace/app/launcher/launcher.c

@@ -70 +70 @@
 };
 
-static int app_launch(const char *);
+static int app_launch(const char *, const char *);
 
 /** Window close button was clicked.
@@ -94 +94 @@
 
         if (pbutton == launcher->pb1) {
-                app_launch("/app/terminal");
+                app_launch("/app/terminal", NULL);
         } else if (pbutton == launcher->pb2) {
-                app_launch("/app/calculator");
+                app_launch("/app/calculator", NULL);
         } else if (pbutton == launcher->pb3) {
-                app_launch("/app/uidemo");
+                app_launch("/app/uidemo", NULL);
         } else if (pbutton == launcher->pb4) {
-                app_launch("/app/launcher");
-        }
-}
-
-static int app_launch(const char *app)
+                app_launch("/app/gfxdemo", "ui");
+        }
+}
+
+static int app_launch(const char *app, const char *arg)
 {
         errno_t rc;
@@ -112 +112 @@
         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, NULL);
+                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, NULL);
+                rc = task_spawnl(&id, &wait, app, app, arg, NULL);
         }
 
@@ -316 +317 @@
         }
 
-        rc = ui_pbutton_create(ui_res, "Launcher", &launcher.pb4);
+        rc = ui_pbutton_create(ui_res, "GFX Demo", &launcher.pb4);
         if (rc != EOK) {
                 printf("Error creating button.\n");