diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-09-30 15:09:09 +0100 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-10-14 13:33:12 +0100 |
commit | d0b54e932b59baa71b54d842b249400db74ce79b (patch) | |
tree | dc8a6aa3920b8d54e24d2ab97dab2c7d1dbbe4b8 /swaybar/main.c | |
parent | commands: fix sending bar mode/hidden_state updates to all bars (diff) | |
download | sway-d0b54e932b59baa71b54d842b249400db74ce79b.tar.gz sway-d0b54e932b59baa71b54d842b249400db74ce79b.tar.zst sway-d0b54e932b59baa71b54d842b249400db74ce79b.zip |
swaybar: save id upon startup
This adds an id property to the bar, which will be used to filter
barconfig_update events
Diffstat (limited to 'swaybar/main.c')
-rw-r--r-- | swaybar/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/swaybar/main.c b/swaybar/main.c index db204f4a..2672abef 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -22,7 +22,6 @@ void sway_terminate(int code) { | |||
22 | 22 | ||
23 | int main(int argc, char **argv) { | 23 | int main(int argc, char **argv) { |
24 | char *socket_path = NULL; | 24 | char *socket_path = NULL; |
25 | char *bar_id = NULL; | ||
26 | bool debug = false; | 25 | bool debug = false; |
27 | 26 | ||
28 | static struct option long_options[] = { | 27 | static struct option long_options[] = { |
@@ -59,7 +58,7 @@ int main(int argc, char **argv) { | |||
59 | socket_path = strdup(optarg); | 58 | socket_path = strdup(optarg); |
60 | break; | 59 | break; |
61 | case 'b': // Type | 60 | case 'b': // Type |
62 | bar_id = strdup(optarg); | 61 | swaybar.id = strdup(optarg); |
63 | break; | 62 | break; |
64 | case 'v': | 63 | case 'v': |
65 | fprintf(stdout, "swaybar version " SWAY_VERSION "\n"); | 64 | fprintf(stdout, "swaybar version " SWAY_VERSION "\n"); |
@@ -80,7 +79,7 @@ int main(int argc, char **argv) { | |||
80 | wlr_log_init(WLR_ERROR, NULL); | 79 | wlr_log_init(WLR_ERROR, NULL); |
81 | } | 80 | } |
82 | 81 | ||
83 | if (!bar_id) { | 82 | if (!swaybar.id) { |
84 | wlr_log(WLR_ERROR, "No bar_id passed. " | 83 | wlr_log(WLR_ERROR, "No bar_id passed. " |
85 | "Provide --bar_id or let sway start swaybar"); | 84 | "Provide --bar_id or let sway start swaybar"); |
86 | return 1; | 85 | return 1; |
@@ -96,13 +95,12 @@ int main(int argc, char **argv) { | |||
96 | 95 | ||
97 | signal(SIGTERM, sig_handler); | 96 | signal(SIGTERM, sig_handler); |
98 | 97 | ||
99 | if (!bar_setup(&swaybar, socket_path, bar_id)) { | 98 | if (!bar_setup(&swaybar, socket_path)) { |
100 | free(socket_path); | 99 | free(socket_path); |
101 | return 1; | 100 | return 1; |
102 | } | 101 | } |
103 | 102 | ||
104 | free(socket_path); | 103 | free(socket_path); |
105 | free(bar_id); | ||
106 | 104 | ||
107 | bar_run(&swaybar); | 105 | bar_run(&swaybar); |
108 | bar_teardown(&swaybar); | 106 | bar_teardown(&swaybar); |