3 files changed, 7 insertions, 26 deletions

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 9ff3fe7b..d61da5dc 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -8,6 +8,8 @@
 struct swaybar_config;
 struct swaybar_output;
 struct swaybar_workspace;
+struct loop;
+struct loop_event;
 
 struct swaybar_pointer {
         struct wl_pointer *pointer;
@@ -66,6 +68,9 @@ struct swaybar {
         struct swaybar_pointer pointer;
         struct status_line *status;
 
+        struct loop *eventloop;
+        struct loop_event *status_event;
+
         int ipc_event_socketfd;
         int ipc_socketfd;
 
diff --git a/include/swaybar/event_loop.h b/include/swaybar/event_loop.h
deleted file mode 100644
index 47be5b79..00000000
--- a/include/swaybar/event_loop.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _SWAYBAR_EVENT_LOOP_H
-#define _SWAYBAR_EVENT_LOOP_H
-#include <stdbool.h>
-#include <time.h>
-
-void add_event(int fd, short mask,
-                void(*cb)(int fd, short mask, void *data),
-                void *data);
-
-// Not guaranteed to notify cb immediately
-void add_timer(timer_t timer,
-                void(*cb)(timer_t timer, void *data),
-                void *data);
-
-// Returns false if nothing exists, true otherwise
-bool remove_event(int fd);
-
-// Returns false if nothing exists, true otherwise
-bool remove_timer(timer_t timer);
-
-// Blocks and returns after sending callbacks
-void event_loop_poll(void);
-
-void init_event_loop(void);
-
-#endif
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 5e7e8771..957a808e 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -14,6 +14,8 @@ enum status_protocol {
 };
 
 struct status_line {
+        struct swaybar *bar;
+
         pid_t pid;
         int read_fd, write_fd;
         FILE *read, *write;