Index: uspace/app/taskbar/meson.build =================================================================== --- uspace/app/taskbar/meson.build (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/app/taskbar/meson.build (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -32,4 +32,5 @@ 'main.c', 'taskbar.c', + 'wndlist.c', ) @@ -37,6 +38,8 @@ 'clock.c', 'taskbar.c', + 'wndlist.c', 'test/clock.c', 'test/main.c', 'test/taskbar.c', + 'test/wndlist.c', ) Index: uspace/app/taskbar/taskbar.c =================================================================== --- uspace/app/taskbar/taskbar.c (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/app/taskbar/taskbar.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -44,4 +44,5 @@ #include "clock.h" #include "taskbar.h" +#include "wndlist.h" static void wnd_close(ui_window_t *, void *); @@ -135,5 +136,5 @@ } - rc = ui_label_create(ui_res, "Task bar!", &taskbar->label); + rc = ui_label_create(ui_res, "HelenOS", &taskbar->label); if (rc != EOK) { printf("Error creating label.\n"); @@ -142,6 +143,11 @@ ui_window_get_app_rect(taskbar->window, &rect); + if (ui_is_textmode(taskbar->ui)) { + rect.p0.x += 1; + } else { + rect.p0.x += 10; + } ui_label_set_rect(taskbar->label, &rect); - ui_label_set_halign(taskbar->label, gfx_halign_center); + ui_label_set_halign(taskbar->label, gfx_halign_left); ui_label_set_valign(taskbar->label, gfx_valign_center); @@ -150,4 +156,16 @@ printf("Error adding control to layout.\n"); ui_label_destroy(taskbar->label); + goto error; + } + + rc = wndlist_create(ui_res, taskbar->fixed, &taskbar->wndlist); + if (rc != EOK) { + printf("Error creating window list.\n"); + goto error; + } + + rc = wndlist_append(taskbar->wndlist, "Text Editor"); + if (rc != EOK) { + printf("Error adding window list entry.\n"); goto error; } @@ -191,4 +209,6 @@ if (taskbar->clock != NULL) taskbar_clock_destroy(taskbar->clock); + if (taskbar->wndlist != NULL) + wndlist_destroy(taskbar->wndlist); if (taskbar->window != NULL) ui_window_destroy(taskbar->window); Index: uspace/app/taskbar/taskbar.h =================================================================== --- uspace/app/taskbar/taskbar.h (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/app/taskbar/taskbar.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2020 Jiri Svoboda + * Copyright (c) 2022 Jiri Svoboda * All rights reserved. * @@ -40,6 +40,6 @@ #include "types/taskbar.h" -errno_t taskbar_create(const char *display_spec, taskbar_t **); -void taskbar_destroy(taskbar_t *); +extern errno_t taskbar_create(const char *display_spec, taskbar_t **); +extern void taskbar_destroy(taskbar_t *); #endif Index: uspace/app/taskbar/test/main.c =================================================================== --- uspace/app/taskbar/test/main.c (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/app/taskbar/test/main.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -33,4 +33,5 @@ PCUT_IMPORT(clock); PCUT_IMPORT(taskbar); +PCUT_IMPORT(wndlist); PCUT_MAIN(); Index: uspace/app/taskbar/test/wndlist.c =================================================================== --- uspace/app/taskbar/test/wndlist.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) +++ uspace/app/taskbar/test/wndlist.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2022 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 "../wndlist.h" + +PCUT_INIT; + +PCUT_TEST_SUITE(taskbar); + +/* Test creating and destroying window list */ +PCUT_TEST(create_destroy) +{ + errno_t rc; + ui_t *ui = NULL; + ui_wnd_params_t params; + ui_window_t *window = NULL; + ui_fixed_t *fixed = NULL; + ui_resource_t *res; + wndlist_t *wndlist; + + rc = ui_create_disp(NULL, &ui); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + ui_wnd_params_init(¶ms); + params.caption = "Hello"; + + rc = ui_window_create(ui, ¶ms, &window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(window); + + res = ui_window_get_res(window); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_fixed_create(&fixed); + ui_window_add(window, ui_fixed_ctl(fixed)); + + rc = wndlist_create(res, fixed, &wndlist); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + wndlist_destroy(wndlist); + + ui_window_destroy(window); + ui_destroy(ui); +} + +PCUT_EXPORT(wndlist); Index: uspace/app/taskbar/types/taskbar.h =================================================================== --- uspace/app/taskbar/types/taskbar.h (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/app/taskbar/types/taskbar.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -42,7 +42,8 @@ #include #include "clock.h" +#include "wndlist.h" /** Task bar */ -typedef struct { +typedef struct taskbar { /** User interface */ ui_t *ui; @@ -52,4 +53,6 @@ ui_fixed_t *fixed; ui_label_t *label; + /** Window list */ + wndlist_t *wndlist; /** Clock */ taskbar_clock_t *clock; Index: uspace/app/taskbar/types/wndlist.h =================================================================== --- uspace/app/taskbar/types/wndlist.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) +++ uspace/app/taskbar/types/wndlist.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2022 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 taskbar + * @{ + */ +/** + * @file Task bar window list + */ + +#ifndef TYPES_WNDLIST_H +#define TYPES_WNDLIST_H + +#include +#include +#include +#include +#include + +/** Taskbar window list entry */ +typedef struct { + /** Containing window list */ + struct wndlist *wndlist; + /** Link to wndlist->entries */ + link_t lentries; + /** Window button */ + ui_pbutton_t *button; +} wndlist_entry_t; + +/** Task bar window list */ +typedef struct wndlist { + /** Base control object */ + struct ui_control *control; + + /** UI resource */ + ui_resource_t *res; + + /** Layout to which we add window buttoons */ + ui_fixed_t *fixed; + + /** Window list rectangle */ + gfx_rect_t rect; + + /** Window list entries (of wndlist_entry_t) */ + list_t entries; +} wndlist_t; + +#endif + +/** @} + */ Index: uspace/app/taskbar/wndlist.c =================================================================== --- uspace/app/taskbar/wndlist.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) +++ uspace/app/taskbar/wndlist.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2022 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 taskbar + * @{ + */ +/** @file Task bar window list + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "clock.h" +#include "wndlist.h" + +/** Create task bar window list. + * + * @param res UI resource + * @param fixed Fixed layout to which buttons will be added + * @param rwndlist Place to store pointer to new window list + * @return @c EOK on success or an error code + */ +errno_t wndlist_create(ui_resource_t *res, ui_fixed_t *fixed, + wndlist_t **rwndlist) +{ + wndlist_t *wndlist = NULL; + errno_t rc; + + wndlist = calloc(1, sizeof(wndlist_t)); + if (wndlist == NULL) { + rc = ENOMEM; + goto error; + } + + wndlist->res = res; + wndlist->fixed = fixed; + list_initialize(&wndlist->entries); + *rwndlist = wndlist; + return EOK; +error: + return rc; + +} + +/** Destroy task bar window list. */ +void wndlist_destroy(wndlist_t *wndlist) +{ + free(wndlist); +} + +/** Append new entry to window list. + * + * @param wndlist Window list + * @param caption Entry caption + * @return @c EOK on success or an error code + */ +errno_t wndlist_append(wndlist_t *wndlist, const char *caption) +{ + wndlist_entry_t *entry = NULL; + gfx_rect_t rect; + errno_t rc; + + entry = calloc(1, sizeof(wndlist_entry_t)); + if (entry == NULL) { + rc = ENOMEM; + goto error; + } + + rc = ui_pbutton_create(wndlist->res, caption, &entry->button); + if (rc != EOK) + goto error; + + if (ui_resource_is_textmode(wndlist->res)) { + rect.p0.x = 9; + rect.p0.y = 0; + rect.p1.x = 25; + rect.p1.y = 1; + } else { + rect.p0.x = 90; + rect.p0.y = 3; + rect.p1.x = 230; + rect.p1.y = 29; + } + + ui_pbutton_set_rect(entry->button, &rect); + + rc = ui_fixed_add(wndlist->fixed, ui_pbutton_ctl(entry->button)); + if (rc != EOK) + goto error; + + entry->wndlist = wndlist; + list_append(&entry->lentries, &wndlist->entries); + + return EOK; +error: + if (entry != NULL && entry->button != NULL) + ui_pbutton_destroy(entry->button); + if (entry != NULL) + free(entry); + return rc; + +} + +/** @} + */ Index: uspace/app/taskbar/wndlist.h =================================================================== --- uspace/app/taskbar/wndlist.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) +++ uspace/app/taskbar/wndlist.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2022 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 taskbar + * @{ + */ +/** + * @file Task bar window list + */ + +#ifndef WNDLIST_H +#define WNDLIST_H + +#include +#include +#include +#include "types/wndlist.h" + +extern errno_t wndlist_create(ui_resource_t *, ui_fixed_t *, wndlist_t **); +extern void wndlist_destroy(wndlist_t *); +extern errno_t wndlist_append(wndlist_t *, const char *); + +#endif + +/** @} + */ Index: uspace/lib/ui/include/ui/resource.h =================================================================== --- uspace/lib/ui/include/ui/resource.h (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/lib/ui/include/ui/resource.h (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -50,4 +50,5 @@ extern void ui_resource_expose(ui_resource_t *); extern gfx_font_t *ui_resource_get_font(ui_resource_t *); +extern bool ui_resource_is_textmode(ui_resource_t *); extern gfx_color_t *ui_resource_get_wnd_face_color(ui_resource_t *); extern gfx_color_t *ui_resource_get_wnd_text_color(ui_resource_t *); Index: uspace/lib/ui/src/resource.c =================================================================== --- uspace/lib/ui/src/resource.c (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/lib/ui/src/resource.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -677,4 +677,14 @@ } +/** Determine if resource is textmode. + * + * @param resource UI resource + * @return @c true iff resource is textmode + */ +bool ui_resource_is_textmode(ui_resource_t *resource) +{ + return resource->textmode; +} + /** Get the UI window face color. * Index: uspace/lib/ui/test/resource.c =================================================================== --- uspace/lib/ui/test/resource.c (revision c77cfd848d0348e5f31cd4634ef728655b51f2aa) +++ uspace/lib/ui/test/resource.c (revision e0e612b4a7ecb09b6016f7d622789dcc33cb26e4) @@ -134,4 +134,110 @@ } +/** ui_resource_get_font() returns the font */ +PCUT_TEST(get_font) +{ + errno_t rc; + gfx_context_t *gc = NULL; + test_gc_t tgc; + ui_resource_t *resource = NULL; + gfx_font_t *font; + + memset(&tgc, 0, sizeof(tgc)); + rc = gfx_context_new(&ops, &tgc, &gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_resource_create(gc, false, &resource); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(resource); + + font = ui_resource_get_font(resource); + PCUT_ASSERT_EQUALS(resource->font, font); + + ui_resource_destroy(resource); + + rc = gfx_context_delete(gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); +} + +/** ui_resource_is_textmode() returns the textmode flag */ +PCUT_TEST(is_textmode) +{ + errno_t rc; + gfx_context_t *gc = NULL; + test_gc_t tgc; + ui_resource_t *resource = NULL; + + memset(&tgc, 0, sizeof(tgc)); + rc = gfx_context_new(&ops, &tgc, &gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_resource_create(gc, false, &resource); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(resource); + + /* To make sure let's test both true and false case */ + resource->textmode = true; + PCUT_ASSERT_TRUE(ui_resource_is_textmode(resource)); + resource->textmode = false; + PCUT_ASSERT_FALSE(ui_resource_is_textmode(resource)); + + ui_resource_destroy(resource); + + rc = gfx_context_delete(gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); +} + +/** ui_resource_get_wnd_face_color() returns window face color */ +PCUT_TEST(get_wnd_face_color) +{ + errno_t rc; + gfx_context_t *gc = NULL; + test_gc_t tgc; + ui_resource_t *resource = NULL; + gfx_color_t *color; + + memset(&tgc, 0, sizeof(tgc)); + rc = gfx_context_new(&ops, &tgc, &gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_resource_create(gc, false, &resource); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(resource); + + color = ui_resource_get_wnd_face_color(resource); + PCUT_ASSERT_EQUALS(resource->wnd_face_color, color); + + ui_resource_destroy(resource); + + rc = gfx_context_delete(gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); +} + +/** ui_resource_get_wnd_text_color() returns window text color */ +PCUT_TEST(get_wnd_text_color) +{ + errno_t rc; + gfx_context_t *gc = NULL; + test_gc_t tgc; + ui_resource_t *resource = NULL; + gfx_color_t *color; + + memset(&tgc, 0, sizeof(tgc)); + rc = gfx_context_new(&ops, &tgc, &gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = ui_resource_create(gc, false, &resource); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(resource); + + color = ui_resource_get_wnd_text_color(resource); + PCUT_ASSERT_EQUALS(resource->wnd_text_color, color); + + ui_resource_destroy(resource); + + rc = gfx_context_delete(gc); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); +} + static errno_t testgc_bitmap_create(void *arg, gfx_bitmap_params_t *params, gfx_bitmap_alloc_t *alloc, void **rbm)