Changeset ee3b28a9 in mainline

Timestamp:

2024-02-26T13:30:48Z (2 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

Files:

• abi/include/abi/ipc/interfaces.h (modified) (2 diffs)
• uspace/app/taskbar-cfg/smeedit.c (modified) (2 diffs)
• uspace/app/taskbar-cfg/startmenu.c (modified) (5 diffs)
• uspace/app/taskbar/taskbar.c (modified) (6 diffs)
• uspace/app/taskbar/tbsmenu.c (modified) (3 diffs)
• uspace/app/taskbar/tbsmenu.h (modified) (1 diff)
• uspace/app/taskbar/types/taskbar.h (modified) (2 diffs)
• uspace/app/taskbar/types/tbsmenu.h (modified) (2 diffs)
• uspace/lib/tbarcfg/include/ipc/tbarcfg.h (added)
• uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h (modified) (2 diffs)
• uspace/lib/tbarcfg/include/types/tbarcfg/tbarcfg.h (modified) (2 diffs)
• uspace/lib/tbarcfg/private/tbarcfg.h (modified) (1 diff)
• uspace/lib/tbarcfg/src/tbarcfg.c (modified) (2 diffs)
• uspace/lib/tbarcfg/test/tbarcfg.c (modified) (3 diffs)
• uspace/lib/ui/src/menuentry.c (modified) (2 diffs)
• uspace/srv/locsrv/locsrv.c (modified) (2 diffs)

abi/include/abi/ipc/interfaces.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2014 Martin Decky
  * All rights reserved.
@@ -201 +201 @@
         INTERFACE_WNDMGT_CB =
             FOURCC_COMPACT('w', 'm', 'g', 't') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
+        INTERFACE_TBARCFG_NOTIFY =
+            FOURCC_COMPACT('t', 'b', 'c', 'f') | IFACE_EXCHANGE_SERIALIZE
 } iface_t;
 

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;
 

uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h

@@ -42 +42 @@
 #include <types/tbarcfg/tbarcfg.h>
 
+#define TBARCFG_NOTIFY_DEFAULT "tbarcfg-notif"
+
 extern errno_t tbarcfg_create(const char *, tbarcfg_t **);
 extern errno_t tbarcfg_open(const char *, tbarcfg_t **);
@@ -63 +65 @@
 extern errno_t smenu_entry_move_up(smenu_entry_t *);
 extern errno_t smenu_entry_move_down(smenu_entry_t *);
+extern errno_t tbarcfg_listener_create(const char *, void (*)(void *),
+    void *, tbarcfg_listener_t **);
+extern void tbarcfg_listener_destroy(tbarcfg_listener_t *);
+extern errno_t tbarcfg_notify(const char *);
 
 #endif

uspace/lib/tbarcfg/include/types/tbarcfg/tbarcfg.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 typedef struct smenu_entry smenu_entry_t;
 
+struct tbarcfg_listener;
+typedef struct tbarcfg_listener tbarcfg_listener_t;
+
 #endif
 

uspace/lib/tbarcfg/private/tbarcfg.h

@@ -71 +71 @@
 };
 
+/** Taskbar configuration listener */
+typedef struct tbarcfg_listener {
+        /** Notification callback */
+        void (*cb)(void *);
+        /** Callback argument */
+        void *arg;
+} tbarcfg_listener_t;
+
 extern errno_t smenu_entry_new(tbarcfg_t *, sif_node_t *, const char *,
     const char *, bool, smenu_entry_t **);

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -34 +34 @@
  */
 
+#include <async.h>
 #include <errno.h>
 #include <sif.h>
+#include <ipc/tbarcfg.h>
+#include <loc.h>
+#include <task.h>
 #include <tbarcfg/tbarcfg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
 #include "../private/tbarcfg.h"
