mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-30 11:10:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow multiple object paths for each connection

Browse source
This commit is contained in:
Calvin Lee 2017-10-25 12:49:34 -06:00
parent bd121999ca
commit 4231061e4d
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
swaybar/tray/sni.c
View file

@ -484,6 +484,17 @@ 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->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;

7
swaybar/tray/tray.c
View file

@ -291,8 +291,11 @@ static DBusHandlerResult signal_handler(DBusConnection *connection,
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
// TODO allow one unique name to have multiple items
if (list_seq_find(tray->items, sni_str_cmp, unique_name) == -1) {
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);