Changeset 8ce56a6 in mainline

Timestamp:

2021-09-07T08:53:42Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ebb3538

Parents:

a0aeb8f

git-author:

Jiri Svoboda <jiri@…> (2021-09-06 17:53:32)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-07 08:53:42)

Message:

Translate window rendering in console/SSR with translation GC

In full-screen mode (such as text/console) and server-side rendering
we need other mechanism than memory GC to translate the coordinates
while rendering. We use a translation GC (xlategc).

Note the extensively elaborate testing of this very simple GC seems
quite overboard. At least the very elaborate test_gc_t could be hoisted
into a library and used wherever a test GC is required.

Location:

uspace/lib

Files:

• memgfx/include/memgfx/xlategc.h (added)
• memgfx/include/types/memgfx/xlategc.h (added)
• memgfx/meson.build (modified) (3 diffs)
• memgfx/private/memgc.h (modified) (2 diffs)
• memgfx/private/xlategc.h (added)
• memgfx/src/xlategc.c (added)
• memgfx/test/main.c (modified) (2 diffs)
• memgfx/test/xlategc.c (added)
• ui/private/window.h (modified) (2 diffs)
• ui/src/ui.c (modified) (1 diff)
• ui/src/window.c (modified) (3 diffs)

uspace/lib/memgfx/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2020 Jiri Svoboda
+# Copyright (c) 2021 Jiri Svoboda
 # All rights reserved.
 #
@@ -29 +29 @@
 deps = [ 'gfx' ]
 src = files(
-        'src/memgc.c'
+        'src/memgc.c',
+        'src/xlategc.c'
 )
 
@@ -35 +36 @@
         'test/main.c',
         'test/memgfx.c',
+        'test/xlategc.c'
 )

uspace/lib/memgfx/private/memgc.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libguigfx
+/** @addtogroup libmemgfx
  * @{
  */
@@ -63 +63 @@
 /** Bitmap in memory GC */
 typedef struct {
-        /** Containing canvas GC */
+        /** Containing memory GC */
         struct mem_gc *mgc;
         /** Allocation info */

uspace/lib/memgfx/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -32 +32 @@
 
 PCUT_IMPORT(memgfx);
+PCUT_IMPORT(xlategc);
 
 PCUT_MAIN();

uspace/lib/ui/private/window.h

@@ -46 +46 @@
 #include <io/pos_event.h>
 #include <memgfx/memgc.h>
+#include <memgfx/xlategc.h>
 #include <types/ui/cursor.h>
 #include <types/ui/window.h>
@@ -70 +71 @@
         /** Window memory GC (if client-side rendering) */
         mem_gc_t *mgc;
+        /** Translating GC (if full screen & server-side rendering) */
+        xlate_gc_t *xgc;
         /** Real window GC (if client-side rendering) */
         gfx_context_t *realgc;

uspace/lib/ui/src/ui.c

@@ -248 +248 @@
         case CEV_POS:
                 pos = event->ev.pos;
-#ifdef CONFIG_UI_CS_RENDER
-                /*
-                 * TODO Enable translation for server-side rendering
-                 * once we can translate rendering operations in this
-                 * case.
-                 */
+                /* Translate event to window-relative coordinates */
                 pos.hpos -= awnd->dpos.x;
                 pos.vpos -= awnd->dpos.y;
-#endif
 
                 claim = ui_wdecor_pos_event(awnd->wdecor, &pos);

uspace/lib/ui/src/window.c

@@ -205 +205 @@
         gfx_bitmap_alloc_t alloc;
         gfx_bitmap_t *bmp = NULL;
+        gfx_coord2_t off;
         mem_gc_t *memgc = NULL;
+        xlate_gc_t *xgc = NULL;
         errno_t rc;
 
@@ -297 +299 @@
         window->gc = mem_gc_get_ctx(memgc);
         window->realgc = gc;
+        (void) off;
 #else
+        /* Server-side rendering */
+
+        /* Full-screen mode? */
+        if (ui->display == NULL) {
+                /* Create translating GC to translate window contents */
+                off.x = 0;
+                off.y = 0;
+                rc = xlate_gc_create(&off, gc, &xgc);
+                if (rc != EOK)
+                        goto error;
+
+                window->xgc = xgc;
+                window->gc = xlate_gc_get_ctx(xgc);
+                window->realgc = gc;
+        } else {
+                window->gc = gc;
+        }
+
         (void) ui_window_mem_gc_cb;
         (void) alloc;
         (void) bparams;
-        window->gc = gc;
 #endif
-        if (ui->display == NULL)
+        if (ui->display == NULL) {
                 ui_window_place(window, &ui->rect, params, &window->dpos);
+                FILE *f = fopen("/tmp/x", "at");
+                fprintf(f, "xlate_gc_set_off: %d,%d\n",
+                    window->dpos.x, window->dpos.y);
+                fclose(f);
+
+                if (window->xgc != NULL)
+                        xlate_gc_set_off(window->xgc, &window->dpos);
+        }
 
         rc = ui_resource_create(window->gc, ui_is_textmode(ui), &res);
@@ -335 +363 @@
         if (memgc != NULL)
                 mem_gc_delete(memgc);
+        if (xgc != NULL)
+                xlate_gc_delete(xgc);
         if (bmp != NULL)
                 gfx_bitmap_destroy(bmp);