Index: uspace/app/disp/disp.c =================================================================== --- uspace/app/disp/disp.c (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/app/disp/disp.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -56,4 +56,5 @@ printf(" %s assign-dev \n", NAME); printf(" %s unassign-dev \n", NAME); + printf(" %s list-dev \n", NAME); } @@ -393,4 +394,95 @@ } +/** List dev subcommand. + * + * @param dcfg_svc Display configuration service name + * @param argc Number of arguments + * @param argv Arguments + * @return EOK on success or an erro code + */ +static errno_t list_dev(const char *dcfg_svc, int argc, char *argv[]) +{ + dispcfg_t *dispcfg; + char *seat_name; + sysarg_t seat_id; + dispcfg_dev_list_t *dev_list; + size_t i; + char *svc_name; + table_t *table = NULL; + errno_t rc; + + if (argc < 1) { + printf(NAME ": Missing arguments.\n"); + print_syntax(); + return EINVAL; + } + + if (argc > 1) { + printf(NAME ": Too many arguments.\n"); + print_syntax(); + return EINVAL; + } + + seat_name = argv[0]; + + rc = dispcfg_open(dcfg_svc, NULL, NULL, &dispcfg); + if (rc != EOK) { + printf(NAME ": Failed connecting to display configuration " + "service: %s.\n", str_error(rc)); + return rc; + } + + rc = seat_find_by_name(dispcfg, seat_name, &seat_id); + if (rc != EOK) { + printf(NAME ": Seat '%s' not found.\n", seat_name); + dispcfg_close(dispcfg); + return ENOENT; + } + + rc = dispcfg_get_asgn_dev_list(dispcfg, seat_id, &dev_list); + if (rc != EOK) { + printf(NAME ": Failed getting seat list.\n"); + dispcfg_close(dispcfg); + return rc; + } + + rc = table_create(&table); + if (rc != EOK) { + printf("Memory allocation failed.\n"); + dispcfg_free_dev_list(dev_list); + dispcfg_close(dispcfg); + return rc; + } + + table_header_row(table); + table_printf(table, "Device Name\n"); + + for (i = 0; i < dev_list->ndevs; i++) { + rc = loc_service_get_name(dev_list->devs[i], &svc_name); + if (rc != EOK) { + printf("Failed getting name of service %zu\n", + (size_t)dev_list->devs[i]); + continue; + } + + table_printf(table, "%s\n", svc_name); + free(svc_name); + } + + if (dev_list->ndevs != 0) { + rc = table_print_out(table, stdout); + if (rc != EOK) { + printf("Error printing table.\n"); + table_destroy(table); + dispcfg_free_dev_list(dev_list); + dispcfg_close(dispcfg); + return rc; + } + } + + dispcfg_close(dispcfg); + return EOK; +} + int main(int argc, char *argv[]) { @@ -423,4 +515,8 @@ if (rc != EOK) return 1; + } else if (str_cmp(argv[1], "list-dev") == 0) { + rc = list_dev(dispcfg_svc, argc - 2, argv + 2); + if (rc != EOK) + return 1; } else { printf(NAME ": Unknown command '%s'.\n", argv[1]); Index: uspace/app/display-cfg/display-cfg.c =================================================================== --- uspace/app/display-cfg/display-cfg.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/display-cfg.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,233 @@ +/* + * 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 display-cfg + * @{ + */ +/** @file Display configuration utility (UI) + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "display-cfg.h" +#include "seats.h" + +static void wnd_close(ui_window_t *, void *); + +static ui_window_cb_t window_cb = { + .close = wnd_close +}; + +/** Window close button was clicked. + * + * @param window Window + * @param arg Argument (dcfg) + */ +static void wnd_close(ui_window_t *window, void *arg) +{ + display_cfg_t *dcfg = (display_cfg_t *) arg; + + ui_quit(dcfg->ui); +} + +/** Create display configuration dialog. + * + * @param display_spec Display specification + * @param rdcfg Place to store pointer to new display configuration + * @return EOK on success or an error code + */ +static errno_t display_cfg_create(const char *display_spec, + display_cfg_t **rdcfg) +{ + ui_t *ui = NULL; + ui_wnd_params_t params; + ui_window_t *window = NULL; + display_cfg_t *dcfg = NULL; + gfx_rect_t rect; + ui_resource_t *ui_res; + errno_t rc; + + dcfg = calloc(1, sizeof(display_cfg_t)); + if (dcfg == NULL) { + printf("Out of memory.\n"); + return ENOMEM; + } + + rc = dispcfg_open(DISPCFG_DEFAULT, NULL, NULL, &dcfg->dispcfg); + if (rc != EOK) { + printf("Error opening display configuration service.\n"); + goto error; + } + + rc = ui_create(display_spec, &ui); + if (rc != EOK) { + printf("Error creating UI on display %s.\n", display_spec); + goto error; + } + + ui_wnd_params_init(¶ms); + params.caption = "Display Configuration"; + if (ui_is_textmode(ui)) { + params.rect.p0.x = 0; + params.rect.p0.y = 0; + params.rect.p1.x = 70; + params.rect.p1.y = 23; + } else { + params.rect.p0.x = 0; + params.rect.p0.y = 0; + params.rect.p1.x = 470; + params.rect.p1.y = 350; + } + + dcfg->ui = ui; + + rc = ui_window_create(ui, ¶ms, &window); + if (rc != EOK) { + printf("Error creating window.\n"); + goto error; + } + + ui_window_set_cb(window, &window_cb, (void *)dcfg); + dcfg->window = window; + + ui_res = ui_window_get_res(window); + + rc = ui_fixed_create(&dcfg->fixed); + if (rc != EOK) { + printf("Error creating fixed layout.\n"); + return rc; + } + + rc = ui_tab_set_create(ui_res, &dcfg->tabset); + if (rc != EOK) { + printf("Error creating tab set.\n"); + return rc; + } + + ui_window_get_app_rect(window, &rect); + ui_tab_set_set_rect(dcfg->tabset, &rect); + + rc = ui_fixed_add(dcfg->fixed, ui_tab_set_ctl(dcfg->tabset)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + return rc; + } + + rc = dcfg_seats_create(dcfg, &dcfg->seats); + if (rc != EOK) + goto error; + + ui_window_add(window, ui_fixed_ctl(dcfg->fixed)); + + rc = ui_window_paint(window); + if (rc != EOK) { + printf("Error painting window.\n"); + return rc; + } + + *rdcfg = dcfg; + return EOK; +error: + if (dcfg->seats != NULL) + dcfg_seats_destroy(dcfg->seats); + if (dcfg->tabset != NULL) + ui_tab_set_destroy(dcfg->tabset); + if (dcfg->fixed != NULL) + ui_fixed_destroy(dcfg->fixed); + if (dcfg->ui != NULL) + ui_destroy(ui); + if (dcfg->dispcfg != NULL) + dispcfg_close(dcfg->dispcfg); + free(dcfg); + return rc; +} + +/** Destroy display configuration dialog. + * + * @param dcfg Display configuration dialog + */ +static void display_cfg_destroy(display_cfg_t *dcfg) +{ + ui_window_destroy(dcfg->window); + ui_destroy(dcfg->ui); +} + +static void print_syntax(void) +{ + printf("Syntax: display-cfg [-d ]\n"); +} + +int main(int argc, char *argv[]) +{ + const char *display_spec = UI_ANY_DEFAULT; + display_cfg_t *dcfg; + errno_t rc; + int i; + + i = 1; + while (i < argc && argv[i][0] == '-') { + if (str_cmp(argv[i], "-d") == 0) { + ++i; + if (i >= argc) { + printf("Argument missing.\n"); + print_syntax(); + return 1; + } + + display_spec = argv[i++]; + } else { + printf("Invalid option '%s'.\n", argv[i]); + print_syntax(); + return 1; + } + } + + if (i < argc) { + print_syntax(); + return 1; + } + + rc = display_cfg_create(display_spec, &dcfg); + if (rc != EOK) + return 1; + + ui_run(dcfg->ui); + display_cfg_destroy(dcfg); + + return 0; +} + +/** @} + */ Index: uspace/app/display-cfg/display-cfg.h =================================================================== --- uspace/app/display-cfg/display-cfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/display-cfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,44 @@ +/* + * 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 display-cfg + * @{ + */ +/** + * @file Display configuration utility (in UI) + */ + +#ifndef DISPLAY_CFG_H +#define DISPLAY_CFG_H + +#include "types/display-cfg.h" + +#endif + +/** @} + */ Index: uspace/app/display-cfg/doc/doxygroups.h =================================================================== --- uspace/app/display-cfg/doc/doxygroups.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/doc/doxygroups.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,4 @@ +/** @addtogroup display-cfg display-cfg + * @brief Display configuration utility (UI) + * @ingroup apps + */ Index: uspace/app/display-cfg/meson.build =================================================================== --- uspace/app/display-cfg/meson.build (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/meson.build (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,39 @@ +# +# 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. +# + +deps = [ 'dispcfg', 'ui' ] +src = files( + 'display-cfg.c', + 'seats.c' +) + +test_src = files( + 'test/display-cfg.c', + 'test/main.c', + 'test/seats.c' +) Index: uspace/app/display-cfg/seats.c =================================================================== --- uspace/app/display-cfg/seats.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/seats.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,1128 @@ +/* + * 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 display-cfg + * @{ + */ +/** @file Seat configuration tab + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "display-cfg.h" +#include "seats.h" + +static errno_t dcfg_seats_list_populate(dcfg_seats_t *); +static errno_t dcfg_seats_asgn_dev_list_populate(dcfg_seats_t *); +static errno_t dcfg_seats_avail_dev_list_populate(dcfg_seats_t *, + ui_select_dialog_t *); +static dcfg_seats_entry_t *dcfg_seats_get_selected(dcfg_seats_t *); +static void dcfg_seats_list_selected(ui_list_entry_t *, void *); +static void dcfg_add_seat_clicked(ui_pbutton_t *, void *); +static void dcfg_remove_seat_clicked(ui_pbutton_t *, void *); +static void dcfg_add_device_clicked(ui_pbutton_t *, void *); +static void dcfg_remove_device_clicked(ui_pbutton_t *, void *); + +/** Seat list callbacks */ +ui_list_cb_t dcfg_seats_list_cb = { + .selected = dcfg_seats_list_selected +}; + +/** Add seat button callbacks */ +ui_pbutton_cb_t dcfg_add_seat_button_cb = { + .clicked = dcfg_add_seat_clicked +}; + +/** Remove seat button callbacks */ +ui_pbutton_cb_t dcfg_remove_seat_button_cb = { + .clicked = dcfg_remove_seat_clicked +}; + +/** Add device button callbacks */ +ui_pbutton_cb_t dcfg_add_device_button_cb = { + .clicked = dcfg_add_device_clicked +}; + +/** Remove device button callbacks */ +ui_pbutton_cb_t dcfg_remove_device_button_cb = { + .clicked = dcfg_remove_device_clicked +}; + +static void add_seat_dialog_bok(ui_prompt_dialog_t *, void *, const char *); +static void add_seat_dialog_bcancel(ui_prompt_dialog_t *, void *); +static void add_seat_dialog_close(ui_prompt_dialog_t *, void *); + +/** Add seat dialog callbacks */ +ui_prompt_dialog_cb_t add_seat_dialog_cb = { + .bok = add_seat_dialog_bok, + .bcancel = add_seat_dialog_bcancel, + .close = add_seat_dialog_close +}; + +static void add_device_dialog_bok(ui_select_dialog_t *, void *, void *); +static void add_device_dialog_bcancel(ui_select_dialog_t *, void *); +static void add_device_dialog_close(ui_select_dialog_t *, void *); + +/** Add device dialog callbacks */ +ui_select_dialog_cb_t add_device_dialog_cb = { + .bok = add_device_dialog_bok, + .bcancel = add_device_dialog_bcancel, + .close = add_device_dialog_close +}; + +/** Create seat configuration tab + * + * @param dcfg Display configuration dialog + * @param rseats Place to store pointer to new seat configuration tab + * @return EOK on success or an error code + */ +errno_t dcfg_seats_create(display_cfg_t *dcfg, dcfg_seats_t **rseats) +{ + ui_resource_t *ui_res; + dcfg_seats_t *seats; + dcfg_seats_entry_t *entry; + gfx_rect_t rect; + char *caption = NULL; + errno_t rc; + int rv; + + ui_res = ui_window_get_res(dcfg->window); + + seats = calloc(1, sizeof(dcfg_seats_t)); + if (dcfg == NULL) { + printf("Out of memory.\n"); + return ENOMEM; + } + + seats->dcfg = dcfg; + + /* 'Seats' tab */ + + rc = ui_tab_create(dcfg->tabset, "Seats", &seats->tab); + if (rc != EOK) + goto error; + + rc = ui_fixed_create(&seats->fixed); + if (rc != EOK) { + printf("Error creating fixed layout.\n"); + goto error; + } + + /* 'Configured seats:' label */ + + rc = ui_label_create(ui_res, "Configured seats:", &seats->seats_label); + if (rc != EOK) { + printf("Error creating label.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 4; + rect.p0.y = 4; + rect.p1.x = 36; + rect.p1.y = 5; + } else { + rect.p0.x = 20; + rect.p0.y = 60; + rect.p1.x = 360; + rect.p1.y = 80; + } + + ui_label_set_rect(seats->seats_label, &rect); + + rc = ui_fixed_add(seats->fixed, ui_label_ctl(seats->seats_label)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + /* List of seats */ + + rc = ui_list_create(dcfg->window, false, &seats->seat_list); + if (rc != EOK) { + printf("Error creating list.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 4; + rect.p0.y = 5; + rect.p1.x = 56; + rect.p1.y = 10; + } else { + rect.p0.x = 20; + rect.p0.y = 80; + rect.p1.x = 360; + rect.p1.y = 180; + } + + ui_list_set_rect(seats->seat_list, &rect); + + rc = ui_fixed_add(seats->fixed, ui_list_ctl(seats->seat_list)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + ui_list_set_cb(seats->seat_list, &dcfg_seats_list_cb, (void *)seats); + + rc = dcfg_seats_list_populate(seats); + if (rc != EOK) + goto error; + + /* 'Add...' seat button */ + + rc = ui_pbutton_create(ui_res, "Add...", &seats->add_seat); + if (rc != EOK) { + printf("Error creating button.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 58; + rect.p0.y = 5; + rect.p1.x = 68; + rect.p1.y = 6; + } else { + rect.p0.x = 370; + rect.p0.y = 80; + rect.p1.x = 450; + rect.p1.y = 105; + } + + ui_pbutton_set_rect(seats->add_seat, &rect); + + rc = ui_fixed_add(seats->fixed, ui_pbutton_ctl(seats->add_seat)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + ui_pbutton_set_cb(seats->add_seat, &dcfg_add_seat_button_cb, + (void *)seats); + + /* 'Remove' seat button */ + + rc = ui_pbutton_create(ui_res, "Remove", &seats->remove_seat); + if (rc != EOK) { + printf("Error creating button.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 58; + rect.p0.y = 7; + rect.p1.x = 68; + rect.p1.y = 8; + } else { + rect.p0.x = 370; + rect.p0.y = 110; + rect.p1.x = 450; + rect.p1.y = 135; + } + + ui_pbutton_set_rect(seats->remove_seat, &rect); + + rc = ui_fixed_add(seats->fixed, ui_pbutton_ctl(seats->remove_seat)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + ui_pbutton_set_cb(seats->remove_seat, &dcfg_remove_seat_button_cb, + (void *)seats); + + /* 'Devices assigned to seat 'xxx':' label */ + + entry = dcfg_seats_get_selected(seats); + rv = asprintf(&caption, "Devices assigned to seat '%s':", entry->name); + if (rv < 0) { + rc = ENOMEM; + goto error; + } + + rc = ui_label_create(ui_res, caption, &seats->devices_label); + if (rc != EOK) { + printf("Error creating label.\n"); + goto error; + } + + free(caption); + caption = NULL; + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 4; + rect.p0.y = 11; + rect.p1.x = 36; + rect.p1.y = 12; + } else { + rect.p0.x = 20; + rect.p0.y = 200; + rect.p1.x = 360; + rect.p1.y = 220; + } + + ui_label_set_rect(seats->devices_label, &rect); + + rc = ui_fixed_add(seats->fixed, ui_label_ctl(seats->devices_label)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + /* List of devices */ + + rc = ui_list_create(dcfg->window, false, &seats->device_list); + if (rc != EOK) { + printf("Error creating list.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 4; + rect.p0.y = 12; + rect.p1.x = 56; + rect.p1.y = 17; + } else { + rect.p0.x = 20; + rect.p0.y = 220; + rect.p1.x = 360; + rect.p1.y = 320; + } + + ui_list_set_rect(seats->device_list, &rect); + + rc = ui_fixed_add(seats->fixed, ui_list_ctl(seats->device_list)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + /* 'Add...' device button */ + + rc = ui_pbutton_create(ui_res, "Add...", &seats->add_device); + if (rc != EOK) { + printf("Error creating button.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 58; + rect.p0.y = 12; + rect.p1.x = 68; + rect.p1.y = 13; + } else { + rect.p0.x = 370; + rect.p0.y = 220; + rect.p1.x = 450; + rect.p1.y = 245; + } + + ui_pbutton_set_rect(seats->add_device, &rect); + + rc = ui_fixed_add(seats->fixed, ui_pbutton_ctl(seats->add_device)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + ui_pbutton_set_cb(seats->add_device, &dcfg_add_device_button_cb, + (void *)seats); + + /* 'Remove' device button */ + + rc = ui_pbutton_create(ui_res, "Remove", &seats->remove_device); + if (rc != EOK) { + printf("Error creating button.\n"); + goto error; + } + + if (ui_resource_is_textmode(ui_res)) { + rect.p0.x = 58; + rect.p0.y = 14; + rect.p1.x = 68; + rect.p1.y = 15; + } else { + rect.p0.x = 370; + rect.p0.y = 250; + rect.p1.x = 450; + rect.p1.y = 275; + } + + ui_pbutton_set_rect(seats->remove_device, &rect); + + rc = ui_fixed_add(seats->fixed, ui_pbutton_ctl(seats->remove_device)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + goto error; + } + + ui_pbutton_set_cb(seats->remove_device, &dcfg_remove_device_button_cb, + (void *)seats); + + ui_tab_add(seats->tab, ui_fixed_ctl(seats->fixed)); + + rc = dcfg_seats_asgn_dev_list_populate(seats); + if (rc != EOK) + goto error; + + *rseats = seats; + return EOK; +error: + if (seats->remove_device != NULL) + ui_pbutton_destroy(seats->remove_device); + if (seats->add_device != NULL) + ui_pbutton_destroy(seats->add_device); + if (caption != NULL) + free(caption); + if (seats->devices_label != NULL) + ui_label_destroy(seats->devices_label); + if (seats->device_list != NULL) + ui_list_destroy(seats->device_list); + if (seats->remove_seat != NULL) + ui_pbutton_destroy(seats->remove_seat); + if (seats->add_seat != NULL) + ui_pbutton_destroy(seats->add_seat); + if (seats->seats_label != NULL) + ui_label_destroy(seats->seats_label); + if (seats->seat_list != NULL) + ui_list_destroy(seats->seat_list); + if (seats->fixed != NULL) + ui_fixed_destroy(seats->fixed); + free(dcfg); + return rc; +} + +/** Destroy display configuration dialog. + * + * @param dcfg Display configuration dialog + */ +void dcfg_seats_destroy(dcfg_seats_t *seats) +{ + ui_list_entry_t *lentry; + dcfg_seats_entry_t *entry; + dcfg_devices_entry_t *dentry; + + ui_pbutton_destroy(seats->add_device); + ui_pbutton_destroy(seats->remove_device); + + ui_label_destroy(seats->devices_label); + + lentry = ui_list_first(seats->device_list); + while (lentry != NULL) { + dentry = (dcfg_devices_entry_t *)ui_list_entry_get_arg(lentry); + free(dentry->name); + free(dentry); + ui_list_entry_delete(lentry); + lentry = ui_list_first(seats->device_list); + } + ui_list_destroy(seats->device_list); + + ui_pbutton_destroy(seats->add_seat); + ui_pbutton_destroy(seats->remove_seat); + + lentry = ui_list_first(seats->seat_list); + while (lentry != NULL) { + entry = (dcfg_seats_entry_t *)ui_list_entry_get_arg(lentry); + free(entry->name); + free(entry); + ui_list_entry_delete(lentry); + lentry = ui_list_first(seats->seat_list); + } + + ui_label_destroy(seats->seats_label); + ui_list_destroy(seats->seat_list); + ui_fixed_destroy(seats->fixed); + free(seats); +} + +/** Insert new entry into seats list. + * + * @param seats Seat configuration tab + * @param name Seat name + * @param seat_id Seat ID + * @param rentry Place to store pointer to new entry or NULL + * @return EOK on success or an error code + */ +static errno_t dcfg_seats_insert(dcfg_seats_t *seats, const char *name, + sysarg_t seat_id, dcfg_seats_entry_t **rentry) +{ + dcfg_seats_entry_t *entry; + ui_list_entry_attr_t attr; + errno_t rc; + + entry = calloc(1, sizeof(dcfg_seats_entry_t)); + if (entry == NULL) + return ENOMEM; + + entry->seats = seats; + entry->seat_id = seat_id; + entry->name = str_dup(name); + if (entry->name == NULL) { + free(entry); + return ENOMEM; + } + + ui_list_entry_attr_init(&attr); + attr.caption = name; + attr.arg = (void *)entry; + rc = ui_list_entry_append(seats->seat_list, &attr, &entry->lentry); + if (rc != EOK) { + free(entry->name); + free(entry); + return rc; + } + + if (rentry != NULL) + *rentry = entry; + return EOK; +} + +/** Populate seat list. + * + * @param seats Seat configuration tab + * @return EOK on success or an error code + */ +static errno_t dcfg_seats_list_populate(dcfg_seats_t *seats) +{ + size_t i; + dispcfg_seat_list_t *seat_list = NULL; + dispcfg_seat_info_t *sinfo = NULL; + errno_t rc; + + rc = dispcfg_get_seat_list(seats->dcfg->dispcfg, &seat_list); + if (rc != EOK) + goto error; + + for (i = 0; i < seat_list->nseats; i++) { + rc = dispcfg_get_seat_info(seats->dcfg->dispcfg, + seat_list->seats[i], &sinfo); + if (rc != EOK) + goto error; + + rc = dcfg_seats_insert(seats, sinfo->name, seat_list->seats[i], + NULL); + if (rc != EOK) + goto error; + + dispcfg_free_seat_info(sinfo); + sinfo = NULL; + } + + dispcfg_free_seat_list(seat_list); + return EOK; +error: + if (sinfo != NULL) + dispcfg_free_seat_info(sinfo); + if (seat_list != NULL) + dispcfg_free_seat_list(seat_list); + return rc; +} + +/** Insert new entry into devices list. + * + * @param seats Seat configuration tab + * @param name Device name + * @param svc_id Service ID + * @return EOK on success or an error code + */ +static errno_t dcfg_devices_insert(dcfg_seats_t *seats, const char *name, + service_id_t svc_id) +{ + dcfg_devices_entry_t *entry; + ui_list_entry_attr_t attr; + errno_t rc; + + entry = calloc(1, sizeof(dcfg_devices_entry_t)); + if (entry == NULL) + return ENOMEM; + + entry->seats = seats; + entry->svc_id = svc_id; + entry->name = str_dup(name); + if (entry->name == NULL) { + free(entry); + return ENOMEM; + } + + ui_list_entry_attr_init(&attr); + attr.caption = name; + attr.arg = (void *)entry; + rc = ui_list_entry_append(seats->device_list, &attr, &entry->lentry); + if (rc != EOK) { + free(entry->name); + free(entry); + return rc; + } + + return EOK; +} + +/** Insert new entry into available devices list. + * + * @param seats Seat configuration tab + * @param dialog 'Add Device' dialog + * @param name Device name + * @param svc_id Service ID + * @return EOK on success or an error code + */ +static errno_t dcfg_avail_devices_insert(dcfg_seats_t *seats, + ui_select_dialog_t *dialog, const char *name, service_id_t svc_id) +{ + dcfg_devices_entry_t *entry; + ui_list_entry_attr_t attr; + errno_t rc; + + entry = calloc(1, sizeof(dcfg_devices_entry_t)); + if (entry == NULL) + return ENOMEM; + + entry->seats = seats; + entry->svc_id = svc_id; + entry->name = str_dup(name); + if (entry->name == NULL) { + free(entry); + return ENOMEM; + } + + ui_list_entry_attr_init(&attr); + attr.caption = name; + attr.arg = (void *)entry; + rc = ui_select_dialog_append(dialog, &attr); + if (rc != EOK) { + free(entry->name); + free(entry); + return rc; + } + + return EOK; +} + +/** Populate assigned device list. + * + * @param seats Seat configuration tab + * @return EOK on success or an error code + */ +static errno_t dcfg_seats_asgn_dev_list_populate(dcfg_seats_t *seats) +{ + size_t i; + dispcfg_dev_list_t *dev_list = NULL; + char *svc_name = NULL; + dcfg_seats_entry_t *seats_entry; + sysarg_t seat_id; + errno_t rc; + + /* Get active seat entry */ + seats_entry = dcfg_seats_get_selected(seats); + seat_id = seats_entry->seat_id; + + rc = dispcfg_get_asgn_dev_list(seats->dcfg->dispcfg, seat_id, &dev_list); + if (rc != EOK) + goto error; + + for (i = 0; i < dev_list->ndevs; i++) { + rc = loc_service_get_name(dev_list->devs[i], &svc_name); + if (rc != EOK) + goto error; + + rc = dcfg_devices_insert(seats, svc_name, dev_list->devs[i]); + if (rc != EOK) + goto error; + + free(svc_name); + svc_name = NULL; + } + + dispcfg_free_dev_list(dev_list); + return EOK; +error: + if (svc_name != NULL) + free(svc_name); + if (dev_list != NULL) + dispcfg_free_dev_list(dev_list); + return rc; +} + +/** Populate available device list in 'Add Device' dialog. + * + * @param seats Seat configuration tab + * @param dialog 'Add Device' dialog + * @return EOK on success or an error code + */ +static errno_t dcfg_seats_avail_dev_list_populate(dcfg_seats_t *seats, + ui_select_dialog_t *dialog) +{ + size_t i, j, k; + category_id_t cat_id; + service_id_t *kbd_svcs = NULL; + size_t nkbd_svcs; + service_id_t *mouse_svcs = NULL; + size_t nmouse_svcs; + dispcfg_seat_list_t *seat_list = NULL; + dispcfg_dev_list_t *adev_list; + char *svc_name = NULL; + errno_t rc; + + /* Get list of keyboard devices */ + + rc = loc_category_get_id("keyboard", &cat_id, 0); + if (rc != EOK) { + printf("Error getting category ID.\n"); + goto error; + } + + rc = loc_category_get_svcs(cat_id, &kbd_svcs, &nkbd_svcs); + if (rc != EOK) { + printf("Error getting service list.\n"); + goto error; + } + + /* Get list of mouse devices */ + + rc = loc_category_get_id("mouse", &cat_id, 0); + if (rc != EOK) { + printf("Error getting category ID.\n"); + goto error; + } + + rc = loc_category_get_svcs(cat_id, &mouse_svcs, &nmouse_svcs); + if (rc != EOK) { + printf("Error getting service list.\n"); + goto error; + } + + /* Filter out assigned devices */ + rc = dispcfg_get_seat_list(seats->dcfg->dispcfg, &seat_list); + if (rc != EOK) { + printf("Error getting seat list.\n"); + goto error; + } + + for (i = 0; i < seat_list->nseats; i++) { + rc = dispcfg_get_asgn_dev_list(seats->dcfg->dispcfg, + seat_list->seats[i], &adev_list); + if (rc != EOK) { + printf("Error getting device list.\n"); + goto error; + } + + for (j = 0; j < adev_list->ndevs; j++) { + /* Filter out assigned keyboard devices */ + for (k = 0; k < nkbd_svcs; k++) { + if (kbd_svcs[k] == adev_list->devs[j]) + kbd_svcs[k] = 0; + } + + /* Filter out assigned mouse devices */ + for (k = 0; k < nmouse_svcs; k++) { + if (mouse_svcs[k] == adev_list->devs[j]) + mouse_svcs[k] = 0; + } + } + + dispcfg_free_dev_list(adev_list); + } + + dispcfg_free_seat_list(seat_list); + seat_list = NULL; + + /* Add keyboard devices */ + + for (i = 0; i < nkbd_svcs; i++) { + if (kbd_svcs[i] == 0) + continue; + + rc = loc_service_get_name(kbd_svcs[i], &svc_name); + if (rc != EOK) + goto error; + + rc = dcfg_avail_devices_insert(seats, dialog, svc_name, + kbd_svcs[i]); + if (rc != EOK) + goto error; + + free(svc_name); + svc_name = NULL; + } + + /* Add mouse devices */ + + for (i = 0; i < nmouse_svcs; i++) { + if (mouse_svcs[i] == 0) + continue; + + rc = loc_service_get_name(mouse_svcs[i], &svc_name); + if (rc != EOK) + goto error; + + rc = dcfg_avail_devices_insert(seats, dialog, svc_name, + mouse_svcs[i]); + if (rc != EOK) + goto error; + + free(svc_name); + svc_name = NULL; + } + + free(kbd_svcs); + free(mouse_svcs); + return EOK; +error: + if (svc_name != NULL) + free(svc_name); + if (seat_list != NULL) + dispcfg_free_seat_list(seat_list); + if (kbd_svcs != NULL) + free(kbd_svcs); + if (mouse_svcs != NULL) + free(mouse_svcs); + return rc; +} + +/** Get selected seat entry. + * + * @param seats Seat configuration tab + * @return Selected entry + */ +static dcfg_seats_entry_t *dcfg_seats_get_selected(dcfg_seats_t *seats) +{ + ui_list_entry_t *lentry; + + lentry = ui_list_get_cursor(seats->seat_list); + return (dcfg_seats_entry_t *)ui_list_entry_get_arg(lentry); +} + +/** Get selected device entry. + * + * @param seats Seat configuration tab + * @return Selected entry + */ +static dcfg_devices_entry_t *dcfg_devices_get_selected(dcfg_seats_t *seats) +{ + ui_list_entry_t *lentry; + + lentry = ui_list_get_cursor(seats->device_list); + return (dcfg_devices_entry_t *)ui_list_entry_get_arg(lentry); +} + +/** Entry in seats list is selected. + * + * @param lentry UI list entry + * @param arg Argument (dcfg_seats_entry_t *) + */ +static void dcfg_seats_list_selected(ui_list_entry_t *lentry, void *arg) +{ + dcfg_seats_entry_t *entry = (dcfg_seats_entry_t *)arg; + dcfg_devices_entry_t *dentry; + ui_list_entry_t *le; + char *caption; + errno_t rc; + int rv; + + (void) lentry; + + /* Update 'Devices assigned to seat 'xxx':' label */ + + rv = asprintf(&caption, "Devices assigned to seat '%s':", entry->name); + if (rv < 0) { + printf("Out of memory.\n"); + return; + } + + rc = ui_label_set_text(entry->seats->devices_label, caption); + if (rc != EOK) { + printf("Error setting label.\n"); + return; + } + + free(caption); + + (void) ui_control_paint(ui_label_ctl(entry->seats->devices_label)); + + /* Clear device list */ + le = ui_list_first(entry->seats->device_list); + while (le != NULL) { + dentry = (dcfg_devices_entry_t *)ui_list_entry_get_arg(le); + free(dentry->name); + free(dentry); + ui_list_entry_delete(le); + le = ui_list_first(entry->seats->device_list); + } + + /* Re-populate it */ + (void) dcfg_seats_asgn_dev_list_populate(entry->seats); + (void) ui_control_paint(ui_list_ctl(entry->seats->device_list)); +} + +/** "Add' seat button clicked. + * + * @param pbutton Push button + * @param arg Argument (dcfg_seats_entry_t *) + */ +static void dcfg_add_seat_clicked(ui_pbutton_t *pbutton, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + ui_prompt_dialog_params_t pdparams; + errno_t rc; + + ui_prompt_dialog_params_init(&pdparams); + pdparams.caption = "Add Seat"; + pdparams.prompt = "New Seat Name"; + + rc = ui_prompt_dialog_create(seats->dcfg->ui, &pdparams, + &seats->add_seat_dlg); + if (rc != EOK) + printf("Error creating dialog.\n"); + + ui_prompt_dialog_set_cb(seats->add_seat_dlg, &add_seat_dialog_cb, + (void *)seats); +} + +/** "Remove' seat button clicked. + * + * @param pbutton Push button + * @param arg Argument (dcfg_seats_entry_t *) + */ +static void dcfg_remove_seat_clicked(ui_pbutton_t *pbutton, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + dcfg_seats_entry_t *entry; + errno_t rc; + + (void)pbutton; + entry = dcfg_seats_get_selected(seats); + + rc = dispcfg_seat_delete(seats->dcfg->dispcfg, entry->seat_id); + if (rc != EOK) { + printf("Error removing seat '%s'.\n", entry->name); + return; + } + + ui_list_entry_delete(entry->lentry); + free(entry->name); + free(entry); + + (void) ui_control_paint(ui_list_ctl(seats->seat_list)); + + /* Since selected seat changed we need to update device list */ + entry = dcfg_seats_get_selected(seats); + dcfg_seats_list_selected(entry->lentry, (void *)entry); +} + +/** Add seat dialog OK button was pressed. + * + * @param dialog Add seat dialog + * @param arg Argument (dcfg_seats_t *) + * @param text Submitted text + */ +void add_seat_dialog_bok(ui_prompt_dialog_t *dialog, void *arg, + const char *text) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + sysarg_t seat_id; + dcfg_seats_entry_t *entry; + errno_t rc; + + seats->add_seat_dlg = NULL; + ui_prompt_dialog_destroy(dialog); + + rc = dispcfg_seat_create(seats->dcfg->dispcfg, text, &seat_id); + if (rc != EOK) { + printf("Error creating seat '%s'.\n", text); + return; + } + + rc = dcfg_seats_insert(seats, text, seat_id, &entry); + if (rc != EOK) + return; + + (void) ui_control_paint(ui_list_ctl(seats->seat_list)); + + /* Select new seat and update device list */ + ui_list_set_cursor(seats->seat_list, entry->lentry); + dcfg_seats_list_selected(entry->lentry, (void *)entry); +} + +/** Add seat dialog Cancel button was pressed. + * + * @param dialog Add seat dialog + * @param arg Argument (dcfg_seats_t *) + */ +void add_seat_dialog_bcancel(ui_prompt_dialog_t *dialog, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + + seats->add_seat_dlg = NULL; + ui_prompt_dialog_destroy(dialog); +} + +/** Add seat dialog close request. + * + * @param dialog Add seat dialog + * @param arg Argument (dcfg_seats_t *) + */ +void add_seat_dialog_close(ui_prompt_dialog_t *dialog, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + + seats->add_seat_dlg = NULL; + ui_prompt_dialog_destroy(dialog); +} + +/** "Add' device button clicked. + * + * @param pbutton Push button + * @param arg Argument (dcfg_seats_entry_t *) + */ +static void dcfg_add_device_clicked(ui_pbutton_t *pbutton, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + ui_select_dialog_params_t sdparams; + errno_t rc; + + ui_select_dialog_params_init(&sdparams); + sdparams.caption = "Add Device"; + sdparams.prompt = "Device Name"; + + rc = ui_select_dialog_create(seats->dcfg->ui, &sdparams, + &seats->add_device_dlg); + if (rc != EOK) + printf("Error creating dialog.\n"); + + ui_select_dialog_set_cb(seats->add_device_dlg, &add_device_dialog_cb, + (void *)seats); + + (void) dcfg_seats_avail_dev_list_populate(seats, + seats->add_device_dlg); + ui_select_dialog_paint(seats->add_device_dlg); +} + +/** "Remove' device button clicked. + * + * @param pbutton Push button + * @param arg Argument (dcfg_seats_entry_t *) + */ +static void dcfg_remove_device_clicked(ui_pbutton_t *pbutton, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + dcfg_devices_entry_t *entry; + errno_t rc; + + (void)pbutton; + entry = dcfg_devices_get_selected(seats); + + rc = dispcfg_dev_unassign(seats->dcfg->dispcfg, entry->svc_id); + if (rc != EOK) { + printf("Error removing device '%s'.\n", entry->name); + return; + } + + ui_list_entry_delete(entry->lentry); + free(entry->name); + free(entry); + + (void) ui_control_paint(ui_list_ctl(seats->device_list)); +} + +/** Add device dialog OK button was pressed. + * + * @param dialog Add device dialog + * @param arg Argument (dcfg_seats_t *) + * @param text Submitted text + */ +void add_device_dialog_bok(ui_select_dialog_t *dialog, void *arg, + void *earg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + dcfg_devices_entry_t *entry; + dcfg_seats_entry_t *seat; + errno_t rc; + + seat = dcfg_seats_get_selected(seats); + entry = (dcfg_devices_entry_t *)earg; + + seats->add_device_dlg = NULL; + ui_select_dialog_destroy(dialog); + + rc = dispcfg_dev_assign(seats->dcfg->dispcfg, entry->svc_id, + seat->seat_id); + if (rc != EOK) { + printf("Error assigning device '%s' seat '%s'.\n", + entry->name, seat->name); + return; + } + + rc = dcfg_devices_insert(seats, entry->name, entry->svc_id); + if (rc != EOK) { + printf("Error inserting device to list.\n"); + return; + } + + (void) ui_control_paint(ui_list_ctl(seats->device_list)); +} + +/** Add device dialog Cancel button was pressed. + * + * @param dialog Add device dialog + * @param arg Argument (dcfg_seats_t *) + */ +void add_device_dialog_bcancel(ui_select_dialog_t *dialog, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + + seats->add_device_dlg = NULL; + ui_select_dialog_destroy(dialog); +} + +/** Add device dialog close request. + * + * @param dialog Add device dialog + * @param arg Argument (dcfg_seats_t *) + */ +void add_device_dialog_close(ui_select_dialog_t *dialog, void *arg) +{ + dcfg_seats_t *seats = (dcfg_seats_t *)arg; + + seats->add_device_dlg = NULL; + ui_select_dialog_destroy(dialog); +} + +/** @} + */ Index: uspace/app/display-cfg/seats.h =================================================================== --- uspace/app/display-cfg/seats.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/seats.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,48 @@ +/* + * 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 display-cfg + * @{ + */ +/** + * @file Seat configuration tab + */ + +#ifndef SEATS_H +#define SEATS_H + +#include "types/display-cfg.h" +#include "types/seats.h" + +extern errno_t dcfg_seats_create(display_cfg_t *, dcfg_seats_t **); +extern void dcfg_seats_destroy(dcfg_seats_t *); + +#endif + +/** @} + */ Index: uspace/app/display-cfg/test/display-cfg.c =================================================================== --- uspace/app/display-cfg/test/display-cfg.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/test/display-cfg.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,39 @@ +/* + * 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 "../display-cfg.h" + +PCUT_INIT; + +PCUT_TEST_SUITE(display_cfg); + +//XXX TODO + +PCUT_EXPORT(display_cfg); Index: uspace/app/display-cfg/test/main.c =================================================================== --- uspace/app/display-cfg/test/main.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/test/main.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,36 @@ +/* + * 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 + +PCUT_INIT; + +PCUT_IMPORT(display_cfg); +PCUT_IMPORT(seats); + +PCUT_MAIN(); Index: uspace/app/display-cfg/test/seats.c =================================================================== --- uspace/app/display-cfg/test/seats.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/test/seats.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,39 @@ +/* + * 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 "../seats.h" + +PCUT_INIT; + +PCUT_TEST_SUITE(seats); + +//XXX TODO + +PCUT_EXPORT(seats); Index: uspace/app/display-cfg/types/display-cfg.h =================================================================== --- uspace/app/display-cfg/types/display-cfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/types/display-cfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,65 @@ +/* + * 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 display-cfg + * @{ + */ +/** + * @file Display configuration utility (UI) types + */ + +#ifndef TYPES_DISPLAY_CFG_H +#define TYPES_DISPLAY_CFG_H + +#include +#include +#include +#include +#include +#include + +/** Display configuration utility (UI) */ +typedef struct display_cfg { + /** Display configuration session */ + dispcfg_t *dispcfg; + /** UI */ + ui_t *ui; + /** Containing window */ + ui_window_t *window; + /** Fixed layout */ + ui_fixed_t *fixed; + /** Tab set */ + ui_tab_set_t *tabset; + /** Seat configuration tab */ + struct dcfg_seats *seats; +} display_cfg_t; + +#endif + +/** @} + */ Index: uspace/app/display-cfg/types/seats.h =================================================================== --- uspace/app/display-cfg/types/seats.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) +++ uspace/app/display-cfg/types/seats.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -0,0 +1,106 @@ +/* + * 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 display-cfg + * @{ + */ +/** + * @file Seat configuration tab + */ + +#ifndef TYPES_SEATS_H +#define TYPES_SEATS_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** Seat configuration tab */ +typedef struct dcfg_seats { + /** Containing display configuration */ + struct display_cfg *dcfg; + /** UI tab */ + ui_tab_t *tab; + /** Fixed layout */ + ui_fixed_t *fixed; + /** 'Configured seats' label */ + ui_label_t *seats_label; + /** List of configured seats */ + ui_list_t *seat_list; + /** Add seat button */ + ui_pbutton_t *add_seat; + /** Remove seat button */ + ui_pbutton_t *remove_seat; + /** Add seat dialog */ + ui_prompt_dialog_t *add_seat_dlg; + /** 'Devices assigned to xxx' label */ + ui_label_t *devices_label; + /** List of assigned devices */ + ui_list_t *device_list; + /** Add device button */ + ui_pbutton_t *add_device; + /** Remove device button */ + ui_pbutton_t *remove_device; + /** Add device dialog */ + ui_select_dialog_t *add_device_dlg; +} dcfg_seats_t; + +/** Entry in seat list */ +typedef struct { + /** Containing seat configuration tab */ + struct dcfg_seats *seats; + /** List entry */ + ui_list_entry_t *lentry; + /** Seat ID */ + sysarg_t seat_id; + /** Seat name */ + char *name; +} dcfg_seats_entry_t; + +/** Entry in device list */ +typedef struct { + /** Containing seat configuration tab */ + struct dcfg_seats *seats; + /** List entry */ + ui_list_entry_t *lentry; + /** Service ID */ + service_id_t svc_id; + /** Device name */ + char *name; +} dcfg_devices_entry_t; + +#endif + +/** @} + */ Index: uspace/app/meson.build =================================================================== --- uspace/app/meson.build (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/app/meson.build (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -40,4 +40,5 @@ 'df', 'disp', + 'display-cfg', 'dnscfg', 'dnsres', Index: uspace/app/uidemo/uidemo.c =================================================================== --- uspace/app/uidemo/uidemo.c (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/app/uidemo/uidemo.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -52,4 +52,5 @@ #include #include +#include #include #include @@ -108,4 +109,5 @@ static void uidemo_file_exit(ui_menu_entry_t *, void *); static void uidemo_edit_modify(ui_menu_entry_t *, void *); +static void uidemo_edit_insert_character(ui_menu_entry_t *, void *); static void file_dialog_bok(ui_file_dialog_t *, void *, const char *); @@ -127,4 +129,14 @@ .bcancel = prompt_dialog_bcancel, .close = prompt_dialog_close +}; + +static void select_dialog_bok(ui_select_dialog_t *, void *, void *); +static void select_dialog_bcancel(ui_select_dialog_t *, void *); +static void select_dialog_close(ui_select_dialog_t *, void *); + +static ui_select_dialog_cb_t select_dialog_cb = { + .bok = select_dialog_bok, + .bcancel = select_dialog_bcancel, + .close = select_dialog_close }; @@ -432,9 +444,64 @@ rc = ui_prompt_dialog_create(demo->ui, &pdparams, &dialog); if (rc != EOK) { - printf("Error creating message dialog.\n"); + printf("Error creating prompt dialog.\n"); return; } ui_prompt_dialog_set_cb(dialog, &prompt_dialog_cb, demo); +} + +/** Edit / Insert Character menu entry selected. + * + * @param mentry Menu entry + * @param arg Argument (demo) + */ +static void uidemo_edit_insert_character(ui_menu_entry_t *mentry, void *arg) +{ + ui_demo_t *demo = (ui_demo_t *) arg; + ui_select_dialog_params_t sdparams; + ui_select_dialog_t *dialog; + ui_list_entry_attr_t attr; + errno_t rc; + + ui_select_dialog_params_init(&sdparams); + sdparams.caption = "Insert Character"; + sdparams.prompt = "Select character to insert"; + + rc = ui_select_dialog_create(demo->ui, &sdparams, &dialog); + if (rc != EOK) { + printf("Error creating select dialog.\n"); + return; + } + + ui_list_entry_attr_init(&attr); + attr.caption = "Dollar sign ($)"; + attr.arg = (void *)'$'; + rc = ui_select_dialog_append(dialog, &attr); + if (rc != EOK) { + printf("Error appending entry to list.\n"); + return; + } + + ui_list_entry_attr_init(&attr); + attr.caption = "Hash sign (#)"; + attr.arg = (void *)'#'; + rc = ui_select_dialog_append(dialog, &attr); + if (rc != EOK) { + printf("Error appending entry to list.\n"); + return; + } + + ui_list_entry_attr_init(&attr); + attr.caption = "Question mark (?)"; + attr.arg = (void *)'?'; + rc = ui_select_dialog_append(dialog, &attr); + if (rc != EOK) { + printf("Error appending entry to list.\n"); + return; + } + + ui_select_dialog_set_cb(dialog, &select_dialog_cb, demo); + + (void) ui_select_dialog_paint(dialog); } @@ -525,5 +592,5 @@ /** Prompt dialog cancel button press. * - * @param dialog File dialog + * @param dialog Prompt dialog * @param arg Argument (ui_demo_t *) */ @@ -538,5 +605,5 @@ /** Prompt dialog close request. * - * @param dialog File dialog + * @param dialog Prompt dialog * @param arg Argument (ui_demo_t *) */ @@ -547,4 +614,48 @@ (void) demo; ui_prompt_dialog_destroy(dialog); +} + +/** Select dialog OK button press. + * + * @param dialog Select dialog + * @param arg Argument (ui_demo_t *) + * @param text Submitted text + */ +static void select_dialog_bok(ui_select_dialog_t *dialog, void *arg, + void *earg) +{ + ui_demo_t *demo = (ui_demo_t *) arg; + char str[2]; + + ui_select_dialog_destroy(dialog); + str[0] = (char)(intptr_t)earg; + str[1] = '\0'; + (void) ui_entry_insert_str(demo->entry, str); +} + +/** Select dialog cancel button press. + * + * @param dialog Select dialog + * @param arg Argument (ui_demo_t *) + */ +static void select_dialog_bcancel(ui_select_dialog_t *dialog, void *arg) +{ + ui_demo_t *demo = (ui_demo_t *) arg; + + (void) demo; + ui_select_dialog_destroy(dialog); +} + +/** Select dialog close request. + * + * @param dialog Select dialog + * @param arg Argument (ui_demo_t *) + */ +static void select_dialog_close(ui_select_dialog_t *dialog, void *arg) +{ + ui_demo_t *demo = (ui_demo_t *) arg; + + (void) demo; + ui_select_dialog_destroy(dialog); } @@ -598,4 +709,5 @@ ui_menu_entry_t *mexit; ui_menu_entry_t *mmodify; + ui_menu_entry_t *minsert_char; ui_menu_entry_t *mabout; ui_list_entry_attr_t eattr; @@ -719,4 +831,14 @@ ui_menu_entry_set_cb(mmodify, uidemo_edit_modify, (void *) &demo); + + rc = ui_menu_entry_create(demo.medit, "~I~nsert Character", + "", &minsert_char); + if (rc != EOK) { + printf("Error creating menu.\n"); + return rc; + } + + ui_menu_entry_set_cb(minsert_char, uidemo_edit_insert_character, + (void *) &demo); rc = ui_menu_create(demo.mbar, "~P~references", &demo.mpreferences); Index: uspace/lib/dispcfg/include/dispcfg.h =================================================================== --- uspace/lib/dispcfg/include/dispcfg.h (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/include/dispcfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -51,4 +51,7 @@ extern errno_t dispcfg_dev_assign(dispcfg_t *, sysarg_t, sysarg_t); extern errno_t dispcfg_dev_unassign(dispcfg_t *, sysarg_t); +extern errno_t dispcfg_get_asgn_dev_list(dispcfg_t *, sysarg_t, + dispcfg_dev_list_t **); +extern void dispcfg_free_dev_list(dispcfg_dev_list_t *); #endif Index: uspace/lib/dispcfg/include/dispcfg_srv.h =================================================================== --- uspace/lib/dispcfg/include/dispcfg_srv.h (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/include/dispcfg_srv.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -56,4 +56,5 @@ errno_t (*dev_assign)(void *, sysarg_t, sysarg_t); errno_t (*dev_unassign)(void *, sysarg_t); + errno_t (*get_asgn_dev_list)(void *, sysarg_t, dispcfg_dev_list_t **); errno_t (*get_event)(void *, dispcfg_ev_t *); }; Index: uspace/lib/dispcfg/include/ipc/dispcfg.h =================================================================== --- uspace/lib/dispcfg/include/ipc/dispcfg.h (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/include/ipc/dispcfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -46,4 +46,5 @@ DISPCFG_DEV_ASSIGN, DISPCFG_DEV_UNASSIGN, + DISPCFG_GET_ASGN_DEV_LIST, DISPCFG_GET_EVENT, } dispcfg_request_t; Index: uspace/lib/dispcfg/include/types/dispcfg.h =================================================================== --- uspace/lib/dispcfg/include/types/dispcfg.h (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/include/types/dispcfg.h (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -85,4 +85,12 @@ } dispcfg_seat_info_t; +/** Assigned device list */ +typedef struct { + /** Number of devices */ + size_t ndevs; + /** ID for each device */ + sysarg_t *devs; +} dispcfg_dev_list_t; + #endif Index: uspace/lib/dispcfg/src/dispcfg.c =================================================================== --- uspace/lib/dispcfg/src/dispcfg.c (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/src/dispcfg.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -206,5 +206,5 @@ /** Free seat list. * - * @param list Display configuration list + * @param list Seat list */ void dispcfg_free_seat_list(dispcfg_seat_list_t *list) @@ -277,5 +277,5 @@ /** Free seat information. * - * @param info Display configuration information + * @param info Seat information */ void dispcfg_free_seat_info(dispcfg_seat_info_t *info) @@ -378,4 +378,73 @@ async_exchange_end(exch); return rc; +} + +/** Get list of devices assigned to a seat. + * + * @param dispcfg Display configuration + * @param seat_id Seat ID + * @param rlist Place to store pointer to new device list structure + * @return EOK on success or an error code + */ +errno_t dispcfg_get_asgn_dev_list(dispcfg_t *dispcfg, sysarg_t seat_id, + dispcfg_dev_list_t **rlist) +{ + async_exch_t *exch; + aid_t req; + ipc_call_t answer; + dispcfg_dev_list_t *list; + sysarg_t ndevs; + sysarg_t *devs; + errno_t rc; + + exch = async_exchange_begin(dispcfg->sess); + req = async_send_1(exch, DISPCFG_GET_ASGN_DEV_LIST, seat_id, &answer); + + /* Receive device list length */ + rc = async_data_read_start(exch, &ndevs, sizeof (ndevs)); + if (rc != EOK) { + async_exchange_end(exch); + async_wait_for(req, &rc); + return rc; + } + + devs = calloc(ndevs, sizeof(sysarg_t)); + if (devs == NULL) { + async_exchange_end(exch); + async_forget(req); + return ENOMEM; + } + + /* Receive device list */ + rc = async_data_read_start(exch, devs, ndevs * sizeof (sysarg_t)); + async_exchange_end(exch); + + if (rc != EOK) { + async_forget(req); + return rc; + } + + async_wait_for(req, &rc); + if (rc != EOK) + return rc; + + list = calloc(1, sizeof(dispcfg_dev_list_t)); + if (list == NULL) + return ENOMEM; + + list->ndevs = ndevs; + list->devs = devs; + *rlist = list; + return EOK; +} + +/** Free device list. + * + * @param list Device list + */ +void dispcfg_free_dev_list(dispcfg_dev_list_t *list) +{ + free(list->devs); + free(list); } Index: uspace/lib/dispcfg/src/dispcfg_srv.c =================================================================== --- uspace/lib/dispcfg/src/dispcfg_srv.c (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/src/dispcfg_srv.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -293,4 +293,77 @@ } +static void dispcfg_get_asgn_dev_list_srv(dispcfg_srv_t *srv, ipc_call_t *icall) +{ + sysarg_t seat_id; + ipc_call_t call; + dispcfg_dev_list_t *list = NULL; + size_t size; + errno_t rc; + + seat_id = ipc_get_arg1(icall); + + if (srv->ops->get_asgn_dev_list == NULL) { + async_answer_0(icall, ENOTSUP); + return; + } + + rc = srv->ops->get_asgn_dev_list(srv->arg, seat_id, &list); + if (rc != EOK) { + async_answer_0(icall, rc); + return; + } + + /* Send list size */ + + if (!async_data_read_receive(&call, &size)) { + dispcfg_free_dev_list(list); + async_answer_0(&call, EREFUSED); + async_answer_0(icall, EREFUSED); + return; + } + + if (size != sizeof(list->ndevs)) { + dispcfg_free_dev_list(list); + async_answer_0(&call, EINVAL); + async_answer_0(icall, EINVAL); + return; + } + + rc = async_data_read_finalize(&call, &list->ndevs, size); + if (rc != EOK) { + dispcfg_free_dev_list(list); + async_answer_0(&call, rc); + async_answer_0(icall, rc); + return; + } + + /* Send device list */ + + if (!async_data_read_receive(&call, &size)) { + dispcfg_free_dev_list(list); + async_answer_0(&call, EREFUSED); + async_answer_0(icall, EREFUSED); + return; + } + + if (size != list->ndevs * sizeof(sysarg_t)) { + dispcfg_free_dev_list(list); + async_answer_0(&call, EINVAL); + async_answer_0(icall, EINVAL); + return; + } + + rc = async_data_read_finalize(&call, list->devs, size); + if (rc != EOK) { + dispcfg_free_dev_list(list); + async_answer_0(&call, rc); + async_answer_0(icall, rc); + return; + } + + async_answer_0(icall, EOK); + dispcfg_free_dev_list(list); +} + static void dispcfg_get_event_srv(dispcfg_srv_t *srv, ipc_call_t *icall) { @@ -372,4 +445,7 @@ case DISPCFG_DEV_UNASSIGN: dispcfg_dev_unassign_srv(srv, &call); + break; + case DISPCFG_GET_ASGN_DEV_LIST: + dispcfg_get_asgn_dev_list_srv(srv, &call); break; case DISPCFG_GET_EVENT: Index: uspace/lib/dispcfg/test/dispcfg.c =================================================================== --- uspace/lib/dispcfg/test/dispcfg.c (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/lib/dispcfg/test/dispcfg.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -52,4 +52,5 @@ static errno_t test_dev_assign(void *, sysarg_t, sysarg_t); static errno_t test_dev_unassign(void *, sysarg_t); +static errno_t test_get_asgn_dev_list(void *, sysarg_t, dispcfg_dev_list_t **); static errno_t test_get_event(void *, dispcfg_ev_t *); @@ -64,4 +65,5 @@ .dev_assign = test_dev_assign, .dev_unassign = test_dev_unassign, + .get_asgn_dev_list = test_get_asgn_dev_list, .get_event = test_get_event }; @@ -102,4 +104,8 @@ bool dev_unassign_called; sysarg_t dev_unassign_svc_id; + + bool get_asgn_dev_list_called; + sysarg_t get_asgn_dev_list_seat_id; + dispcfg_dev_list_t *get_asgn_dev_list_rlist; bool get_event_called; @@ -604,4 +610,90 @@ } +/** dispcfg_get_asgn_dev_list() with server returning error response works */ +PCUT_TEST(get_asgn_dev_list_failure) +{ + errno_t rc; + service_id_t sid; + dispcfg_t *dispcfg = NULL; + dispcfg_dev_list_t *list; + sysarg_t seat_id; + test_response_t resp; + + async_set_fallback_port_handler(test_dispcfg_conn, &resp); + + // FIXME This causes this test to be non-reentrant! + rc = loc_server_register(test_dispcfg_server); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = loc_service_register(test_dispcfg_svc, &sid); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = dispcfg_open(test_dispcfg_svc, NULL, NULL, &dispcfg); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dispcfg); + + resp.rc = ENOMEM; + resp.get_asgn_dev_list_called = false; + seat_id = 42; + + rc = dispcfg_get_asgn_dev_list(dispcfg, seat_id, &list); + PCUT_ASSERT_TRUE(resp.get_asgn_dev_list_called); + PCUT_ASSERT_INT_EQUALS(seat_id, resp.get_asgn_dev_list_seat_id); + PCUT_ASSERT_ERRNO_VAL(resp.rc, rc); + + dispcfg_close(dispcfg); + rc = loc_service_unregister(sid); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); +} + +/** dispcfg_get_asgn_dev_list() with server returning success response works */ +PCUT_TEST(get_asgn_dev_list_success) +{ + errno_t rc; + service_id_t sid; + dispcfg_t *dispcfg = NULL; + dispcfg_dev_list_t *list; + sysarg_t seat_id; + test_response_t resp; + + async_set_fallback_port_handler(test_dispcfg_conn, &resp); + + // FIXME This causes this test to be non-reentrant! + rc = loc_server_register(test_dispcfg_server); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = loc_service_register(test_dispcfg_svc, &sid); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = dispcfg_open(test_dispcfg_svc, NULL, NULL, &dispcfg); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dispcfg); + + resp.rc = EOK; + resp.get_asgn_dev_list_called = false; + resp.get_asgn_dev_list_rlist = calloc(1, sizeof(dispcfg_dev_list_t)); + PCUT_ASSERT_NOT_NULL(resp.get_asgn_dev_list_rlist); + resp.get_asgn_dev_list_rlist->ndevs = 2; + resp.get_asgn_dev_list_rlist->devs = calloc(2, sizeof(sysarg_t)); + PCUT_ASSERT_NOT_NULL(resp.get_asgn_dev_list_rlist->devs); + resp.get_asgn_dev_list_rlist->devs[0] = 11; + resp.get_asgn_dev_list_rlist->devs[1] = 12; + seat_id = 42; + + rc = dispcfg_get_asgn_dev_list(dispcfg, seat_id, &list); + PCUT_ASSERT_TRUE(resp.get_asgn_dev_list_called); + PCUT_ASSERT_INT_EQUALS(seat_id, resp.get_asgn_dev_list_seat_id); + PCUT_ASSERT_ERRNO_VAL(resp.rc, rc); + + PCUT_ASSERT_INT_EQUALS(2, list->ndevs); + PCUT_ASSERT_INT_EQUALS(11, list->devs[0]); + PCUT_ASSERT_INT_EQUALS(12, list->devs[1]); + + dispcfg_free_dev_list(list); + dispcfg_close(dispcfg); + rc = loc_service_unregister(sid); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); +} + /** Window added event can be delivered from server to client callback function */ PCUT_TEST(seat_added_deliver) @@ -808,4 +900,19 @@ } +static errno_t test_get_asgn_dev_list(void *arg, sysarg_t seat_id, + dispcfg_dev_list_t **rlist) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->get_asgn_dev_list_called = true; + resp->get_asgn_dev_list_seat_id = seat_id; + + if (resp->rc != EOK) + return resp->rc; + + *rlist = resp->get_asgn_dev_list_rlist; + return EOK; +} + static errno_t test_get_event(void *arg, dispcfg_ev_t *event) { 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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 ec8ef12310886f8dae440b616a2f7eb60602d141) +++ 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); Index: uspace/srv/hid/display/cfgops.c =================================================================== --- uspace/srv/hid/display/cfgops.c (revision ec8ef12310886f8dae440b616a2f7eb60602d141) +++ uspace/srv/hid/display/cfgops.c (revision c0757e1f444227a4a7447e0004af74bd7026104d) @@ -50,4 +50,5 @@ static errno_t dispc_dev_assign(void *, sysarg_t, sysarg_t); static errno_t dispc_dev_unassign(void *, sysarg_t); +static errno_t dispc_get_asgn_dev_list(void *, sysarg_t, dispcfg_dev_list_t **); static errno_t dispc_get_event(void *, dispcfg_ev_t *); @@ -59,4 +60,5 @@ .dev_assign = dispc_dev_assign, .dev_unassign = dispc_dev_unassign, + .get_asgn_dev_list = dispc_get_asgn_dev_list, .get_event = dispc_get_event, }; @@ -281,4 +283,64 @@ } +/** Get assigned device list. + * + * @param arg Argument (CFG client) + * @param seat_id Seat ID + * @param rlist Place to store pointer to new list + * @return EOK on success or an error code + */ +static errno_t dispc_get_asgn_dev_list(void *arg, sysarg_t seat_id, + dispcfg_dev_list_t **rlist) +{ + ds_cfgclient_t *cfgclient = (ds_cfgclient_t *)arg; + dispcfg_dev_list_t *list; + ds_seat_t *seat; + ds_idevcfg_t *idevcfg; + unsigned i; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "dispcfg_get_asgn_dev_list()"); + + list = calloc(1, sizeof(dispcfg_dev_list_t)); + if (list == NULL) + return ENOMEM; + + ds_display_lock(cfgclient->display); + + seat = ds_display_find_seat(cfgclient->display, seat_id); + if (seat == NULL) { + ds_display_unlock(cfgclient->display); + free(list); + return ENOENT; + } + + /* Count the number of devices */ + list->ndevs = 0; + idevcfg = ds_seat_first_idevcfg(seat); + while (idevcfg != NULL) { + ++list->ndevs; + idevcfg = ds_display_next_idevcfg(idevcfg); + } + + /* Allocate array for device IDs */ + list->devs = calloc(list->ndevs, sizeof(sysarg_t)); + if (list->devs == NULL) { + ds_display_unlock(cfgclient->display); + free(list); + return ENOMEM; + } + + /* Fill in device IDs */ + i = 0; + idevcfg = ds_seat_first_idevcfg(seat); + while (idevcfg != NULL) { + list->devs[i++] = idevcfg->svc_id; + idevcfg = ds_display_next_idevcfg(idevcfg); + } + + ds_display_unlock(cfgclient->display); + *rlist = list; + return EOK; +} + /** Get display configuration event. *