diff options
Diffstat (limited to 'swaybar/main.c')
-rw-r--r-- | swaybar/main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/swaybar/main.c b/swaybar/main.c index 51846bca..fc5acdae 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -5,17 +5,18 @@ | |||
5 | #include <getopt.h> | 5 | #include <getopt.h> |
6 | #include "ipc-client.h" | 6 | #include "ipc-client.h" |
7 | #include "log.h" | 7 | #include "log.h" |
8 | #include "state.h" | 8 | #include "bar.h" |
9 | 9 | ||
10 | struct swaybar_state state; | 10 | /* global bar state */ |
11 | struct bar swaybar; | ||
11 | 12 | ||
12 | void sway_terminate(void) { | 13 | void sway_terminate(void) { |
13 | state_teardown(&state); | 14 | bar_teardown(&swaybar); |
14 | exit(EXIT_FAILURE); | 15 | exit(EXIT_FAILURE); |
15 | } | 16 | } |
16 | 17 | ||
17 | void sig_handler(int signal) { | 18 | void sig_handler(int signal) { |
18 | state_teardown(&state); | 19 | bar_teardown(&swaybar); |
19 | exit(0); | 20 | exit(0); |
20 | } | 21 | } |
21 | 22 | ||
@@ -102,15 +103,15 @@ int main(int argc, char **argv) { | |||
102 | 103 | ||
103 | signal(SIGTERM, sig_handler); | 104 | signal(SIGTERM, sig_handler); |
104 | 105 | ||
105 | state_setup(&state, socket_path, bar_id, desired_output); | 106 | bar_setup(&swaybar, socket_path, bar_id, desired_output); |
106 | 107 | ||
107 | free(socket_path); | 108 | free(socket_path); |
108 | free(bar_id); | 109 | free(bar_id); |
109 | 110 | ||
110 | state_run(&state); | 111 | bar_run(&swaybar); |
111 | 112 | ||
112 | // gracefully shutdown swaybar and status_command | 113 | // gracefully shutdown swaybar and status_command |
113 | state_teardown(&state); | 114 | bar_teardown(&swaybar); |
114 | 115 | ||
115 | return 0; | 116 | return 0; |
116 | } | 117 | } |