Index: uspace/lib/guigfx/meson.build =================================================================== --- uspace/lib/guigfx/meson.build (revision d8e2485695a8df0a972901d55b5c62f1bafbe173) +++ uspace/lib/guigfx/meson.build (revision cea9f0cdb1a2d2752bc931602d11342eb862c44e) @@ -27,5 +27,5 @@ # -deps = [ 'gui', 'gfx' ] +deps = [ 'gui', 'gfx', 'memgfx' ] src = files( 'src/canvas.c' Index: uspace/lib/guigfx/private/canvas.h =================================================================== --- uspace/lib/guigfx/private/canvas.h (revision d8e2485695a8df0a972901d55b5c62f1bafbe173) +++ uspace/lib/guigfx/private/canvas.h (revision cea9f0cdb1a2d2752bc931602d11342eb862c44e) @@ -44,4 +44,5 @@ #include #include +#include /** Actual structure of canvas GC. */ @@ -53,6 +54,8 @@ /** Surface */ surface_t *surface; - /** Current drawing color */ - pixel_t color; + /** Memory GC */ + mem_gc_t *mgc; + /** Base GC for memory GC */ + gfx_context_t *mbgc; }; @@ -61,16 +64,6 @@ /** Containing canvas GC */ struct canvas_gc *cgc; - /** Allocation info */ - gfx_bitmap_alloc_t alloc; - /** @c true if we allocated the bitmap, @c false if allocated by caller */ - bool myalloc; - /** Surface */ - surface_t *surface; - /** Rectangle covered by bitmap */ - gfx_rect_t rect; - /** Bitmap flags */ - gfx_bitmap_flags_t flags; - /** Key color */ - pixel_t key_color; + /** Memory GC bitmap */ + gfx_bitmap_t *mbitmap; } canvas_gc_bitmap_t; Index: uspace/lib/guigfx/src/canvas.c =================================================================== --- uspace/lib/guigfx/src/canvas.c (revision d8e2485695a8df0a972901d55b5c62f1bafbe173) +++ uspace/lib/guigfx/src/canvas.c (revision cea9f0cdb1a2d2752bc931602d11342eb862c44e) @@ -78,9 +78,6 @@ { canvas_gc_t *cgc = (canvas_gc_t *) arg; - uint16_t r, g, b; - - gfx_color_get_rgb_i16(color, &r, &g, &b); - cgc->color = PIXEL(0, r >> 8, g >> 8, b >> 8); - return EOK; + + return gfx_set_color(cgc->mbgc, color); } @@ -95,17 +92,11 @@ { canvas_gc_t *cgc = (canvas_gc_t *) arg; - gfx_coord_t x, y; - - // XXX We should handle p0.x > p1.x and p0.y > p1.y - - for (y = rect->p0.y; y < rect->p1.y; y++) { - for (x = rect->p0.x; x < rect->p1.x; x++) { - surface_put_pixel(cgc->surface, x, y, cgc->color); - } - } - - update_canvas(cgc->canvas, cgc->surface); - - return EOK; + errno_t rc; + + rc = gfx_fill_rect(cgc->mbgc, rect); + if (rc == EOK) + update_canvas(cgc->canvas, cgc->surface); + + return rc; } @@ -125,5 +116,10 @@ canvas_gc_t *cgc = NULL; gfx_context_t *gc = NULL; - errno_t rc; + surface_coord_t w, h; + gfx_rect_t rect; + gfx_bitmap_alloc_t alloc; + errno_t rc; + + surface_get_resolution(surface, &w, &h); cgc = calloc(1, sizeof(canvas_gc_t)); @@ -136,4 +132,19 @@ if (rc != EOK) goto error; + + rect.p0.x = 0; + rect.p0.y = 0; + rect.p1.x = w; + rect.p1.y = h; + + alloc.pitch = w * sizeof(uint32_t); + alloc.off0 = 0; + alloc.pixels = surface_direct_access(surface); + + rc = mem_gc_create(&rect, &alloc, &cgc->mgc); + if (rc != EOK) + goto error; + + cgc->mbgc = mem_gc_get_ctx(cgc->mgc); cgc->gc = gc; @@ -143,7 +154,8 @@ return EOK; error: + if (gc != NULL) + gfx_context_delete(gc); if (cgc != NULL) free(cgc); - gfx_context_delete(gc); return rc; } @@ -156,4 +168,6 @@ { errno_t rc; + + mem_gc_delete(cgc->mgc); rc = gfx_context_delete(cgc->gc); @@ -188,5 +202,4 @@ canvas_gc_t *cgc = (canvas_gc_t *) arg; canvas_gc_bitmap_t *cbm = NULL; - gfx_coord2_t dim; errno_t rc; @@ -195,29 +208,7 @@ return ENOMEM; - gfx_coord2_subtract(¶ms->rect.p1, ¶ms->rect.p0, &dim); - cbm->rect = params->rect; - cbm->flags = params->flags; - cbm->key_color = params->key_color; - - if (alloc == NULL) { - cbm->surface = surface_create(dim.x, dim.y, NULL, 0); - if (cbm->surface == NULL) { - rc = ENOMEM; - goto error; - } - - 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(dim.x, dim.y, alloc->pixels, 0); - if (cbm->surface == NULL) { - rc = ENOMEM; - goto error; - } - - cbm->alloc = *alloc; - } + rc = gfx_bitmap_create(cgc->mbgc, params, alloc, &cbm->mbitmap); + if (rc != EOK) + goto error; cbm->cgc = cgc; @@ -238,8 +229,10 @@ { canvas_gc_bitmap_t *cbm = (canvas_gc_bitmap_t *)bm; - if (cbm->myalloc) - surface_destroy(cbm->surface); - // XXX if !cbm->myalloc, surface is leaked - no way to destroy it - // without destroying the pixel buffer + errno_t rc; + + rc = gfx_bitmap_destroy(cbm->mbitmap); + if (rc != EOK) + return rc; + free(cbm); return EOK; @@ -257,59 +250,11 @@ { canvas_gc_bitmap_t *cbm = (canvas_gc_bitmap_t *)bm; - gfx_rect_t srect; - gfx_rect_t drect; - gfx_coord2_t offs; - gfx_coord2_t dim; - gfx_coord_t x, y; - pixel_t pixel; - - if (srect0 != NULL) - srect = *srect0; - else - srect = cbm->rect; - - if (offs0 != NULL) { - offs = *offs0; - } else { - offs.x = 0; - offs.y = 0; - } - - /* Destination rectangle */ - gfx_rect_translate(&offs, &srect, &drect); - - gfx_coord2_subtract(&drect.p1, &drect.p0, &dim); - - transform_t transform; - transform_identity(&transform); - transform_translate(&transform, offs.x - cbm->rect.p0.x, - offs.y - cbm->rect.p0.y); - - source_t source; - source_init(&source); - source_set_transform(&source, transform); - source_set_texture(&source, cbm->surface, - PIXELMAP_EXTEND_TRANSPARENT_BLACK); - - if ((cbm->flags & bmpf_color_key) == 0) { - drawctx_t drawctx; - drawctx_init(&drawctx, cbm->cgc->surface); - - drawctx_set_source(&drawctx, &source); - drawctx_transfer(&drawctx, drect.p0.x, drect.p0.y, dim.x, dim.y); - } else { - for (y = drect.p0.y; y < drect.p1.y; y++) { - for (x = drect.p0.x; x < drect.p1.x; x++) { - pixel = source_determine_pixel(&source, x, y); - if (pixel != cbm->key_color) { - surface_put_pixel(cbm->cgc->surface, - x, y, pixel); - } - } - } - } - - update_canvas(cbm->cgc->canvas, cbm->cgc->surface); - return EOK; + errno_t rc; + + rc = gfx_bitmap_render(cbm->mbitmap, srect0, offs0); + if (rc == EOK) + update_canvas(cbm->cgc->canvas, cbm->cgc->surface); + + return rc; } @@ -323,6 +268,6 @@ { canvas_gc_bitmap_t *cbm = (canvas_gc_bitmap_t *)bm; - *alloc = cbm->alloc; - return EOK; + + return gfx_bitmap_get_alloc(cbm->mbitmap, alloc); } Index: uspace/lib/memgfx/test/memgfx.c =================================================================== --- uspace/lib/memgfx/test/memgfx.c (revision d8e2485695a8df0a972901d55b5c62f1bafbe173) +++ uspace/lib/memgfx/test/memgfx.c (revision cea9f0cdb1a2d2752bc931602d11342eb862c44e) @@ -193,5 +193,4 @@ PCUT_ASSERT_ERRNO_VAL(EOK, rc); - rc = gfx_bitmap_get_alloc(bitmap, &balloc); PCUT_ASSERT_ERRNO_VAL(EOK, rc);