Index: meson/part/initrd_manifest/meson.build =================================================================== --- meson/part/initrd_manifest/meson.build (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ meson/part/initrd_manifest/meson.build (revision 0d71fd6fb826667181acc317bb2e664fd2c9b10d) @@ -61,5 +61,5 @@ rd_essential += [ 'app/launcher', - 'app/vterm', + 'app/terminal', 'srv/hid/display', Index: pace/app/fontviewer/doc/doxygroups.h =================================================================== --- uspace/app/fontviewer/doc/doxygroups.h (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,3 +1,0 @@ -/** @addtogroup fontviewer fontviewer - * @ingroup apps - */ Index: pace/app/fontviewer/fontviewer.c =================================================================== --- uspace/app/fontviewer/fontviewer.c (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,323 +1,0 @@ -/* - * Copyright (c) 2014 Martin Sucha - * 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 fontviewer - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "fontviewer" - -#define WINDOW_WIDTH 640 -#define WINDOW_HEIGHT 480 - -static window_t *main_window; -static surface_t *surface = NULL; -static canvas_t *canvas = NULL; -static surface_coord_t width, height; -uint16_t points = 16; -bool show_metrics = true; -char *font_path = NULL; - -static errno_t draw(void); - -static void on_keyboard_event(widget_t *widget, void *data) -{ - kbd_event_t *event = (kbd_event_t *) data; - - if (event->type == KEY_PRESS) { - if (event->c == 'q') - exit(0); - - if (event->key == KC_UP || event->key == KC_DOWN) { - uint16_t increment = (event->mods & KM_SHIFT) ? 10 : 1; - - if (event->key == KC_UP) - points += increment; - - if (event->key == KC_DOWN) { - if (points <= increment) { - points = 1; - } else { - points -= increment; - } - } - - if (points < 1) - points = 1; - } - - if (event->c == 'm') - show_metrics = !show_metrics; - } - - errno_t rc = draw(); - if (rc != EOK) { - printf("Failed drawing: %s.\n", str_error(rc)); - exit(1); - } - update_canvas(canvas, surface); -} - -static errno_t create_font(font_t **font, uint16_t points) -{ - if (font_path == NULL) { - return embedded_font_create(font, points); - } - - return pcf_font_create(font, font_path, points); -} - -static source_t rgb(uint8_t r, uint8_t g, uint8_t b) -{ - source_t source; - source_init(&source); - source_set_color(&source, PIXEL(255, r, g, b)); - return source; -} - -static void horizontal_rectangle(drawctx_t *drawctx, surface_coord_t x1, - surface_coord_t y1, surface_coord_t x2, surface_coord_t y2, - source_t *source) -{ - if (y2 < y1) - return; - - drawctx_set_source(drawctx, source); - drawctx_transfer(drawctx, x1, y1, x2 - x1 + 1, y2 - y1 + 1); -} - -static void horizontal_line(drawctx_t *drawctx, surface_coord_t y, - surface_coord_t x1, surface_coord_t x2, source_t *source) -{ - horizontal_rectangle(drawctx, x1, y, x2, y, source); -} - -static int text(drawctx_t *, font_t *, source_t *, surface_coord_t x, - surface_coord_t, const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(6, 7); -static int text(drawctx_t *drawctx, font_t *font, source_t *source, - surface_coord_t x, surface_coord_t y, const char *fmt, ...) -{ - char *str = NULL; - va_list args; - va_start(args, fmt); - int ret = vasprintf(&str, fmt, args); - va_end(args); - - if (ret >= 0) { - drawctx_set_source(drawctx, source); - drawctx_set_font(drawctx, font); - drawctx_print(drawctx, str, x, y); - - free(str); - } - - return ret; -} - -static errno_t draw(void) -{ - source_t background = rgb(255, 255, 255); - source_t foreground = rgb(0, 0, 0); - source_t glyphs = rgb(0, 0, 255); - source_t ascender_bg = rgb(255, 230, 128); - source_t ascender_fg = rgb(255, 153, 85); - source_t descender_bg = rgb(204, 255, 170); - source_t descender_fg = rgb(85, 212, 0); - source_t leading_bg = rgb(170, 238, 255); - source_t leading_fg = rgb(0, 170, 212); - font_t *info_font = NULL; - font_t *font = NULL; - - errno_t rc = create_font(&font, points); - if (rc != EOK) { - printf("Failed creating font\n"); - goto out_err; - } - - rc = embedded_font_create(&info_font, 16); - if (rc != EOK) { - printf("Failed creating info font\n"); - goto out_err; - } - - font_metrics_t font_metrics; - rc = font_get_metrics(font, &font_metrics); - if (rc != EOK) - goto out_err; - - surface_coord_t top = 50; - metric_t ascender_top = top; - metric_t descender_top = ascender_top + font_metrics.ascender; - metric_t leading_top = descender_top + font_metrics.descender; - metric_t line_bottom = leading_top + font_metrics.leading; - - drawctx_t drawctx; - drawctx_init(&drawctx, surface); - - drawctx_set_source(&drawctx, &background); - drawctx_transfer(&drawctx, 0, 0, - width, height); - - if (show_metrics) { - horizontal_rectangle(&drawctx, 0, ascender_top, width, - descender_top - 1, &ascender_bg); - horizontal_line(&drawctx, ascender_top, 0, width, - &ascender_fg); - - horizontal_rectangle(&drawctx, 0, descender_top, width, - leading_top - 1, &descender_bg); - horizontal_line(&drawctx, descender_top, 0, width, - &descender_fg); - - horizontal_rectangle(&drawctx, 0, leading_top, - width, line_bottom - 1, &leading_bg); - horizontal_line(&drawctx, leading_top, 0, width, - &leading_fg); - } - - drawctx_set_source(&drawctx, &glyphs); - drawctx_set_font(&drawctx, font); - drawctx_print(&drawctx, "Čaj'_", 0, top); - - if (show_metrics) { - surface_coord_t infos_top = line_bottom + 10; - text(&drawctx, info_font, &ascender_fg, 0, infos_top, - "Ascender: %d", font_metrics.ascender); - text(&drawctx, info_font, &descender_fg, 0, infos_top + 16, - "Descender: %d", font_metrics.descender); - text(&drawctx, info_font, &foreground, 0, infos_top + 32, - "Line height: %d", - font_metrics.ascender + font_metrics.descender); - text(&drawctx, info_font, &leading_fg, 0, infos_top + 48, - "Leading: %d", font_metrics.leading); - - } - -out_err: - if (font) - font_release(font); - if (info_font) - font_release(info_font); - return rc; -} - -static void print_syntax(void) -{ - printf("Syntax: %s [-d ]\n", NAME); -} - -int main(int argc, char *argv[]) -{ - const char *display_svc = DISPLAY_DEFAULT; - int i; - - i = 1; - while (i < argc) { - if (str_cmp(argv[i], "-d") == 0) { - ++i; - if (i >= argc) { - printf("Argument missing.\n"); - print_syntax(); - return 1; - } - - display_svc = argv[i++]; - } else { - printf("Invalid option '%s'.\n", argv[i]); - print_syntax(); - return 1; - } - } - - if (i < argc) { - font_path = NULL; - } else { - font_path = argv[i]; - } - - main_window = window_open(display_svc, NULL, WINDOW_MAIN, "fontviewer"); - if (!main_window) { - printf("Cannot open main window.\n"); - return 2; - } - - surface = surface_create(WINDOW_WIDTH, WINDOW_HEIGHT, NULL, - SURFACE_FLAG_NONE); - if (surface == NULL) { - printf("Cannot create surface.\n"); - return 2; - } - - width = WINDOW_WIDTH; - height = WINDOW_HEIGHT; - - errno_t rc = draw(); - if (rc != EOK) { - printf("Failed drawing: %s.\n", str_error(rc)); - return 2; - } - - canvas = create_canvas(window_root(main_window), NULL, - WINDOW_WIDTH, WINDOW_HEIGHT, surface); - if (canvas == NULL) { - printf("Cannot create canvas.\n"); - return 2; - } - sig_connect(&canvas->keyboard_event, NULL, on_keyboard_event); - - window_resize(main_window, 200, 200, WINDOW_WIDTH, WINDOW_HEIGHT, - WINDOW_PLACEMENT_ABSOLUTE); - window_exec(main_window); - - task_retval(0); - async_manager(); - - return 0; -} - -/** @} - */ Index: pace/app/fontviewer/meson.build =================================================================== --- uspace/app/fontviewer/meson.build (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,30 +1,0 @@ -# -# Copyright (c) 2014 Martin Sucha -# 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 = [ 'gui' ] -src = files('fontviewer.c') Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ uspace/app/init/init.c (revision 0d71fd6fb826667181acc317bb2e664fd2c9b10d) @@ -471,7 +471,7 @@ rc = display_server(); if (rc == EOK) { + app_start("/app/terminal"); + app_start("/app/launcher"); app_start("/app/barber"); - app_start("/app/launcher"); - app_start("/app/vterm"); } } Index: uspace/app/meson.build =================================================================== --- uspace/app/meson.build (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ uspace/app/meson.build (revision 0d71fd6fb826667181acc317bb2e664fd2c9b10d) @@ -45,5 +45,4 @@ 'fdisk', 'fontedit', - 'fontviewer', 'getterm', 'gfxdemo', @@ -91,8 +90,6 @@ 'untar', 'usbinfo', - 'vdemo', 'viewer', 'vol', - 'vterm', 'vuhid', 'wavplay', Index: pace/app/vdemo/doc/doxygroups.h =================================================================== --- uspace/app/vdemo/doc/doxygroups.h (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,4 +1,0 @@ -/** @addtogroup vdemo vdemo - * @brief Demo application - * @ingroup apps - */ Index: pace/app/vdemo/meson.build =================================================================== --- uspace/app/vdemo/meson.build (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,30 +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 = [ 'gui' ] -src = files('vdemo.c') Index: pace/app/vdemo/vdemo.c =================================================================== --- uspace/app/vdemo/vdemo.c (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,191 +1,0 @@ -/* - * Copyright (c) 2020 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 vdemo - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#define NAME "vdemo" - -typedef struct my_label { - label_t label; - slot_t confirm; - slot_t cancel; -} my_label_t; - -static void deinit_my_label(my_label_t *lbl) -{ - deinit_label(&lbl->label); -} - -static void my_label_destroy(widget_t *widget) -{ - my_label_t *lbl = (my_label_t *) widget; - - deinit_my_label(lbl); - - free(lbl); -} - -static void on_confirm(widget_t *widget, void *data) -{ - my_label_t *lbl = (my_label_t *) widget; - const char *confirmed = "Confirmed"; - lbl->label.rewrite(&lbl->label.widget, (void *) confirmed); -} - -static void on_cancel(widget_t *widget, void *data) -{ - my_label_t *lbl = (my_label_t *) widget; - const char *cancelled = "Cancelled"; - lbl->label.rewrite(&lbl->label.widget, (void *) cancelled); -} - -static bool init_my_label(my_label_t *lbl, widget_t *parent, - const char *caption, uint16_t points, pixel_t background, pixel_t foreground) -{ - lbl->confirm = on_confirm; - lbl->cancel = on_cancel; - bool initialized = init_label(&lbl->label, parent, NULL, caption, - points, background, foreground); - lbl->label.widget.destroy = my_label_destroy; - return initialized; -} - -static my_label_t *create_my_label(widget_t *parent, - const char *caption, uint16_t points, pixel_t background, pixel_t foreground) -{ - my_label_t *lbl = (my_label_t *) malloc(sizeof(my_label_t)); - if (!lbl) { - return NULL; - } - - if (init_my_label(lbl, parent, caption, points, background, foreground)) { - return lbl; - } else { - free(lbl); - return NULL; - } -} - -static void print_syntax(void) -{ - printf("Syntax: %s [-d ]\n", NAME); -} - -int main(int argc, char *argv[]) -{ - const char *disp_svc = DISPLAY_DEFAULT; - int i; - - i = 1; - while (i < argc) { - if (str_cmp(argv[i], "-d") == 0) { - ++i; - if (i >= argc) { - printf("Argument missing.\n"); - print_syntax(); - return 1; - } - - disp_svc = argv[i++]; - } else { - printf("Invalid option '%s'.\n", argv[i]); - print_syntax(); - return 1; - } - } - - window_t *main_window = window_open(disp_svc, NULL, - WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vdemo"); - if (!main_window) { - printf("Cannot open main window.\n"); - return 1; - } - - pixel_t grd_bg = PIXEL(255, 240, 240, 240); - - pixel_t btn_bg = PIXEL(255, 240, 240, 240); - pixel_t btn_fg = PIXEL(255, 186, 186, 186); - pixel_t btn_text = PIXEL(255, 0, 0, 0); - - pixel_t lbl_bg = PIXEL(255, 240, 240, 240); - pixel_t lbl_text = PIXEL(255, 0, 0, 0); - - my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16, - lbl_bg, lbl_text); - button_t *btn_confirm = create_button(NULL, NULL, "Confirm", 16, - btn_bg, btn_fg, btn_text); - button_t *btn_cancel = create_button(NULL, NULL, "Cancel", 16, - btn_bg, btn_fg, btn_text); - grid_t *grid = create_grid(window_root(main_window), NULL, 2, 2, - grd_bg); - if (!lbl_action || !btn_confirm || !btn_cancel || !grid) { - window_close(main_window); - printf("Cannot create widgets.\n"); - return 1; - } - - sig_connect( - &btn_confirm->clicked, - &lbl_action->label.widget, - lbl_action->confirm); - sig_connect( - &btn_cancel->clicked, - &lbl_action->label.widget, - lbl_action->cancel); - - grid->add(grid, &lbl_action->label.widget, 0, 0, 2, 1); - grid->add(grid, &btn_confirm->widget, 0, 1, 1, 1); - grid->add(grid, &btn_cancel->widget, 1, 1, 1, 1); - window_resize(main_window, 0, 0, 200, 76, - WINDOW_PLACEMENT_CENTER); - - window_exec(main_window); - task_retval(0); - async_manager(); - return 0; -} - -/** @} - */ Index: pace/app/vterm/doc/doxygroups.h =================================================================== --- uspace/app/vterm/doc/doxygroups.h (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,4 +1,0 @@ -/** @addtogroup vterm vterm - * @brief Terminal application - * @ingroup apps - */ Index: pace/app/vterm/meson.build =================================================================== --- uspace/app/vterm/meson.build (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,30 +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 = [ 'gui' ] -src = files('vterm.c') Index: pace/app/vterm/vterm.c =================================================================== --- uspace/app/vterm/vterm.c (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ (revision ) @@ -1,98 +1,0 @@ -/* - * Copyright (c) 2020 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 vterm - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include - -#define NAME "vterm" - -static void print_syntax(void) -{ - printf("Syntax: %s [-d ]\n", NAME); -} - -int main(int argc, char *argv[]) -{ - const char *display_svc = DISPLAY_DEFAULT; - int i; - - i = 1; - while (i < argc) { - if (str_cmp(argv[i], "-d") == 0) { - ++i; - if (i >= argc) { - printf("Argument missing.\n"); - print_syntax(); - return 1; - } - - display_svc = argv[i++]; - } else { - printf("Invalid option '%s'.\n", argv[i]); - print_syntax(); - return 1; - } - } - - window_t *main_window = window_open(display_svc, NULL, - WINDOW_MAIN | WINDOW_DECORATED, "vterm"); - if (!main_window) { - printf("%s: Cannot open main window.\n", NAME); - return 2; - } - - window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_TOP | - WINDOW_PLACEMENT_LEFT); - terminal_t *terminal_widget = - create_terminal(window_root(main_window), NULL, 640, 480); - if (!terminal_widget) { - window_close(main_window); - printf("%s: Cannot create widgets.\n", NAME); - return 3; - } - - window_exec(main_window); - task_retval(0); - async_manager(); - - return 0; -} - -/** @} - */ Index: uspace/lib/gui/terminal.c =================================================================== --- uspace/lib/gui/terminal.c (revision 6dca10f8c152110e0eef31e9daaf728c22ab6700) +++ uspace/lib/gui/terminal.c (revision 0d71fd6fb826667181acc317bb2e664fd2c9b10d) @@ -52,6 +52,6 @@ #include "terminal.h" -#define NAME "vterm" -#define NAMESPACE "vterm" +#define NAME "terminal" +#define NAMESPACE "terminal" #define LOCFS_MOUNT_POINT "/loc"