diff options
| author | Drew DeVault <[email protected]> | 2018-09-28 16:44:35 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-09-28 16:44:35 +0200 |
| commit | ca7084cb52bd5a27a847e43320490b7a5ee5ef73 (patch) | |
| tree | 9e9da5790b1fd66f13ab89b70570750081b36c45 /swaybar/bar.c | |
| parent | 02df1e2b1b4306481f8e1023d99fb568095a89b3 (diff) | |
| parent | 25e1f327386c5c8d0b2839d03e2d833e71dc9e61 (diff) | |
Merge pull request #2723 from ianyfan/swaybar
swaybar: small fixes and clean-ups
Diffstat (limited to 'swaybar/bar.c')
| -rw-r--r-- | swaybar/bar.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index ab307fd4..15e81976 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -16,12 +16,13 @@ #else #include <linux/input-event-codes.h> #endif -#include "swaybar/render.h" +#include "swaybar/bar.h" #include "swaybar/config.h" #include "swaybar/event_loop.h" -#include "swaybar/status_line.h" -#include "swaybar/bar.h" +#include "swaybar/i3bar.h" #include "swaybar/ipc.h" +#include "swaybar/status_line.h" +#include "swaybar/render.h" #include "ipc-client.h" #include "list.h" #include "log.h" @@ -478,14 +479,16 @@ static void render_all_frames(struct swaybar *bar) { } } -void bar_setup(struct swaybar *bar, +bool bar_setup(struct swaybar *bar, const char *socket_path, const char *bar_id) { bar_init(bar); init_event_loop(); bar->ipc_socketfd = ipc_open_socket(socket_path); bar->ipc_event_socketfd = ipc_open_socket(socket_path); - ipc_initialize(bar, bar_id); + if (!ipc_initialize(bar, bar_id)) { + return false; + } if (bar->config->status_command) { bar->status = status_line_init(bar->config->status_command); } @@ -526,6 +529,7 @@ void bar_setup(struct swaybar *bar, ipc_get_workspaces(bar); render_all_frames(bar); + return true; } static void display_in(int fd, short mask, void *data) { |