Index: uspace/lib/ui/include/types/ui/selectdialog.h =================================================================== --- uspace/lib/ui/include/types/ui/selectdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/lib/ui/include/types/ui/selectdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2023 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 Select dialog + */ + +#ifndef _UI_TYPES_SELECTDIALOG_H +#define _UI_TYPES_SELECTDIALOG_H + +#include +#include +#include + +struct ui_select_dialog; +typedef struct ui_select_dialog ui_select_dialog_t; + +/** Select dialog parameters */ +typedef struct { + /** Window caption */ + const char *caption; + /** Prompt text */ + const char *prompt; +} ui_select_dialog_params_t; + +/** Select dialog callback */ +typedef struct ui_select_dialog_cb { + /** OK button was pressed */ + void (*bok)(ui_select_dialog_t *, void *, void *); + /** Cancel button was pressed */ + void (*bcancel)(ui_select_dialog_t *, void *); + /** Window closure requested (e.g. via close button) */ + void (*close)(ui_select_dialog_t *, void *); +} ui_select_dialog_cb_t; + +#endif + +/** @} + */ Index: uspace/lib/ui/include/ui/entry.h =================================================================== --- uspace/lib/ui/include/ui/entry.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/include/ui/entry.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -54,4 +54,5 @@ extern const char *ui_entry_get_text(ui_entry_t *); extern errno_t ui_entry_paint(ui_entry_t *); +extern errno_t ui_entry_insert_str(ui_entry_t *, const char *); extern void ui_entry_activate(ui_entry_t *); extern void ui_entry_deactivate(ui_entry_t *); Index: uspace/lib/ui/include/ui/list.h =================================================================== --- uspace/lib/ui/include/ui/list.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/include/ui/list.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -48,8 +48,10 @@ extern ui_control_t *ui_list_ctl(ui_list_t *); extern void ui_list_set_cb(ui_list_t *, ui_list_cb_t *, void *); +extern void *ui_list_get_cb_arg(ui_list_t *); extern void ui_list_set_rect(ui_list_t *, gfx_rect_t *); extern errno_t ui_list_activate(ui_list_t *); extern void ui_list_deactivate(ui_list_t *); extern ui_list_entry_t *ui_list_get_cursor(ui_list_t *); +extern void ui_list_set_cursor(ui_list_t *, ui_list_entry_t *); extern void ui_list_entry_attr_init(ui_list_entry_attr_t *); extern errno_t ui_list_entry_append(ui_list_t *, @@ -57,4 +59,5 @@ extern void ui_list_entry_delete(ui_list_entry_t *); extern void *ui_list_entry_get_arg(ui_list_entry_t *); +extern ui_list_t *ui_list_entry_get_list(ui_list_entry_t *); extern size_t ui_list_entries_cnt(ui_list_t *); extern errno_t ui_list_sort(ui_list_t *); Index: uspace/lib/ui/include/ui/selectdialog.h =================================================================== --- uspace/lib/ui/include/ui/selectdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/lib/ui/include/ui/selectdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2023 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 Select dialog + */ + +#ifndef _UI_SELECTDIALOG_H +#define _UI_SELECTDIALOG_H + +#include +#include +#include +#include + +extern void ui_select_dialog_params_init(ui_select_dialog_params_t *); +extern errno_t ui_select_dialog_create(ui_t *, ui_select_dialog_params_t *, + ui_select_dialog_t **); +extern void ui_select_dialog_set_cb(ui_select_dialog_t *, ui_select_dialog_cb_t *, + void *); +extern void ui_select_dialog_destroy(ui_select_dialog_t *); +extern errno_t ui_select_dialog_append(ui_select_dialog_t *, + ui_list_entry_attr_t *); +extern errno_t ui_select_dialog_paint(ui_select_dialog_t *); + +#endif + +/** @} + */ Index: uspace/lib/ui/include/ui/tab.h =================================================================== --- uspace/lib/ui/include/ui/tab.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/include/ui/tab.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -43,4 +43,5 @@ #include #include +#include #include #include Index: uspace/lib/ui/meson.build =================================================================== --- uspace/lib/ui/meson.build (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/meson.build (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -52,4 +52,5 @@ 'src/resource.c', 'src/scrollbar.c', + 'src/selectdialog.c', 'src/slider.c', 'src/tab.c', @@ -85,4 +86,5 @@ 'test/resource.c', 'test/scrollbar.c', + 'test/selectdialog.c', 'test/slider.c', 'test/tab.c', Index: uspace/lib/ui/private/entry.h =================================================================== --- uspace/lib/ui/private/entry.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/private/entry.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -92,5 +92,4 @@ } ui_entry_geom_t; -extern errno_t ui_entry_insert_str(ui_entry_t *, const char *); extern ui_evclaim_t ui_entry_key_press_ctrl(ui_entry_t *, kbd_event_t *); extern ui_evclaim_t ui_entry_key_press_shift(ui_entry_t *, kbd_event_t *); Index: uspace/lib/ui/private/filelist.h =================================================================== --- uspace/lib/ui/private/filelist.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/private/filelist.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -103,5 +103,5 @@ extern bool ui_file_list_is_active(ui_file_list_t *); -extern void ui_file_list_entry_delete(ui_file_list_entry_t *); +extern void ui_file_list_entry_destroy(ui_file_list_entry_t *); extern void ui_file_list_clear_entries(ui_file_list_t *); extern errno_t ui_file_list_sort(ui_file_list_t *); Index: uspace/lib/ui/private/list.h =================================================================== --- uspace/lib/ui/private/list.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/private/list.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -136,4 +136,5 @@ extern int ui_list_entry_ptr_cmp(const void *, const void *); extern size_t ui_list_entry_get_idx(ui_list_entry_t *); +extern void ui_list_entry_destroy(ui_list_entry_t *); #endif Index: uspace/lib/ui/private/promptdialog.h =================================================================== --- uspace/lib/ui/private/promptdialog.h (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/private/promptdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -45,5 +45,5 @@ /** Dialog window */ struct ui_window *window; - /** File name entry */ + /** Text entry */ struct ui_entry *ename; /** OK button */ Index: uspace/lib/ui/private/selectdialog.h =================================================================== --- uspace/lib/ui/private/selectdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/lib/ui/private/selectdialog.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2023 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 Select dialog structure + * + */ + +#ifndef _UI_PRIVATE_SELECTDIALOG_H +#define _UI_PRIVATE_SELECTDIALOG_H + +/** Actual structure of select dialog. + * + * This is private to libui. + */ +struct ui_select_dialog { + /** Dialog window */ + struct ui_window *window; + /** List */ + struct ui_list *list; + /** OK button */ + struct ui_pbutton *bok; + /** Cancel button */ + struct ui_pbutton *bcancel; + /** Select dialog callbacks */ + struct ui_select_dialog_cb *cb; + /** Callback argument */ + void *arg; +}; + +#endif + +/** @} + */ Index: uspace/lib/ui/src/filelist.c =================================================================== --- uspace/lib/ui/src/filelist.c (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/src/filelist.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -46,4 +46,5 @@ #include #include "../private/filelist.h" +#include "../private/list.h" #include "../private/resource.h" @@ -290,7 +291,7 @@ * @param entry File list entry */ -void ui_file_list_entry_delete(ui_file_list_entry_t *entry) -{ - ui_list_entry_delete(entry->entry); +void ui_file_list_entry_destroy(ui_file_list_entry_t *entry) +{ + ui_list_entry_destroy(entry->entry); free(entry->name); free(entry); @@ -307,5 +308,5 @@ entry = ui_file_list_first(flist); while (entry != NULL) { - ui_file_list_entry_delete(entry); + ui_file_list_entry_destroy(entry); entry = ui_file_list_first(flist); } Index: uspace/lib/ui/src/list.c =================================================================== --- uspace/lib/ui/src/list.c (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/src/list.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -149,4 +149,14 @@ list->cb = cb; list->cb_arg = arg; +} + +/** Get UI list callback argument. + * + * @param list UI list + * @return Callback argument + */ +void *ui_list_get_cb_arg(ui_list_t *list) +{ + return list->cb_arg; } @@ -701,9 +711,11 @@ } -/** Delete UI list entry. +/** Destroy UI list entry. + * + * This is the quick way, but does not update cursor or page position. * * @param entry UI list entry */ -void ui_list_entry_delete(ui_list_entry_t *entry) +void ui_list_entry_destroy(ui_list_entry_t *entry) { if (entry->list->cursor == entry) @@ -718,4 +730,25 @@ } +/** Delete UI list entry. + * + * If required, update cursor and page position and repaint. + * + * @param entry UI list entry + */ +void ui_list_entry_delete(ui_list_entry_t *entry) +{ + /* Try to make sure entry does not disappear between cursor and page */ + if (entry->list->cursor == entry) + ui_list_cursor_up(entry->list); + if (entry->list->cursor == entry) + ui_list_cursor_down(entry->list); + if (entry->list->page == entry) + ui_list_scroll_up(entry->list); + if (entry->list->page == entry) + ui_list_scroll_down(entry->list); + + ui_list_entry_destroy(entry); +} + /** Get entry argument. * @@ -728,4 +761,14 @@ } +/** Get containing list. + * + * @param entry UI list entry + * @return Containing list + */ +ui_list_t *ui_list_entry_get_list(ui_list_entry_t *entry) +{ + return entry->list; +} + /** Clear UI list entry list. * @@ -738,5 +781,5 @@ entry = ui_list_first(list); while (entry != NULL) { - ui_list_entry_delete(entry); + ui_list_entry_destroy(entry); entry = ui_list_first(list); } @@ -858,4 +901,19 @@ { return list->cursor; +} + +/** Set new cursor position. + * + * O(N) in list size, use with caution. + * + * @param list UI list + * @param entry New cursor position + */ +void ui_list_set_cursor(ui_list_t *list, ui_list_entry_t *entry) +{ + size_t idx; + + idx = ui_list_entry_get_idx(entry); + ui_list_cursor_move(list, entry, idx); } @@ -912,5 +970,5 @@ /* Find first page entry (go back rows - 1) */ e = entry; - for (i = 0; i < rows - 1; i++) { + for (i = 0; i + 1 < rows; i++) { e = ui_list_prev(e); } @@ -1098,4 +1156,7 @@ ui_list_entry_t *prev; + if (list->page == NULL) + return; + prev = ui_list_prev(list->page); if (prev == NULL) @@ -1120,4 +1181,7 @@ size_t i; size_t rows; + + if (list->page == NULL) + return; next = ui_list_next(list->page); Index: uspace/lib/ui/src/promptdialog.c =================================================================== --- uspace/lib/ui/src/promptdialog.c (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/src/promptdialog.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -327,5 +327,5 @@ { ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg; - const char *fname; + const char *text; if (event->type == KEY_PRESS && @@ -334,6 +334,6 @@ /* Confirm */ if (dialog->cb != NULL && dialog->cb->bok != NULL) { - fname = ui_entry_get_text(dialog->ename); - dialog->cb->bok(dialog, dialog->arg, fname); + text = ui_entry_get_text(dialog->ename); + dialog->cb->bok(dialog, dialog->arg, text); return; } @@ -358,9 +358,9 @@ { ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg; - const char *fname; + const char *text; if (dialog->cb != NULL && dialog->cb->bok != NULL) { - fname = ui_entry_get_text(dialog->ename); - dialog->cb->bok(dialog, dialog->arg, fname); + text = ui_entry_get_text(dialog->ename); + dialog->cb->bok(dialog, dialog->arg, text); } } Index: uspace/lib/ui/src/selectdialog.c =================================================================== --- uspace/lib/ui/src/selectdialog.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/lib/ui/src/selectdialog.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,432 @@ +/* + * Copyright (c) 2023 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 Select dialog + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../private/selectdialog.h" + +static void ui_select_dialog_wnd_close(ui_window_t *, void *); +static void ui_select_dialog_wnd_kbd(ui_window_t *, void *, kbd_event_t *); + +ui_window_cb_t ui_select_dialog_wnd_cb = { + .close = ui_select_dialog_wnd_close, + .kbd = ui_select_dialog_wnd_kbd +}; + +static void ui_select_dialog_bok_clicked(ui_pbutton_t *, void *); +static void ui_select_dialog_bcancel_clicked(ui_pbutton_t *, void *); + +ui_pbutton_cb_t ui_select_dialog_bok_cb = { + .clicked = ui_select_dialog_bok_clicked +}; + +ui_pbutton_cb_t ui_select_dialog_bcancel_cb = { + .clicked = ui_select_dialog_bcancel_clicked +}; + +static void ui_select_dialog_list_selected(ui_list_entry_t *, void *); + +ui_list_cb_t ui_select_dialog_list_cb = { + .selected = ui_select_dialog_list_selected +}; + +/** Initialize select dialog parameters structure. + * + * Select dialog parameters structure must always be initialized using + * this function first. + * + * @param params Select dialog parameters structure + */ +void ui_select_dialog_params_init(ui_select_dialog_params_t *params) +{ + memset(params, 0, sizeof(ui_select_dialog_params_t)); +} + +/** Create new select dialog. + * + * @param ui User interface + * @param params Select dialog parameters + * @param rdialog Place to store pointer to new dialog + * @return EOK on success or an error code + */ +errno_t ui_select_dialog_create(ui_t *ui, ui_select_dialog_params_t *params, + ui_select_dialog_t **rdialog) +{ + errno_t rc; + ui_select_dialog_t *dialog; + ui_window_t *window = NULL; + ui_wnd_params_t wparams; + ui_fixed_t *fixed = NULL; + ui_label_t *label = NULL; + ui_list_t *list = NULL; + ui_pbutton_t *bok = NULL; + ui_pbutton_t *bcancel = NULL; + gfx_rect_t rect; + ui_resource_t *ui_res; + + dialog = calloc(1, sizeof(ui_select_dialog_t)); + if (dialog == NULL) { + rc = ENOMEM; + goto error; + } + + ui_wnd_params_init(&wparams); + wparams.caption = params->caption; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + wparams.rect.p0.x = 0; + wparams.rect.p0.y = 0; + wparams.rect.p1.x = 40; + wparams.rect.p1.y = 19; + } else { + wparams.rect.p0.x = 0; + wparams.rect.p0.y = 0; + wparams.rect.p1.x = 300; + wparams.rect.p1.y = 235; + } + + rc = ui_window_create(ui, &wparams, &window); + if (rc != EOK) + goto error; + + ui_window_set_cb(window, &ui_select_dialog_wnd_cb, dialog); + + ui_res = ui_window_get_res(window); + + rc = ui_fixed_create(&fixed); + if (rc != EOK) + goto error; + + rc = ui_label_create(ui_res, params->prompt, &label); + if (rc != EOK) + goto error; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 3; + rect.p0.y = 2; + rect.p1.x = 17; + rect.p1.y = 3; + } else { + rect.p0.x = 10; + rect.p0.y = 35; + rect.p1.x = 190; + rect.p1.y = 50; + } + + ui_label_set_rect(label, &rect); + + rc = ui_fixed_add(fixed, ui_label_ctl(label)); + if (rc != EOK) + goto error; + + label = NULL; + + rc = ui_list_create(window, true, &list); + if (rc != EOK) + goto error; + + ui_list_set_cb(list, &ui_select_dialog_list_cb, dialog); + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 3; + rect.p0.y = 4; + rect.p1.x = 37; + rect.p1.y = 15; + } else { + rect.p0.x = 10; + rect.p0.y = 55; + rect.p1.x = 290; + rect.p1.y = 180; + } + + ui_list_set_rect(list, &rect); + + rc = ui_fixed_add(fixed, ui_list_ctl(list)); + if (rc != EOK) + goto error; + + dialog->list = list; + list = NULL; + + rc = ui_pbutton_create(ui_res, "OK", &bok); + if (rc != EOK) + goto error; + + ui_pbutton_set_cb(bok, &ui_select_dialog_bok_cb, dialog); + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 10; + rect.p0.y = 16; + rect.p1.x = 20; + rect.p1.y = 17; + } else { + rect.p0.x = 55; + rect.p0.y = 190; + rect.p1.x = 145; + rect.p1.y = 218; + } + + ui_pbutton_set_rect(bok, &rect); + + ui_pbutton_set_default(bok, true); + + rc = ui_fixed_add(fixed, ui_pbutton_ctl(bok)); + if (rc != EOK) + goto error; + + dialog->bok = bok; + bok = NULL; + + rc = ui_pbutton_create(ui_res, "Cancel", &bcancel); + if (rc != EOK) + goto error; + + ui_pbutton_set_cb(bcancel, &ui_select_dialog_bcancel_cb, dialog); + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + rect.p0.x = 22; + rect.p0.y = 16; + rect.p1.x = 32; + rect.p1.y = 17; + } else { + rect.p0.x = 155; + rect.p0.y = 190; + rect.p1.x = 245; + rect.p1.y = 218; + } + + ui_pbutton_set_rect(bcancel, &rect); + + rc = ui_fixed_add(fixed, ui_pbutton_ctl(bcancel)); + if (rc != EOK) + goto error; + + dialog->bcancel = bcancel; + bcancel = NULL; + + ui_window_add(window, ui_fixed_ctl(fixed)); + fixed = NULL; + + rc = ui_window_paint(window); + if (rc != EOK) + goto error; + + dialog->window = window; + *rdialog = dialog; + return EOK; +error: + if (list != NULL) + ui_list_destroy(list); + if (bok != NULL) + ui_pbutton_destroy(bok); + if (bcancel != NULL) + ui_pbutton_destroy(bcancel); + if (label != NULL) + ui_label_destroy(label); + if (fixed != NULL) + ui_fixed_destroy(fixed); + if (window != NULL) + ui_window_destroy(window); + if (dialog != NULL) + free(dialog); + return rc; +} + +/** Destroy select dialog. + * + * @param dialog Select dialog or @c NULL + */ +void ui_select_dialog_destroy(ui_select_dialog_t *dialog) +{ + if (dialog == NULL) + return; + + ui_window_destroy(dialog->window); + free(dialog); +} + +/** Set mesage dialog callback. + * + * @param dialog Select dialog + * @param cb Select dialog callbacks + * @param arg Callback argument + */ +void ui_select_dialog_set_cb(ui_select_dialog_t *dialog, ui_select_dialog_cb_t *cb, + void *arg) +{ + dialog->cb = cb; + dialog->arg = arg; +} + +/** Append new entry to select dialog. + * + * @param dialog Select dialog + * @param attr List entry attributes + * @return EOK on success or an error code + */ +errno_t ui_select_dialog_append(ui_select_dialog_t *dialog, + ui_list_entry_attr_t *attr) +{ + return ui_list_entry_append(dialog->list, attr, NULL); +} + +/** Paint select dialog. + * + * This needs to be called after appending entries. + * + * @param dialog Select dialog + * @return EOK on success or an error code + */ +errno_t ui_select_dialog_paint(ui_select_dialog_t *dialog) +{ + return ui_window_paint(dialog->window); +} + +/** Select dialog window close handler. + * + * @param window Window + * @param arg Argument (ui_select_dialog_t *) + */ +static void ui_select_dialog_wnd_close(ui_window_t *window, void *arg) +{ + ui_select_dialog_t *dialog = (ui_select_dialog_t *) arg; + + if (dialog->cb != NULL && dialog->cb->close != NULL) + dialog->cb->close(dialog, dialog->arg); +} + +/** Select dialog window keyboard event handler. + * + * @param window Window + * @param arg Argument (ui_select_dialog_t *) + * @param event Keyboard event + */ +static void ui_select_dialog_wnd_kbd(ui_window_t *window, void *arg, + kbd_event_t *event) +{ + ui_select_dialog_t *dialog = (ui_select_dialog_t *) arg; + ui_list_entry_t *entry; + void *earg; + + if (event->type == KEY_PRESS && + (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) { + if (event->key == KC_ENTER) { + /* Confirm */ + if (dialog->cb != NULL && dialog->cb->bok != NULL) { + entry = ui_list_get_cursor(dialog->list); + earg = ui_list_entry_get_arg(entry); + dialog->cb->bok(dialog, dialog->arg, earg); + return; + } + } else if (event->key == KC_ESCAPE) { + /* Cancel */ + if (dialog->cb != NULL && dialog->cb->bcancel != NULL) { + dialog->cb->bcancel(dialog, dialog->arg); + return; + } + } + } + + ui_window_def_kbd(window, event); +} + +/** Select dialog OK button click handler. + * + * @param pbutton Push button + * @param arg Argument (ui_select_dialog_t *) + */ +static void ui_select_dialog_bok_clicked(ui_pbutton_t *pbutton, void *arg) +{ + ui_select_dialog_t *dialog = (ui_select_dialog_t *) arg; + ui_list_entry_t *entry; + void *earg; + + if (dialog->cb != NULL && dialog->cb->bok != NULL) { + entry = ui_list_get_cursor(dialog->list); + if (entry != NULL) + earg = ui_list_entry_get_arg(entry); + else + earg = NULL; + + dialog->cb->bok(dialog, dialog->arg, earg); + } +} + +/** Select dialog cancel button click handler. + * + * @param pbutton Push button + * @param arg Argument (ui_select_dialog_t *) + */ +static void ui_select_dialog_bcancel_clicked(ui_pbutton_t *pbutton, void *arg) +{ + ui_select_dialog_t *dialog = (ui_select_dialog_t *) arg; + + if (dialog->cb != NULL && dialog->cb->bcancel != NULL) + dialog->cb->bcancel(dialog, dialog->arg); +} + +/** Select dialog list entry selection handler. + * + * @param entry UI list entry + * @param arg Entry argument + */ +static void ui_select_dialog_list_selected(ui_list_entry_t *entry, void *arg) +{ + ui_list_t *list; + ui_select_dialog_t *dialog; + + list = ui_list_entry_get_list(entry); + dialog = (ui_select_dialog_t *)ui_list_get_cb_arg(list); + + if (dialog->cb != NULL && dialog->cb->bok != NULL) + dialog->cb->bok(dialog, dialog->arg, arg); +} + +/** @} + */ Index: uspace/lib/ui/test/filelist.c =================================================================== --- uspace/lib/ui/test/filelist.c (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/test/filelist.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -350,6 +350,6 @@ } -/** ui_file_list_entry_delete() deletes entry */ -PCUT_TEST(entry_delete) +/** ui_file_list_entry_destroy() destroys entry */ +PCUT_TEST(entry_destroy) { ui_t *ui; @@ -386,10 +386,10 @@ entry = ui_file_list_first(flist); - ui_file_list_entry_delete(entry); + ui_file_list_entry_destroy(entry); PCUT_ASSERT_INT_EQUALS(1, ui_list_entries_cnt(flist->list)); entry = ui_file_list_first(flist); - ui_file_list_entry_delete(entry); + ui_file_list_entry_destroy(entry); PCUT_ASSERT_INT_EQUALS(0, ui_list_entries_cnt(flist->list)); Index: uspace/lib/ui/test/list.c =================================================================== --- uspace/lib/ui/test/list.c (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/test/list.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -119,4 +119,9 @@ } +//XXX +PCUT_TEST(get_cb_arg) +{ +} + /** ui_list_entry_height() gives the correct height */ PCUT_TEST(entry_height) @@ -751,4 +756,9 @@ } +//XXX TODO +PCUT_TEST(set_cursor) +{ +} + /** ui_list_entry_attr_init() initializes entry attribute structure */ PCUT_TEST(entry_attr_init) @@ -902,4 +912,9 @@ ui_window_destroy(window); ui_destroy(ui); +} + +//XXX +PCUT_TEST(entry_get_list) +{ } Index: uspace/lib/ui/test/main.c =================================================================== --- uspace/lib/ui/test/main.c (revision 7cf5ddbad0929896f7de7dcfdf23d42fe47929b3) +++ uspace/lib/ui/test/main.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -52,4 +52,5 @@ PCUT_IMPORT(resource); PCUT_IMPORT(scrollbar); +PCUT_IMPORT(select_dialog); PCUT_IMPORT(slider); PCUT_IMPORT(tab); @@ -59,3 +60,4 @@ PCUT_IMPORT(wdecor); PCUT_IMPORT(window); + PCUT_MAIN(); Index: uspace/lib/ui/test/selectdialog.c =================================================================== --- uspace/lib/ui/test/selectdialog.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/lib/ui/test/selectdialog.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,334 @@ +/* + * Copyright (c) 2023 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 "../private/list.h" +#include "../private/selectdialog.h" +#include "../private/window.h" + +PCUT_INIT; + +PCUT_TEST_SUITE(select_dialog); + +static void test_dialog_bok(ui_select_dialog_t *, void *, void *); +static void test_dialog_bcancel(ui_select_dialog_t *, void *); +static void test_dialog_close(ui_select_dialog_t *, void *); + +static ui_select_dialog_cb_t test_select_dialog_cb = { + .bok = test_dialog_bok, + .bcancel = test_dialog_bcancel, + .close = test_dialog_close +}; + +static ui_select_dialog_cb_t dummy_select_dialog_cb = { +}; + +typedef struct { + bool bok; + const char *fname; + bool bcancel; + bool close; +} test_cb_resp_t; + +/** Create and destroy select dialog */ +PCUT_TEST(create_destroy) +{ + errno_t rc; + ui_t *ui = NULL; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +/** ui_select_dialog_destroy() can take NULL argument (no-op) */ +PCUT_TEST(destroy_null) +{ + ui_select_dialog_destroy(NULL); +} + +/** Clicking OK invokes callback set via ui_select_dialog_set_cb() */ +PCUT_TEST(bok_cb) +{ + errno_t rc; + ui_t *ui = NULL; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + test_cb_resp_t resp; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + /* OK button callback with no callbacks set */ + ui_pbutton_clicked(dialog->bok); + + /* OK button callback with callback not implemented */ + ui_select_dialog_set_cb(dialog, &dummy_select_dialog_cb, NULL); + ui_pbutton_clicked(dialog->bok); + + /* OK button callback with real callback set */ + resp.bok = false; + ui_select_dialog_set_cb(dialog, &test_select_dialog_cb, &resp); + ui_pbutton_clicked(dialog->bok); + PCUT_ASSERT_TRUE(resp.bok); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +/** Clicking Cancel invokes callback set via ui_select_dialog_set_cb() */ +PCUT_TEST(bcancel_cb) +{ + errno_t rc; + ui_t *ui = NULL; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + test_cb_resp_t resp; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + /* Cancel button callback with no callbacks set */ + ui_pbutton_clicked(dialog->bcancel); + + /* Cancel button callback with callback not implemented */ + ui_select_dialog_set_cb(dialog, &dummy_select_dialog_cb, NULL); + ui_pbutton_clicked(dialog->bcancel); + + /* OK button callback with real callback set */ + resp.bcancel = false; + ui_select_dialog_set_cb(dialog, &test_select_dialog_cb, &resp); + ui_pbutton_clicked(dialog->bcancel); + PCUT_ASSERT_TRUE(resp.bcancel); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +/** Selecting a list entry invokes bok callback set via ui_select_dialog_set_cb() */ +PCUT_TEST(lselect_cb) +{ + errno_t rc; + ui_t *ui = NULL; + ui_list_entry_t *entry; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + ui_list_entry_attr_t attr; + test_cb_resp_t resp; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + /* Need an entry to select */ + ui_list_entry_attr_init(&attr); + attr.caption = "Entry"; + rc = ui_select_dialog_append(dialog, &attr); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + entry = ui_list_first(dialog->list); + + /* Select entry with no callbacks set */ + ui_list_selected(entry); + + /* Select entry with callback not implemented */ + ui_select_dialog_set_cb(dialog, &dummy_select_dialog_cb, NULL); + ui_list_selected(entry); + + /* Select entry with real callback set */ + resp.bok = false; + ui_select_dialog_set_cb(dialog, &test_select_dialog_cb, &resp); + ui_list_selected(entry); + PCUT_ASSERT_TRUE(resp.bok); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +/** Sending window close request invokes callback set via + * ui_select_dialog_set_cb() + */ +PCUT_TEST(close_cb) +{ + errno_t rc; + ui_t *ui = NULL; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + test_cb_resp_t resp; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + /* Button callback with no callbacks set */ + ui_window_send_close(dialog->window); + + /* Button callback with unfocus callback not implemented */ + ui_select_dialog_set_cb(dialog, &dummy_select_dialog_cb, NULL); + ui_window_send_close(dialog->window); + + /* Button callback with real callback set */ + resp.close = false; + ui_select_dialog_set_cb(dialog, &test_select_dialog_cb, &resp); + ui_window_send_close(dialog->window); + PCUT_ASSERT_TRUE(resp.close); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +/** ui_select_dialog_append() appends entries TBD */ +PCUT_TEST(append) +{ + errno_t rc; + ui_t *ui = NULL; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + ui_list_entry_attr_t attr; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + PCUT_ASSERT_INT_EQUALS(0, dialog->list->entries_cnt); + + /* Add one entry */ + ui_list_entry_attr_init(&attr); + attr.caption = "Entry"; + rc = ui_select_dialog_append(dialog, &attr); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + PCUT_ASSERT_INT_EQUALS(1, dialog->list->entries_cnt); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +/** ui_select_dialog_paint() succeeds */ +PCUT_TEST(paint) +{ + errno_t rc; + ui_t *ui = NULL; + ui_select_dialog_params_t params; + ui_select_dialog_t *dialog = NULL; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_params_init(¶ms); + params.caption = "Select one"; + params.prompt = "Please select"; + + rc = ui_select_dialog_create(ui, ¶ms, &dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dialog); + + rc = ui_select_dialog_paint(dialog); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_select_dialog_destroy(dialog); + ui_destroy(ui); +} + +static void test_dialog_bok(ui_select_dialog_t *dialog, void *arg, + void *earg) +{ + test_cb_resp_t *resp = (test_cb_resp_t *) arg; + + resp->bok = true; +} + +static void test_dialog_bcancel(ui_select_dialog_t *dialog, void *arg) +{ + test_cb_resp_t *resp = (test_cb_resp_t *) arg; + + resp->bcancel = true; +} + +static void test_dialog_close(ui_select_dialog_t *dialog, void *arg) +{ + test_cb_resp_t *resp = (test_cb_resp_t *) arg; + + resp->close = true; +} + +PCUT_EXPORT(select_dialog);