1 files changed, 136 insertions, 75 deletions

diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c
index 91c3af06..a5248f6c 100644
--- a/swaybar/tray/tray.c
+++ b/swaybar/tray/tray.c
@@ -38,95 +38,81 @@ static void register_host(char *name) {
         dbus_message_unref(message);
 }
 
-static void get_items_reply(DBusPendingCall *pending, void *_data) {
-        DBusMessage *reply = dbus_pending_call_steal_reply(pending);
-
-        if (!reply) {
-                sway_log(L_ERROR, "Got no items reply from sni watcher");
-                goto bail;
+static void get_items_reply(DBusMessageIter *iter, void *_data, enum property_status status) {
+        if (status != PROP_EXISTS) {
+                return;
         }
+        DBusMessageIter array;
 
-        int message_type = dbus_message_get_type(reply);
+        // O(n) function, could be faster dynamically reading values
+        int len = dbus_message_iter_get_element_count(iter);
 
-        if (message_type == DBUS_MESSAGE_TYPE_ERROR) {
-                char *msg;
+        dbus_message_iter_recurse(iter, &array);
+        for (int i = 0; i < len; i++) {
+                const char *name;
+                dbus_message_iter_get_basic(&array, &name);
 
-                dbus_message_get_args(reply, NULL,
-                                DBUS_TYPE_STRING, &msg,
-                                DBUS_TYPE_INVALID);
+                if (list_seq_find(tray->items, sni_str_cmp, name) == -1) {
+                        struct StatusNotifierItem *item = sni_create(name);
 
-                sway_log(L_ERROR, "Message is error: %s", msg);
-                goto bail;
+                        if (item) {
+                                sway_log(L_DEBUG, "Item registered with host: %s", name);
+                                list_add(tray->items, item);
+                                dirty = true;
+                        }
+                }
+        }
+}
+static void get_obj_items_reply(DBusMessageIter *iter, void *_data, enum property_status status) {
+        if (status != PROP_EXISTS) {
+                return;
         }
-
-        DBusMessageIter iter;
-        DBusMessageIter variant;
         DBusMessageIter array;
+        DBusMessageIter dstruct;
 
-        dbus_message_iter_init(reply, &iter);
-        if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
-                sway_log(L_ERROR, "Replyed with wrong type, not v(as)");
-                goto bail;
-        }
-        dbus_message_iter_recurse(&iter, &variant);
-        if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_ARRAY ||
-                        dbus_message_iter_get_element_type(&variant) != DBUS_TYPE_STRING) {
-                sway_log(L_ERROR, "Replyed with wrong type, not v(as)");
-                goto bail;
-        }
+        int len = dbus_message_iter_get_element_count(iter);
 
-        // Clear list
-        list_foreach(tray->items, (void (*)(void *))sni_free);
-        list_free(tray->items);
-        tray->items = create_list();
+        dbus_message_iter_recurse(iter, &array);
+        for (int i = 0; i < len; i++) {
+                const char *object_path;
+                const char *unique_name;
 
-        // O(n) function, could be faster dynamically reading values
-        int len = dbus_message_iter_get_element_count(&variant);
+                dbus_message_iter_recurse(&array, &dstruct);
 
-        dbus_message_iter_recurse(&variant, &array);
-        for (int i = 0; i < len; i++) {
-                const char *name;
-                dbus_message_iter_get_basic(&array, &name);
+                dbus_message_iter_get_basic(&dstruct, &object_path);
+                dbus_message_iter_next(&dstruct);
+                dbus_message_iter_get_basic(&dstruct, &unique_name);
 
-                struct StatusNotifierItem *item = sni_create(name);
+                struct ObjName obj_name = {
+                        object_path,
+                        unique_name,
+                };
+                if (list_seq_find(tray->items, sni_obj_name_cmp, &obj_name) == -1) {
+                        struct StatusNotifierItem *item =
+                                sni_create_from_obj_path(unique_name, object_path);
 
-                if (item) {
-                        sway_log(L_DEBUG, "Item registered with host: %s", name);
-                        list_add(tray->items, item);
-                        dirty = true;
+                        if (item) {
+                                sway_log(L_DEBUG, "Item registered with host: %s", unique_name);
+                                list_add(tray->items, item);
+                                dirty = true;
+                        }
                 }
         }
-
-bail:
-        dbus_message_unref(reply);
-        dbus_pending_call_unref(pending);
-        return;
 }
-static void get_items() {
-        DBusPendingCall *pending;
-        DBusMessage *message = dbus_message_new_method_call(
-                        "org.freedesktop.StatusNotifierWatcher",
-                        "/StatusNotifierWatcher",
-                        "org.freedesktop.DBus.Properties",
-                        "Get");
-
-        const char *iface = "org.freedesktop.StatusNotifierWatcher";
-        const char *prop = "RegisteredStatusNotifierItems";
-        dbus_message_append_args(message,
-                        DBUS_TYPE_STRING, &iface,
-                        DBUS_TYPE_STRING, &prop,
-                        DBUS_TYPE_INVALID);
 
-        bool status =
-                dbus_connection_send_with_reply(conn, message, &pending, -1);
-        dbus_message_unref(message);
+static void get_items() {
+        // Clear list
+        list_foreach(tray->items, (void (*)(void *))sni_free);
+        list_free(tray->items);
+        tray->items = create_list();
 
-        if (!(pending || status)) {
-                sway_log(L_ERROR, "Could not get items");
-                return;
-        }
+        dbus_get_prop_async("org.freedesktop.StatusNotifierWatcher",
+                "/StatusNotifierWatcher","org.freedesktop.StatusNotifierWatcher",
+                "RegisteredStatusNotifierItems", "as", get_items_reply, NULL);
 
-        dbus_pending_call_set_notify(pending, get_items_reply, NULL, NULL);
+        dbus_get_prop_async("org.freedesktop.StatusNotifierWatcher",
+                "/StatusNotifierWatcher","org.swaywm.LessSuckyStatusNotifierWatcher",
+                "RegisteredObjectPathItems", "a(os)", get_obj_items_reply, NULL);
 }
 
 static DBusHandlerResult signal_handler(DBusConnection *connection,
@@ -162,11 +148,14 @@ static DBusHandlerResult signal_handler(DBusConnection *connection,
                 }
 
                 int index;
-                if ((index = list_seq_find(tray->items, sni_str_cmp, name)) != -1) {
+                bool found_item = false;
+                while ((index = list_seq_find(tray->items, sni_str_cmp, name)) != -1) {
+                        found_item = true;
                         sni_free(tray->items->items[index]);
                         list_del(tray->items, index);
                         dirty = true;
-                } else {
+                }
+                if (found_item == false) {
                         // If it's not in our list, then our list is incorrect.
                         // Fetch all items again
                         sway_log(L_INFO, "Host item list incorrect, refreshing");
@@ -178,17 +167,52 @@ static DBusHandlerResult signal_handler(DBusConnection *connection,
                                 "NewIcon") || dbus_message_is_signal(message,
                                 "org.kde.StatusNotifierItem", "NewIcon")) {
                 const char *name;
+                const char *obj_path;
                 int index;
                 struct StatusNotifierItem *item;
 
                 name = dbus_message_get_sender(message);
-                if ((index = list_seq_find(tray->items, sni_uniq_cmp, name)) != -1) {
+                obj_path = dbus_message_get_path(message);
+                struct ObjName obj_name = {
+                        obj_path,
+                        name,
+                };
+                if ((index = list_seq_find(tray->items, sni_obj_name_cmp, &obj_name)) != -1) {
                         item = tray->items->items[index];
                         sway_log(L_INFO, "NewIcon signal from item %s", item->name);
                         get_icon(item);
                 }
 
                 return DBUS_HANDLER_RESULT_HANDLED;
+        } else if (dbus_message_is_signal(message,
+                                "org.swaywm.LessSuckyStatusNotifierWatcher",
+                                "ObjPathItemRegistered")) {
+                const char *object_path;
+                const char *unique_name;
+                if (!dbus_message_get_args(message, NULL,
+                                DBUS_TYPE_OBJECT_PATH, &object_path,
+                                DBUS_TYPE_STRING, &unique_name,
+                                DBUS_TYPE_INVALID)) {
+                        sway_log(L_ERROR, "Error getting ObjPathItemRegistered args");
+                        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+                }
+
+                struct ObjName obj_name = {
+                        object_path,
+                        unique_name,
+                };
+                if (list_seq_find(tray->items, sni_obj_name_cmp, &obj_name) == -1) {
+                        struct StatusNotifierItem *item =
+                                sni_create_from_obj_path(unique_name,
+                                                object_path);
+
+                        if (item) {
+                                list_add(tray->items, item);
+                                dirty = true;
+                        }
+                }
+
+                return DBUS_HANDLER_RESULT_HANDLED;
         }
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
@@ -234,6 +258,9 @@ static int init_host() {
 
         register_host(name);
 
+        // Chances are if an item is already running, we'll get it two times.
+        // Once from this and another time from queued signals. Still we want
+        // to do this to be a complient sni host just in case.
         get_items();
 
         // Perhaps use addmatch helper functions like wlc does?
@@ -255,6 +282,15 @@ static int init_host() {
                 sway_log(L_ERROR, "dbus_err: %s", error.message);
                 return -1;
         }
+        dbus_bus_add_match(conn,
+                        "type='signal',\
+                        sender='org.freedesktop.StatusNotifierWatcher',\
+                        member='ObjPathItemRegistered'",
+                        &error);
+        if (dbus_error_is_set(&error)) {
+                sway_log(L_ERROR, "dbus_err: %s", error.message);
+                return -1;
+        }
 
         // SNI matches
         dbus_bus_add_match(conn,
@@ -287,9 +323,13 @@ err:
         return -1;
 }
 
-void tray_mouse_event(struct output *output, int x, int y,
+void tray_mouse_event(struct output *output, int rel_x, int rel_y,
                 uint32_t button, uint32_t state) {
 
+        int x = rel_x;
+        int y = rel_y + (swaybar.config->position == DESKTOP_SHELL_PANEL_POSITION_TOP
+                        ? 0 : (output->state->height - output->window->height));
+
         struct window *window = output->window;
         uint32_t tray_padding = swaybar.config->tray_padding;
         int tray_width = window->width * window->scale;
@@ -332,6 +372,24 @@ uint32_t tray_render(struct output *output, struct config *config) {
                 return tray_width;
         }
 
+        bool clean_item = false;
+        // Clean item if only one output has tray or this is the last output
+        if (swaybar.outputs->length == 1 || config->tray_output || output->idx == swaybar.outputs->length-1) {
+                clean_item = true;
+        // More trickery is needed in case you plug off secondary outputs on live
+        } else {
+                int active_outputs = 0;
+                for (int i = 0; i < swaybar.outputs->length; i++) {
+                        struct output *output = swaybar.outputs->items[i];
+                        if (output->active) {
+                                active_outputs++;
+                        }
+                }
+                if (active_outputs == 1) {
+                        clean_item = true;
+                }
+        }
+
         for (int i = 0; i < tray->items->length; ++i) {
                 struct StatusNotifierItem *item =
                         tray->items->items[i];
@@ -358,6 +416,7 @@ uint32_t tray_render(struct output *output, struct config *config) {
                         list_add(output->items, render_item);
                 } else if (item->dirty) {
                         // item needs re-render
+                        sway_log(L_DEBUG, "Redrawing item %d for output %d", i, output->idx);
                         sni_icon_ref_free(render_item);
                         output->items->items[j] = render_item =
                                 sni_icon_ref_create(item, item_size);
@@ -373,7 +432,9 @@ uint32_t tray_render(struct output *output, struct config *config) {
                 cairo_fill(cairo);
                 cairo_set_operator(cairo, op);
 
-                item->dirty = false;
+                if (clean_item) {
+                        item->dirty = false;
+                }
         }