mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 11:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: handle new and lost StatusNotifierWatcher

Browse source
This commit is contained in:
Ian Fan 2018-12-17 14:08:16 +00:00
parent 8ffb7f0529
commit 371089f62c
2 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
swaybar/tray/host.c
View file

@ -115,6 +115,25 @@ static bool register_to_watcher(struct swaybar_host *host) {
return ret >= 0; return ret >= 0;
} }
static int handle_new_watcher(sd_bus_message *msg,
void *data, sd_bus_error *error) {
char *service, *old_owner, *new_owner;
int ret = sd_bus_message_read(msg, "sss", &service, &old_owner, &new_owner);
if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to parse owner change message: %s", strerror(-ret));
return ret;
}
if (!*old_owner) {
struct swaybar_host *host = data;
if (strcmp(service, host->watcher_interface) == 0) {
register_to_watcher(host);
}
}
return 0;
}
bool init_host(struct swaybar_host *host, char *protocol, bool init_host(struct swaybar_host *host, char *protocol,
struct swaybar_tray *tray) { struct swaybar_tray *tray) {
size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1; size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1;
@ -124,7 +143,7 @@ bool init_host(struct swaybar_host *host, char *protocol,
} }
snprintf(host->watcher_interface, len, "org.%s.StatusNotifierWatcher", protocol); snprintf(host->watcher_interface, len, "org.%s.StatusNotifierWatcher", protocol);
sd_bus_slot *reg_slot = NULL, *unreg_slot = NULL; sd_bus_slot *reg_slot = NULL, *unreg_slot = NULL, *watcher_slot = NULL;
int ret = sd_bus_match_signal(tray->bus, &reg_slot, host->watcher_interface, int ret = sd_bus_match_signal(tray->bus, &reg_slot, host->watcher_interface,
watcher_path, host->watcher_interface, watcher_path, host->watcher_interface,
"StatusNotifierItemRegistered", handle_sni_registered, tray); "StatusNotifierItemRegistered", handle_sni_registered, tray);
@ -142,6 +161,15 @@ bool init_host(struct swaybar_host *host, char *protocol,
goto error; goto error;
} }
ret = sd_bus_match_signal(tray->bus, &watcher_slot, "org.freedesktop.DBus",
"/org/freedesktop/DBus", "org.freedesktop.DBus", "NameOwnerChanged",
handle_new_watcher, host);
if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to subscribe to unregistering events: %s",
strerror(-ret));
goto error;
}
pid_t pid = getpid(); pid_t pid = getpid();
size_t service_len = snprintf(NULL, 0, "org.%s.StatusNotifierHost-%d", size_t service_len = snprintf(NULL, 0, "org.%s.StatusNotifierHost-%d",
protocol, pid) + 1; protocol, pid) + 1;
@ -163,12 +191,14 @@ bool init_host(struct swaybar_host *host, char *protocol,
sd_bus_slot_set_floating(reg_slot, 1); sd_bus_slot_set_floating(reg_slot, 1);
sd_bus_slot_set_floating(unreg_slot, 1); sd_bus_slot_set_floating(unreg_slot, 1);
sd_bus_slot_set_floating(watcher_slot, 1);
wlr_log(WLR_DEBUG, "Registered %s", host->service); wlr_log(WLR_DEBUG, "Registered %s", host->service);
return true; return true;
error: error:
sd_bus_slot_unref(reg_slot); sd_bus_slot_unref(reg_slot);
sd_bus_slot_unref(unreg_slot); sd_bus_slot_unref(unreg_slot);
sd_bus_slot_unref(watcher_slot);
finish_host(host); finish_host(host);
return false; return false;
} }

29
swaybar/tray/tray.c
View file

@ -12,6 +12,27 @@
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
static int handle_lost_watcher(sd_bus_message *msg,
void *data, sd_bus_error *error) {
char *service, *old_owner, *new_owner;
int ret = sd_bus_message_read(msg, "sss", &service, &old_owner, &new_owner);
if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to parse owner change message: %s", strerror(-ret));
return ret;
}
if (!*new_owner) {
struct swaybar_tray *tray = data;
if (strcmp(service, "org.freedesktop.StatusNotifierWatcher") == 0) {
tray->watcher_xdg = create_watcher("freedesktop", tray->bus);
} else if (strcmp(service, "org.kde.StatusNotifierWatcher") == 0) {
tray->watcher_kde = create_watcher("kde", tray->bus);
}
}
return 0;
}
struct swaybar_tray *create_tray(struct swaybar *bar) { struct swaybar_tray *create_tray(struct swaybar *bar) {
wlr_log(WLR_DEBUG, "Initializing tray"); wlr_log(WLR_DEBUG, "Initializing tray");
@ -33,6 +54,14 @@ struct swaybar_tray *create_tray(struct swaybar *bar) {
tray->watcher_xdg = create_watcher("freedesktop", tray->bus); tray->watcher_xdg = create_watcher("freedesktop", tray->bus);
tray->watcher_kde = create_watcher("kde", tray->bus); tray->watcher_kde = create_watcher("kde", tray->bus);
ret = sd_bus_match_signal(bus, NULL, "org.freedesktop.DBus",
"/org/freedesktop/DBus", "org.freedesktop.DBus",
"NameOwnerChanged", handle_lost_watcher, tray);
if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to subscribe to unregistering events: %s",
strerror(-ret));
}
tray->items = create_list(); tray->items = create_list();
init_host(&tray->host_xdg, "freedesktop", tray); init_host(&tray->host_xdg, "freedesktop", tray);