Changeset 12dd36c in mainline

Timestamp:

2024-11-12T10:04:38Z (3 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

1eeddb3, 5ce0438, 9bfb74a, ad85592, b718826, ed19604b

Parents:

9a07ee3

Message:

Handle Enter/Escape keys in message dialog.

Location:

uspace/lib/ui/src

Files:

• filedialog.c (modified) (3 diffs)
• msgdialog.c (modified) (2 diffs)

uspace/lib/ui/src/filedialog.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -396 +396 @@
  *
  * @param window Window
- * @param arg Argument (ui_prompt_dialog_t *)
+ * @param arg Argument (ui_file_dialog_t *)
  * @param event Keyboard event
  */
@@ -427 +427 @@
                 }
         }
-
 }
 

uspace/lib/ui/src/msgdialog.c

@@ -47 +47 @@
 
 static void ui_msg_dialog_wnd_close(ui_window_t *, void *);
+static void ui_msg_dialog_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 ui_window_cb_t ui_msg_dialog_wnd_cb = {
-        .close = ui_msg_dialog_wnd_close
+        .close = ui_msg_dialog_wnd_close,
+        .kbd = ui_msg_dialog_wnd_kbd
 };
 
@@ -281 +283 @@
 }
 
+/** Message dialog window keyboard event handler.
+ *
+ * @param window Window
+ * @param arg Argument (ui_msg_dialog_t *)
+ * @param event Keyboard event
+ */
+static void ui_msg_dialog_wnd_kbd(ui_window_t *window, void *arg,
+    kbd_event_t *event)
+{
+        ui_msg_dialog_t *dialog = (ui_msg_dialog_t *) arg;
+        ui_evclaim_t claim;
+
+        claim = ui_window_def_kbd(window, event);
+        if (claim == ui_claimed)
+                return;
+
+        if (event->type == KEY_PRESS &&
+            (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) {
+                if (event->key == KC_ENTER) {
+                        /* OK / default button */
+                        if (dialog->cb != NULL && dialog->cb->button != NULL) {
+                                dialog->cb->button(dialog, dialog->arg, 0);
+                                return;
+                        }
+                } else if (event->key == KC_ESCAPE) {
+                        /* Cancel */
+                        if (dialog->cb != NULL && dialog->cb->close != NULL) {
+                                dialog->cb->close(dialog, dialog->arg);
+                                return;
+                        }
+                }
+        }
+
+}
+
 /** Message dialog button click handler.
  *