Changeset 46bd63c9 in mainline for uspace/lib/ui/private/menu.h

Timestamp:

2023-09-08T08:47:30Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1af103e

Parents:

0b6fad9

git-author:

Jiri Svoboda <jiri@…> (2023-09-07 18:47:09)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-08 08:47:30)

Message:

Split drop-down menu into two classes: drop-down and menu

Naming is clearly the hardest problem in computer science.

File:

• uspace/lib/ui/private/menu.h (modified) (5 diffs)

uspace/lib/ui/private/menu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <gfx/coord.h>
 #include <stdbool.h>
+#include <types/common.h>
 #include <types/ui/menu.h>
 #include <types/ui/resource.h>
@@ -49 +50 @@
  */
 struct ui_menu {
-        /** Containing menu bar */
-        struct ui_menu_bar *mbar;
-        /** Link to @c bar->menus */
-        link_t lmenus;
+        /** Parent window */
+        struct ui_window *parent;
         /** Caption */
         char *caption;
@@ -67 +66 @@
         /** Menu entries (ui_menu_entry_t) */
         list_t entries;
+        /** Callbacks */
+        struct ui_menu_cb *cb;
+        /** Callback argument */
+        void *arg;
 };
 
@@ -86 +89 @@
 extern void ui_menu_up(ui_menu_t *);
 extern void ui_menu_down(ui_menu_t *);
+extern void ui_menu_left(ui_menu_t *, sysarg_t);
+extern void ui_menu_right(ui_menu_t *, sysarg_t);
+extern void ui_menu_close_req(ui_menu_t *);
+extern void ui_menu_press_accel(ui_menu_t *, char32_t, sysarg_t);
 
 #endif