Changeset 9f7e9bb in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

be1d74c1

Parents:

0e80e40

git-author:

Jiri Svoboda <jiri@…> (2021-10-07 18:43:56)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Ctrl-Q to quit Navigator

File:

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

uspace/app/nav/nav.c

@@ -48 +48 @@
 
 static void wnd_close(ui_window_t *, void *);
+static void wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 static ui_window_cb_t window_cb = {
-        .close = wnd_close
+        .close = wnd_close,
+        .kbd = wnd_kbd
 };
 
@@ -63 +65 @@
 
         ui_quit(navigator->ui);
+}
+
+/** Window keyboard event handler.
+ *
+ * @param window Window
+ * @param arg Argument (navigator)
+ * @param event Keyboard event
+ */
+static void wnd_kbd(ui_window_t *window, void *arg, kbd_event_t *event)
+{
+        navigator_t *navigator = (navigator_t *) arg;
+
+        if (event->type == KEY_PRESS &&
+            ((event->mods & KM_ALT) == 0) &&
+            ((event->mods & KM_SHIFT) == 0) &&
+            (event->mods & KM_CTRL) != 0) {
+                if (event->key == KC_Q)
+                        ui_quit(navigator->ui);
+        }
+
+        ui_window_def_kbd(window, event);
 }