Changeset dc5c303 in mainline for uspace/lib/ui/include

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

Location:

uspace/lib/ui/include

Files:

• types/ui/menu.h (modified) (2 diffs)
• types/ui/menudd.h (added)
• types/ui/selectdialog.h (added)
• types/ui/wdecor.h (modified) (3 diffs)
• types/ui/window.h (modified) (2 diffs)
• ui/entry.h (modified) (1 diff)
• ui/list.h (modified) (2 diffs)
• ui/menu.h (modified) (1 diff)
• ui/menubar.h (modified) (1 diff)
• ui/menudd.h (added)
• ui/menuentry.h (modified) (2 diffs)
• ui/scrollbar.h (modified) (3 diffs)
• ui/selectdialog.h (added)
• ui/tab.h (modified) (1 diff)
• ui/ui.h (modified) (1 diff)
• ui/wdecor.h (modified) (3 diffs)
• ui/window.h (modified) (2 diffs)

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/types/ui/wdecor.h

@@ -38 +38 @@
 
 #include <gfx/coord.h>
+#include <types/common.h>
 #include <types/ui/cursor.h>
 
@@ -51 +52 @@
         /** Window has a title bar */
         ui_wds_titlebar = 0x2,
+        /** Window has a system menu handle */
+        ui_wds_sysmenu_hdl = 0x4,
         /** Window has a minimize button */
-        ui_wds_minimize_btn = 0x4,
+        ui_wds_minimize_btn = 0x8,
         /** Window has a maximize button */
-        ui_wds_maximize_btn = 0x8,
+        ui_wds_maximize_btn = 0x10,
         /** Window has a close button */
-        ui_wds_close_btn = 0x10,
+        ui_wds_close_btn = 0x20,
         /** Window is resizable */
-        ui_wds_resizable = 0x20,
+        ui_wds_resizable = 0x40,
         /** Window is decorated (default decoration) */
-        ui_wds_decorated = ui_wds_frame | ui_wds_titlebar |
+        ui_wds_decorated = ui_wds_frame | ui_wds_titlebar | ui_wds_sysmenu_hdl |
             ui_wds_minimize_btn | ui_wds_close_btn
 } ui_wdecor_style_t;
