Changeset 96c6a00 in mainline

Timestamp:

2022-03-10T13:44:10Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c88d7f99

Parents:

ca2680d

git-author:

Jiri Svoboda <jiri@…> (2022-03-09 18:44:00)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-10 13:44:10)

Message:

Menu accelerators

Open a menu by pressing F10, then accelerator key (e.g. 'F').

Location:

uspace

Files:

• app/calculator/calculator.c (modified) (3 diffs)
• app/edit/edit.c (modified) (3 diffs)
• app/nav/menu.c (modified) (2 diffs)
• lib/ui/include/ui/accel.h (added)
• lib/ui/include/ui/menu.h (modified) (2 diffs)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/src/accel.c (added)
• lib/ui/src/menu.c (modified) (2 diffs)
• lib/ui/src/menubar.c (modified) (4 diffs)
• lib/ui/src/paint.c (modified) (4 diffs)
• lib/ui/test/accel.c (added)
• lib/ui/test/main.c (modified) (2 diffs)
• lib/ui/test/menubar.c (modified) (2 diffs)

uspace/app/calculator/calculator.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * Copyright (c) 2016 Martin Decky
  * All rights reserved.
@@ -896 +896 @@
         }
 
-        rc = ui_menu_create(calc.menubar, "File", &mfile);
+        rc = ui_menu_create(calc.menubar, "~F~ile", &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -910 +910 @@
         ui_menu_entry_set_cb(mexit, calc_file_exit, (void *) &calc);
 
-        rc = ui_menu_create(calc.menubar, "Edit", &medit);
+        rc = ui_menu_create(calc.menubar, "~E~dit", &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");

uspace/app/edit/edit.c

@@ -430 +430 @@
         }
 
-        rc = ui_menu_create(edit->menubar, "File", &mfile);
+        rc = ui_menu_create(edit->menubar, "~F~ile", &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -466 +466 @@
         ui_menu_entry_set_cb(mexit, edit_file_exit, (void *) edit);
 
-        rc = ui_menu_create(edit->menubar, "Edit", &medit);
+        rc = ui_menu_create(edit->menubar, "~E~dit", &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -518 +518 @@
         ui_menu_entry_set_cb(mselall, edit_edit_select_all, (void *) edit);
 
-        rc = ui_menu_create(edit->menubar, "Search", &msearch);
+        rc = ui_menu_create(edit->menubar, "~S~earch", &msearch);
         if (rc != EOK) {
                 printf("Error creating menu.\n");

uspace/app/nav/menu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -72 +72 @@
                 goto error;
 
-        rc = ui_menu_create(menu->menubar, "File", &mfile);
+        rc = ui_menu_create(menu->menubar, "~F~ile", &mfile);
         if (rc != EOK)
                 goto error;

uspace/lib/ui/include/ui/menu.h

@@ -45 +45 @@
 #include <types/ui/menubar.h>
 #include <types/ui/event.h>
+#include <uchar.h>
 
 extern errno_t ui_menu_create(ui_menu_bar_t *, const char *, ui_menu_t **);
@@ -54 +55 @@
 extern const char *ui_menu_caption(ui_menu_t *);
 extern void ui_menu_get_rect(ui_menu_t *, gfx_coord2_t *, gfx_rect_t *);
+extern char32_t ui_menu_get_accel(ui_menu_t *);
 extern errno_t ui_menu_open(ui_menu_t *, gfx_rect_t *);
 extern void ui_menu_close(ui_menu_t *);

uspace/lib/ui/meson.build

@@ -29 +29 @@
 deps = [ 'gfx', 'gfxfont', 'memgfx', 'display', 'congfx' ]
 src = files(
+        'src/accel.c',
         'src/checkbox.c',
         'src/control.c',
@@ -54 +55 @@
 
 test_src = files(
+        'test/accel.c',
         'test/checkbox.c',
         'test/control.c',

uspace/lib/ui/src/menu.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
+#include <uchar.h>
+#include <ui/accel.h>
 #include <ui/control.h>
 #include <ui/paint.h>
@@ -251 +253 @@
         ui_menu_get_geom(menu, spos, &geom);
         *rect = geom.outer_rect;
+}
+
+/** Get menu accelerator character.
+ *
+ * @param menu Menu
+ * @return Accelerator character (lowercase) or the null character if
+ *         the menu has no accelerator.
+ */
+char32_t ui_menu_get_accel(ui_menu_t *menu)
+{
+        return ui_accel_get(menu->caption);
 }
 

uspace/lib/ui/src/menubar.c

@@ -252 +252 @@
         old_menu = mbar->selected;
 
-        if (mbar->selected != menu)
-                mbar->selected = menu;
-        else
-                mbar->selected = NULL;
+        mbar->selected = menu;
 
         /* Close previously open menu */
@@ -333 +330 @@
 {
         gfx_rect_t rect;
+        ui_menu_t *menu;
+        char32_t maccel;
 
         if (event->key == KC_F10) {
@@ -361 +360 @@
 
                 return ui_claimed;
+        }
+
+        if (event->c != '\0' && !ui_menu_is_open(mbar->selected)) {
+                /* Check if it is an accelerator. */
+
+                menu = ui_menu_first(mbar);
+                while (menu != NULL) {
+                        maccel = ui_menu_get_accel(menu);
+                        if (event->c == maccel) {
+                                ui_menu_bar_select(mbar, menu, true);
+                                return ui_claimed;
+                        }
+
+                        menu = ui_menu_next(menu);
+                }
         }
 
@@ -428 +442 @@
                     gfx_pix_inside_rect(&ppos, &rect)) {
                         mbar->active = true;
-                        ui_menu_bar_select(mbar, menu, true);
+
+                        /* Open the menu, close if already open. */
+                        if (menu == mbar->selected)
+                                ui_menu_bar_select(mbar, NULL, false);
+                        else
+                                ui_menu_bar_select(mbar, menu, true);
+
                         return ui_claimed;
                 }

uspace/lib/ui/src/paint.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <gfx/render.h>
 #include <gfx/text.h>
+#include <ui/accel.h>
 #include <ui/paint.h>
 #include <stdlib.h>
@@ -566 +567 @@
 }
 
-/** Process text with '~' markup.
- *
- * Parse text with tilde markup into a list of strings. @a *rbuf is set
- * to point to a newly allocated buffer containing consecutive null-terminated
- * strings.
- *
- * Each part between two '~' becomes one string. '~~' is translated into
- * a literal '~' character. @a *endptr is set to point to the first character
- * beyond the end of the list.
- *
- * @param str String with tilde markup
- * @param rbuf Place to store pointer to newly allocated buffer.
- * @param endptr Place to store end pointer (just after last character)
- * @return EOK on success or an error code
- */
-static int ui_text_process(const char *str, char **rbuf, char **endptr)
-{
-        const char *sp;
-        char *dp;
-        char *buf;
-
-        buf = malloc(str_size(str) + 1);
-        if (buf == NULL)
-                return ENOMEM;
-
-        /* Break down string into list of (non)highlighted parts */
-        sp = str;
-        dp = buf;
-        while (*sp != '\0') {
-                if (*sp == '~') {
-                        if (sp[1] == '~') {
-                                sp += 2;
-                                *dp++ = '~';
-                        } else {
-                                ++sp;
-                                *dp++ = '\0';
-                        }
-                } else {
-                        *dp++ = *sp++;
-                }
-        }
-
-        *dp++ = '\0';
-        *rbuf = buf;
-        *endptr = dp;
-
-        return EOK;
-}
-
 /** Compute UI text width.
  *
@@ -664 +616 @@
 
         /* Break down string into list of (non)highlighted parts */
-        rc = ui_text_process(str, &buf, &endptr);
+        rc = ui_accel_process(str, &buf, &endptr);
         if (rc != EOK)
                 return rc;

uspace/lib/ui/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -31 +31 @@
 PCUT_INIT;
 
+PCUT_IMPORT(accel);
 PCUT_IMPORT(control);
 PCUT_IMPORT(checkbox);

uspace/lib/ui/test/menubar.c

@@ -187 +187 @@
 
         event.type = KEY_PRESS;
-        event.key = KC_ESCAPE;
+        event.key = KC_F10;
+        event.mods = 0;
         claimed = ui_menu_bar_kbd_event(mbar, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -249 +250 @@
 }
 
-/** Calling ui_menu_bar_select() with the same menu twice deselects it */
-PCUT_TEST(select_same)
-{
-        ui_t *ui = NULL;
-        ui_window_t *window = NULL;
-        ui_wnd_params_t params;
-        ui_menu_bar_t *mbar = NULL;
-        ui_menu_t *menu = NULL;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Hello";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(window);
-
-        rc = ui_menu_bar_create(ui, window, &mbar);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(mbar);
-
-        rc = ui_menu_create(mbar, "Test", &menu);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_NOT_NULL(menu);
-
-        ui_menu_bar_select(mbar, menu, true);
-        PCUT_ASSERT_EQUALS(menu, mbar->selected);
-
-        /* Selecting again should unselect the menu */
-        ui_menu_bar_select(mbar, menu, true);
-        PCUT_ASSERT_NULL(mbar->selected);
-
-        ui_menu_bar_destroy(mbar);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
 /** Calling ui_menu_bar_select() with another menu selects it */
 PCUT_TEST(select_different)