Changeset 082feff in mainline

Timestamp:

2023-10-10T18:37:44Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c0efb2e

Parents:

f9ae472

Message:

GFX Demo should handle keyboard events in console mode

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -68 +68 @@
 };
 
+static void demo_kbd_event(kbd_event_t *);
+
 static bool quit = false;
 static FIBRIL_MUTEX_INITIALIZE(quit_lock);
@@ -74 +76 @@
 static gfx_font_t *font;
 static gfx_coord_t vpad;
+static console_ctrl_t *con = NULL;
 
 /** Determine if we are running in text mode.
@@ -93 +96 @@
 static void demo_msleep(unsigned msec)
 {
+        errno_t rc;
+        usec_t usec;
+        cons_event_t cevent;
+
         fibril_mutex_lock(&quit_lock);
-
         if (!quit) {
-                (void) fibril_condvar_wait_timeout(&quit_cv, &quit_lock,
-                    (usec_t)msec * 1000);
-        }
-
+                if (con != NULL) {
+                        usec = (usec_t)msec * 1000;
+                        while (usec > 0 && !quit) {
+                                rc = console_get_event_timeout(con, &cevent, &usec);
+                                if (rc == EOK) {
+                                        if (cevent.type == CEV_KEY) {
+                                                fibril_mutex_unlock(&quit_lock);
+                                                demo_kbd_event(&cevent.ev.key);
+                                                fibril_mutex_lock(&quit_lock);
+                                        }
+                                }
+                        }
+                } else {
+                        (void) fibril_condvar_wait_timeout(&quit_cv, &quit_lock,
+                            (usec_t)msec * 1000);
+                }
+        }
         fibril_mutex_unlock(&quit_lock);
 }
@@ -1050 +1069 @@
 static errno_t demo_console(void)
 {
-        console_ctrl_t *con = NULL;
         console_gc_t *cgc = NULL;
         gfx_context_t *gc;