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

Timestamp:

2019-11-04T14:05:35Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

be15256

Parents:

22faaf2

git-author:

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

git-committer:

Jiri Svoboda <jiri@…> (2019-11-04 14:05:35)

Message:

Window event delivery mechanism

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -44 +44 @@
 #include <io/console.h>
 #include <io/pixelmap.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <str.h>
 #include <window.h>
+
+static void wnd_kbd_event(void *, kbd_event_t *);
+
+static display_wnd_cb_t wnd_cb = {
+        .kbd_event = wnd_kbd_event
+};
+
+static bool quit = false;
 
 /** Clear screen.
@@ -126 +135 @@
 
                 fibril_usleep(500 * 1000);
+
+                if (quit)
+                        break;
         }
 
@@ -245 +257 @@
                                 goto error;
                         fibril_usleep(250 * 1000);
+
+                        if (quit)
+                                break;
                 }
         }
@@ -298 +313 @@
 
                 fibril_usleep(500 * 1000);
+
+                if (quit)
+                        break;
         }
 
@@ -318 +336 @@
         errno_t rc;
 
-        while (true) {
+        while (!quit) {
                 rc = demo_rects(gc, w, h);
                 if (rc != EOK)
@@ -331 +349 @@
                         return rc;
         }
+
+        return EOK;
 }
 
@@ -444 +464 @@
         }
 
-        rc = display_window_create(display, &window);
+        rc = display_window_create(display, &wnd_cb, NULL, &window);
         if (rc != EOK) {
                 printf("Error creating window.\n");
@@ -464 +484 @@
 
         return EOK;
+}
+
+static void wnd_kbd_event(void *arg, kbd_event_t *event)
+{
+        printf("Keyboard event type=%d key=%d\n", event->type, event->key);
+        quit = true;
 }