Index: uspace/app/nav/menu.c =================================================================== --- uspace/app/nav/menu.c (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) +++ uspace/app/nav/menu.c (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2021 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 nav + * @{ + */ +/** @file Navigator. + * + * HelenOS file manager. + */ + +#include +#include +#include +#include +#include +#include "menu.h" +#include "nav.h" + +static void nav_file_exit(ui_menu_entry_t *, void *); + +/** Create navigator menu. + * + * @param navigator Navigator + * @param rmenu Place to store pointer to new menu + * @return EOK on success or an error code + */ +errno_t nav_menu_create(navigator_t *navigator, nav_menu_t **rmenu) +{ + nav_menu_t *menu; + ui_menu_t *mfile; + ui_menu_entry_t *mexit; + gfx_rect_t arect; + gfx_rect_t rect; + errno_t rc; + + menu = calloc(1, sizeof(nav_menu_t)); + if (menu == NULL) + return ENOMEM; + + rc = ui_menu_bar_create(navigator->ui, navigator->window, + &menu->menubar); + if (rc != EOK) + goto error; + + rc = ui_menu_create(menu->menubar, "File", &mfile); + if (rc != EOK) + goto error; + + rc = ui_menu_entry_create(mfile, "Exit", "Ctrl-Q", &mexit); + if (rc != EOK) + goto error; + + ui_menu_entry_set_cb(mexit, nav_file_exit, (void *) navigator); + + ui_window_get_app_rect(navigator->window, &arect); + + rect.p0 = arect.p0; + rect.p1.x = arect.p1.x; + rect.p1.y = arect.p0.y + 1; + ui_menu_bar_set_rect(menu->menubar, &rect); + + rc = ui_fixed_add(navigator->fixed, ui_menu_bar_ctl(menu->menubar)); + if (rc != EOK) + goto error; + + menu->navigator = navigator; + *rmenu = menu; + return EOK; +error: + nav_menu_destroy(menu); + return rc; +} + +/** Destroy navigator menu. + * + * @param menu Menu + */ +void nav_menu_destroy(nav_menu_t *menu) +{ + if (menu->menubar != NULL) { + ui_fixed_remove(menu->navigator->fixed, + ui_menu_bar_ctl(menu->menubar)); + ui_menu_bar_destroy(menu->menubar); + } + + free(menu); +} + +/** File / Exit menu entry selected. + * + * @param mentry Menu entry + * @param arg Argument (navigator_t *) + */ +static void nav_file_exit(ui_menu_entry_t *mentry, void *arg) +{ + navigator_t *navigator = (navigator_t *) arg; + + ui_quit(navigator->ui); +} + +/** @} + */ Index: uspace/app/nav/menu.h =================================================================== --- uspace/app/nav/menu.h (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) +++ uspace/app/nav/menu.h (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2021 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 nav + * @{ + */ +/** + * @file Navigator menu + */ + +#ifndef MENU_H +#define MENU_H + +#include +#include +#include +#include +#include "nav.h" + +/** Navigator menu */ +typedef struct nav_menu { + navigator_t *navigator; + ui_menu_bar_t *menubar; +} nav_menu_t; + +extern errno_t nav_menu_create(navigator_t *, nav_menu_t **); +extern void nav_menu_destroy(nav_menu_t *); + +#endif + +/** @} + */ Index: uspace/app/nav/meson.build =================================================================== --- uspace/app/nav/meson.build (revision e0e1b3dc9da59c3a7a87bc7068e5241a909c8cac) +++ uspace/app/nav/meson.build (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) @@ -29,4 +29,5 @@ deps = [ 'ui' ] src = files( + 'menu.c', 'nav.c', ) Index: uspace/app/nav/nav.c =================================================================== --- uspace/app/nav/nav.c (revision e0e1b3dc9da59c3a7a87bc7068e5241a909c8cac) +++ uspace/app/nav/nav.c (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) @@ -37,11 +37,15 @@ #include #include +#include #include #include -#include #include #include #include +#include "menu.h" #include "nav.h" + +static errno_t navigator_create(const char *, navigator_t **); +static void navigator_destroy(navigator_t *); static void wnd_close(ui_window_t *, void *); @@ -63,85 +67,89 @@ } -/** Run navigator on the specified display. */ -static errno_t navigator_run(const char *display_spec) +/** Create navigator. + * + * @param display_spec Display specification + * @param rnavigator Place to store pointer to new navigator + * @return EOK on success or ane error code + */ +static errno_t navigator_create(const char *display_spec, + navigator_t **rnavigator) { - ui_t *ui = NULL; + navigator_t *navigator; ui_wnd_params_t params; - ui_window_t *window = NULL; - navigator_t navigator; - gfx_rect_t rect; - ui_resource_t *ui_res; errno_t rc; - rc = ui_create(display_spec, &ui); + navigator = calloc(1, sizeof(navigator_t)); + if (navigator == NULL) + return ENOMEM; + + rc = ui_create(display_spec, &navigator->ui); if (rc != EOK) { printf("Error creating UI on display %s.\n", display_spec); - return rc; + goto error; } ui_wnd_params_init(¶ms); params.caption = "Navigator"; - if (ui_is_textmode(ui)) { - params.rect.p0.x = 0; - params.rect.p0.y = 0; - params.rect.p1.x = 24; - params.rect.p1.y = 5; - } else { - params.rect.p0.x = 0; - params.rect.p0.y = 0; - params.rect.p1.x = 200; - params.rect.p1.y = 60; + params.style &= ~ui_wds_decorated; + params.placement = ui_wnd_place_full_screen; + + rc = ui_window_create(navigator->ui, ¶ms, &navigator->window); + if (rc != EOK) { + printf("Error creating window.\n"); + goto error; } - memset((void *) &navigator, 0, sizeof(navigator)); - navigator.ui = ui; + ui_window_set_cb(navigator->window, &window_cb, (void *) navigator); - rc = ui_window_create(ui, ¶ms, &window); + rc = ui_fixed_create(&navigator->fixed); if (rc != EOK) { - printf("Error creating window.\n"); - return rc; + printf("Error creating fixed layout.\n"); + goto error; } - ui_window_set_cb(window, &window_cb, (void *) &navigator); - navigator.window = window; + ui_window_add(navigator->window, ui_fixed_ctl(navigator->fixed)); - ui_res = ui_window_get_res(window); + rc = nav_menu_create(navigator, &navigator->menu); + if (rc != EOK) + goto error; - rc = ui_fixed_create(&navigator.fixed); + rc = ui_window_paint(navigator->window); if (rc != EOK) { - printf("Error creating fixed layout.\n"); - return rc; + printf("Error painting window.\n"); + goto error; } - rc = ui_label_create(ui_res, "Hello!", &navigator.label); - if (rc != EOK) { - printf("Error creating label.\n"); + *rnavigator = navigator; + return EOK; +error: + navigator_destroy(navigator); + return rc; +} + +static void navigator_destroy(navigator_t *navigator) +{ + if (navigator->menu != NULL) + nav_menu_destroy(navigator->menu); + if (navigator->window != NULL) + ui_window_destroy(navigator->window); + if (navigator->ui != NULL) + ui_destroy(navigator->ui); + free(navigator); +} + +/** Run navigator on the specified display. */ +static errno_t navigator_run(const char *display_spec) +{ + navigator_t *navigator; + errno_t rc; + + rc = navigator_create(display_spec, &navigator); + if (rc != EOK) return rc; - } - ui_window_get_app_rect(window, &rect); - ui_label_set_rect(navigator.label, &rect); - ui_label_set_halign(navigator.label, gfx_halign_center); - ui_label_set_valign(navigator.label, gfx_valign_center); + ui_run(navigator->ui); - rc = ui_fixed_add(navigator.fixed, ui_label_ctl(navigator.label)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - ui_window_add(window, ui_fixed_ctl(navigator.fixed)); - - rc = ui_window_paint(window); - if (rc != EOK) { - printf("Error painting window.\n"); - return rc; - } - - ui_run(ui); - - ui_window_destroy(window); - ui_destroy(ui); - + navigator_destroy(navigator); return EOK; } @@ -149,5 +157,5 @@ static void print_syntax(void) { - printf("Syntax: navigator [-d ]\n"); + printf("Syntax: nav [-d ]\n"); } Index: uspace/app/nav/nav.h =================================================================== --- uspace/app/nav/nav.h (revision e0e1b3dc9da59c3a7a87bc7068e5241a909c8cac) +++ uspace/app/nav/nav.h (revision d097daca0b4477f4950c6da8f56adc0b0d6990d3) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2020 Jiri Svoboda + * Copyright (c) 2021 Jiri Svoboda * All rights reserved. * @@ -39,14 +39,17 @@ #include #include -#include #include #include /** Navigator */ -typedef struct { +typedef struct navigator { + /** User interface */ ui_t *ui; + /** Window */ ui_window_t *window; + /** Fixed layout */ ui_fixed_t *fixed; - ui_label_t *label; + /** Menu */ + struct nav_menu *menu; } navigator_t;