Changeset e0e612b in mainline

Timestamp:

2022-10-07T08:38:50Z (19 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0761448

Parents:

c77cfd8

git-author:

Jiri Svoboda <jiri@…> (2022-10-06 18:38:37)

git-committer:

Jiri Svoboda <jiri@…> (2022-10-07 08:38:50)

Message:

Add window list to taskbar (with one dummy entry so far)

Location:

uspace

Files:

• app/taskbar/meson.build (modified) (2 diffs)
• app/taskbar/taskbar.c (modified) (5 diffs)
• app/taskbar/taskbar.h (modified) (2 diffs)
• app/taskbar/test/main.c (modified) (1 diff)
• app/taskbar/test/wndlist.c (added)
• app/taskbar/types/taskbar.h (modified) (2 diffs)
• app/taskbar/types/wndlist.h (added)
• app/taskbar/wndlist.c (added)
• app/taskbar/wndlist.h (added)
• lib/ui/include/ui/resource.h (modified) (1 diff)
• lib/ui/src/resource.c (modified) (1 diff)
• lib/ui/test/resource.c (modified) (1 diff)

uspace/app/taskbar/meson.build

@@ -32 +32 @@
         'main.c',
         'taskbar.c',
+        'wndlist.c',
 )
 
@@ -37 +38 @@
         'clock.c',
         'taskbar.c',
+        'wndlist.c',
         'test/clock.c',
         'test/main.c',
         'test/taskbar.c',
+        'test/wndlist.c',
 )

uspace/app/taskbar/taskbar.c

@@ -44 +44 @@
 #include "clock.h"
 #include "taskbar.h"
+#include "wndlist.h"
 
 static void wnd_close(ui_window_t *, void *);
@@ -135 +136 @@
         }
 
-        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 +143 @@
 
         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 +156 @@
                 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 +209 @@
         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);

uspace/app/taskbar/taskbar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #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

uspace/app/taskbar/test/main.c

@@ -33 +33 @@
 PCUT_IMPORT(clock);
 PCUT_IMPORT(taskbar);
+PCUT_IMPORT(wndlist);
 
 PCUT_MAIN();

uspace/app/taskbar/types/taskbar.h

@@ -42 +42 @@
 #include <ui/window.h>
 #include "clock.h"
+#include "wndlist.h"
 
 /** Task bar */
-typedef struct {
+typedef struct taskbar {
         /** User interface */
         ui_t *ui;
@@ -52 +53 @@
         ui_fixed_t *fixed;
         ui_label_t *label;
+        /** Window list */
+        wndlist_t *wndlist;
         /** Clock */
         taskbar_clock_t *clock;

uspace/lib/ui/include/ui/resource.h

@@ -50 +50 @@
 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 *);

uspace/lib/ui/src/resource.c

@@ -677 +677 @@
 }
 
+/** 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.
  *

uspace/lib/ui/test/resource.c

@@ -134 +134 @@
 }
 
+/** 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)