Changeset 46bd63c9 in mainline for uspace/lib/ui/include

Timestamp:

2023-09-08T08:47:30Z (23 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.

Location:

uspace/lib/ui/include

Files:

• types/ui/menu.h (modified) (2 diffs)
• types/ui/menudd.h (added)
• ui/menu.h (modified) (1 diff)
• ui/menudd.h (added)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define _UI_TYPES_MENU_H
 
+#include <types/common.h>
+
 struct ui_menu;
 typedef struct ui_menu ui_menu_t;
+
+/** Menu callbacks */
+typedef struct ui_menu_cb {
+        /** Left arrow pressed */
+        void (*left)(ui_menu_t *, void *, sysarg_t);
+        /** Right arrow pressed */
+        void (*right)(ui_menu_t *, void *, sysarg_t);
+        /** Request menu closure */
+        void (*close_req)(ui_menu_t *, void *);
+        /** Accelerator key pressed */
+        void (*press_accel)(ui_menu_t *, void *, char32_t, sysarg_t);
+} ui_menu_cb_t;
 
 #endif

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

@@ -43 +43 @@
 #include <stdbool.h>
 #include <types/common.h>
+#include <types/ui/event.h>
 #include <types/ui/menu.h>
 #include <types/ui/menubar.h>
-#include <types/ui/event.h>
+#include <types/ui/window.h>
 #include <uchar.h>
 
-extern errno_t ui_menu_create(ui_menu_bar_t *, const char *, ui_menu_t **);
+extern errno_t ui_menu_create(ui_window_t *, ui_menu_t **);
 extern void ui_menu_destroy(ui_menu_t *);
-extern ui_menu_t *ui_menu_first(ui_menu_bar_t *);
-extern ui_menu_t *ui_menu_next(ui_menu_t *);
-extern ui_menu_t *ui_menu_last(ui_menu_bar_t *);
-extern ui_menu_t *ui_menu_prev(ui_menu_t *);
-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 void ui_menu_set_cb(ui_menu_t *, ui_menu_cb_t *, void *);
 extern errno_t ui_menu_open(ui_menu_t *, gfx_rect_t *, sysarg_t);
 extern void ui_menu_close(ui_menu_t *);