Index: uspace/app/uidemo/meson.build =================================================================== --- uspace/app/uidemo/meson.build (revision 3583ffba079f2204a6f171e8f3c934940ddb3679) +++ uspace/app/uidemo/meson.build (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -27,5 +27,5 @@ # -deps = [ 'display', 'ui' ] +deps = [ 'ui' ] src = files( 'uidemo.c', Index: uspace/lib/gfx/src/bitmap.c =================================================================== --- uspace/lib/gfx/src/bitmap.c (revision 3583ffba079f2204a6f171e8f3c934940ddb3679) +++ uspace/lib/gfx/src/bitmap.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -62,5 +62,5 @@ * * @return EOK on success, EINVAL if parameters are invald, - * ENOMEM if insufficient resources, EIO if grahic device connection + * ENOMEM if insufficient resources, EIO if graphic device connection * was lost */ @@ -92,5 +92,5 @@ * @param bitmap Bitmap * - * @return EOK on success, EIO if grahic device connection was lost + * @return EOK on success, EIO if graphic device connection was lost */ errno_t gfx_bitmap_destroy(gfx_bitmap_t *bitmap) @@ -112,5 +112,5 @@ * @param offs Bitmap offset or @c NULL for zero offset * - * @return EOK on success, EIO if grahic device connection was lost + * @return EOK on success, EIO if graphic device connection was lost */ errno_t gfx_bitmap_render(gfx_bitmap_t *bitmap, gfx_rect_t *srect, @@ -125,5 +125,5 @@ * @param alloc Allocation info structure to fill in * - * @return EOK on success, EIO if grahic device connection was lost + * @return EOK on success, EIO if graphic device connection was lost */ errno_t gfx_bitmap_get_alloc(gfx_bitmap_t *bitmap, gfx_bitmap_alloc_t *alloc) Index: uspace/lib/ui/include/types/ui/image.h =================================================================== --- uspace/lib/ui/include/types/ui/image.h (revision f93e4e3ae22ee5f272a9195be2946896615a6219) +++ uspace/lib/ui/include/types/ui/image.h (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2020 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 libui + * @{ + */ +/** + * @file Image + */ + +#ifndef _UI_TYPES_IMAGE_H +#define _UI_TYPES_IMAGE_H + +struct ui_image; +typedef struct ui_image ui_image_t; + +#endif + +/** @} + */ Index: uspace/lib/ui/include/ui/image.h =================================================================== --- uspace/lib/ui/include/ui/image.h (revision f93e4e3ae22ee5f272a9195be2946896615a6219) +++ uspace/lib/ui/include/ui/image.h (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2020 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 libui + * @{ + */ +/** + * @file Image + */ + +#ifndef _UI_IMAGE_H +#define _UI_IMAGE_H + +#include +#include +#include +#include +#include +#include + +extern errno_t ui_image_create(ui_resource_t *, gfx_bitmap_t *, gfx_rect_t *, + ui_image_t **); +extern void ui_image_destroy(ui_image_t *); +extern ui_control_t *ui_image_ctl(ui_image_t *); +extern void ui_image_set_rect(ui_image_t *, gfx_rect_t *); +extern errno_t ui_image_paint(ui_image_t *); + +#endif + +/** @} + */ Index: uspace/lib/ui/meson.build =================================================================== --- uspace/lib/ui/meson.build (revision 3583ffba079f2204a6f171e8f3c934940ddb3679) +++ uspace/lib/ui/meson.build (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -32,4 +32,5 @@ 'src/dummygc.c', 'src/fixed.c', + 'src/image.c', 'src/label.c', 'src/paint.c', @@ -44,4 +45,5 @@ 'test/control.c', 'test/fixed.c', + 'test/image.c', 'test/label.c', 'test/main.c', Index: uspace/lib/ui/private/image.h =================================================================== --- uspace/lib/ui/private/image.h (revision f93e4e3ae22ee5f272a9195be2946896615a6219) +++ uspace/lib/ui/private/image.h (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2020 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 libui + * @{ + */ +/** + * @file Image structure + * + */ + +#ifndef _UI_PRIVATE_IMAGE_H +#define _UI_PRIVATE_IMAGE_H + +#include +#include + +/** Actual structure of image. + * + * This is private to libui. + */ +struct ui_image { + /** Base control object */ + struct ui_control *control; + /** UI resource */ + struct ui_resource *res; + /** Image rectangle */ + gfx_rect_t rect; + /** Bitmap */ + gfx_bitmap_t *bitmap; + gfx_rect_t brect; +}; + +#endif + +/** @} + */ Index: uspace/lib/ui/src/image.c =================================================================== --- uspace/lib/ui/src/image.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) +++ uspace/lib/ui/src/image.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2020 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 libui + * @{ + */ +/** + * @file Image + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../private/image.h" +#include "../private/resource.h" +#include "../private/ui.h" + +static void ui_image_ctl_destroy(void *); +static errno_t ui_image_ctl_paint(void *); +static ui_evclaim_t ui_image_ctl_pos_event(void *, pos_event_t *); + +/** Image control ops */ +ui_control_ops_t ui_image_ops = { + .destroy = ui_image_ctl_destroy, + .paint = ui_image_ctl_paint, + .pos_event = ui_image_ctl_pos_event +}; + +/** Create new image. + * + * @param resource UI resource + * @param bitmap Bitmap + * @param brect Bitmap rectangle + * @param rimage Place to store pointer to new image + * @return EOK on success, ENOMEM if out of memory + */ +errno_t ui_image_create(ui_resource_t *resource, gfx_bitmap_t *bitmap, + gfx_rect_t *brect, ui_image_t **rimage) +{ + ui_image_t *image; + errno_t rc; + + image = calloc(1, sizeof(ui_image_t)); + if (image == NULL) + return ENOMEM; + + rc = ui_control_new(&ui_image_ops, (void *) image, &image->control); + if (rc != EOK) { + free(image); + return rc; + } + + image->bitmap = bitmap; + image->brect = *brect; + image->res = resource; + *rimage = image; + return EOK; +} + +/** Destroy image. + * + * @param image Image or @c NULL + */ +void ui_image_destroy(ui_image_t *image) +{ + if (image == NULL) + return; + + ui_control_delete(image->control); + if (image->bitmap != NULL) + gfx_bitmap_destroy(image->bitmap); + free(image); +} + +/** Get base control from image. + * + * @param image Image + * @return Control + */ +ui_control_t *ui_image_ctl(ui_image_t *image) +{ + return image->control; +} + +/** Set image rectangle. + * + * @param image Image + * @param rect New image rectangle + */ +void ui_image_set_rect(ui_image_t *image, gfx_rect_t *rect) +{ + image->rect = *rect; +} + +/** Paint image. + * + * @param image Image + * @return EOK on success or an error code + */ +errno_t ui_image_paint(ui_image_t *image) +{ + gfx_rect_t srect; + gfx_coord2_t offs; + + /* + * UI image position does not depend on bitmap rectangle p0, so + * we need to subtract it. + */ + offs.x = image->rect.p0.x - image->brect.p0.x; + offs.y = image->rect.p0.y - image->brect.p0.y; + + /* + * Transalte image rectangle back to bitmap coordinate space. + * Thus the bitmap will be clipped to the image rectangle. + */ + gfx_rect_rtranslate(&offs, &image->rect, &srect); + return gfx_bitmap_render(image->bitmap, &srect, &offs); +} + +/** Destroy image control. + * + * @param arg Argument (ui_image_t *) + */ +void ui_image_ctl_destroy(void *arg) +{ + ui_image_t *image = (ui_image_t *) arg; + + ui_image_destroy(image); +} + +/** Paint image control. + * + * @param arg Argument (ui_image_t *) + * @return EOK on success or an error code + */ +errno_t ui_image_ctl_paint(void *arg) +{ + ui_image_t *image = (ui_image_t *) arg; + + return ui_image_paint(image); +} + +/** Handle image control position event. + * + * @param arg Argument (ui_image_t *) + * @param pos_event Position event + * @return @c ui_claimed iff the event is claimed + */ +ui_evclaim_t ui_image_ctl_pos_event(void *arg, pos_event_t *event) +{ + ui_image_t *image = (ui_image_t *) arg; + + (void) image; + return ui_unclaimed; +} + +/** @} + */ Index: uspace/lib/ui/test/image.c =================================================================== --- uspace/lib/ui/test/image.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) +++ uspace/lib/ui/test/image.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2020 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "../private/dummygc.h" +#include "../private/image.h" + +PCUT_INIT; + +PCUT_TEST_SUITE(image); + +typedef struct { + bool clicked; +} test_cb_resp_t; + +/** Create and destroy image */ +PCUT_TEST(create_destroy) +{ + ui_image_t *image = NULL; + gfx_rect_t brect; + errno_t rc; + + rc = ui_image_create(NULL, NULL, &brect, &image); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(image); + + ui_image_destroy(image); +} + +/** ui_image_destroy() can take NULL argument (no-op) */ +PCUT_TEST(destroy_null) +{ + ui_image_destroy(NULL); +} + +/** ui_image_ctl() returns control that has a working virtual destructor */ +PCUT_TEST(ctl) +{ + ui_image_t *image = NULL; + ui_control_t *control; + gfx_rect_t brect; + errno_t rc; + + rc = ui_image_create(NULL, NULL, &brect, &image); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(image); + + control = ui_image_ctl(image); + PCUT_ASSERT_NOT_NULL(control); + + ui_control_destroy(control); +} + +/** Set image rectangle sets internal field */ +PCUT_TEST(set_rect) +{ + + ui_image_t *image = NULL; + gfx_rect_t brect; + gfx_rect_t rect; + errno_t rc; + + rc = ui_image_create(NULL, NULL, &brect, &image); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(image); + + rect.p0.x = 1; + rect.p0.y = 2; + rect.p1.x = 3; + rect.p1.y = 4; + + ui_image_set_rect(image, &rect); + PCUT_ASSERT_INT_EQUALS(rect.p0.x, image->rect.p0.x); + PCUT_ASSERT_INT_EQUALS(rect.p0.y, image->rect.p0.y); + PCUT_ASSERT_INT_EQUALS(rect.p1.x, image->rect.p1.x); + PCUT_ASSERT_INT_EQUALS(rect.p1.y, image->rect.p1.y); + + ui_image_destroy(image); +} + +/** Paint image */ +PCUT_TEST(paint) +{ + dummy_gc_t *dgc; + gfx_context_t *gc; + gfx_bitmap_params_t params; + gfx_bitmap_t *bitmap; + ui_image_t *image = NULL; + gfx_rect_t brect; + errno_t rc; + + rc = dummygc_create(&dgc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + gc = dummygc_get_ctx(dgc); + + gfx_bitmap_params_init(¶ms); + rc = gfx_bitmap_create(gc, ¶ms, NULL, &bitmap); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_image_create(NULL, bitmap, &brect, &image); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(image); + + rc = ui_image_paint(image); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_image_destroy(image); +} + +PCUT_EXPORT(image); Index: uspace/lib/ui/test/label.c =================================================================== --- uspace/lib/ui/test/label.c (revision 3583ffba079f2204a6f171e8f3c934940ddb3679) +++ uspace/lib/ui/test/label.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -79,5 +79,5 @@ } test_cb_resp_t; -/** Create and destroy button */ +/** Create and destroy label */ PCUT_TEST(create_destroy) { @@ -114,5 +114,5 @@ } -/** Set button rectangle sets internal field */ +/** Set label rectangle sets internal field */ PCUT_TEST(set_rect) { @@ -138,5 +138,5 @@ } -/** Set button text horizontal alignment sets internal field */ +/** Set label text horizontal alignment sets internal field */ PCUT_TEST(set_halign) { @@ -155,5 +155,5 @@ } -/** Set button rectangle sets internal field */ +/** Set label rectangle sets internal field */ PCUT_TEST(set_text) { @@ -179,5 +179,5 @@ } -/** Paint button */ +/** Paint label */ PCUT_TEST(paint) { Index: uspace/lib/ui/test/main.c =================================================================== --- uspace/lib/ui/test/main.c (revision 3583ffba079f2204a6f171e8f3c934940ddb3679) +++ uspace/lib/ui/test/main.c (revision f93e4e3ae22ee5f272a9195be2946896615a6219) @@ -33,4 +33,5 @@ PCUT_IMPORT(control); PCUT_IMPORT(fixed); +PCUT_IMPORT(image); PCUT_IMPORT(label); PCUT_IMPORT(paint);