Changeset 7b882c1f in mainline for uspace/lib/guigfx/src/canvas.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/guigfx/src/canvas.c (modified) (6 diffs)

uspace/lib/guigfx/src/canvas.c

@@ -188 +188 @@
         canvas_gc_t *cgc = (canvas_gc_t *) arg;
         canvas_gc_bitmap_t *cbm = NULL;
-        gfx_coord_t w, h;
+        gfx_coord2_t dim;
         errno_t rc;
 
@@ -195 +195 @@
                 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->surface = surface_create(w, h, NULL, 0);
+                cbm->surface = surface_create(dim.x, dim.y, NULL, 0);
                 if (cbm->surface == NULL) {
                         rc = ENOMEM;
@@ -206 +205 @@
                 }
 
-                cbm->alloc.pitch = w * sizeof(uint32_t);
+                cbm->alloc.pitch = dim.x * sizeof(uint32_t);
                 cbm->alloc.off0 = 0;
                 cbm->alloc.pixels = surface_direct_access(cbm->surface);
                 cbm->myalloc = true;
         } else {
-                cbm->surface = surface_create(w, h, alloc->pixels, 0);
+                cbm->surface = surface_create(dim.x, dim.y, alloc->pixels, 0);
                 if (cbm->surface == NULL) {
                         rc = ENOMEM;
@@ -259 +258 @@
         gfx_rect_t drect;
         gfx_coord2_t offs;
+        gfx_coord2_t dim;
 
         if (srect0 != NULL)
@@ -272 +272 @@
         }
 
-        // 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;
+        /* Destination rectangle */
+        gfx_rect_translate(&offs, &srect, &drect);
+
+        gfx_coord2_subtract(&drect.p1, &drect.p0, &dim);
 
         transform_t transform;
@@ -293 +292 @@
 
         drawctx_set_source(&drawctx, &source);
-        drawctx_transfer(&drawctx, drect.p0.x, drect.p0.y,
-            drect.p1.x - drect.p0.x, drect.p1.y - drect.p0.y);
+        drawctx_transfer(&drawctx, drect.p0.x, drect.p0.y, dim.x, dim.y);
 
         update_canvas(cbm->cgc->canvas, cbm->cgc->surface);