Changeset ee3b28a9 in mainline for uspace/app

Timestamp:

2024-02-26T13:30:48Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

d92b8e8f

Parents:

90ba06c

git-author:

Jiri Svoboda <jiri@…> (2024-02-25 16:12:29)

git-committer:

Jiri Svoboda <jiri@…> (2024-02-26 13:30:48)

Message:

Notify taskbar when start menu changes

Location:

uspace/app

Files:

• taskbar-cfg/smeedit.c (modified) (2 diffs)
• taskbar-cfg/startmenu.c (modified) (5 diffs)
• taskbar/taskbar.c (modified) (6 diffs)
• taskbar/tbsmenu.c (modified) (3 diffs)
• taskbar/tbsmenu.h (modified) (1 diff)
• taskbar/types/taskbar.h (modified) (2 diffs)
• taskbar/types/tbsmenu.h (modified) (2 diffs)

uspace/app/taskbar-cfg/smeedit.c

@@ -403 +403 @@
 
                 startmenu_repaint(smee->startmenu);
+                (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
         } else {
                 /* Edit existing entry */
@@ -419 +420 @@
                 (void)smenu_entry_save(smee->smentry->entry);
                 startmenu_entry_update(smee->smentry);
+                (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
         }
 

uspace/app/taskbar-cfg/startmenu.c

@@ -515 +515 @@
 
         (void)smee;
+        (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
 
@@ -533 +534 @@
         (void)startmenu_insert(smenu, entry, &smentry);
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
 
@@ -633 +635 @@
         free(smentry);
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
 
@@ -685 +688 @@
 
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
 
@@ -711 +715 @@
 
         (void)ui_control_paint(ui_list_ctl(smenu->entries_list));
+        (void)tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
 }
 

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 = {
@@ -201 +204 @@
         }
 
-        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");
         }
 
@@ -287 +296 @@
         return EOK;
 error:
+        if (taskbar->lst != NULL)
+                tbarcfg_listener_destroy(taskbar->lst);
         if (taskbar->clock != NULL)
                 taskbar_clock_destroy(taskbar->clock);
@@ -304 +315 @@
 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 +325 @@
 }
 
+/** 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);
+}
+
 /** @}
  */

uspace/app/taskbar/tbsmenu.c

@@ -135 +135 @@
         errno_t rc;
 
+        if (tbsmenu->repopath != NULL)
+                free(tbsmenu->repopath);
+
+        tbsmenu->repopath = str_dup(repopath);
+        if (tbsmenu->repopath == NULL)
+                return ENOMEM;
+
+        /* Remove existing entries */
+        tentry = tbsmenu_first(tbsmenu);
+        while (tentry != NULL) {
+                tbsmenu_remove(tbsmenu, tentry, false);
+                tentry = tbsmenu_first(tbsmenu);
+        }
+
         rc = tbarcfg_open(repopath, &tbcfg);
         if (rc != EOK)
@@ -170 +184 @@
 }
 
+/** Reload start menu from repository (or schedule reload).
+ *
+ * @param tbsmenu Start menu
+ */
+void tbsmenu_reload(tbsmenu_t *tbsmenu)
+{
+        if (!tbsmenu_is_open(tbsmenu))
+                (void) tbsmenu_load(tbsmenu, tbsmenu->repopath);
+        else
+                tbsmenu->needs_reload = true;
+}
+
 /** Set start menu rectangle.
  *
@@ -198 +224 @@
 {
         ui_menu_close(tbsmenu->smenu);
+
+        if (tbsmenu->needs_reload)
+                (void) tbsmenu_load(tbsmenu, tbsmenu->repopath);
 }
 

uspace/app/taskbar/tbsmenu.h

@@ -48 +48 @@
 extern errno_t tbsmenu_create(ui_window_t *, ui_fixed_t *, tbsmenu_t **);
 extern errno_t tbsmenu_load(tbsmenu_t *, const char *);
+extern void tbsmenu_reload(tbsmenu_t *);
 extern void tbsmenu_set_rect(tbsmenu_t *, gfx_rect_t *);
 extern void tbsmenu_open(tbsmenu_t *);

uspace/app/taskbar/types/taskbar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
         /** Clock */
         taskbar_clock_t *clock;
+        /** Configuration change listener */
+        tbarcfg_listener_t *lst;
 } taskbar_t;
 

uspace/app/taskbar/types/tbsmenu.h

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <stdbool.h>
+#include <tbarcfg/tbarcfg.h>
 #include <ui/pbutton.h>
 #include <ui/fixed.h>
@@ -84 +85 @@
         /** Device ID of last input event */
         sysarg_t ev_idev_id;
+
+        /** Repository path name */
+        char *repopath;
+
+        /** Need to reload menu when possible */
+        bool needs_reload;
 } tbsmenu_t;