1 files changed, 70 insertions, 184 deletions

diff --git a/swaybar/tray/sni.c b/swaybar/tray/sni.c
index c9d00657..be7d9fd7 100644
--- a/swaybar/tray/sni.c
+++ b/swaybar/tray/sni.c
@@ -14,6 +14,9 @@
 #include "client/cairo.h"
 #include "log.h"
 
+static const char *KDE_IFACE = "org.kde.StatusNotifierItem";
+static const char *FD_IFACE = "org.freedesktop.StatusNotifierItem";
+
 // Not sure what this is but cairo needs it.
 static const cairo_user_data_key_t cairo_user_data_key;
 
@@ -38,90 +41,53 @@ void sni_icon_ref_free(struct sni_icon_ref *sni_ref) {
 }
 
 /* Gets the pixmap of an icon */
-static void reply_icon(DBusPendingCall *pending, void *_data) {
-        struct StatusNotifierItem *item = _data;
-
-        DBusMessage *reply = dbus_pending_call_steal_reply(pending);
-
-        if (!reply) {
-                sway_log(L_ERROR, "Did not get reply");
-                goto bail;
-        }
-
-        int message_type = dbus_message_get_type(reply);
-
-        if (message_type == DBUS_MESSAGE_TYPE_ERROR) {
-                char *msg;
-
-                dbus_message_get_args(reply, NULL,
-                                DBUS_TYPE_STRING, &msg,
-                                DBUS_TYPE_INVALID);
-
-                sway_log(L_ERROR, "Message is error: %s", msg);
-                goto bail;
+static void reply_icon(DBusMessageIter *iter /* a(iiay) */, void *_data, enum property_status status) {
+        if (status != PROP_EXISTS) {
+                return;
         }
+        struct StatusNotifierItem *item = _data;
 
-        DBusMessageIter iter;
-        DBusMessageIter variant; /* v[a(iiay)] */
-        DBusMessageIter array; /* a(iiay) */
         DBusMessageIter d_struct; /* (iiay) */
-        DBusMessageIter icon; /* ay */
-
-        dbus_message_iter_init(reply, &iter);
-
-        // Each if here checks the types above before recursing
-        if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
-                sway_log(L_ERROR, "Relpy type incorrect");
-                sway_log(L_ERROR, "Should be \"v\", is \"%s\"",
-                                dbus_message_iter_get_signature(&iter));
-                goto bail;
-        }
-        dbus_message_iter_recurse(&iter, &variant);
-
-        if (strcmp("a(iiay)", dbus_message_iter_get_signature(&variant)) != 0) {
-                sway_log(L_ERROR, "Relpy type incorrect");
-                sway_log(L_ERROR, "Should be \"a(iiay)\", is \"%s\"",
-                                dbus_message_iter_get_signature(&variant));
-                goto bail;
-        }
+        DBusMessageIter struct_items;
+        DBusMessageIter icon;
 
-        if (dbus_message_iter_get_element_count(&variant) == 0) {
+        if (dbus_message_iter_get_element_count(iter) == 0) {
                 // Can't recurse if there are no items
                 sway_log(L_INFO, "Item has no icon");
-                goto bail;
+                return;
         }
-        dbus_message_iter_recurse(&variant, &array);
 
-        dbus_message_iter_recurse(&array, &d_struct);
+        dbus_message_iter_recurse(iter, &d_struct);
+        dbus_message_iter_recurse(&d_struct, &struct_items);
 
         int width;
-        dbus_message_iter_get_basic(&d_struct, &width);
-        dbus_message_iter_next(&d_struct);
+        dbus_message_iter_get_basic(&struct_items, &width);
+        dbus_message_iter_next(&struct_items);
 
         int height;
-        dbus_message_iter_get_basic(&d_struct, &height);
-        dbus_message_iter_next(&d_struct);
+        dbus_message_iter_get_basic(&struct_items, &height);
+        dbus_message_iter_next(&struct_items);
 
-        int len = dbus_message_iter_get_element_count(&d_struct);
+        int len = dbus_message_iter_get_element_count(&struct_items);
 
         if (!len) {
                 sway_log(L_ERROR, "No icon data");
-                goto bail;
+                return;
         }
 
         // Also implies len % 4 == 0, useful below
         if (len != width * height * 4) {
                 sway_log(L_ERROR, "Incorrect array size passed");
-                goto bail;
+                return;
         }
 
-        dbus_message_iter_recurse(&d_struct, &icon);
+        dbus_message_iter_recurse(&struct_items, &icon);
 
         int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
         // FIXME support a variable stride
         // (works on my machine though for all tested widths)
         if (!sway_assert(stride == width * 4, "Stride must be equal to byte length")) {
-                goto bail;
+                return;
         }
 
         // Data is by reference, no need to free
@@ -131,7 +97,7 @@ static void reply_icon(DBusPendingCall *pending, void *_data) {
         uint8_t *image_data = malloc(stride * height);
         if (!image_data) {
                 sway_log(L_ERROR, "Could not allocate memory for icon");
-                goto bail;
+                return;
         }
 
         // Transform from network byte order to host byte order
@@ -159,101 +125,29 @@ static void reply_icon(DBusPendingCall *pending, void *_data) {
                 item->dirty = true;
                 dirty = true;
 
-                dbus_message_unref(reply);
-                dbus_pending_call_unref(pending);
                 return;
         } else {
                 sway_log(L_ERROR, "Could not create image surface");
                 free(image_data);
         }
 
-bail:
-        if (reply) {
-                dbus_message_unref(reply);
-        }
-        dbus_pending_call_unref(pending);
         sway_log(L_ERROR, "Could not get icon from item");
         return;
 }
-static void send_icon_msg(struct StatusNotifierItem *item) {
-        DBusPendingCall *pending;
-        DBusMessage *message = dbus_message_new_method_call(
-                        item->name,
-                        "/StatusNotifierItem",
-                        "org.freedesktop.DBus.Properties",
-                        "Get");
-        const char *iface;
-        if (item->kde_special_snowflake) {
-                iface = "org.kde.StatusNotifierItem";
-        } else {
-                iface = "org.freedesktop.StatusNotifierItem";
-        }
-        const char *prop = "IconPixmap";
-
-        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);
-
-        if (!(pending || status)) {
-                sway_log(L_ERROR, "Could not get item icon");
-                return;
-        }
-
-        dbus_pending_call_set_notify(pending, reply_icon, item, NULL);
-}
 
 /* Get an icon by its name */
-static void reply_icon_name(DBusPendingCall *pending, void *_data) {
+static void reply_icon_name(DBusMessageIter *iter, void *_data, enum property_status status) {
         struct StatusNotifierItem *item = _data;
 
-        DBusMessage *reply = dbus_pending_call_steal_reply(pending);
-
-        if (!reply) {
-                sway_log(L_INFO, "Got no icon name reply from item");
-                goto bail;
-        }
-
-        int message_type = dbus_message_get_type(reply);
-
-        if (message_type == DBUS_MESSAGE_TYPE_ERROR) {
-                char *msg;
-
-                dbus_message_get_args(reply, NULL,
-                                DBUS_TYPE_STRING, &msg,
-                                DBUS_TYPE_INVALID);
-
-                sway_log(L_INFO, "Could not get icon name: %s", msg);
-                goto bail;
-        }
-
-        DBusMessageIter iter; /* v[s] */
-        DBusMessageIter variant; /* s */
-
-        dbus_message_iter_init(reply, &iter);
-        if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
-                sway_log(L_ERROR, "Relpy type incorrect");
-                sway_log(L_ERROR, "Should be \"v\", is \"%s\"",
-                                dbus_message_iter_get_signature(&iter));
-                goto bail;
-        }
-        dbus_message_iter_recurse(&iter, &variant);
-
-
-        if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_STRING) {
-                sway_log(L_ERROR, "Relpy type incorrect");
-                sway_log(L_ERROR, "Should be \"s\", is \"%s\"",
-                                dbus_message_iter_get_signature(&iter));
-                goto bail;
+        if (status != PROP_EXISTS) {
+                dbus_get_prop_async(item->name, item->object_path,
+                        (item->kde_special_snowflake ? KDE_IFACE : FD_IFACE),
+                        "IconPixmap", "a(iiay)", reply_icon, item);
+                return;
         }
 
         char *icon_name;
-        dbus_message_iter_get_basic(&variant, &icon_name);
+        dbus_message_iter_get_basic(iter, &icon_name);
 
         cairo_surface_t *image = find_icon(icon_name, 256);
 
@@ -267,55 +161,19 @@ static void reply_icon_name(DBusPendingCall *pending, void *_data) {
                 item->dirty = true;
                 dirty = true;
 
-                dbus_message_unref(reply);
-                dbus_pending_call_unref(pending);
                 return;
         }
 
-bail:
-        if (reply) {
-                dbus_message_unref(reply);
-        }
-        dbus_pending_call_unref(pending);
         // Now try the pixmap
-        send_icon_msg(item);
-        return;
-}
-static void send_icon_name_msg(struct StatusNotifierItem *item) {
-        DBusPendingCall *pending;
-        DBusMessage *message = dbus_message_new_method_call(
-                        item->name,
-                        "/StatusNotifierItem",
-                        "org.freedesktop.DBus.Properties",
-                        "Get");
-        const char *iface;
-        if (item->kde_special_snowflake) {
-                iface = "org.kde.StatusNotifierItem";
-        } else {
-                iface = "org.freedesktop.StatusNotifierItem";
-        }
-        const char *prop = "IconName";
-
-        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);
-
-        if (!(pending || status)) {
-                sway_log(L_ERROR, "Could not get item icon name");
-                return;
-        }
-
-        dbus_pending_call_set_notify(pending, reply_icon_name, item, NULL);
+        dbus_get_prop_async(item->name, item->object_path,
+                (item->kde_special_snowflake ? KDE_IFACE : FD_IFACE),
+                "IconPixmap", "a(iiay)", reply_icon, item);
 }
 
 void get_icon(struct StatusNotifierItem *item) {
-        send_icon_name_msg(item);
+        dbus_get_prop_async(item->name, item->object_path,
+                (item->kde_special_snowflake ? KDE_IFACE : FD_IFACE),
+                "IconName", "s", reply_icon_name, item);
 }
 
 void sni_activate(struct StatusNotifierItem *item, uint32_t x, uint32_t y) {
@@ -324,7 +182,7 @@ void sni_activate(struct StatusNotifierItem *item, uint32_t x, uint32_t y) {
                  : "org.freedesktop.StatusNotifierItem");
         DBusMessage *message = dbus_message_new_method_call(
                         item->name,
-                        "/StatusNotifierItem",
+                        item->object_path,
                         iface,
                         "Activate");
 
@@ -342,9 +200,10 @@ void sni_context_menu(struct StatusNotifierItem *item, uint32_t x, uint32_t y) {
         const char *iface =
                 (item->kde_special_snowflake ? "org.kde.StatusNotifierItem"
                  : "org.freedesktop.StatusNotifierItem");
+        sway_log(L_INFO, "Activating context menu for item: (%s,%s)", item->name, item->object_path);
         DBusMessage *message = dbus_message_new_method_call(
                         item->name,
-                        "/StatusNotifierItem",
+                        item->object_path,
                         iface,
                         "ContextMenu");
 
@@ -363,7 +222,7 @@ void sni_secondary(struct StatusNotifierItem *item, uint32_t x, uint32_t y) {
                  : "org.freedesktop.StatusNotifierItem");
         DBusMessage *message = dbus_message_new_method_call(
                         item->name,
-                        "/StatusNotifierItem",
+                        item->object_path,
                         iface,
                         "SecondaryActivate");
 
@@ -426,6 +285,8 @@ struct StatusNotifierItem *sni_create(const char *name) {
         struct StatusNotifierItem *item = malloc(sizeof(struct StatusNotifierItem));
         item->name = strdup(name);
         item->unique_name = NULL;
+        // TODO use static str if the default path instead of all these god-damn strdups
+        item->object_path = strdup("/StatusNotifierItem");
         item->image = NULL;
         item->dirty = false;
 
@@ -449,6 +310,21 @@ struct StatusNotifierItem *sni_create(const char *name) {
 
         return item;
 }
+struct StatusNotifierItem *sni_create_from_obj_path(const char *unique_name,
+                const char *object_path) {
+        struct StatusNotifierItem *item = malloc(sizeof(struct StatusNotifierItem));
+        // XXX strdup-ing twice to avoid a double-free; see above todo
+        item->name = strdup(unique_name);
+        item->unique_name = strdup(unique_name);
+        item->object_path = strdup(object_path);
+        item->image = NULL;
+        item->dirty = false;
+        // If they're registering by obj-path they're a special snowflake
+        item->kde_special_snowflake = true;
+
+        get_icon(item);
+        return item;
+}
 /* Return 0 if `item` has a name of `str` */
 int sni_str_cmp(const void *_item, const void *_str) {
         const struct StatusNotifierItem *item = _item;
@@ -466,14 +342,24 @@ int sni_uniq_cmp(const void *_item, const void *_str) {
         }
         return strcmp(item->unique_name, str);
 }
+int sni_obj_name_cmp(const void *_item, const void *_obj_name) {
+        const struct StatusNotifierItem *item = _item;
+        const struct ObjName *obj_name = _obj_name;
+
+        if (strcmp(item->unique_name, obj_name->name) == 0 &&
+                        strcmp(item->object_path, obj_name->obj_path) == 0) {
+                return 0;
+        }
+        return 1;
+}
+
 void sni_free(struct StatusNotifierItem *item) {
         if (!item) {
                 return;
         }
         free(item->name);
-        if (item->unique_name) {
-                free(item->unique_name);
-        }
+        free(item->unique_name);
+        free(item->object_path);
         if (item->image) {
                 cairo_surface_destroy(item->image);
         }