diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-13 16:04:37 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-15 00:26:27 +1000 |
commit | 4056c09e13c1aeead6dd4085fc7e263a17a0b195 (patch) | |
tree | a3413f2a5717968e370d68521b689580d5adc5a0 /include | |
parent | Document `border csd` (diff) | |
download | sway-4056c09e13c1aeead6dd4085fc7e263a17a0b195.tar.gz sway-4056c09e13c1aeead6dd4085fc7e263a17a0b195.tar.zst sway-4056c09e13c1aeead6dd4085fc7e263a17a0b195.zip |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/loop.h | 47 | ||||
-rw-r--r-- | include/swaybar/bar.h | 5 | ||||
-rw-r--r-- | include/swaybar/event_loop.h | 26 | ||||
-rw-r--r-- | include/swaybar/status_line.h | 2 |
4 files changed, 54 insertions, 26 deletions
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 @@ | |||
1 | #ifndef _SWAY_LOOP_H | ||
2 | #define _SWAY_LOOP_H | ||
3 | #include <stdbool.h> | ||
4 | |||
5 | /** | ||
6 | * This is an event loop system designed for sway clients, not sway itself. | ||
7 | * | ||
8 | * It uses pollfds to block on multiple file descriptors at once, and provides | ||
9 | * an easy way to set timers. Typically the Wayland display's fd will be one of | ||
10 | * the fds in the loop. | ||
11 | */ | ||
12 | |||
13 | struct loop; | ||
14 | |||
15 | /** | ||
16 | * Create an event loop. | ||
17 | */ | ||
18 | struct loop *loop_create(void); | ||
19 | |||
20 | /** | ||
21 | * Destroy the event loop (eg. on program termination). | ||
22 | */ | ||
23 | void loop_destroy(struct loop *loop); | ||
24 | |||
25 | /** | ||
26 | * Poll the event loop. This will block until one of the fds has data. | ||
27 | */ | ||
28 | void loop_poll(struct loop *loop); | ||
29 | |||
30 | /** | ||
31 | * Add an fd to the loop. | ||
32 | */ | ||
33 | struct loop_event *loop_add_fd(struct loop *loop, int fd, short mask, | ||
34 | void (*func)(int fd, short mask, void *data), void *data); | ||
35 | |||
36 | /** | ||
37 | * Add a timer to the loop. | ||
38 | */ | ||
39 | struct loop_event *loop_add_timer(struct loop *loop, int ms, | ||
40 | void (*callback)(int fd, short mask, void *data), void *data); | ||
41 | |||
42 | /** | ||
43 | * Remove an event from the loop. | ||
44 | */ | ||
45 | bool loop_remove_event(struct loop *loop, struct loop_event *event); | ||
46 | |||
47 | #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 @@ | |||
8 | struct swaybar_config; | 8 | struct swaybar_config; |
9 | struct swaybar_output; | 9 | struct swaybar_output; |
10 | struct swaybar_workspace; | 10 | struct swaybar_workspace; |
11 | struct loop; | ||
12 | struct loop_event; | ||
11 | 13 | ||
12 | struct swaybar_pointer { | 14 | struct swaybar_pointer { |
13 | struct wl_pointer *pointer; | 15 | struct wl_pointer *pointer; |
@@ -66,6 +68,9 @@ struct swaybar { | |||
66 | struct swaybar_pointer pointer; | 68 | struct swaybar_pointer pointer; |
67 | struct status_line *status; | 69 | struct status_line *status; |
68 | 70 | ||
71 | struct loop *eventloop; | ||
72 | struct loop_event *status_event; | ||
73 | |||
69 | int ipc_event_socketfd; | 74 | int ipc_event_socketfd; |
70 | int ipc_socketfd; | 75 | int ipc_socketfd; |
71 | 76 | ||
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 @@ | |||
1 | #ifndef _SWAYBAR_EVENT_LOOP_H | ||
2 | #define _SWAYBAR_EVENT_LOOP_H | ||
3 | #include <stdbool.h> | ||
4 | #include <time.h> | ||
5 | |||
6 | void add_event(int fd, short mask, | ||
7 | void(*cb)(int fd, short mask, void *data), | ||
8 | void *data); | ||
9 | |||
10 | // Not guaranteed to notify cb immediately | ||
11 | void add_timer(timer_t timer, | ||
12 | void(*cb)(timer_t timer, void *data), | ||
13 | void *data); | ||
14 | |||
15 | // Returns false if nothing exists, true otherwise | ||
16 | bool remove_event(int fd); | ||
17 | |||
18 | // Returns false if nothing exists, true otherwise | ||
19 | bool remove_timer(timer_t timer); | ||
20 | |||
21 | // Blocks and returns after sending callbacks | ||
22 | void event_loop_poll(void); | ||
23 | |||
24 | void init_event_loop(void); | ||
25 | |||
26 | #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 { | |||
14 | }; | 14 | }; |
15 | 15 | ||
16 | struct status_line { | 16 | struct status_line { |
17 | struct swaybar *bar; | ||
18 | |||
17 | pid_t pid; | 19 | pid_t pid; |
18 | int read_fd, write_fd; | 20 | int read_fd, write_fd; |
19 | FILE *read, *write; | 21 | FILE *read, *write; |