Changeset 50a16d9 in mainline

Timestamp:

2022-09-26T11:58:09Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3fd38b2

Parents:

2139676

git-author:

Jiri Svoboda <jiri@…> (2022-09-24 23:57:50)

git-committer:

Jiri Svoboda <jiri@…> (2022-09-26 11:58:09)

Message:

Add simple digital clock display to task bar

Location:

uspace

Files:

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

uspace/app/taskbar/meson.build

@@ -29 +29 @@
 deps = [ 'ui' ]
 src = files(
+        'clock.c',
         'main.c',
         'taskbar.c',

uspace/app/taskbar/taskbar.c

@@ -42 +42 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include "clock.h"
 #include "taskbar.h"
 
@@ -96 +97 @@
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
-                params.rect.p1.x = 24;
-                params.rect.p1.y = 5;
+                params.rect.p1.x = 80;
+                params.rect.p1.y = 1;
+                params.style &= ~ui_wds_frame;
         } else {
                 params.rect.p0.x = 0;
@@ -138 +140 @@
         }
 
+        rc = taskbar_clock_create(taskbar->window, &taskbar->clock);
+        if (rc != EOK)
+                goto error;
+
+        rect.p0.x = 1024 - 80;
+        rect.p0.y = 4;
+        rect.p1.x = 1024 - 4;
+        rect.p1.y = 32 - 4;
+        taskbar_clock_set_rect(taskbar->clock, &rect);
+
+        rc = ui_fixed_add(taskbar->fixed, taskbar_clock_ctl(taskbar->clock));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                taskbar_clock_destroy(taskbar->clock);
+                goto error;
+        }
+
         ui_window_add(taskbar->window, ui_fixed_ctl(taskbar->fixed));
 
@@ -149 +168 @@
         return EOK;
 error:
+        if (taskbar->clock != NULL)
+                taskbar_clock_destroy(taskbar->clock);
         if (taskbar->window != NULL)
                 ui_window_destroy(taskbar->window);
@@ -160 +181 @@
 void taskbar_destroy(taskbar_t *taskbar)
 {
+        taskbar_clock_destroy(taskbar->clock);
         ui_window_destroy(taskbar->window);
         ui_destroy(taskbar->ui);

uspace/app/taskbar/types/taskbar.h

@@ -41 +41 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include "clock.h"
 
 /** Task bar */
@@ -51 +52 @@
         ui_fixed_t *fixed;
         ui_label_t *label;
+        /** Clock */
+        taskbar_clock_t *clock;
 } taskbar_t;
 

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

@@ -38 +38 @@
 
 #include <errno.h>
+#include <gfx/color.h>
 #include <gfx/context.h>
 #include <gfx/font.h>
@@ -49 +50 @@
 extern void ui_resource_expose(ui_resource_t *);
 extern gfx_font_t *ui_resource_get_font(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 *);
 
 #endif

uspace/lib/ui/src/resource.c

@@ -677 +677 @@
 }
 
+/** Get the UI window face color.
+ *
+ * @param resource UI resource
+ * @return UI window face color
+ */
+gfx_color_t *ui_resource_get_wnd_face_color(ui_resource_t *resource)
+{
+        return resource->wnd_face_color;
+}
+
+/** Get the UI window text color.
+ *
+ * @param resource UI resource
+ * @return UI window text color
+ */
+gfx_color_t *ui_resource_get_wnd_text_color(ui_resource_t *resource)
+{
+        return resource->wnd_text_color;
+}
+
 /** @}
  */