Index: pace/lib/guigfx/doc/doxygroups.h =================================================================== --- uspace/lib/guigfx/doc/doxygroups.h (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ (revision ) @@ -1,3 +1,0 @@ -/** @addtogroup libguigfx libguigfx - * @ingroup libs - */ Index: pace/lib/guigfx/include/guigfx/canvas.h =================================================================== --- uspace/lib/guigfx/include/guigfx/canvas.h (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ (revision ) @@ -1,53 +1,0 @@ -/* - * Copyright (c) 2019 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libguigfx - * @{ - */ -/** - * @file GFX canvas backend - */ - -#ifndef _GUIGFX_CANVAS_H -#define _GUIGFX_CANVAS_H - -#include -#include -#include -#include - -extern gfx_context_ops_t canvas_gc_ops; - -extern errno_t canvas_gc_create(canvas_t *, surface_t *, canvas_gc_t **); -extern errno_t canvas_gc_delete(canvas_gc_t *); -extern gfx_context_t *canvas_gc_get_ctx(canvas_gc_t *); - -#endif - -/** @} - */ Index: pace/lib/guigfx/include/types/guigfx/canvas.h =================================================================== --- uspace/lib/guigfx/include/types/guigfx/canvas.h (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2019 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libguigfx - * @{ - */ -/** - * @file GFX canvas backend - */ - -#ifndef _GUIGFX_TYPES_CANVAS_H -#define _GUIGFX_TYPES_CANVAS_H - -struct canvas_gc; -typedef struct canvas_gc canvas_gc_t; - -#endif - -/** @} - */ Index: pace/lib/guigfx/meson.build =================================================================== --- uspace/lib/guigfx/meson.build (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ (revision ) @@ -1,32 +1,0 @@ -# -# Copyright (c) 2019 Jiri Svoboda -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -deps = [ 'gui', 'gfx', 'memgfx' ] -src = files( - 'src/canvas.c' -) Index: pace/lib/guigfx/private/canvas.h =================================================================== --- uspace/lib/guigfx/private/canvas.h (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ (revision ) @@ -1,63 +1,0 @@ -/* - * Copyright (c) 2019 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libguigfx - * @{ - */ -/** - * @file GFX canvas backend structure - * - */ - -#ifndef _GUIGFX_PRIVATE_CANVAS_H -#define _GUIGFX_PRIVATE_CANVAS_H - -#include -#include -#include -#include -#include -#include -#include - -/** Actual structure of canvas GC. */ -struct canvas_gc { - /** Memory GC */ - mem_gc_t *mgc; - /** Base graphic context */ - gfx_context_t *gc; - /** Canvas */ - canvas_t *canvas; - /** Surface */ - surface_t *surface; -}; - -#endif - -/** @} - */ Index: pace/lib/guigfx/src/canvas.c =================================================================== --- uspace/lib/guigfx/src/canvas.c (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ (revision ) @@ -1,147 +1,0 @@ -/* - * Copyright (c) 2019 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libguigfx - * @{ - */ -/** - * @file GFX canvas backend - * - * This implements a graphics context over a libgui canvas. - * This is just for experimentation purposes and its kind of backwards. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../private/canvas.h" -//#include "../../private/color.h" - -static void canvas_gc_update_cb(void *, gfx_rect_t *); - -/** Create canvas GC. - * - * Create graphics context for rendering into a canvas. - * - * @param canvas Canvas object - * @param fout File to which characters are written (canvas) - * @param rgc Place to store pointer to new GC. - * - * @return EOK on success or an error code - */ -errno_t canvas_gc_create(canvas_t *canvas, surface_t *surface, - canvas_gc_t **rgc) -{ - canvas_gc_t *cgc = NULL; - 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)); - if (cgc == NULL) { - rc = ENOMEM; - 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, canvas_gc_update_cb, - (void *)cgc, &cgc->mgc); - if (rc != EOK) - goto error; - - cgc->gc = mem_gc_get_ctx(cgc->mgc); - - cgc->canvas = canvas; - cgc->surface = surface; - *rgc = cgc; - return EOK; -error: - if (cgc != NULL) - free(cgc); - return rc; -} - -/** Delete canvas GC. - * - * @param cgc Canvas GC - */ -errno_t canvas_gc_delete(canvas_gc_t *cgc) -{ - errno_t rc; - - mem_gc_delete(cgc->mgc); - - rc = gfx_context_delete(cgc->gc); - if (rc != EOK) - return rc; - - free(cgc); - return EOK; -} - -/** Get generic graphic context from canvas GC. - * - * @param cgc Canvas GC - * @return Graphic context - */ -gfx_context_t *canvas_gc_get_ctx(canvas_gc_t *cgc) -{ - return cgc->gc; -} - -/** Canvas GC update callback called by memory GC. - * - * @param arg Canvas GC - * @param rect Rectangle to update - */ -static void canvas_gc_update_cb(void *arg, gfx_rect_t *rect) -{ - canvas_gc_t *cgc = (canvas_gc_t *)arg; - - update_canvas(cgc->canvas, cgc->surface); -} - -/** @} - */ Index: uspace/lib/meson.build =================================================================== --- uspace/lib/meson.build (revision b93ec7c0b1ad687158c0b60742ae81046302f956) +++ uspace/lib/meson.build (revision 7a5825ba13ecf6c1685db24212c9f0857f03997c) @@ -100,6 +100,4 @@ 'gui', 'ui', - - 'guigfx', ]