Index: uspace/lib/gfx/include/gfx/backend/canvas.h =================================================================== --- uspace/lib/gfx/include/gfx/backend/canvas.h (revision 00e8290f885b3dc03a5c5a191983eb336d1e852c) +++ (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 libgfx - * @{ - */ -/** - * @file GFX canvas backend - */ - -#ifndef _GFX_BACKEND_CANVAS_H -#define _GFX_BACKEND_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: uspace/lib/gfx/include/gfx/backend/console.h =================================================================== --- uspace/lib/gfx/include/gfx/backend/console.h (revision 00e8290f885b3dc03a5c5a191983eb336d1e852c) +++ (revision ) @@ -1,54 +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 libgfx - * @{ - */ -/** - * @file GFX console backend - */ - -#ifndef _GFX_BACKEND_CONSOLE_H -#define _GFX_BACKEND_CONSOLE_H - -#include -#include -#include -#include -#include - -extern gfx_context_ops_t console_gc_ops; - -extern errno_t console_gc_create(console_ctrl_t *, FILE *, console_gc_t **); -extern errno_t console_gc_delete(console_gc_t *); -extern gfx_context_t *console_gc_get_ctx(console_gc_t *); - -#endif - -/** @} - */ Index: uspace/lib/gfx/include/gfx/color.h =================================================================== --- uspace/lib/gfx/include/gfx/color.h (revision 00e8290f885b3dc03a5c5a191983eb336d1e852c) +++ uspace/lib/gfx/include/gfx/color.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -44,4 +44,6 @@ uint16_t, gfx_color_t **); extern void gfx_color_delete(gfx_color_t *); +extern void gfx_color_get_rgb_i16(gfx_color_t *, uint16_t *, uint16_t *, + uint16_t *); #endif Index: uspace/lib/gfx/include/types/gfx/backend/canvas.h =================================================================== --- uspace/lib/gfx/include/types/gfx/backend/canvas.h (revision 00e8290f885b3dc03a5c5a191983eb336d1e852c) +++ (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 libgfx - * @{ - */ -/** - * @file GFX canvas backend - */ - -#ifndef _GFX_TYPES_BACKEND_CANVAS_H -#define _GFX_TYPES_BACKEND_CANVAS_H - -struct canvas_gc; -typedef struct canvas_gc canvas_gc_t; - -#endif - -/** @} - */ Index: uspace/lib/gfx/include/types/gfx/backend/console.h =================================================================== --- uspace/lib/gfx/include/types/gfx/backend/console.h (revision 00e8290f885b3dc03a5c5a191983eb336d1e852c) +++ (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 libgfx - * @{ - */ -/** - * @file GFX console backend - */ - -#ifndef _GFX_TYPES_BACKEND_CONSOLE_H -#define _GFX_TYPES_BACKEND_CONSOLE_H - -struct console_gc; -typedef struct console_gc console_gc_t; - -#endif - -/** @} - */