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/loop.h | 47 +++++++++++++++++++++++++++++++++++++++++++ include/swaybar/bar.h | 5 +++++ include/swaybar/event_loop.h | 26 ------------------------ include/swaybar/status_line.h | 2 ++ 4 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 include/loop.h delete mode 100644 include/swaybar/event_loop.h (limited to 'include') diff --git a/include/loop.h b/include/loop.h new file mode 100644 index 00000000..7c151785 --- /dev/null +++ b/include/loop.h @@ -0,0 +1,47 @@ +#ifndef _SWAY_LOOP_H +#define _SWAY_LOOP_H +#include + +/** + * This is an event loop system designed for sway clients, not sway itself. + * + * It uses pollfds to block on multiple file descriptors at once, and provides + * an easy way to set timers. Typically the Wayland display's fd will be one of + * the fds in the loop. + */ + +struct loop; + +/** + * Create an event loop. + */ +struct loop *loop_create(void); + +/** + * Destroy the event loop (eg. on program termination). + */ +void loop_destroy(struct loop *loop); + +/** + * Poll the event loop. This will block until one of the fds has data. + */ +void loop_poll(struct loop *loop); + +/** + * Add an fd to the loop. + */ +struct loop_event *loop_add_fd(struct loop *loop, int fd, short mask, + void (*func)(int fd, short mask, void *data), void *data); + +/** + * Add a timer to the loop. + */ +struct loop_event *loop_add_timer(struct loop *loop, int ms, + void (*callback)(int fd, short mask, void *data), void *data); + +/** + * Remove an event from the loop. + */ +bool loop_remove_event(struct loop *loop, struct loop_event *event); + +#endif 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 9c833c661ac9e061bf4d666065e3090639f481ff Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:14:35 +1000 Subject: swaylock: Use common event loop --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index fbdd42a8..c8732cb7 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -54,6 +54,7 @@ struct swaylock_password { }; struct swaylock_state { + struct loop *eventloop; struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From c242712262c5cb751fc0f89050a7f7a24433b105 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:52:13 +1000 Subject: swaylock: Remove indicator after 3 seconds --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index c8732cb7..792d34cf 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -55,6 +55,7 @@ struct swaylock_password { struct swaylock_state { struct loop *eventloop; + struct loop_event *clear_indicator_timer; // clears the indicator struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From fa11b7f7012d153ba9728fe718ffc1a2650d6e98 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:56:35 +1000 Subject: swaylock: clear password after 10 seconds --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 792d34cf..ae042c4f 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -56,6 +56,7 @@ struct swaylock_password { struct swaylock_state { struct loop *eventloop; struct loop_event *clear_indicator_timer; // clears the indicator + struct loop_event *clear_password_timer; // clears the password buffer struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From f98f351a5275967c46482e1c9c754fee927d72ee Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 17:06:33 +1000 Subject: swaylock: Don't wait too long for surface damage before verifying --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index ae042c4f..e7165b3b 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -57,6 +57,7 @@ struct swaylock_state { struct loop *eventloop; struct loop_event *clear_indicator_timer; // clears the indicator struct loop_event *clear_password_timer; // clears the password buffer + struct loop_event *verify_password_timer; struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- 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/loop.h | 25 ++++++++++++++++--------- include/swaybar/bar.h | 1 - include/swaylock/swaylock.h | 6 +++--- 3 files changed, 19 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/loop.h b/include/loop.h index 7c151785..2f608eda 100644 --- a/include/loop.h +++ b/include/loop.h @@ -5,12 +5,12 @@ /** * This is an event loop system designed for sway clients, not sway itself. * - * It uses pollfds to block on multiple file descriptors at once, and provides - * an easy way to set timers. Typically the Wayland display's fd will be one of - * the fds in the loop. + * The loop consists of file descriptors and timers. Typically the Wayland + * display's file descriptor will be one of the fds in the loop. */ struct loop; +struct loop_timer; /** * Create an event loop. @@ -28,20 +28,27 @@ void loop_destroy(struct loop *loop); void loop_poll(struct loop *loop); /** - * Add an fd to the loop. + * Add a file descriptor to the loop. */ -struct loop_event *loop_add_fd(struct loop *loop, int fd, short mask, +void loop_add_fd(struct loop *loop, int fd, short mask, void (*func)(int fd, short mask, void *data), void *data); /** * Add a timer to the loop. + * + * When the timer expires, the timer will be removed from the loop and freed. + */ +struct loop_timer *loop_add_timer(struct loop *loop, int ms, + void (*callback)(void *data), void *data); + +/** + * Remove a file descriptor from the loop. */ -struct loop_event *loop_add_timer(struct loop *loop, int ms, - void (*callback)(int fd, short mask, void *data), void *data); +bool loop_remove_fd(struct loop *loop, int fd); /** - * Remove an event from the loop. + * Remove a timer from the loop. */ -bool loop_remove_event(struct loop *loop, struct loop_event *event); +bool loop_remove_timer(struct loop *loop, struct loop_timer *timer); #endif 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; diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index e7165b3b..25b41a71 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -55,9 +55,9 @@ struct swaylock_password { struct swaylock_state { struct loop *eventloop; - struct loop_event *clear_indicator_timer; // clears the indicator - struct loop_event *clear_password_timer; // clears the password buffer - struct loop_event *verify_password_timer; + struct loop_timer *clear_indicator_timer; // clears the indicator + struct loop_timer *clear_password_timer; // clears the password buffer + struct loop_timer *verify_password_timer; struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- 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') 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