summaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-05 23:18:59 +0100
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-05 23:18:59 +0100
commit843e2ad2c140288733110691f7dc8252fbe4dc16 (patch)
tree3244491ed6cc45666e0599f8cbb3099864f627eb /sway/config.c
parentAdd modifier key to bar_config json (diff)
downloadsway-843e2ad2c140288733110691f7dc8252fbe4dc16.tar.gz
sway-843e2ad2c140288733110691f7dc8252fbe4dc16.tar.zst
sway-843e2ad2c140288733110691f7dc8252fbe4dc16.zip
Only send modifier event once for active modifiers
This makes sure that a modifier event is only sent for active bar modifiers, and that it is only sent once for each of those modifiers. An active bar modifier is a modifier defined for a bar with `mode hide` and `hidden_state hide`.
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 87b1342d..95d8f339 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -103,6 +103,8 @@ static void free_config(struct sway_config *config) {
103 free_output_config(config->output_configs->items[i]); 103 free_output_config(config->output_configs->items[i]);
104 } 104 }
105 list_free(config->output_configs); 105 list_free(config->output_configs);
106
107 list_free(config->active_bar_modifiers);
106 free(config); 108 free(config);
107} 109}
108 110
@@ -145,6 +147,33 @@ static void config_defaults(struct sway_config *config) {
145 config->edge_gaps = true; 147 config->edge_gaps = true;
146 config->gaps_inner = 0; 148 config->gaps_inner = 0;
147 config->gaps_outer = 0; 149 config->gaps_outer = 0;
150
151 config->active_bar_modifiers = create_list();
152}
153
154static int compare_modifiers(const void *left, const void *right) {
155 uint32_t a = *(uint32_t *)left;
156 uint32_t b = *(uint32_t *)right;
157
158 return a - b;
159}
160
161void update_active_bar_modifiers() {
162 if (config->active_bar_modifiers->length > 0) {
163 list_free(config->active_bar_modifiers);
164 config->active_bar_modifiers = create_list();
165 }
166
167 struct bar_config *bar;
168 int i;
169 for (i = 0; i < config->bars->length; ++i) {
170 bar = config->bars->items[i];
171 if (strcmp(bar->mode, "hide") == 0 && strcmp(bar->hidden_state, "hide") == 0) {
172 if (list_seq_find(config->active_bar_modifiers, compare_modifiers, &bar->modifier) < 0) {
173 list_add(config->active_bar_modifiers, &bar->modifier);
174 }
175 }
176 }
148} 177}
149 178
150static char *get_config_path(void) { 179static char *get_config_path(void) {
@@ -215,6 +244,8 @@ bool load_config(const char *file) {
215 } 244 }
216 fclose(f); 245 fclose(f);
217 246
247 update_active_bar_modifiers();
248
218 return config_load_success; 249 return config_load_success;
219} 250}
220 251