From 4056c09e13c1aeead6dd4085fc7e263a17a0b195 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:04:37 +1000 Subject: Move swaybar's event loop to common directory and refactor * The loop functions are now prefixed with `loop_`. * It is now easy to add timers to the loop. * Timers are implemented using pollfd and timerfd, rather than manually checking them when any other event happens to arrive. --- include/swaybar/bar.h | 5 +++++ include/swaybar/event_loop.h | 26 -------------------------- include/swaybar/status_line.h | 2 ++ 3 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 include/swaybar/event_loop.h (limited to 'include/swaybar') 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 -#include - -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; -- cgit v1.2.3 From 6921fdc6d6134fd7aaf38ffc1686623eca9bbd18 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 14 Oct 2018 12:28:38 +1000 Subject: Remove timerfd from loop implementation timerfd doesn't work on the BSDs, so this replaces it with a timespec for the expiry and uses a poll timeout to check the timers when needed. --- include/swaybar/bar.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/swaybar') diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index d61da5dc..db2d3d62 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h @@ -69,7 +69,6 @@ struct swaybar { struct status_line *status; struct loop *eventloop; - struct loop_event *status_event; int ipc_event_socketfd; int ipc_socketfd; -- cgit v1.2.3 From c6f153d8f9ad6c961c8dd8e620dc2e8fcb20e7bc Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Oct 2018 00:23:53 +1000 Subject: Event loop: Fix memmove and remove extraneous declaration --- include/swaybar/bar.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/swaybar') diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index db2d3d62..58e2dee6 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h @@ -9,7 +9,6 @@ struct swaybar_config; struct swaybar_output; struct swaybar_workspace; struct loop; -struct loop_event; struct swaybar_pointer { struct wl_pointer *pointer; -- cgit v1.2.3