Changeset d284ce9 in mainline for uspace/lib/ui/src/window.c

Timestamp:

2020-10-27T21:56:15Z (4 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

File:

• uspace/lib/ui/src/window.c (modified) (7 diffs)

uspace/lib/ui/src/window.c

@@ -37 +37 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include <io/pos_event.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -44 +45 @@
 #include "../private/dummygc.h"
 #include "../private/ui.h"
+#include "../private/wdecor.h"
 #include "../private/window.h"
+
+static void dwnd_close_event(void *);
+static void dwnd_focus_event(void *);
+static void dwnd_kbd_event(void *, kbd_event_t *);
+static void dwnd_pos_event(void *, pos_event_t *);
+static void dwnd_unfocus_event(void *);
+
+static display_wnd_cb_t dwnd_cb = {
+        .close_event = dwnd_close_event,
+        .focus_event = dwnd_focus_event,
+        .kbd_event = dwnd_kbd_event,
+        .pos_event = dwnd_pos_event,
+        .unfocus_event = dwnd_unfocus_event
+};
+
+static void wd_close(ui_wdecor_t *, void *);
+static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
+
+static ui_wdecor_cb_t wdecor_cb = {
+        .close = wd_close,
+        .move = wd_move
+};
 
 /** Initialize window parameters structure.
@@ -53 +77 @@
  * @param params Window parameters structure
  */
-void ui_window_params_init(ui_window_params_t *params)
-{
-        memset(params, 0, sizeof(ui_window_params_t));
+void ui_wnd_params_init(ui_wnd_params_t *params)
+{
+        memset(params, 0, sizeof(ui_wnd_params_t));
 }
 
@@ -65 +89 @@
  * @return EOK on success or an error code
  */
-errno_t ui_window_create(ui_t *ui, ui_window_params_t *params,
+errno_t ui_window_create(ui_t *ui, ui_wnd_params_t *params,
     ui_window_t **rwindow)
 {
@@ -82 +106 @@
 
         display_wnd_params_init(&dparams);
+        dparams.rect = params->rect;
 
         if (ui->display != NULL) {
-                rc = display_window_create(ui->display, &dparams, NULL, NULL,
-                    &dwindow);
+                rc = display_window_create(ui->display, &dparams, &dwnd_cb,
+                    (void *) window, &dwindow);
                 if (rc != EOK)
                         goto error;
@@ -108 +133 @@
         if (rc != EOK)
                 goto error;
+
+        ui_wdecor_set_rect(wdecor, &params->rect);
+        ui_wdecor_set_cb(wdecor, &wdecor_cb, (void *) window);
+        ui_wdecor_paint(wdecor);
 
         window->ui = ui;
@@ -145 +174 @@
 }
 
+/** Set window callbacks.
+ *
+ * @param window Window
+ * @param cb Window decoration callbacks
+ * @param arg Callback argument
+ */
+void ui_window_set_cb(ui_window_t *window, ui_window_cb_t *cb, void *arg)
+{
+        window->cb = cb;
+        window->arg = arg;
+}
+
+ui_resource_t *ui_window_get_res(ui_window_t *window)
+{
+        return window->res;
+}
+
+gfx_context_t *ui_window_get_gc(ui_window_t *window)
+{
+        return window->gc;
+}
+
+void ui_window_get_app_rect(ui_window_t *window, gfx_rect_t *rect)
+{
+        ui_wdecor_geom_t geom;
+
+        ui_wdecor_get_geom(window->wdecor, &geom);
+        *rect = geom.app_area_rect;
+}
+
+/** Handle window close event. */
+static void dwnd_close_event(void *arg)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        ui_window_close(window);
+}
+
+/** Handle window focus event. */
+static void dwnd_focus_event(void *arg)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->wdecor != NULL) {
+                ui_wdecor_set_active(window->wdecor, true);
+                ui_wdecor_paint(window->wdecor);
+        }
+}
+
+/** Handle window keyboard event */
+static void dwnd_kbd_event(void *arg, kbd_event_t *kbd_event)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        (void) window;
+        (void) kbd_event;
+}
+
+/** Handle window position event */
+static void dwnd_pos_event(void *arg, pos_event_t *event)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        /* Make sure we don't process events until fully initialized */
+        if (window->wdecor == NULL)
+                return;
+
+        ui_wdecor_pos_event(window->wdecor, event);
+        ui_window_pos(window, event);
+}
+
+/** Handle window unfocus event. */
+static void dwnd_unfocus_event(void *arg)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->wdecor != NULL) {
+                ui_wdecor_set_active(window->wdecor, false);
+                ui_wdecor_paint(window->wdecor);
+        }
+}
+
+/** Window decoration requested window closure.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ */
+static void wd_close(ui_wdecor_t *wdecor, void *arg)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        ui_window_close(window);
+}
+
+/** Window decoration requested window move.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ * @param pos Position where the title bar was pressed
+ */
+static void wd_move(ui_wdecor_t *wdecor, void *arg, gfx_coord2_t *pos)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        (void) display_window_move_req(window->dwindow, pos);
+}
+
+/** Send window close event.
+ *
+ * @param window Window
+ */
+void ui_window_close(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->close != NULL)
+                window->cb->close(window, window->arg);
+}
+
+/** Send window position event.
+ *
+ * @param window Window
+ */
+void ui_window_pos(ui_window_t *window, pos_event_t *pos)
+{
+        if (window->cb != NULL && window->cb->pos != NULL)
+                window->cb->pos(window, window->arg, pos);
+}
+
 /** @}
  */