Index: uspace/lib/ui/include/types/ui/cursor.h =================================================================== --- uspace/lib/ui/include/types/ui/cursor.h (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/include/types/ui/cursor.h (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2020 Jiri Svoboda + * Copyright (c) 2021 Jiri Svoboda * All rights reserved. * @@ -47,5 +47,7 @@ ui_curs_size_uldr, /** Double arrow pointing up-right nad down-left */ - ui_curs_size_urdl + ui_curs_size_urdl, + /** I-beam (suggests editable text) */ + ui_curs_ibeam } ui_stock_cursor_t; Index: uspace/lib/ui/include/ui/entry.h =================================================================== --- uspace/lib/ui/include/ui/entry.h (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/include/ui/entry.h (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2020 Jiri Svoboda + * Copyright (c) 2021 Jiri Svoboda * All rights reserved. * @@ -42,7 +42,7 @@ #include #include -#include +#include -extern errno_t ui_entry_create(ui_resource_t *, const char *, +extern errno_t ui_entry_create(ui_window_t *, const char *, ui_entry_t **); extern void ui_entry_destroy(ui_entry_t *); Index: uspace/lib/ui/include/ui/window.h =================================================================== --- uspace/lib/ui/include/ui/window.h (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/include/ui/window.h (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -60,4 +60,5 @@ extern errno_t ui_window_get_app_gc(ui_window_t *, gfx_context_t **); extern void ui_window_get_app_rect(ui_window_t *, gfx_rect_t *); +extern void ui_window_set_ctl_cursor(ui_window_t *, ui_stock_cursor_t); extern errno_t ui_window_paint(ui_window_t *); extern errno_t ui_window_def_paint(ui_window_t *); Index: uspace/lib/ui/private/entry.h =================================================================== --- uspace/lib/ui/private/entry.h (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/private/entry.h (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2020 Jiri Svoboda + * Copyright (c) 2021 Jiri Svoboda * All rights reserved. * @@ -48,6 +48,6 @@ /** Base control object */ struct ui_control *control; - /** UI resource */ - struct ui_resource *res; + /** UI window */ + struct ui_window *window; /** Entry rectangle */ gfx_rect_t rect; @@ -56,4 +56,6 @@ /** Text */ char *text; + /** Pointer is currently inside */ + bool pointer_inside; }; Index: uspace/lib/ui/private/window.h =================================================================== --- uspace/lib/ui/private/window.h (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/private/window.h (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -92,4 +92,5 @@ }; +extern display_stock_cursor_t wnd_dcursor_from_cursor(ui_stock_cursor_t); extern void ui_window_send_close(ui_window_t *); extern void ui_window_send_focus(ui_window_t *); Index: uspace/lib/ui/src/entry.c =================================================================== --- uspace/lib/ui/src/entry.c (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/src/entry.c (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -47,4 +47,5 @@ #include #include +#include #include "../private/entry.h" #include "../private/resource.h" @@ -70,10 +71,10 @@ /** Create new text entry. * - * @param resource UI resource + * @param window UI window * @param text Text * @param rentry Place to store pointer to new text entry * @return EOK on success, ENOMEM if out of memory */ -errno_t ui_entry_create(ui_resource_t *resource, const char *text, +errno_t ui_entry_create(ui_window_t *window, const char *text, ui_entry_t **rentry) { @@ -98,5 +99,5 @@ } - entry->res = resource; + entry->window = window; entry->halign = gfx_halign_left; *rentry = entry; @@ -174,4 +175,5 @@ errno_t ui_entry_paint(ui_entry_t *entry) { + ui_resource_t *res; gfx_text_fmt_t fmt; gfx_coord2_t pos; @@ -181,5 +183,7 @@ errno_t rc; - if (entry->res->textmode) { + res = ui_window_get_res(entry->window); + + if (res->textmode) { hpad = ui_entry_hpad_text; vpad = ui_entry_vpad_text; @@ -189,7 +193,7 @@ } - if (entry->res->textmode == false) { + if (res->textmode == false) { /* Paint inset frame */ - rc = ui_paint_inset_frame(entry->res, &entry->rect, &inside); + rc = ui_paint_inset_frame(res, &entry->rect, &inside); if (rc != EOK) goto error; @@ -200,9 +204,9 @@ /* Paint entry background */ - rc = gfx_set_color(entry->res->gc, entry->res->entry_bg_color); + rc = gfx_set_color(res->gc, res->entry_bg_color); if (rc != EOK) goto error; - rc = gfx_fill_rect(entry->res->gc, &inside); + rc = gfx_fill_rect(res->gc, &inside); if (rc != EOK) goto error; @@ -224,13 +228,13 @@ gfx_text_fmt_init(&fmt); - fmt.color = entry->res->entry_fg_color; + fmt.color = res->entry_fg_color; fmt.halign = entry->halign; fmt.valign = gfx_valign_top; - rc = gfx_puttext(entry->res->font, &pos, &fmt, entry->text); + rc = gfx_puttext(res->font, &pos, &fmt, entry->text); if (rc != EOK) goto error; - rc = gfx_update(entry->res->gc); + rc = gfx_update(res->gc); if (rc != EOK) goto error; @@ -273,6 +277,25 @@ { ui_entry_t *entry = (ui_entry_t *) arg; - - (void) entry; + gfx_coord2_t pos; + + if (event->type == POS_UPDATE) { + pos.x = event->hpos; + pos.y = event->vpos; + + if (gfx_pix_inside_rect(&pos, &entry->rect)) { + if (!entry->pointer_inside) { + ui_window_set_ctl_cursor(entry->window, + ui_curs_ibeam); + entry->pointer_inside = true; + } + } else { + if (entry->pointer_inside) { + ui_window_set_ctl_cursor(entry->window, + ui_curs_arrow); + entry->pointer_inside = false; + } + } + } + return ui_unclaimed; } Index: uspace/lib/ui/src/window.c =================================================================== --- uspace/lib/ui/src/window.c (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/src/window.c (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -646,4 +646,19 @@ } +/** Set cursor when pointer is hovering over a control. + * + * @param window Window + * @param cursor Cursor + */ +void ui_window_set_ctl_cursor(ui_window_t *window, ui_stock_cursor_t cursor) +{ + display_stock_cursor_t dcursor; + + dcursor = wnd_dcursor_from_cursor(cursor); + + if (window->dwindow != NULL) + (void) display_window_set_cursor(window->dwindow, dcursor); +} + /** Paint window * @@ -770,18 +785,12 @@ } -/** Window decoration requested changing cursor. - * - * @param wdecor Window decoration - * @param arg Argument (window) - * @param cursor Cursor to set - */ -static void wd_set_cursor(ui_wdecor_t *wdecor, void *arg, - ui_stock_cursor_t cursor) -{ - ui_window_t *window = (ui_window_t *) arg; +/** Get display stock cursor from UI stock cursor. + * + * @param cursor UI stock cursor + * @return Display stock cursor + */ +display_stock_cursor_t wnd_dcursor_from_cursor(ui_stock_cursor_t cursor) +{ display_stock_cursor_t dcursor; - - if (cursor == window->cursor) - return; dcursor = dcurs_arrow; @@ -803,8 +812,32 @@ dcursor = dcurs_size_urdl; break; - } + case ui_curs_ibeam: + dcursor = dcurs_ibeam; + break; + } + + return dcursor; +} + +/** Window decoration requested changing cursor. + * + * @param wdecor Window decoration + * @param arg Argument (window) + * @param cursor Cursor to set + */ +static void wd_set_cursor(ui_wdecor_t *wdecor, void *arg, + ui_stock_cursor_t cursor) +{ + ui_window_t *window = (ui_window_t *) arg; + display_stock_cursor_t dcursor; + + if (cursor == window->cursor) + return; + + dcursor = wnd_dcursor_from_cursor(cursor); if (window->dwindow != NULL) (void) display_window_set_cursor(window->dwindow, dcursor); + window->cursor = cursor; } Index: uspace/lib/ui/test/entry.c =================================================================== --- uspace/lib/ui/test/entry.c (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/test/entry.c (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -35,4 +35,6 @@ #include #include +#include +#include #include "../private/entry.h" @@ -40,46 +42,4 @@ PCUT_TEST_SUITE(entry); - -static errno_t testgc_set_clip_rect(void *, gfx_rect_t *); -static errno_t testgc_set_color(void *, gfx_color_t *); -static errno_t testgc_fill_rect(void *, gfx_rect_t *); -static errno_t testgc_update(void *); -static errno_t testgc_bitmap_create(void *, gfx_bitmap_params_t *, - gfx_bitmap_alloc_t *, void **); -static errno_t testgc_bitmap_destroy(void *); -static errno_t testgc_bitmap_render(void *, gfx_rect_t *, gfx_coord2_t *); -static errno_t testgc_bitmap_get_alloc(void *, gfx_bitmap_alloc_t *); - -static gfx_context_ops_t ops = { - .set_clip_rect = testgc_set_clip_rect, - .set_color = testgc_set_color, - .fill_rect = testgc_fill_rect, - .update = testgc_update, - .bitmap_create = testgc_bitmap_create, - .bitmap_destroy = testgc_bitmap_destroy, - .bitmap_render = testgc_bitmap_render, - .bitmap_get_alloc = testgc_bitmap_get_alloc -}; - -typedef struct { - bool bm_created; - bool bm_destroyed; - gfx_bitmap_params_t bm_params; - void *bm_pixels; - gfx_rect_t bm_srect; - gfx_coord2_t bm_offs; - bool bm_rendered; - bool bm_got_alloc; -} test_gc_t; - -typedef struct { - test_gc_t *tgc; - gfx_bitmap_alloc_t alloc; - bool myalloc; -} testgc_bitmap_t; - -typedef struct { - bool clicked; -} test_cb_resp_t; /** Create and destroy text entry */ @@ -187,18 +147,20 @@ { errno_t rc; - gfx_context_t *gc = NULL; - test_gc_t tgc; - ui_resource_t *resource = NULL; + ui_t *ui = NULL; + ui_window_t *window = NULL; + ui_wnd_params_t params; ui_entry_t *entry; - memset(&tgc, 0, sizeof(tgc)); - rc = gfx_context_new(&ops, &tgc, &gc); + rc = ui_create_disp(NULL, &ui); PCUT_ASSERT_ERRNO_VAL(EOK, rc); - rc = ui_resource_create(gc, false, &resource); + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); PCUT_ASSERT_ERRNO_VAL(EOK, rc); - PCUT_ASSERT_NOT_NULL(resource); + PCUT_ASSERT_NOT_NULL(window); - rc = ui_entry_create(resource, "Hello", &entry); + rc = ui_entry_create(window, "Hello", &entry); PCUT_ASSERT_ERRNO_VAL(EOK, rc); @@ -207,97 +169,6 @@ ui_entry_destroy(entry); - ui_resource_destroy(resource); - - rc = gfx_context_delete(gc); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); -} - -static errno_t testgc_set_clip_rect(void *arg, gfx_rect_t *rect) -{ - (void) arg; - (void) rect; - return EOK; -} - -static errno_t testgc_set_color(void *arg, gfx_color_t *color) -{ - (void) arg; - (void) color; - return EOK; -} - -static errno_t testgc_fill_rect(void *arg, gfx_rect_t *rect) -{ - (void) arg; - (void) rect; - return EOK; -} - -static errno_t testgc_update(void *arg) -{ - (void) arg; - return EOK; -} - -static errno_t testgc_bitmap_create(void *arg, gfx_bitmap_params_t *params, - gfx_bitmap_alloc_t *alloc, void **rbm) -{ - test_gc_t *tgc = (test_gc_t *) arg; - testgc_bitmap_t *tbm; - - tbm = calloc(1, sizeof(testgc_bitmap_t)); - if (tbm == NULL) - return ENOMEM; - - if (alloc == NULL) { - tbm->alloc.pitch = (params->rect.p1.x - params->rect.p0.x) * - sizeof(uint32_t); - tbm->alloc.off0 = 0; - tbm->alloc.pixels = calloc(sizeof(uint32_t), - (params->rect.p1.x - params->rect.p0.x) * - (params->rect.p1.y - params->rect.p0.y)); - tbm->myalloc = true; - if (tbm->alloc.pixels == NULL) { - free(tbm); - return ENOMEM; - } - } else { - tbm->alloc = *alloc; - } - - tbm->tgc = tgc; - tgc->bm_created = true; - tgc->bm_params = *params; - tgc->bm_pixels = tbm->alloc.pixels; - *rbm = (void *)tbm; - return EOK; -} - -static errno_t testgc_bitmap_destroy(void *bm) -{ - testgc_bitmap_t *tbm = (testgc_bitmap_t *)bm; - if (tbm->myalloc) - free(tbm->alloc.pixels); - tbm->tgc->bm_destroyed = true; - free(tbm); - return EOK; -} - -static errno_t testgc_bitmap_render(void *bm, gfx_rect_t *srect, - gfx_coord2_t *offs) -{ - testgc_bitmap_t *tbm = (testgc_bitmap_t *)bm; - tbm->tgc->bm_rendered = true; - tbm->tgc->bm_srect = *srect; - tbm->tgc->bm_offs = *offs; - return EOK; -} - -static errno_t testgc_bitmap_get_alloc(void *bm, gfx_bitmap_alloc_t *alloc) -{ - testgc_bitmap_t *tbm = (testgc_bitmap_t *)bm; - *alloc = tbm->alloc; - tbm->tgc->bm_got_alloc = true; - return EOK; + ui_window_destroy(window); + ui_destroy(ui); } Index: uspace/lib/ui/test/window.c =================================================================== --- uspace/lib/ui/test/window.c (revision 90f1f1988231da4facc94fa385270f4748b2e9cd) +++ uspace/lib/ui/test/window.c (revision 034ce6bbc25bb496d142b2ea86f60aebedce4aa4) @@ -291,4 +291,28 @@ } +/** ui_window_set_ctl_cursor() */ +PCUT_TEST(set_ctl_cursor) +{ + errno_t rc; + ui_t *ui = NULL; + ui_wnd_params_t params; + ui_window_t *window = NULL; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + ui_window_set_ctl_cursor(window, ui_curs_ibeam); + + ui_window_destroy(window); + ui_destroy(ui); +} + /** ui_window_get_app_gc() return valid GC */ PCUT_TEST(get_app_gc)