@@ -81 +84 @@
 /** Window decoration callbacks */
 typedef struct ui_wdecor_cb {
+        void (*sysmenu_open)(ui_wdecor_t *, void *, sysarg_t);
+        void (*sysmenu_left)(ui_wdecor_t *, void *, sysarg_t);
+        void (*sysmenu_right)(ui_wdecor_t *, void *, sysarg_t);
+        void (*sysmenu_accel)(ui_wdecor_t *, void *, char32_t, sysarg_t);
         void (*minimize)(ui_wdecor_t *, void *);
         void (*maximize)(ui_wdecor_t *, void *);

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

@@ -40 +40 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <types/common.h>
 #include <types/ui/wdecor.h>
 
@@ -95 +96 @@
 /** Window callbacks */
 typedef struct ui_window_cb {
+        void (*sysmenu)(ui_window_t *, void *, sysarg_t);
         void (*minimize)(ui_window_t *, void *);
         void (*maximize)(ui_window_t *, void *);

uspace/lib/ui/include/ui/entry.h

@@ -54 +54 @@
 extern const char *ui_entry_get_text(ui_entry_t *);
 extern errno_t ui_entry_paint(ui_entry_t *);
+extern errno_t ui_entry_insert_str(ui_entry_t *, const char *);
 extern void ui_entry_activate(ui_entry_t *);
 extern void ui_entry_deactivate(ui_entry_t *);

uspace/lib/ui/include/ui/list.h

@@ -48 +48 @@
 extern ui_control_t *ui_list_ctl(ui_list_t *);
 extern void ui_list_set_cb(ui_list_t *, ui_list_cb_t *, void *);
+extern void *ui_list_get_cb_arg(ui_list_t *);
 extern void ui_list_set_rect(ui_list_t *, gfx_rect_t *);
 extern errno_t ui_list_activate(ui_list_t *);
 extern void ui_list_deactivate(ui_list_t *);
 extern ui_list_entry_t *ui_list_get_cursor(ui_list_t *);
+extern void ui_list_set_cursor(ui_list_t *, ui_list_entry_t *);
 extern void ui_list_entry_attr_init(ui_list_entry_attr_t *);
 extern errno_t ui_list_entry_append(ui_list_t *,
@@ -57 +59 @@
 extern void ui_list_entry_delete(ui_list_entry_t *);
 extern void *ui_list_entry_get_arg(ui_list_entry_t *);
+extern ui_list_t *ui_list_entry_get_list(ui_list_entry_t *);
+extern errno_t ui_list_entry_set_caption(ui_list_entry_t *, const char *);
 extern size_t ui_list_entries_cnt(ui_list_t *);
 extern errno_t ui_list_sort(ui_list_t *);

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 *);

uspace/lib/ui/include/ui/menubar.h

@@ -61 +61 @@
 extern void ui_menu_bar_activate(ui_menu_bar_t *);
 extern void ui_menu_bar_deactivate(ui_menu_bar_t *);
+extern void ui_menu_bar_select_first(ui_menu_bar_t *, bool, sysarg_t);
+extern void ui_menu_bar_select_last(ui_menu_bar_t *, bool, sysarg_t);
 
 #endif

uspace/lib/ui/include/ui/menuentry.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 extern void ui_menu_entry_set_cb(ui_menu_entry_t *, ui_menu_entry_cb_t,
     void *);
+extern void ui_menu_entry_set_disabled(ui_menu_entry_t *, bool);
+extern bool ui_menu_entry_is_disabled(ui_menu_entry_t *);
 extern ui_menu_entry_t *ui_menu_entry_first(ui_menu_t *);
 extern ui_menu_entry_t *ui_menu_entry_last(ui_menu_t *);

uspace/lib/ui/include/ui/scrollbar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 extern void ui_scrollbar_set_rect(ui_scrollbar_t *, gfx_rect_t *);
 extern errno_t ui_scrollbar_paint(ui_scrollbar_t *);
-extern gfx_coord_t ui_scrollbar_through_length(ui_scrollbar_t *);
+extern gfx_coord_t ui_scrollbar_trough_length(ui_scrollbar_t *);
 extern gfx_coord_t ui_scrollbar_move_length(ui_scrollbar_t *);
 extern gfx_coord_t ui_scrollbar_get_pos(ui_scrollbar_t *);
@@ -60 +60 @@
 extern void ui_scrollbar_set_pos(ui_scrollbar_t *, gfx_coord_t);
 extern void ui_scrollbar_thumb_press(ui_scrollbar_t *, gfx_coord2_t *);
-extern void ui_scrollbar_up_through_press(ui_scrollbar_t *);
-extern void ui_scrollbar_down_through_press(ui_scrollbar_t *);
+extern void ui_scrollbar_upper_trough_press(ui_scrollbar_t *);
+extern void ui_scrollbar_lower_trough_press(ui_scrollbar_t *);
 extern void ui_scrollbar_release(ui_scrollbar_t *, gfx_coord2_t *);
 extern void ui_scrollbar_update(ui_scrollbar_t *, gfx_coord2_t *);
-extern void ui_scrollbar_throughs_update(ui_scrollbar_t *, gfx_coord2_t *);
+extern void ui_scrollbar_troughs_update(ui_scrollbar_t *, gfx_coord2_t *);
 extern void ui_scrollbar_up(ui_scrollbar_t *);
 extern void ui_scrollbar_down(ui_scrollbar_t *);

uspace/lib/ui/include/ui/tab.h

@@ -43 +43 @@
 #include <stdbool.h>
 #include <types/common.h>
+#include <types/ui/control.h>
 #include <types/ui/tab.h>
 #include <types/ui/tabset.h>

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

@@ -57 +57 @@
 extern errno_t ui_suspend(ui_t *);
 extern errno_t ui_resume(ui_t *);
+extern bool ui_is_suspended(ui_t *);
 extern void ui_lock(ui_t *);
 extern void ui_unlock(ui_t *);

uspace/lib/ui/include/ui/wdecor.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/coord.h>
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 #include <stdbool.h>
@@ -53 +54 @@
 extern void ui_wdecor_set_maximized(ui_wdecor_t *, bool);
 extern errno_t ui_wdecor_set_caption(ui_wdecor_t *, const char *);
+extern void ui_wdecor_sysmenu_hdl_set_active(ui_wdecor_t *, bool);
 extern errno_t ui_wdecor_paint(ui_wdecor_t *);
+extern ui_evclaim_t ui_wdecor_kbd_event(ui_wdecor_t *, kbd_event_t *);
 extern ui_evclaim_t ui_wdecor_pos_event(ui_wdecor_t *, pos_event_t *);
 extern void ui_wdecor_rect_from_app(ui_wdecor_style_t, gfx_rect_t *,

uspace/lib/ui/include/ui/window.h

@@ -42 +42 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <types/common.h>
 #include <types/ui/control.h>
 #include <types/ui/ui.h>
@@ -65 +66 @@
 extern void ui_window_set_ctl_cursor(ui_window_t *, ui_stock_cursor_t);
 extern errno_t ui_window_paint(ui_window_t *);
+extern errno_t ui_window_def_sysmenu(ui_window_t *, sysarg_t);
 extern errno_t ui_window_def_minimize(ui_window_t *);
 extern errno_t ui_window_def_maximize(ui_window_t *);