Index: uspace/app/meson.build =================================================================== --- uspace/app/meson.build (revision cd981f2ab573f6154bc4872d06b8deb9c9bb9530) +++ uspace/app/meson.build (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) @@ -66,4 +66,5 @@ 'mkmfs', 'modplay', + 'nav', 'netecho', 'nic', Index: uspace/app/nav/doc/doxygroups.h =================================================================== --- uspace/app/nav/doc/doxygroups.h (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) +++ uspace/app/nav/doc/doxygroups.h (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) @@ -0,0 +1,4 @@ +/** @addtogroup nav nav + * @brief Navigator + * @ingroup apps + */ Index: uspace/app/nav/meson.build =================================================================== --- uspace/app/nav/meson.build (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) +++ uspace/app/nav/meson.build (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) @@ -0,0 +1,32 @@ +# +# 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. +# + +deps = [ 'ui' ] +src = files( + 'nav.c', +) Index: uspace/app/nav/nav.c =================================================================== --- uspace/app/nav/nav.c (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) +++ uspace/app/nav/nav.c (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) @@ -0,0 +1,191 @@ +/* + * 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 +#include +#include +#include "nav.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 (navigator) + */ +static void wnd_close(ui_window_t *window, void *arg) +{ + navigator_t *navigator = (navigator_t *) arg; + + ui_quit(navigator->ui); +} + +/** Run navigator on the specified display. */ +static errno_t navigator_run(const char *display_spec) +{ + ui_t *ui = NULL; + 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); + if (rc != EOK) { + printf("Error creating UI on display %s.\n", display_spec); + return rc; + } + + 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; + } + + memset((void *) &navigator, 0, sizeof(navigator)); + navigator.ui = ui; + + rc = ui_window_create(ui, ¶ms, &window); + if (rc != EOK) { + printf("Error creating window.\n"); + return rc; + } + + ui_window_set_cb(window, &window_cb, (void *) &navigator); + navigator.window = window; + + ui_res = ui_window_get_res(window); + + rc = ui_fixed_create(&navigator.fixed); + if (rc != EOK) { + printf("Error creating fixed layout.\n"); + return rc; + } + + rc = ui_label_create(ui_res, "Hello!", &navigator.label); + if (rc != EOK) { + printf("Error creating label.\n"); + 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); + + 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); + + return EOK; +} + +static void print_syntax(void) +{ + printf("Syntax: navigator [-d ]\n"); +} + +int main(int argc, char *argv[]) +{ + const char *display_spec = UI_CONSOLE_DEFAULT; + 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 = navigator_run(display_spec); + if (rc != EOK) + return 1; + + return 0; +} + +/** @} + */ Index: uspace/app/nav/nav.h =================================================================== --- uspace/app/nav/nav.h (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) +++ uspace/app/nav/nav.h (revision 748c8bd3c125cb750f2fa4fa221154624d44eb18) @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup nav + * @{ + */ +/** + * @file Navigator + */ + +#ifndef NAV_H +#define NAV_H + +#include +#include +#include +#include +#include + +/** Navigator */ +typedef struct { + ui_t *ui; + ui_window_t *window; + ui_fixed_t *fixed; + ui_label_t *label; +} navigator_t; + +#endif + +/** @} + */