Changeset 6c0766b in mainline

Timestamp:

2021-09-29T14:07:36Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e0cf963

Parents:

8603145

git-author:

Jiri Svoboda <jiri@…> (2021-09-28 14:06:29)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-29 14:07:36)

Message:

Confirm / cancel file and prompt dialogs using Enter / Escape

Location:

uspace/lib/ui/src

Files:

• filedialog.c (modified) (2 diffs)
• promptdialog.c (modified) (2 diffs)

uspace/lib/ui/src/filedialog.c

@@ -48 +48 @@
 
 static void ui_file_dialog_wnd_close(ui_window_t *, void *);
+static void ui_file_dialog_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 ui_window_cb_t ui_file_dialog_wnd_cb = {
-        .close = ui_file_dialog_wnd_close
+        .close = ui_file_dialog_wnd_close,
+        .kbd = ui_file_dialog_wnd_kbd
 };
 
@@ -310 +312 @@
 }
 
+/** File dialog window keyboard event handler.
+ *
+ * @param window Window
+ * @param arg Argument (ui_prompt_dialog_t *)
+ * @param event Keyboard event
+ */
+static void ui_file_dialog_wnd_kbd(ui_window_t *window, void *arg,
+    kbd_event_t *event)
+{
+        ui_file_dialog_t *dialog = (ui_file_dialog_t *) arg;
+        const char *fname;
+
+        if (event->type == KEY_PRESS &&
+            (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) {
+                if (event->key == KC_ENTER) {
+                        /* Confirm */
+                        if (dialog->cb != NULL && dialog->cb->bok != NULL) {
+                                fname = ui_entry_get_text(dialog->ename);
+                                dialog->cb->bok(dialog, dialog->arg, fname);
+                                return;
+                        }
+                } else if (event->key == KC_ESCAPE) {
+                        /* Cancel */
+                        if (dialog->cb != NULL && dialog->cb->bcancel != NULL) {
+                                dialog->cb->bcancel(dialog, dialog->arg);
+                                return;
+                        }
+                }
+        }
+
+        ui_window_def_kbd(window, event);
+}
+
 /** File dialog OK button click handler.
  *

uspace/lib/ui/src/promptdialog.c

@@ -48 +48 @@
 
 static void ui_prompt_dialog_wnd_close(ui_window_t *, void *);
+static void ui_prompt_dialog_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 ui_window_cb_t ui_prompt_dialog_wnd_cb = {
-        .close = ui_prompt_dialog_wnd_close
+        .close = ui_prompt_dialog_wnd_close,
+        .kbd = ui_prompt_dialog_wnd_kbd
 };
 
@@ -310 +312 @@
 }
 
+/** Prompt dialog window keyboard event handler.
+ *
+ * @param window Window
+ * @param arg Argument (ui_prompt_dialog_t *)
+ * @param event Keyboard event
+ */
+static void ui_prompt_dialog_wnd_kbd(ui_window_t *window, void *arg,
+    kbd_event_t *event)
+{
+        ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg;
+        const char *fname;
+
+        if (event->type == KEY_PRESS &&
+            (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) {
+                if (event->key == KC_ENTER) {
+                        /* Confirm */
+                        if (dialog->cb != NULL && dialog->cb->bok != NULL) {
+                                fname = ui_entry_get_text(dialog->ename);
+                                dialog->cb->bok(dialog, dialog->arg, fname);
+                                return;
+                        }
+                } else if (event->key == KC_ESCAPE) {
+                        /* Cancel */
+                        if (dialog->cb != NULL && dialog->cb->bcancel != NULL) {
+                                dialog->cb->bcancel(dialog, dialog->arg);
+                                return;
+                        }
+                }
+        }
+
+        ui_window_def_kbd(window, event);
+}
+
 /** Prompt dialog OK button click handler.
  *