Changeset 2f11647f in mainline

Timestamp:

2024-03-18T14:43:51Z (7 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

a29af37

Parents:

7b7a7d2

Message:

Barber should respond to Ctrl-Q/Escape. Call ui_window_def_kbd().

Location:

uspace/app

Files:

• barber/barber.c (modified) (2 diffs)
• viewer/viewer.c (modified) (1 diff)

uspace/app/barber/barber.c

@@ -102 +102 @@
 
 static void wnd_close(ui_window_t *, void *);
+static void wnd_kbd_event(ui_window_t *, void *, kbd_event_t *);
 
 static ui_window_cb_t window_cb = {
-        .close = wnd_close
+        .close = wnd_close,
+        .kbd = wnd_kbd_event
 };
+
 
 /** Window close button was clicked.
@@ -117 +120 @@
 
         ui_quit(barber->ui);
+}
+
+/** Barber unmodified key press.
+ *
+ * @param barber Barber
+ * @param event Keyboard event
+ */
+static void barber_kbd_event_unmod(barber_t *barber, kbd_event_t *event)
+{
+        if (event->key == KC_ESCAPE)
+                ui_quit(barber->ui);
+}
+
+/** Barber ctrl-key key press.
+ *
+ * @param barber Barber
+ * @param event Keyboard event
+ */
+static void barber_kbd_event_ctrl(barber_t *barber, kbd_event_t *event)
+{
+        if (event->key == KC_Q)
+                ui_quit(barber->ui);
+}
+
+/** Barber window keyboard event.
+ *
+ * @param window UI window
+ * @param arg Argument (barber_t *)
+ * @param event Keyboard event
+ */
+static void wnd_kbd_event(ui_window_t *window, void *arg, kbd_event_t *event)
+{
+        barber_t *barber = (barber_t *)arg;
+
+        if (event->type != KEY_PRESS)
+                return;
+
+        if ((event->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0)
+                barber_kbd_event_unmod(barber, event);
+
+        if ((event->mods & KM_CTRL) != 0 &&
+            (event->mods & (KM_ALT | KM_SHIFT)) == 0)
+                barber_kbd_event_ctrl(barber, event);
+
+        ui_window_def_kbd(window, event);
 }
 

uspace/app/viewer/viewer.c

@@ -181 +181 @@
             (event->mods & (KM_ALT | KM_SHIFT)) == 0)
                 viewer_kbd_event_ctrl(viewer, event);
+
+        ui_window_def_kbd(window, event);
 }