Changeset c88d7f99 in mainline for uspace/lib/ui/src

Timestamp:

2022-03-10T17:44:35Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c38ab6c

Parents:

96c6a00

Message:

Menu entry accelerators

Location:

uspace/lib/ui/src

Files:

• menu.c (modified) (2 diffs)
• menuentry.c (modified) (8 diffs)

uspace/lib/ui/src/menu.c

@@ -604 +604 @@
 static void ui_menu_key_press_unmod(ui_menu_t *menu, kbd_event_t *event)
 {
+        ui_menu_entry_t *mentry;
+        char32_t c;
+
         switch (event->key) {
         case KC_ESCAPE:
@@ -625 +628 @@
                 break;
         default:
+                if (event->c != '\0') {
+                        mentry = ui_menu_entry_first(menu);
+                        while (mentry != NULL) {
+                                c = ui_menu_entry_get_accel(mentry);
+                                if (c == event->c && menu->selected != NULL) {
+                                        ui_menu_entry_activate(mentry);
+                                        break;
+                                }
+                                mentry = ui_menu_entry_next(mentry);
+                        }
+                }
                 break;
         }

uspace/lib/ui/src/menuentry.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
+#include <ui/accel.h>
 #include <ui/control.h>
 #include <ui/paint.h>
@@ -245 +246 @@
         res = ui_window_get_res(mentry->menu->mbar->window);
 
-        *caption_w = gfx_text_width(res->font, mentry->caption);
-        *shortcut_w = gfx_text_width(res->font, mentry->shortcut);
+        *caption_w = ui_text_width(res->font, mentry->caption);
+        *shortcut_w = ui_text_width(res->font, mentry->shortcut);
 }
 
@@ -331 +332 @@
 }
 
+/** Get menu entry accelerator character.
+ *
+ * @param mentry Menu entry
+ * @return Accelerator character (lowercase) or the null character if
+ *         the menu entry has no accelerator.
+ */
+char32_t ui_menu_entry_get_accel(ui_menu_entry_t *mentry)
+{
+        return ui_accel_get(mentry->caption);
+}
+
 /** Paint menu entry.
  *
@@ -340 +352 @@
 {
         ui_resource_t *res;
-        gfx_text_fmt_t fmt;
+        ui_text_fmt_t fmt;
         gfx_color_t *bg_color;
         ui_menu_entry_geom_t geom;
@@ -350 +362 @@
         ui_menu_entry_get_geom(mentry, pos, &geom);
 
-        gfx_text_fmt_init(&fmt);
+        ui_text_fmt_init(&fmt);
         fmt.font = res->font;
         fmt.halign = gfx_halign_left;
@@ -358 +370 @@
             mentry == mentry->menu->selected) {
                 fmt.color = res->wnd_sel_text_color;
+                fmt.hgl_color = res->wnd_sel_text_hgl_color;
                 bg_color = res->wnd_sel_text_bg_color;
         } else {
                 fmt.color = res->wnd_text_color;
+                fmt.hgl_color = res->wnd_text_hgl_color;
                 bg_color = res->wnd_face_color;
         }
@@ -372 +386 @@
                 goto error;
 
-        rc = gfx_puttext(&geom.caption_pos, &fmt, mentry->caption);
+        rc = ui_paint_text(&geom.caption_pos, &fmt, mentry->caption);
         if (rc != EOK)
                 goto error;
@@ -378 +392 @@
         fmt.halign = gfx_halign_right;
 
-        rc = gfx_puttext(&geom.shortcut_pos, &fmt, mentry->shortcut);
+        rc = ui_paint_text(&geom.shortcut_pos, &fmt, mentry->shortcut);
         if (rc != EOK)
                 goto error;