Changeset c8cf261 in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2019-10-03T09:10:01Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6af4b4f

Parents:

aac5069

git-author:

Jiri Svoboda <jiri@…> (2019-10-02 17:09:46)

git-committer:

Jiri Svoboda <jiri@…> (2019-10-03 09:10:01)

Message:

Display server scaffolding

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (8 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -36 +36 @@
 #include <congfx/console.h>
 #include <draw/surface.h>
+#include <display.h>
 #include <fibril.h>
 #include <guigfx/canvas.h>
@@ -117 +118 @@
 static errno_t demo_canvas(void)
 {
-        console_ctrl_t *con = NULL;
         canvas_gc_t *cgc = NULL;
         gfx_context_t *gc;
@@ -128 +128 @@
 
         printf("Init canvas..\n");
-        con = console_init(stdin, stdout);
-        if (con == NULL)
-                return EIO;
 
         window = window_open("comp:0/winreg", NULL,
@@ -145 +142 @@
         if (pixbuf == NULL) {
                 printf("Error allocating memory for pixel buffer.\n");
-                return -1;
+                return ENOMEM;
         }
 
@@ -151 +148 @@
         if (surface == NULL) {
                 printf("Error creating surface.\n");
-                return -1;
+                return EIO;
         }
 
@@ -158 +155 @@
         if (canvas == NULL) {
                 printf("Error creating canvas.\n");
-                return -1;
+                return EIO;
         }
 
@@ -182 +179 @@
 }
 
+/** Run demo on display server. */
+static errno_t demo_display(void)
+{
+        display_t *display = NULL;
+        gfx_context_t *gc;
+        display_window_t *window = NULL;
+        errno_t rc;
+
+        printf("Init display..\n");
+
+        rc = display_open(NULL, &display);
+        if (rc != EOK) {
+                printf("Error opening display.\n");
+                return rc;
+        }
+
+        rc = display_window_create(display, &window);
+        if (rc != EOK) {
+                printf("Error creating window.\n");
+                return rc;
+        }
+
+        rc = display_window_get_gc(window, &gc);
+        if (rc != EOK) {
+                printf("Error getting graphics context.\n");
+        }
+
+        rc = demo_rects(gc, 400, 300);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_context_delete(gc);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
-        printf("syntax: gfxdemo {canvas|console}\n");
+        printf("syntax: gfxdemo {canvas|console|display}\n");
 }
 
@@ -202 +237 @@
         } else if (str_cmp(argv[1], "canvas") == 0) {
                 rc = demo_canvas();
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "display") == 0) {
+                rc = demo_display();
                 if (rc != EOK)
                         return 1;