Changeset fd11144 in mainline for uspace/app/barber/barber.c

Timestamp:

2020-07-04T21:52:35Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fc4abca

Parents:

e79a025

Message:

Make display service argument optional

File:

• uspace/app/barber/barber.c (modified) (3 diffs)

uspace/app/barber/barber.c

@@ -40 +40 @@
 #include <loc.h>
 #include <stats.h>
+#include <str.h>
 #include <fibril_synch.h>
 #include <io/pixel.h>
@@ -247 +248 @@
 }
 
+static void print_syntax(void)
+{
+        printf("Syntax: %s [-d <display>]\n", NAME);
+}
+
 int main(int argc, char *argv[])
 {
-        if (argc < 2) {
-                printf("Compositor server not specified.\n");
-                return 1;
+        const char *display_svc = DISPLAY_DEFAULT;
+        int i;
+
+        i = 1;
+        while (i < argc) {
+                if (str_cmp(argv[i], "-d") == 0) {
+                        ++i;
+                        if (i >= argc) {
+                                printf("Argument missing.\n");
+                                print_syntax();
+                                return 1;
+                        }
+
+                        display_svc = argv[i++];
+                } else {
+                        printf("Invalid option '%s'.\n", argv[i]);
+                        print_syntax();
+                        return 1;
+                }
         }
 
@@ -277 +299 @@
 
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], NULL,
+        window_t *main_window = window_open(display_svc, NULL,
             WINDOW_MAIN | WINDOW_DECORATED, "barber");
         if (!main_window) {