Changeset 5d9403d5 in mainline for uspace/app/taskbar/taskbar.c

Timestamp:

2023-10-13T20:27:14Z (19 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7aa9fa1b

Parents:

788c76e3

Message:

Open start menu using Enter, fix input device ID

Pressing Enter opens start menu, but only if it is focused.
Need to fix input device ID so that the menu is opened in the
correct seat, both in case of clicking and in case a key is
pressed to open the menu.

File:

• uspace/app/taskbar/taskbar.c (modified) (3 diffs)

uspace/app/taskbar/taskbar.c

@@ -49 +49 @@
 
 static void taskbar_wnd_close(ui_window_t *, void *);
+static void taskbar_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 static void taskbar_wnd_pos(ui_window_t *, void *, pos_event_t *);
 
 static ui_window_cb_t window_cb = {
         .close = taskbar_wnd_close,
+        .kbd = taskbar_wnd_kbd,
         .pos = taskbar_wnd_pos
 };
@@ -66 +68 @@
 
         ui_quit(taskbar->ui);
+}
+
+/** Window received keyboard event.
+ *
+ * @param window Window
+ * @param arg Argument (taskbar)
+ * @param event Keyboard event
+ */
+static void taskbar_wnd_kbd(ui_window_t *window, void *arg, kbd_event_t *event)
+{
+        taskbar_t *taskbar = (taskbar_t *) arg;
+        ui_evclaim_t claim;
+
+        /* Remember ID of device that sent the last event */
+        taskbar->wndlist->ev_idev_id = event->kbd_id;
+        taskbar->tbsmenu->ev_idev_id = event->kbd_id;
+
+        claim = ui_window_def_kbd(window, event);
+        if (claim == ui_claimed)
+                return;
+
+        if (event->type == KEY_PRESS && (event->mods & KM_CTRL) == 0 &&
+            (event->mods & KM_ALT) == 0 && (event->mods & KM_SHIFT) == 0 &&
+            event->key == KC_ENTER) {
+                if (!tbsmenu_is_open(taskbar->tbsmenu))
+                        tbsmenu_open(taskbar->tbsmenu);
+        }
 }
 
@@ -79 +108 @@
 
         /* Remember ID of device that sent the last event */
-        taskbar->wndlist->ev_pos_id = event->pos_id;
+        taskbar->wndlist->ev_idev_id = event->pos_id;
+        taskbar->tbsmenu->ev_idev_id = event->pos_id;
 
         ui_window_def_pos(window, event);