Changeset 1c6c3e1d in mainline for uspace/lib/ui/private/menu.h

Timestamp:

2023-10-22T17:55:33Z (17 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

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