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

Timestamp:

2020-10-27T21:56:15Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f03d1308

Parents:

f7a90df

Message:

Let ui_window handle window decoration, display window

Location:

uspace/lib/ui/include

Files:

• types/ui/window.h (modified) (2 diffs)
• ui/ui.h (modified) (1 diff)
• ui/window.h (modified) (1 diff)

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

@@ -37 +37 @@
 #define _UI_TYPES_WINDOW_H
 
+#include <io/pos_event.h>
+
 struct ui_window;
 typedef struct ui_window ui_window_t;
@@ -43 +45 @@
 typedef struct {
         /** Window rectangle */
-        gfx_rect_t *rect;
+        gfx_rect_t rect;
         /** Window caption */
         const char *caption;
-} ui_window_params_t;
+} ui_wnd_params_t;
+
+/** Window callbacks */
+typedef struct ui_window_cb {
+        void (*close)(ui_window_t *, void *);
+        void (*pos)(ui_window_t *, void *, pos_event_t *);
+} ui_window_cb_t;
 
 #endif

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

@@ -44 +44 @@
 extern errno_t ui_create_disp(display_t *, ui_t **);
 extern void ui_destroy(ui_t *);
+extern void ui_quit(ui_t *);
+extern void ui_run(ui_t *);
 
 #endif

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

@@ -38 +38 @@
 
 #include <errno.h>
+#include <gfx/context.h>
+#include <gfx/coord.h>
 #include <types/ui/ui.h>
+#include <types/ui/resource.h>
 #include <types/ui/window.h>
 
-extern void ui_window_params_init(ui_window_params_t *);
-extern errno_t ui_window_create(ui_t *, ui_window_params_t *,
+extern void ui_wnd_params_init(ui_wnd_params_t *);
+extern errno_t ui_window_create(ui_t *, ui_wnd_params_t *,
     ui_window_t **);
+extern void ui_window_set_cb(ui_window_t *, ui_window_cb_t *, void *);
 extern void ui_window_destroy(ui_window_t *);
+extern ui_resource_t *ui_window_get_res(ui_window_t *);
+extern gfx_context_t *ui_window_get_gc(ui_window_t *);
+extern void ui_window_get_app_rect(ui_window_t *, gfx_rect_t *);
 
 #endif