Index: meson/part/initrd_manifest/meson.build =================================================================== --- meson/part/initrd_manifest/meson.build (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ meson/part/initrd_manifest/meson.build (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -68,5 +68,5 @@ if CONFIG_FB rd_essential += [ - 'app/launcher', + 'app/taskbar', 'app/terminal', Index: uspace/app/aboutos/aboutos.c =================================================================== --- uspace/app/aboutos/aboutos.c (revision e229148c5c401bc953a39417b7d612a34790de73) +++ uspace/app/aboutos/aboutos.c (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -0,0 +1,386 @@ +/* + * Copyright (c) 2024 Jiri Svoboda + * Copyright (c) 2012 Petr Koupy + * 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 aboutos + * @{ + */ +/** @file About HelenOS + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "aboutos.h" +#include "images.h" + +#define NAME "aboutos" + +static const char *display_spec = UI_DISPLAY_DEFAULT; + +static void aboutos_wnd_close(ui_window_t *, void *); +static void aboutos_wnd_kbd(ui_window_t *, void *, kbd_event_t *); + +static ui_window_cb_t window_cb = { + .close = aboutos_wnd_close, + .kbd = aboutos_wnd_kbd +}; + +static void pb_clicked(ui_pbutton_t *, void *); + +static ui_pbutton_cb_t pbutton_cb = { + .clicked = pb_clicked +}; + +/** Window close button was clicked. + * + * @param window Window + * @param arg Argument (aboutos) + */ +static void aboutos_wnd_close(ui_window_t *window, void *arg) +{ + aboutos_t *aboutos = (aboutos_t *) arg; + + ui_quit(aboutos->ui); +} + +/** About HelenOS window keyboard event handler. + * + * @param window Window + * @param arg Argument (ui_prompt_dialog_t *) + * @param event Keyboard event + */ +static void aboutos_wnd_kbd(ui_window_t *window, void *arg, + kbd_event_t *event) +{ + aboutos_t *aboutos = (aboutos_t *) arg; + + (void)window; + + if (event->type == KEY_PRESS && + (event->mods & (KM_CTRL | KM_SHIFT | KM_ALT)) == 0) { + if (event->key == KC_ENTER) { + /* Quit */ + ui_quit(aboutos->ui); + + } + } + + ui_window_def_kbd(window, event); +} + +/** Push button was clicked. + * + * @param pbutton Push button + * @param arg Argument (aboutos) + */ +static void pb_clicked(ui_pbutton_t *pbutton, void *arg) +{ + aboutos_t *aboutos = (aboutos_t *) arg; + + ui_quit(aboutos->ui); +} + +static void print_syntax(void) +{ + printf("Syntax: %s [-d ]\n", NAME); +} + +int main(int argc, char *argv[]) +{ + int i; + aboutos_t aboutos; + ui_t *ui = NULL; + ui_wnd_params_t params; + ui_window_t *window = NULL; + ui_resource_t *ui_res; + gfx_bitmap_params_t logo_params; + gfx_bitmap_t *logo_bmp; + gfx_context_t *gc; + gfx_rect_t logo_rect; + gfx_rect_t rect; + gfx_coord2_t off; + const char *dspec = UI_DISPLAY_DEFAULT; + char *qmark; + errno_t rc; + + i = 1; + while (i < argc) { + if (str_cmp(argv[i], "-d") == 0) { + ++i; + if (i >= argc) { + printf("Argument missing.\n"); + print_syntax(); + return 1; + } + + dspec = argv[i++]; + } else { + printf("Invalid option '%s'.\n", argv[i]); + print_syntax(); + return 1; + } + } + + display_spec = str_dup(dspec); + if (display_spec == NULL) { + printf("Out of memory.\n"); + return 1; + } + + /* Remove additional arguments */ + qmark = str_chr(display_spec, '?'); + if (qmark != NULL) + *qmark = '\0'; + + rc = ui_create(dspec, &ui); + if (rc != EOK) { + printf("Error creating UI on display %s.\n", display_spec); + return rc; + } + + ui_wnd_params_init(¶ms); + params.caption = "About HelenOS"; + + /* FIXME: Auto layout */ + if (ui_is_textmode(ui)) { + params.rect.p0.x = 0; + params.rect.p0.y = 0; + params.rect.p1.x = 45; + params.rect.p1.y = 15; + } else { + params.rect.p0.x = 0; + params.rect.p0.y = 0; + params.rect.p1.x = 350; + params.rect.p1.y = 275; + } + + memset((void *) &aboutos, 0, sizeof(aboutos)); + aboutos.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 *) &aboutos); + aboutos.window = window; + + ui_res = ui_window_get_res(window); + gc = ui_window_get_gc(window); + + rc = decode_tga(gc, (void *) helenos_tga, helenos_tga_size, + &logo_bmp, &logo_rect); + if (rc != EOK) { + printf("Unable to decode logo.\n"); + return 1; + } + + gfx_bitmap_params_init(&logo_params); + logo_params.rect = logo_rect; + + rc = ui_fixed_create(&aboutos.fixed); + if (rc != EOK) { + printf("Error creating fixed layout.\n"); + return rc; + } + + rc = ui_image_create(ui_res, logo_bmp, &logo_rect, &aboutos.image); + if (rc != EOK) { + printf("Error creating label.\n"); + return rc; + } + + off.x = 76; + off.y = 42; + gfx_rect_translate(&off, &logo_rect, &rect); + + /* Adjust for frame width (2 x 1 pixel) */ + rect.p1.x += 2; + rect.p1.y += 2; + ui_image_set_rect(aboutos.image, &rect); + ui_image_set_flags(aboutos.image, ui_imgf_frame); + + rc = ui_fixed_add(aboutos.fixed, ui_image_ctl(aboutos.image)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + return rc; + } + + /* Release label */ + + rc = ui_label_create(ui_res, "HelenOS " STRING(HELENOS_RELEASE) + " (" STRING(HELENOS_CODENAME) ")", &aboutos.lrelease); + if (rc != EOK) { + printf("Error creating label.\n"); + return rc; + } + + if (ui_is_textmode(ui)) { + rect.p0.x = 1; + rect.p0.y = 5; + rect.p1.x = 44; + rect.p1.y = 6; + } else { + rect.p0.x = 10; + rect.p0.y = 140; + rect.p1.x = 340; + rect.p1.y = 160; + } + + ui_label_set_rect(aboutos.lrelease, &rect); + ui_label_set_halign(aboutos.lrelease, gfx_halign_center); + + rc = ui_fixed_add(aboutos.fixed, ui_label_ctl(aboutos.lrelease)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + return rc; + } + + /* Copyright label */ + + rc = ui_label_create(ui_res, STRING(HELENOS_COPYRIGHT), &aboutos.lcopy); + if (rc != EOK) { + printf("Error creating label.\n"); + return rc; + } + + if (ui_is_textmode(ui)) { + rect.p0.x = 1; + rect.p0.y = 6; + rect.p1.x = 44; + rect.p1.y = 7; + } else { + rect.p0.x = 10; + rect.p0.y = 160; + rect.p1.x = 340; + rect.p1.y = 180; + } + + ui_label_set_rect(aboutos.lcopy, &rect); + ui_label_set_halign(aboutos.lcopy, gfx_halign_center); + + rc = ui_fixed_add(aboutos.fixed, ui_label_ctl(aboutos.lcopy)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + return rc; + } + + /* Architecture label */ + + rc = ui_label_create(ui_res, "Running on " STRING(UARCH), &aboutos.larch); + if (rc != EOK) { + printf("Error creating label.\n"); + return rc; + } + + if (ui_is_textmode(ui)) { + rect.p0.x = 1; + rect.p0.y = 9; + rect.p1.x = 44; + rect.p1.y = 10; + } else { + rect.p0.x = 10; + rect.p0.y = 190; + rect.p1.x = 340; + rect.p1.y = 210; + } + + ui_label_set_rect(aboutos.larch, &rect); + ui_label_set_halign(aboutos.larch, gfx_halign_center); + + rc = ui_fixed_add(aboutos.fixed, ui_label_ctl(aboutos.larch)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + return rc; + } + + /* OK button */ + + rc = ui_pbutton_create(ui_res, "OK", &aboutos.pbok); + if (rc != EOK) { + printf("Error creating button.\n"); + return rc; + } + + ui_pbutton_set_cb(aboutos.pbok, &pbutton_cb, (void *) &aboutos); + + if (ui_is_textmode(ui)) { + rect.p0.x = 17; + rect.p0.y = 13; + rect.p1.x = 28; + rect.p1.y = 14; + } else { + rect.p0.x = 125; + rect.p0.y = 235; + rect.p1.x = 225; + rect.p1.y = rect.p0.y + 28; + } + + ui_pbutton_set_rect(aboutos.pbok, &rect); + ui_pbutton_set_default(aboutos.pbok, true); + + rc = ui_fixed_add(aboutos.fixed, ui_pbutton_ctl(aboutos.pbok)); + if (rc != EOK) { + printf("Error adding control to layout.\n"); + return rc; + } + + ui_window_add(window, ui_fixed_ctl(aboutos.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 0; +} + +/** @} + */ Index: uspace/app/aboutos/aboutos.h =================================================================== --- uspace/app/aboutos/aboutos.h (revision e229148c5c401bc953a39417b7d612a34790de73) +++ uspace/app/aboutos/aboutos.h (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2024 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 aboutos + * @{ + */ +/** + * @file About HelenOS + */ + +#ifndef ABOUTOS_H +#define ABOUTOS_H + +#include +#include +#include +#include +#include +#include + +/** About HelenOS */ +typedef struct { + ui_t *ui; + ui_window_t *window; + ui_fixed_t *fixed; + + ui_image_t *image; + ui_label_t *lrelease; + ui_label_t *lcopy; + ui_label_t *larch; + + ui_pbutton_t *pbok; +} aboutos_t; + +#endif + +/** @} + */ Index: uspace/app/aboutos/doc/doxygroups.h =================================================================== --- uspace/app/aboutos/doc/doxygroups.h (revision e229148c5c401bc953a39417b7d612a34790de73) +++ uspace/app/aboutos/doc/doxygroups.h (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -0,0 +1,4 @@ +/** @addtogroup aboutos aboutos + * @brief About HelenOS + * @ingroup apps + */ Index: uspace/app/aboutos/meson.build =================================================================== --- uspace/app/aboutos/meson.build (revision e229148c5c401bc953a39417b7d612a34790de73) +++ uspace/app/aboutos/meson.build (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -0,0 +1,59 @@ +# +# Copyright (c) 2024 Jiri Svoboda +# Copyright (c) 2012 Petr Koupy +# 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 = [ 'gfximage', 'ui' ] + +_images = files('gfx/helenos.tga') + +_images_zip = custom_target('aboutos_images.zip', + input : _images, + output : [ 'images.zip' ], + command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ], +) +_imgs_s = custom_target('aboutos_images.s', + input : _images_zip, + output : [ 'images.s' ], + command : [ unzip, '-p', '@INPUT@', 'images.s' ], + capture : true, +) +_imgs_h = custom_target('aboutos_images.h', + input : _images_zip, + output : [ 'images.h' ], + command : [ unzip, '-p', '@INPUT@', 'images.h' ], + capture : true, +) +_imgs_desc_c = custom_target('aboutos_images_desc.c', + input : _images_zip, + output : [ 'images_desc.c' ], + command : [ unzip, '-p', '@INPUT@', 'images_desc.c' ], + capture : true, +) + +c_args += [ '-DHELENOS_RELEASE=' + HELENOS_RELEASE, '-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT, '-DHELENOS_CODENAME=' + HELENOS_CODENAME ] +src = [ files('aboutos.c'), _imgs_s, _imgs_h, _imgs_desc_c ] Index: uspace/app/barber/barber.c =================================================================== --- uspace/app/barber/barber.c (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ uspace/app/barber/barber.c (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2020 Jiri Svoboda + * Copyright (c) 2024 Jiri Svoboda * Copyright (c) 2014 Martin Decky * All rights reserved. @@ -110,5 +110,5 @@ * * @param window Window - * @param arg Argument (launcher) + * @param arg Argument (barber) */ static void wnd_close(ui_window_t *window, void *arg) Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ uspace/app/init/init.c (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -476,5 +476,4 @@ rc = display_server(); if (rc == EOK) { - app_start("/app/launcher", NULL); app_start("/app/taskbar", NULL); app_start("/app/terminal", "-topleft"); Index: pace/app/launcher/doc/doxygroups.h =================================================================== --- uspace/app/launcher/doc/doxygroups.h (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ (revision ) @@ -1,4 +1,0 @@ -/** @addtogroup launcher launcher - * @brief Application launcher - * @ingroup apps - */ Index: pace/app/launcher/launcher.c =================================================================== --- uspace/app/launcher/launcher.c (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ (revision ) @@ -1,488 +1,0 @@ -/* - * Copyright (c) 2023 Jiri Svoboda - * Copyright (c) 2012 Petr Koupy - * 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 launcher - * @{ - */ -/** @file Launcher - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "images.h" -#include "launcher.h" - -#define NAME "launcher" - -static const char *display_spec = UI_DISPLAY_DEFAULT; - -static void wnd_close(ui_window_t *, void *); -static void wnd_pos(ui_window_t *, void *, pos_event_t *); - -static ui_window_cb_t window_cb = { - .close = wnd_close, - .pos = wnd_pos -}; - -static void pb_clicked(ui_pbutton_t *, void *); - -static ui_pbutton_cb_t pbutton_cb = { - .clicked = pb_clicked -}; - -static int app_launchl(launcher_t *, const char *, ...); - -/** Window close button was clicked. - * - * @param window Window - * @param arg Argument (launcher) - */ -static void wnd_close(ui_window_t *window, void *arg) -{ - launcher_t *launcher = (launcher_t *) arg; - - ui_quit(launcher->ui); -} - -/** Window received position event. - * - * @param window Window - * @param arg Argument (launcher) - * @param event Position event - */ -static void wnd_pos(ui_window_t *window, void *arg, pos_event_t *event) -{ - launcher_t *launcher = (launcher_t *) arg; - - /* Remember ID of device that sent the last event */ - launcher->ev_pos_id = event->pos_id; - - ui_window_def_pos(window, event); -} - -/** Push button was clicked. - * - * @param pbutton Push button - * @param arg Argument (launcher) - */ -static void pb_clicked(ui_pbutton_t *pbutton, void *arg) -{ - launcher_t *launcher = (launcher_t *) arg; - - if (pbutton == launcher->pb1) { - app_launchl(launcher, "/app/terminal", "-c", "/app/nav", NULL); - } else if (pbutton == launcher->pb2) { - app_launchl(launcher, "/app/terminal", "-c", "/app/edit", NULL); - } else if (pbutton == launcher->pb3) { - app_launchl(launcher, "/app/terminal", NULL); - } else if (pbutton == launcher->pb4) { - app_launchl(launcher, "/app/calculator", NULL); - } else if (pbutton == launcher->pb5) { - app_launchl(launcher, "/app/uidemo", NULL); - } else if (pbutton == launcher->pb6) { - app_launchl(launcher, "/app/gfxdemo", "ui", NULL); - } -} - -static int app_launchl(launcher_t *launcher, const char *app, ...) -{ - errno_t rc; - task_id_t id; - task_wait_t wait; - va_list ap; - const char *arg; - const char **argv; - const char **argp; - char *dspec; - int cnt = 0; - int i; - int rv; - - va_start(ap, app); - do { - arg = va_arg(ap, const char *); - cnt++; - } while (arg != NULL); - va_end(ap); - - argv = calloc(cnt + 4, sizeof(const char *)); - if (argv == NULL) - return -1; - - task_exit_t texit; - int retval; - - argp = argv; - *argp++ = app; - - rv = asprintf(&dspec, "%s?idev=%zu", display_spec, - (size_t)launcher->ev_pos_id); - if (rv < 0) { - printf("Out of memory.\n"); - return -1; - } - - /* TODO Might be omitted if default display AND only one seat */ - *argp++ = "-d"; - *argp++ = dspec; - - va_start(ap, app); - do { - arg = va_arg(ap, const char *); - *argp++ = arg; - } while (arg != NULL); - va_end(ap); - - *argp++ = NULL; - - printf("%s: Spawning %s", NAME, app); - for (i = 0; argv[i] != NULL; i++) { - printf(" %s", argv[i]); - } - printf("\n"); - - rc = task_spawnv(&id, &wait, app, argv); - if (rc != EOK) { - printf("%s: Error spawning %s (%s)\n", NAME, app, str_error(rc)); - return -1; - } - - rc = task_wait(&wait, &texit, &retval); - if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) { - printf("%s: Error retrieving retval from %s (%s)\n", NAME, - app, str_error(rc)); - return -1; - } - - return retval; -} - -static void print_syntax(void) -{ - printf("Syntax: %s [-d ]\n", NAME); -} - -int main(int argc, char *argv[]) -{ - int i; - launcher_t launcher; - ui_t *ui = NULL; - ui_wnd_params_t params; - ui_window_t *window = NULL; - ui_resource_t *ui_res; - gfx_bitmap_params_t logo_params; - gfx_bitmap_t *logo_bmp; - gfx_context_t *gc; - gfx_rect_t logo_rect; - gfx_rect_t rect; - gfx_coord2_t off; - const char *dspec = UI_DISPLAY_DEFAULT; - char *qmark; - errno_t rc; - - i = 1; - while (i < argc) { - if (str_cmp(argv[i], "-d") == 0) { - ++i; - if (i >= argc) { - printf("Argument missing.\n"); - print_syntax(); - return 1; - } - - dspec = argv[i++]; - } else { - printf("Invalid option '%s'.\n", argv[i]); - print_syntax(); - return 1; - } - } - - display_spec = str_dup(dspec); - if (display_spec == NULL) { - printf("Out of memory.\n"); - return 1; - } - - /* Remove additional arguments */ - qmark = str_chr(display_spec, '?'); - if (qmark != NULL) - *qmark = '\0'; - - rc = ui_create(dspec, &ui); - if (rc != EOK) { - printf("Error creating UI on display %s.\n", display_spec); - return rc; - } - - ui_wnd_params_init(¶ms); - params.caption = "Launcher"; - params.placement = ui_wnd_place_top_right; - params.rect.p0.x = 0; - params.rect.p0.y = 0; - params.rect.p1.x = 210; - params.rect.p1.y = 345; - - memset((void *) &launcher, 0, sizeof(launcher)); - launcher.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 *) &launcher); - launcher.window = window; - - ui_res = ui_window_get_res(window); - gc = ui_window_get_gc(window); - - rc = decode_tga(gc, (void *) helenos_tga, helenos_tga_size, - &logo_bmp, &logo_rect); - if (rc != EOK) { - printf("Unable to decode logo.\n"); - return 1; - } - - gfx_bitmap_params_init(&logo_params); - logo_params.rect = logo_rect; - - rc = ui_fixed_create(&launcher.fixed); - if (rc != EOK) { - printf("Error creating fixed layout.\n"); - return rc; - } - - rc = ui_image_create(ui_res, logo_bmp, &logo_rect, &launcher.image); - if (rc != EOK) { - printf("Error creating label.\n"); - return rc; - } - - off.x = 6; - off.y = 32; - gfx_rect_translate(&off, &logo_rect, &rect); - - /* Adjust for frame width (2 x 1 pixel) */ - rect.p1.x += 2; - rect.p1.y += 2; - ui_image_set_rect(launcher.image, &rect); - ui_image_set_flags(launcher.image, ui_imgf_frame); - - rc = ui_fixed_add(launcher.fixed, ui_image_ctl(launcher.image)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - rc = ui_label_create(ui_res, "Launch application", &launcher.label); - if (rc != EOK) { - printf("Error creating label.\n"); - return rc; - } - - rect.p0.x = 60; - rect.p0.y = 107; - rect.p1.x = 160; - rect.p1.y = 120; - ui_label_set_rect(launcher.label, &rect); - ui_label_set_halign(launcher.label, gfx_halign_center); - - rc = ui_fixed_add(launcher.fixed, ui_label_ctl(launcher.label)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - /* Navigator */ - - rc = ui_pbutton_create(ui_res, "Navigator", &launcher.pb1); - if (rc != EOK) { - printf("Error creating button.\n"); - return rc; - } - - ui_pbutton_set_cb(launcher.pb1, &pbutton_cb, (void *) &launcher); - - rect.p0.x = 15; - rect.p0.y = 130; - rect.p1.x = 190; - rect.p1.y = rect.p0.y + 28; - ui_pbutton_set_rect(launcher.pb1, &rect); - - rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb1)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - /* Text Editor */ - - rc = ui_pbutton_create(ui_res, "Text Editor", &launcher.pb2); - if (rc != EOK) { - printf("Error creating button.\n"); - return rc; - } - - ui_pbutton_set_cb(launcher.pb2, &pbutton_cb, (void *) &launcher); - - rect.p0.x = 15; - rect.p0.y = 130 + 35; - rect.p1.x = 190; - rect.p1.y = rect.p0.y + 28; - ui_pbutton_set_rect(launcher.pb2, &rect); - - rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb2)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - /* Terminal */ - - rc = ui_pbutton_create(ui_res, "Terminal", &launcher.pb3); - if (rc != EOK) { - printf("Error creating button.\n"); - return rc; - } - - ui_pbutton_set_cb(launcher.pb3, &pbutton_cb, (void *) &launcher); - - rect.p0.x = 15; - rect.p0.y = 130 + 2 * 35; - rect.p1.x = 190; - rect.p1.y = rect.p0.y + 28; - ui_pbutton_set_rect(launcher.pb3, &rect); - - rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb3)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - /* Calculator */ - - rc = ui_pbutton_create(ui_res, "Calculator", &launcher.pb4); - if (rc != EOK) { - printf("Error creating button.\n"); - return rc; - } - - ui_pbutton_set_cb(launcher.pb4, &pbutton_cb, (void *) &launcher); - - rect.p0.x = 15; - rect.p0.y = 130 + 3 * 35; - rect.p1.x = 190; - rect.p1.y = rect.p0.y + 28; - ui_pbutton_set_rect(launcher.pb4, &rect); - - rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb4)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - /* UI Demo */ - - rc = ui_pbutton_create(ui_res, "UI Demo", &launcher.pb5); - if (rc != EOK) { - printf("Error creating button.\n"); - return rc; - } - - ui_pbutton_set_cb(launcher.pb5, &pbutton_cb, (void *) &launcher); - - rect.p0.x = 15; - rect.p0.y = 130 + 4 * 35; - rect.p1.x = 190; - rect.p1.y = rect.p0.y + 28; - ui_pbutton_set_rect(launcher.pb5, &rect); - - rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb5)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - /* GFX Demo */ - - rc = ui_pbutton_create(ui_res, "GFX Demo", &launcher.pb6); - if (rc != EOK) { - printf("Error creating button.\n"); - return rc; - } - - ui_pbutton_set_cb(launcher.pb6, &pbutton_cb, (void *) &launcher); - - rect.p0.x = 15; - rect.p0.y = 130 + 5 * 35; - rect.p1.x = 190; - rect.p1.y = rect.p0.y + 28; - ui_pbutton_set_rect(launcher.pb6, &rect); - - rc = ui_fixed_add(launcher.fixed, ui_pbutton_ctl(launcher.pb6)); - if (rc != EOK) { - printf("Error adding control to layout.\n"); - return rc; - } - - ui_window_add(window, ui_fixed_ctl(launcher.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 0; -} - -/** @} - */ Index: pace/app/launcher/launcher.h =================================================================== --- uspace/app/launcher/launcher.h (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ (revision ) @@ -1,71 +1,0 @@ -/* - * 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 launcher - * @{ - */ -/** - * @file Launcher - */ - -#ifndef LAUNCHER_H -#define LAUNCHER_H - -#include -#include -#include -#include -#include -#include -#include -#include - -/** Launcher */ -typedef struct { - ui_t *ui; - ui_window_t *window; - ui_fixed_t *fixed; - - ui_image_t *image; - ui_label_t *label; - - ui_pbutton_t *pb1; - ui_pbutton_t *pb2; - ui_pbutton_t *pb3; - ui_pbutton_t *pb4; - ui_pbutton_t *pb5; - ui_pbutton_t *pb6; - - /** ID of device that sent last position event */ - sysarg_t ev_pos_id; -} launcher_t; - -#endif - -/** @} - */ Index: pace/app/launcher/meson.build =================================================================== --- uspace/app/launcher/meson.build (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ (revision ) @@ -1,57 +1,0 @@ -# -# Copyright (c) 2012 Petr Koupy -# 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 = [ 'gfximage', 'ui' ] - -_images = files('gfx/helenos.tga') - -_images_zip = custom_target('launcher_images.zip', - input : _images, - output : [ 'images.zip' ], - command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ], -) -_imgs_s = custom_target('launcher_images.s', - input : _images_zip, - output : [ 'images.s' ], - command : [ unzip, '-p', '@INPUT@', 'images.s' ], - capture : true, -) -_imgs_h = custom_target('launcher_images.h', - input : _images_zip, - output : [ 'images.h' ], - command : [ unzip, '-p', '@INPUT@', 'images.h' ], - capture : true, -) -_imgs_desc_c = custom_target('launcher_images_desc.c', - input : _images_zip, - output : [ 'images_desc.c' ], - command : [ unzip, '-p', '@INPUT@', 'images_desc.c' ], - capture : true, -) - -src = [ files('launcher.c'), _imgs_s, _imgs_h, _imgs_desc_c ] Index: uspace/app/meson.build =================================================================== --- uspace/app/meson.build (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ uspace/app/meson.build (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -28,4 +28,5 @@ apps = [ + 'aboutos', 'barber', 'bdsh', @@ -57,5 +58,4 @@ 'killall', 'kio', - 'launcher', 'loc', 'logset', Index: uspace/app/taskbar/meson.build =================================================================== --- uspace/app/taskbar/meson.build (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ uspace/app/taskbar/meson.build (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -48,5 +48,3 @@ ) -if install_nonessential_data - installed_data += { 'name': 'taskbar.sif', 'dir': '/cfg' } -endif +installed_data += { 'name': 'taskbar.sif', 'dir': '/cfg' } Index: uspace/app/taskbar/taskbar.sif =================================================================== --- uspace/app/taskbar/taskbar.sif (revision d92b8e8f16d19c0ce7828d8dfbc2f178747ce076) +++ uspace/app/taskbar/taskbar.sif (revision e229148c5c401bc953a39417b7d612a34790de73) @@ -1,1 +1,1 @@ -[sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/nav][terminal]=[y]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/edit][terminal]=[y]){}[entry]([caption]=[Co~m~mand Line][cmd]=[/app/bdsh][terminal]=[y]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo -d %d][terminal]=[n]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo -d %d ui][terminal]=[n]){}[entry]([caption]=[~B~arber Pole][cmd]=[/app/barber -d %d][terminal]=[n]){}[entry]([caption]=[~T~etris][cmd]=[/app/tetris][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~D~isplay Configuration][cmd]=[/app/display-cfg -d %d][terminal]=[n]){}[entry]([caption]=[Ta~s~kbar Configuration][cmd]=[/app/taskbar-cfg -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[Tas~k~ Monitor (top)][cmd]=[/app/top][terminal]=[y]){}[entry]([caption]=[~F~disk Disk Editor][cmd]=[/app/fdisk][terminal]=[y]){}}} +[sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/nav][terminal]=[y]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/edit][terminal]=[y]){}[entry]([caption]=[Co~m~mand Line][cmd]=[/app/bdsh][terminal]=[y]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo -d %d][terminal]=[n]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo -d %d ui][terminal]=[n]){}[entry]([caption]=[~B~arber Pole][cmd]=[/app/barber -d %d][terminal]=[n]){}[entry]([caption]=[~T~etris][cmd]=[/app/tetris][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~D~isplay Configuration][cmd]=[/app/display-cfg -d %d][terminal]=[n]){}[entry]([caption]=[Ta~s~kbar Configuration][cmd]=[/app/taskbar-cfg -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[Tas~k~ Monitor (top)][cmd]=[/app/top][terminal]=[y]){}[entry]([caption]=[~F~disk Disk Editor][cmd]=[/app/fdisk][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~A~bout HelenOS][cmd]=[/app/aboutos -d %d][terminal]=[n]){}}}