Changeset fd11144 in mainline for uspace/app/viewer/viewer.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/viewer/viewer.c (modified) (4 diffs)

uspace/app/viewer/viewer.c

@@ -176 +176 @@
 }
 
+static void print_syntax(void)
+{
+        printf("Syntax: %s [-d <display>] <image-file>...\n", NAME);
+}
+
 int main(int argc, char *argv[])
 {
+        const char *display_svc = DISPLAY_DEFAULT;
         window_flags_t flags;
         surface_t *lsface;
@@ -183 +189 @@
         sysarg_t dwidth;
         sysarg_t dheight;
-
-        if (argc < 2) {
-                printf("Compositor server not specified.\n");
+        int i;
+
+        i = 1;
+        while (i < argc && argv[i][0] == '-') {
+                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;
+                }
+        }
+
+        if (i >= argc) {
+                printf("No image files specified.\n");
+                print_syntax();
                 return 1;
         }
 
-        if (argc < 3) {
-                printf("No image files specified.\n");
-                return 1;
-        }
-
-        imgs_count = argc - 2;
+        imgs_count = argc - i;
         imgs = calloc(imgs_count, sizeof(char *));
         if (imgs == NULL) {
@@ -201 +222 @@
         }
 
-        for (int i = 0; i < argc - 2; i++) {
-                imgs[i] = str_dup(argv[i + 2]);
-                if (imgs[i] == NULL) {
+        for (int j = 0; j < argc - i; j++) {
+                imgs[j] = str_dup(argv[i + j]);
+                if (imgs[j] == NULL) {
                         printf("Out of memory.\n");
                         return 3;
@@ -221 +242 @@
                 flags |= WINDOW_DECORATED;
 
-        main_window = window_open(argv[1], NULL, flags, "viewer");
+        main_window = window_open(display_svc, NULL, flags, "viewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");