Changeset 59768c7 in mainline for uspace/lib/ui/src/menuentry.c

Timestamp:

2022-01-10T19:29:00Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5de852c

Parents:

9754ed2

git-author:

Jiri Svoboda <jiri@…> (2022-01-10 19:27:55)

git-committer:

Jiri Svoboda <jiri@…> (2022-01-10 19:29:00)

Message:

Menu control using F10, cursor keys, Enter, Escape

File:

• uspace/lib/ui/src/menuentry.c (modified) (6 diffs)

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
 #include <ui/control.h>
 #include <ui/paint.h>
+#include <ui/menubar.h>
 #include <ui/menuentry.h>
 #include <ui/window.h>
@@ -177 +178 @@
 }
 
+/** Get last menu entry in menu.
+ *
+ * @param menu Menu
+ * @return Last menu entry or @c NULL if there is none
+ */
+ui_menu_entry_t *ui_menu_entry_last(ui_menu_t *menu)
+{
+        link_t *link;
+
+        link = list_last(&menu->entries);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_menu_entry_t, lentries);
+}
+
 /** Get next menu entry in menu.
  *
@@ -187 +204 @@
 
         link = list_next(&cur->lentries, &cur->menu->entries);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_menu_entry_t, lentries);
+}
+
+/** Get previous menu entry in menu.
+ *
+ * @param cur Current menu entry
+ * @return Next menu entry or @c NULL if @a cur is the last one
+ */
+ui_menu_entry_t *ui_menu_entry_prev(ui_menu_entry_t *cur)
+{
+        link_t *link;
+
+        link = list_prev(&cur->lentries, &cur->menu->entries);
         if (link == NULL)
                 return NULL;
@@ -378 +411 @@
 }
 
+/** Determine if entry is selectable.
+ *
+ * @return @c true iff entry is selectable
+ */
+bool ui_menu_entry_selectable(ui_menu_entry_t *mentry)
+{
+        return !mentry->separator;
+}
+
 /** Handle button press in menu entry.
  *
@@ -407 +449 @@
         mentry->held = false;
 
-        if (mentry->inside) {
-                /* Close menu */
-                ui_menu_bar_select(mentry->menu->mbar, NULL, NULL);
-
-                /* Call back */
-                ui_menu_entry_cb(mentry);
-        }
+        ui_menu_entry_activate(mentry);
+}
+
+/** Activate menu entry.
+ *
+ * @param mentry Menu entry
+ */
+void ui_menu_entry_activate(ui_menu_entry_t *mentry)
+{
+        /* Deactivate menu bar, close menu */
+        ui_menu_bar_deactivate(mentry->menu->mbar);
+
+        /* Call back */
+        ui_menu_entry_cb(mentry);
 }