summaryrefslogtreecommitdiffstats
path: root/swaybar/bar.c
diff options
context:
space:
mode:
Diffstat (limited to 'swaybar/bar.c')
-rw-r--r--swaybar/bar.c14
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 @@
16#else 16#else
17#include <linux/input-event-codes.h> 17#include <linux/input-event-codes.h>
18#endif 18#endif
19#include "swaybar/render.h" 19#include "swaybar/bar.h"
20#include "swaybar/config.h" 20#include "swaybar/config.h"
21#include "swaybar/event_loop.h" 21#include "swaybar/event_loop.h"
22#include "swaybar/status_line.h" 22#include "swaybar/i3bar.h"
23#include "swaybar/bar.h"
24#include "swaybar/ipc.h" 23#include "swaybar/ipc.h"
24#include "swaybar/status_line.h"
25#include "swaybar/render.h"
25#include "ipc-client.h" 26#include "ipc-client.h"
26#include "list.h" 27#include "list.h"
27#include "log.h" 28#include "log.h"
@@ -478,14 +479,16 @@ static void render_all_frames(struct swaybar *bar) {
478 } 479 }
479} 480}
480 481
481void bar_setup(struct swaybar *bar, 482bool bar_setup(struct swaybar *bar,
482 const char *socket_path, const char *bar_id) { 483 const char *socket_path, const char *bar_id) {
483 bar_init(bar); 484 bar_init(bar);
484 init_event_loop(); 485 init_event_loop();
485 486
486 bar->ipc_socketfd = ipc_open_socket(socket_path); 487 bar->ipc_socketfd = ipc_open_socket(socket_path);
487 bar->ipc_event_socketfd = ipc_open_socket(socket_path); 488 bar->ipc_event_socketfd = ipc_open_socket(socket_path);
488 ipc_initialize(bar, bar_id); 489 if (!ipc_initialize(bar, bar_id)) {
490 return false;
491 }
489 if (bar->config->status_command) { 492 if (bar->config->status_command) {
490 bar->status = status_line_init(bar->config->status_command); 493 bar->status = status_line_init(bar->config->status_command);
491 } 494 }
@@ -526,6 +529,7 @@ void bar_setup(struct swaybar *bar,
526 529
527 ipc_get_workspaces(bar); 530 ipc_get_workspaces(bar);
528 render_all_frames(bar); 531 render_all_frames(bar);
532 return true;
529} 533}
530 534
531static void display_in(int fd, short mask, void *data) { 535static void display_in(int fd, short mask, void *data) {