Changeset f9ae472 in mainline

Timestamp:

2023-10-10T17:44:52Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

082feff

Parents:

af967ef9

Message:

GFX Demo should not quit on any key

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -1205 +1205 @@
 }
 
+static void demo_kbd_event(kbd_event_t *event)
+{
+        if (event->type == KEY_PRESS) {
+                /* Ctrl-Q */
+                if ((event->mods & KM_CTRL) != 0 &&
+                    (event->mods & KM_ALT) == 0 &&
+                    (event->mods & KM_SHIFT) == 0 &&
+                    event->key == KC_Q) {
+                        demo_quit();
+                }
+
+                /* Escape */
+                if ((event->mods & KM_CTRL) == 0 &&
+                    (event->mods & KM_ALT) == 0 &&
+                    (event->mods & KM_SHIFT) == 0 &&
+                    event->key == KC_ESCAPE) {
+                        demo_quit();
+                }
+        }
+}
+
 static void wnd_kbd_event(void *arg, kbd_event_t *event)
 {
-        if (event->type == KEY_PRESS)
-                demo_quit();
+        (void)arg;
+        demo_kbd_event(event);
 }
 
@@ -1218 +1239 @@
 static void uiwnd_kbd_event(ui_window_t *window, void *arg, kbd_event_t *event)
 {
-        if (event->type == KEY_PRESS)
-                demo_quit();
+        (void)window;
+        (void)arg;
+        demo_kbd_event(event);
 }