Changeset 66a2becf in mainline for uspace/lib

Timestamp:

2020-11-11T18:05:01Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b93ec7c0

Parents:

d942ca4

Message:

Application area GC / port font editor

Font editor and other 'non-GUI' applications typically assume that
0,0 is the top left of the 'screen'/application area. We provide
a special GC that meets this requirement.

Location:

uspace/lib/ui

Files:

• include/ui/window.h (modified) (1 diff)
• meson.build (modified) (1 diff)
• private/window.h (modified) (1 diff)
• src/window.c (modified) (8 diffs)
• test/window.c (modified) (2 diffs)

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

@@ -55 +55 @@
 extern ui_resource_t *ui_window_get_res(ui_window_t *);
 extern gfx_context_t *ui_window_get_gc(ui_window_t *);
+extern errno_t ui_window_get_app_gc(ui_window_t *, gfx_context_t **);
 extern void ui_window_get_app_rect(ui_window_t *, gfx_rect_t *);
 extern errno_t ui_window_paint(ui_window_t *);

uspace/lib/ui/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'gfx', 'gfxfont', 'display' ]
+deps = [ 'gfx', 'gfxfont', 'memgfx', 'display' ]
 src = files(
         'src/control.c',

uspace/lib/ui/private/window.h

@@ -59 +59 @@
         /** Window GC */
         gfx_context_t *gc;
+        /** Application area bitmap */
+        gfx_bitmap_t *app_bmp;
+        /** Application area GC */
+        gfx_context_t *app_gc;
         /** UI resource. Ideally this would be in ui_t. */
         struct ui_resource *res;

uspace/lib/ui/src/window.c

@@ -36 +36 @@
 #include <display.h>
 #include <errno.h>
+#include <gfx/bitmap.h>
 #include <gfx/context.h>
 #include <gfx/render.h>
@@ -41 +42 @@
 #include <io/pos_event.h>
 #include <mem.h>
+#include <memgfx/memgc.h>
 #include <stdlib.h>
 #include <ui/control.h>
@@ -74 +76 @@
         .move = wd_move
 };
+
+static void ui_window_app_update(void *, gfx_rect_t *);
 
 /** Initialize window parameters structure.
@@ -223 +227 @@
 }
 
+/** Get UI resource from window.
+ *
+ * @param window Window
+ * @return UI resource
+ */
 ui_resource_t *ui_window_get_res(ui_window_t *window)
 {
@@ -228 +237 @@
 }
 
+/** Get window GC.
+ *
+ * @param window Window
+ * @return GC (relative to window)
+ */
 gfx_context_t *ui_window_get_gc(ui_window_t *window)
 {
@@ -233 +247 @@
 }
 
+/** Get window application area GC
+ *
+ * @param window Window
+ * @param rgc Place to store GC (relative to application area)
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_get_app_gc(ui_window_t *window, gfx_context_t **rgc)
+{
+        gfx_bitmap_params_t params;
+        gfx_bitmap_alloc_t alloc;
+        gfx_rect_t rect;
+        mem_gc_t *memgc;
+        errno_t rc;
+
+        if (window->app_gc == NULL) {
+                assert(window->app_bmp == NULL);
+
+                gfx_bitmap_params_init(&params);
+
+                /*
+                 * The bitmap will have the same dimensions as the
+                 * application rectangle, but start at 0,0.
+                 */
+                ui_window_get_app_rect(window, &rect);
+                gfx_rect_rtranslate(&rect.p0, &rect, &params.rect);
+
+                rc = gfx_bitmap_create(window->gc, &params, NULL,
+                    &window->app_bmp);
+                if (rc != EOK)
+                        return rc;
+
+                rc = gfx_bitmap_get_alloc(window->app_bmp, &alloc);
+                if (rc != EOK) {
+                        gfx_bitmap_destroy(window->app_bmp);
+                        return rc;
+                }
+
+                rc = mem_gc_create(&params.rect, &alloc, ui_window_app_update,
+                    (void *) window, &memgc);
+                if (rc != EOK) {
+                        gfx_bitmap_destroy(window->app_bmp);
+                        return rc;
+                }
+
+                window->app_gc = mem_gc_get_ctx(memgc);
+        }
+
+        *rgc = window->app_gc;
+        return EOK;
+}
+
+/** Get window application rectangle
+ *
+ * @param window Window
+ * @param rect Place to store application rectangle
+ */
 void ui_window_get_app_rect(ui_window_t *window, gfx_rect_t *rect)
 {
@@ -241 +311 @@
 }
 
+/** Paint window
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
 errno_t ui_window_paint(ui_window_t *window)
 {
@@ -428 +503 @@
 }
 
+/** Application area update callback
+ *
+ * @param arg Argument (ui_window_t *)
+ * @param rect Rectangle to update
+ */
+static void ui_window_app_update(void *arg, gfx_rect_t *rect)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+        gfx_rect_t arect;
+
+        ui_window_get_app_rect(window, &arect);
+
+        /* Render bitmap rectangle inside the application area */
+        (void) gfx_bitmap_render(window->app_bmp, rect, &arect.p0);
+}
+
 /** @}
  */

uspace/lib/ui/test/window.c

@@ -29 +29 @@
 #include <gfx/context.h>
 #include <gfx/coord.h>
+#include <gfx/render.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
@@ -207 +208 @@
 }
 
+/** ui_window_get_app_gc() return valid GC */
+PCUT_TEST(get_app_gc)
+{
+        errno_t rc;
+        ui_t *ui = NULL;
+        ui_wnd_params_t params;
+        ui_window_t *window = NULL;
+        gfx_context_t *gc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Hello";
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 10;
+        params.rect.p0.y = 10;
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(window);
+
+        rc = ui_window_get_app_gc(window, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(gc);
+
+        rc = gfx_fill_rect(gc, &params.rect);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 /** Test ui_window_paint() */
 PCUT_TEST(paint)