Changeset 7b882c1f in mainline for uspace/lib/congfx/src/console.c

Timestamp:

2019-10-21T18:23:29Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0008c0f

Parents:

1822545

git-author:

Jiri Svoboda <jiri@…> (2019-10-21 00:37:28)

git-committer:

Jiri Svoboda <jiri@…> (2019-10-21 18:23:29)

Message:

Need some vector operations

File:

• uspace/lib/congfx/src/console.c (modified) (5 diffs)

uspace/lib/congfx/src/console.c

@@ -40 +40 @@
 #include <congfx/console.h>
 #include <gfx/context.h>
+#include <gfx/coord.h>
 #include <gfx/render.h>
 #include <io/pixel.h>
@@ -191 +192 @@
         console_gc_t *cgc = (console_gc_t *) arg;
         console_gc_bitmap_t *cbm = NULL;
-        gfx_coord_t w, h;
+        gfx_coord2_t dim;
         errno_t rc;
 
@@ -198 +199 @@
                 return ENOMEM;
 
-        w = params->rect.p1.x - params->rect.p0.x;
-        h = params->rect.p1.y - params->rect.p0.y;
+        gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
         cbm->rect = params->rect;
 
         if (alloc == NULL) {
-                cbm->alloc.pitch = w * sizeof(uint32_t);
+                cbm->alloc.pitch = dim.x * sizeof(uint32_t);
                 cbm->alloc.off0 = 0;
-                cbm->alloc.pixels = calloc(w * h, sizeof(uint32_t));
+                cbm->alloc.pixels = calloc(dim.x * dim.y, sizeof(uint32_t));
                 if (cbm->alloc.pixels == NULL) {
                         rc = ENOMEM;
@@ -271 +271 @@
 
         // XXX Add function to translate rectangle
-        drect.p0.x = srect.p0.x + offs.x;
-        drect.p0.y = srect.p0.y + offs.y;
-        drect.p1.x = srect.p1.x + offs.x;
-        drect.p1.y = srect.p1.y + offs.y;
+        gfx_rect_translate(&offs, &srect, &drect);
 
         pixelmap.width = cbm->rect.p1.x - cbm->rect.p0.x;
@@ -313 +310 @@
 }
 
-
 /** @}
  */