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

Timestamp:

2021-06-26T23:30:18Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e87415e6

Parents:

bb14312

Message:

Memory GC needs to be able to forward cursor control

File:

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

uspace/lib/ui/src/window.c

@@ -39 +39 @@
 #include <gfx/bitmap.h>
 #include <gfx/context.h>
+#include <gfx/cursor.h>
 #include <gfx/render.h>
 #include <io/kbd_event.h>
@@ -88 +89 @@
 static void ui_window_invalidate(void *, gfx_rect_t *);
 static void ui_window_update(void *);
+static errno_t ui_window_cursor_get_pos(void *, gfx_coord2_t *);
+static errno_t ui_window_cursor_set_pos(void *, gfx_coord2_t *);
+static errno_t ui_window_cursor_set_visible(void *, bool);
+
+/** Window memory GC callbacks */
+static mem_gc_cb_t ui_window_mem_gc_cb = {
+        .invalidate = ui_window_invalidate,
+        .update = ui_window_update,
+        .cursor_get_pos = ui_window_cursor_get_pos,
+        .cursor_set_pos = ui_window_cursor_set_pos,
+        .cursor_set_visible = ui_window_cursor_set_visible
+};
+
 static void ui_window_app_invalidate(void *, gfx_rect_t *);
 static void ui_window_app_update(void *);
+
+/** Application area memory GC callbacks */
+static mem_gc_cb_t ui_window_app_mem_gc_cb = {
+        .invalidate = ui_window_app_invalidate,
+        .update = ui_window_app_update
+};
+
 static void ui_window_expose_cb(void *);
 
@@ -255 +276 @@
         }
 
-        rc = mem_gc_create(&bparams.rect, &alloc, ui_window_invalidate,
-            ui_window_update, (void *) window, &memgc);
+        rc = mem_gc_create(&bparams.rect, &alloc, &ui_window_mem_gc_cb,
+            (void *) window, &memgc);
         if (rc != EOK) {
                 gfx_bitmap_destroy(window->app_bmp);
@@ -267 +288 @@
         window->realgc = gc;
 #else
-        (void) ui_window_update;
-        (void) ui_window_invalidate;
+        (void) ui_window_mem_gc_cb;
         (void) alloc;
         (void) bparams;
@@ -618 +638 @@
                 }
 
-                rc = mem_gc_create(&params.rect, &alloc, ui_window_app_invalidate,
-                    ui_window_app_update, (void *) window, &memgc);
+                rc = mem_gc_create(&params.rect, &alloc,
+                    &ui_window_app_mem_gc_cb, (void *) window, &memgc);
                 if (rc != EOK) {
                         gfx_bitmap_destroy(window->app_bmp);
@@ -1003 +1023 @@
 }
 
+/** Window cursor get position callback
+ *
+ * @param arg Argument (ui_window_t *)
+ * @param pos Place to store position
+ */
+static errno_t ui_window_cursor_get_pos(void *arg, gfx_coord2_t *pos)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        return gfx_cursor_get_pos(window->realgc, pos);
+}
+
+/** Window cursor set position callback
+ *
+ * @param arg Argument (ui_window_t *)
+ * @param pos New position
+ */
+static errno_t ui_window_cursor_set_pos(void *arg, gfx_coord2_t *pos)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        return gfx_cursor_set_pos(window->realgc, pos);
+}
+
+/** Window cursor set visibility callback
+ *
+ * @param arg Argument (ui_window_t *)
+ * @param visible @c true iff cursor is to be made visible
+ */
+static errno_t ui_window_cursor_set_visible(void *arg, bool visible)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        return gfx_cursor_set_visible(window->realgc, visible);
+}
+
 /** Application area invalidate callback
  *