+
+static void tbarcfg_notify_conn(ipc_call_t *, void *);
 
 /** Create taskbar configuration.
@@ -784 +791 @@
 }
 
+/** Create taskbar configuration listener.
+ *
+ * Listens for taskbar configuration change notifications.
+ *
+ * @param nchan Notification channel (TBARCFG_NOTIFY_DEFAULT)
+ * @param rlst Place to store pointer to new listener
+ * @return EOK on success or an error code
+ */
+errno_t tbarcfg_listener_create(const char *nchan, void (*cb)(void *),
+    void *arg, tbarcfg_listener_t **rlst)
+{
+        tbarcfg_listener_t *lst;
+        service_id_t svcid = 0;
+        loc_srv_t *srv = NULL;
+        task_id_t taskid;
+        char *svcname = NULL;
+        category_id_t catid;
+        port_id_t port;
+        int rv;
+        errno_t rc;
+
+        lst = calloc(1, sizeof(tbarcfg_listener_t));
+        if (lst == NULL)
+                return ENOMEM;
+
+        lst->cb = cb;
+        lst->arg = arg;
+
+        rc = async_create_port(INTERFACE_TBARCFG_NOTIFY,
+            tbarcfg_notify_conn, (void *)lst, &port);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_server_register("tbarcfg-listener", &srv);
+        if (rc != EOK)
+                goto error;
+
+        taskid = task_get_id();
+
+        rv = asprintf(&svcname, "tbarcfg/%u", (unsigned)taskid);
+        if (rv < 0) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = loc_service_register(srv, svcname, &svcid);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_category_get_id(nchan, &catid, 0);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_service_add_to_cat(srv, svcid, catid);
+        if (rc != EOK)
+                goto error;
+
+        *rlst = lst;
+        return EOK;
+error:
+        if (svcid != 0)
+                loc_service_unregister(srv, svcid);
+        if (srv != NULL)
+                loc_server_unregister(srv);
+        if (svcname != NULL)
+                free(svcname);
+        return rc;
+}
+
+/** Destroy taskbar configuration listener.
+ *
+ * @param lst Listener
+ */
+void tbarcfg_listener_destroy(tbarcfg_listener_t *lst)
+{
+        free(lst);
+}
+
+/** Send taskbar configuration notification to a particular service ID.
+ *
+ * @param svcid Service ID
+ * @return EOK on success or an error code
+ */
+static errno_t tbarcfg_notify_svc(service_id_t svcid)
+{
+        async_sess_t *sess;
+        async_exch_t *exch;
+        errno_t rc;
+
+        sess = loc_service_connect(svcid, INTERFACE_TBARCFG_NOTIFY, 0);
+        if (sess == NULL)
+                return EIO;
+
+        exch = async_exchange_begin(sess);
+        rc = async_req_0_0(exch, TBARCFG_NOTIFY_NOTIFY);
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_hangup(sess);
+                return rc;
+        }
+
+        async_exchange_end(exch);
+        async_hangup(sess);
+        return EOK;
+}
+
+/** Send taskbar configuration change notification.
+ *
+ * @param nchan Notification channel (TBARCFG_NOTIFY_DEFAULT)
+ */
+errno_t tbarcfg_notify(const char *nchan)
+{
+        errno_t rc;
+        category_id_t catid;
+        service_id_t *svcs = NULL;
+        size_t count, i;
+
+        rc = loc_category_get_id(nchan, &catid, 0);
+        if (rc != EOK)
+                return rc;
+
+        rc = loc_category_get_svcs(catid, &svcs, &count);
+        if (rc != EOK)
+                return rc;
+
+        for (i = 0; i < count; i++) {
+                rc = tbarcfg_notify_svc(svcs[i]);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        free(svcs);
+        return EOK;
+error:
+        free(svcs);
+        return rc;
+}
+
+/** Taskbar configuration connection handler.
+ *
+ * @param icall Initial call
+ * @param arg Argument (tbarcfg_listener_t *)
+ */
+static void tbarcfg_notify_conn(ipc_call_t *icall, void *arg)
+{
+        tbarcfg_listener_t *lst = (tbarcfg_listener_t *)arg;
+
+        /* Accept the connection */
+        async_accept_0(icall);
+
+        while (true) {
+                ipc_call_t call;
+                async_get_call(&call);
+                sysarg_t method = ipc_get_imethod(&call);
+
+                if (!method) {
+                        /* The other side has hung up */
+                        async_answer_0(&call, EOK);
+                        return;
+                }
+
+                switch (method) {
+                case TBARCFG_NOTIFY_NOTIFY:
+                        lst->cb(lst->arg);
+                        async_answer_0(&call, EOK);
+                        break;
+                default:
+                        async_answer_0(&call, EINVAL);
+                }
+        }
+}
+
 /** @}
  */

uspace/lib/tbarcfg/test/tbarcfg.c

@@ -30 +30 @@
 #include <pcut/pcut.h>
 #include <tbarcfg/tbarcfg.h>
+#include <stdbool.h>
 #include <stdio.h>
 
@@ -35 +36 @@
 
 PCUT_TEST_SUITE(tbarcfg);
+
+typedef struct {
+        bool notified;
+} tbarcfg_test_resp_t;
+
+static void test_cb(void *);
 
 /** Creating, opening and closing taskbar configuration */
@@ -554 +561 @@
 }
 
+/** Notifications can be delivered from tbarcfg_notify() to a listener. */
+PCUT_TEST(notify)
+{
+        errno_t rc;
+        tbarcfg_listener_t *lst;
+        tbarcfg_test_resp_t test_resp;
+
+        test_resp.notified = false;
+
+        printf("create listener resp=%p\n", (void *)&test_resp);
+        rc = tbarcfg_listener_create(TBARCFG_NOTIFY_DEFAULT,
+            test_cb, &test_resp, &lst);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_TRUE(test_resp.notified);
+        tbarcfg_listener_destroy(lst);
+}
+
+static void test_cb(void *arg)
+{
+        tbarcfg_test_resp_t *resp = (tbarcfg_test_resp_t *)arg;
+
+        printf("test_cb: executing resp=%p\n", (void *)resp);
+        resp->notified = true;
+}
+
 PCUT_EXPORT(tbarcfg);

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -145 +145 @@
                 return;
 
+        mentry->menu->total_h -= ui_menu_entry_height(mentry);
+        /* NOTE: max_caption_w/max_shortcut_w not updated (speed) */
+
         list_remove(&mentry->lentries);
+
+        /*
+         * If we emptied the menu, reset accumulated dims so they
+         * can be correctly calculated when (if) the menu is
+         * re-populated.
+         */
+        if (list_empty(&mentry->menu->entries)) {
+                mentry->menu->total_h = 0;
+                mentry->menu->max_caption_w = 0;
+                mentry->menu->max_shortcut_w = 0;
+        }
+
         free(mentry->caption);
         free(mentry);

uspace/srv/locsrv/locsrv.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2007 Josef Cejka
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -1354 +1354 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("tbarcfg-notif");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("test3");
         categ_dir_add_cat(&cdir, cat);