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

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -487 +487 @@
 
 /** Run demo on canvas. */
-static errno_t demo_canvas(void)
+static errno_t demo_canvas(const char *display_svc)
 {
         canvas_gc_t *cgc = NULL;
@@ -500 +500 @@
         printf("Init canvas..\n");
 
-        window = window_open(DISPLAY_DEFAULT, NULL,
+        window = window_open(display_svc, NULL,
             WINDOW_MAIN | WINDOW_DECORATED, "GFX Demo");
         if (window == NULL) {
@@ -553 +553 @@
 
 /** Run demo on display server. */
-static errno_t demo_display(void)
+static errno_t demo_display(const char *display_svc)
 {
         display_t *display = NULL;
@@ -563 +563 @@
         printf("Init display..\n");
 
-        rc = display_open(DISPLAY_DEFAULT, &display);
+        rc = display_open(display_svc, &display);
         if (rc != EOK) {
                 printf("Error opening display.\n");
@@ -618 +618 @@
 static void print_syntax(void)
 {
-        printf("syntax: gfxdemo {canvas|console|display}\n");
+        printf("Syntax: gfxdemo [-d <display>] {canvas|console|display}\n");
 }
 
@@ -624 +624 @@
 {
         errno_t rc;
-
-        if (argc < 2 || str_cmp(argv[1], "display") == 0) {
-                rc = demo_display();
-                if (rc != EOK)
+        const char *display_svc = DISPLAY_DEFAULT;
+        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;
-        } else if (str_cmp(argv[1], "console") == 0) {
+                }
+        }
+
+        if (i >= argc || str_cmp(argv[i], "display") == 0) {
+                rc = demo_display(display_svc);
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[i], "console") == 0) {
                 rc = demo_console();
                 if (rc != EOK)
                         return 1;
-        } else if (str_cmp(argv[1], "canvas") == 0) {
-                rc = demo_canvas();
+        } else if (str_cmp(argv[i], "canvas") == 0) {
+                rc = demo_canvas(display_svc);
                 if (rc != EOK)
                         return 1;