From ef555012fa49e66c30264fcb7ab2d62391b4aa2e Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Wed, 5 Dec 2018 17:36:37 +0000 Subject: [PATCH] swaybar: add skeleton dbus code to tray --- swaybar/tray/tray.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c index d5fb3ea91..0a4f29559 100644 --- a/swaybar/tray/tray.c +++ b/swaybar/tray/tray.c @@ -1,19 +1,48 @@ #include #include #include +#include #include "swaybar/bar.h" #include "swaybar/tray/tray.h" #include "log.h" struct swaybar_tray *create_tray(struct swaybar *bar) { wlr_log(WLR_DEBUG, "Initializing tray"); - return NULL; + + sd_bus *bus; + int ret = sd_bus_open_user(&bus); + if (ret < 0) { + wlr_log(WLR_ERROR, "Failed to connect to user bus: %s", strerror(-ret)); + return NULL; + } + + struct swaybar_tray *tray = calloc(1, sizeof(struct swaybar_tray)); + if (!tray) { + return NULL; + } + tray->bar = bar; + tray->bus = bus; + tray->fd = sd_bus_get_fd(tray->bus); + return tray; } void destroy_tray(struct swaybar_tray *tray) { + if (!tray) { + return; + } + sd_bus_flush_close_unref(tray->bus); + free(tray); } void tray_in(int fd, short mask, void *data) { + sd_bus *bus = data; + int ret; + while ((ret = sd_bus_process(bus, NULL)) > 0) { + // This space intentionally left blank + } + if (ret < 0) { + wlr_log(WLR_ERROR, "Failed to process bus: %s", strerror(-ret)); + } } uint32_t render_tray(cairo_t *cairo, struct swaybar_output *output, double *x) {