Changes in uspace/app/taskbar/taskbar.c [82d3c28:d92b8e8f] in mainline

File:

• uspace/app/taskbar/taskbar.c (modified) (9 diffs)

uspace/app/taskbar/taskbar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 #include "wndlist.h"
 
+#define TASKBAR_CONFIG_FILE "/cfg/taskbar.sif"
+
 static void taskbar_wnd_close(ui_window_t *, void *);
 static void taskbar_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 static void taskbar_wnd_pos(ui_window_t *, void *, pos_event_t *);
+static void taskbar_notif_cb(void *);
 
 static ui_window_cb_t window_cb = {
@@ -128 +131 @@
         gfx_rect_t scr_rect;
         gfx_rect_t rect;
+        char *dspec = NULL;
+        char *qmark;
         errno_t rc;
 
         taskbar = calloc(1, sizeof(taskbar_t));
         if (taskbar == NULL) {
+                printf("Out of memory.\n");
                 rc = ENOMEM;
                 goto error;
         }
+
+        dspec = str_dup(display_spec);
+        if (dspec == NULL) {
+                printf("Out of memory.\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        /* Remove additional arguments */
+        qmark = str_chr(dspec, '?');
+        if (qmark != NULL)
+                *qmark = '\0';
 
         rc = ui_create(display_spec, &taskbar->ui);
@@ -195 +213 @@
         }
 
-        rc = tbsmenu_create(taskbar->window, taskbar->fixed, &taskbar->tbsmenu);
+        rc = tbsmenu_create(taskbar->window, taskbar->fixed, dspec,
+            &taskbar->tbsmenu);
         if (rc != EOK) {
                 printf("Error creating start menu.\n");
@@ -201 +220 @@
         }
 
-        rc = tbsmenu_load(taskbar->tbsmenu, "/cfg/taskbar.sif");
+        rc = tbsmenu_load(taskbar->tbsmenu, TASKBAR_CONFIG_FILE);
         if (rc != EOK) {
                 printf("Error loading start menu from '%s'.\n",
-                    "/cfg/taskbar.sif");
+                    TASKBAR_CONFIG_FILE);
+        }
+
+        rc = tbarcfg_listener_create(TBARCFG_NOTIFY_DEFAULT,
+            taskbar_notif_cb, (void *)taskbar, &taskbar->lst);
+        if (rc != EOK) {
+                printf("Error listening for configuration changes.\n");
         }
 
@@ -284 +309 @@
         }
 
+        free(dspec);
         *rtaskbar = taskbar;
         return EOK;
 error:
+        if (dspec != NULL)
+                free(dspec);
+        if (taskbar->lst != NULL)
+                tbarcfg_listener_destroy(taskbar->lst);
         if (taskbar->clock != NULL)
                 taskbar_clock_destroy(taskbar->clock);
@@ -297 +327 @@
         if (taskbar->ui != NULL)
                 ui_destroy(taskbar->ui);
+        free(taskbar);
         return rc;
 
@@ -304 +335 @@
 void taskbar_destroy(taskbar_t *taskbar)
 {
+        if (taskbar->lst != NULL)
+                tbarcfg_listener_destroy(taskbar->lst);
         ui_fixed_remove(taskbar->fixed, taskbar_clock_ctl(taskbar->clock));
         taskbar_clock_destroy(taskbar->clock);
@@ -312 +345 @@
 }
 
+/** Configuration change notification callback.
+ *
+ * Called when configuration changed.
+ *
+ * @param arg Argument (taskbar_t *)
+ */
+static void taskbar_notif_cb(void *arg)
+{
+        taskbar_t *taskbar = (taskbar_t *)arg;
+
+        ui_lock(taskbar->ui);
+        tbsmenu_reload(taskbar->tbsmenu);
+        ui_unlock(taskbar->ui);
+}
+
 /** @}
  */