diff options
Diffstat (limited to 'swaybar/ipc.c')
-rw-r--r-- | swaybar/ipc.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 7c53a44f..70086a36 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include "swaybar/config.h" | 7 | #include "swaybar/config.h" |
8 | #include "swaybar/ipc.h" | 8 | #include "swaybar/ipc.h" |
9 | #include "ipc-client.h" | 9 | #include "ipc-client.h" |
10 | #include "list.h" | ||
10 | 11 | ||
11 | void ipc_send_workspace_command(struct swaybar *bar, const char *ws) { | 12 | void ipc_send_workspace_command(struct swaybar *bar, const char *ws) { |
12 | const char *fmt = "workspace \"%s\""; | 13 | const char *fmt = "workspace \"%s\""; |
@@ -154,6 +155,7 @@ static bool ipc_parse_config( | |||
154 | json_object *markup, *mode, *hidden_bar, *position, *status_command; | 155 | json_object *markup, *mode, *hidden_bar, *position, *status_command; |
155 | json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers; | 156 | json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers; |
156 | json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs; | 157 | json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs; |
158 | json_object *bindings; | ||
157 | json_object_object_get_ex(bar_config, "mode", &mode); | 159 | json_object_object_get_ex(bar_config, "mode", &mode); |
158 | json_object_object_get_ex(bar_config, "hidden_bar", &hidden_bar); | 160 | json_object_object_get_ex(bar_config, "hidden_bar", &hidden_bar); |
159 | json_object_object_get_ex(bar_config, "position", &position); | 161 | json_object_object_get_ex(bar_config, "position", &position); |
@@ -169,6 +171,7 @@ static bool ipc_parse_config( | |||
169 | json_object_object_get_ex(bar_config, "colors", &colors); | 171 | json_object_object_get_ex(bar_config, "colors", &colors); |
170 | json_object_object_get_ex(bar_config, "outputs", &outputs); | 172 | json_object_object_get_ex(bar_config, "outputs", &outputs); |
171 | json_object_object_get_ex(bar_config, "pango_markup", &markup); | 173 | json_object_object_get_ex(bar_config, "pango_markup", &markup); |
174 | json_object_object_get_ex(bar_config, "bindings", &bindings); | ||
172 | if (status_command) { | 175 | if (status_command) { |
173 | free(config->status_command); | 176 | free(config->status_command); |
174 | config->status_command = strdup(json_object_get_string(status_command)); | 177 | config->status_command = strdup(json_object_get_string(status_command)); |
@@ -202,6 +205,21 @@ static bool ipc_parse_config( | |||
202 | if (markup) { | 205 | if (markup) { |
203 | config->pango_markup = json_object_get_boolean(markup); | 206 | config->pango_markup = json_object_get_boolean(markup); |
204 | } | 207 | } |
208 | if (bindings) { | ||
209 | int length = json_object_array_length(bindings); | ||
210 | for (int i = 0; i < length; ++i) { | ||
211 | json_object *bindobj = json_object_array_get_idx(bindings, i); | ||
212 | struct swaybar_binding *binding = | ||
213 | calloc(1, sizeof(struct swaybar_binding)); | ||
214 | binding->button = json_object_get_int( | ||
215 | json_object_object_get(bindobj, "input_code")); | ||
216 | binding->command = strdup(json_object_get_string( | ||
217 | json_object_object_get(bindobj, "command"))); | ||
218 | binding->release = json_object_get_boolean( | ||
219 | json_object_object_get(bindobj, "release")); | ||
220 | list_add(config->bindings, binding); | ||
221 | } | ||
222 | } | ||
205 | 223 | ||
206 | struct config_output *output, *tmp; | 224 | struct config_output *output, *tmp; |
207 | wl_list_for_each_safe(output, tmp, &config->outputs, link) { | 225 | wl_list_for_each_safe(output, tmp, &config->outputs, link) { |
@@ -319,6 +337,12 @@ static void ipc_get_outputs(struct swaybar *bar) { | |||
319 | free(res); | 337 | free(res); |
320 | } | 338 | } |
321 | 339 | ||
340 | void ipc_execute_binding(struct swaybar *bar, struct swaybar_binding *bind) { | ||
341 | uint32_t len = strlen(bind->command); | ||
342 | free(ipc_single_command(bar->ipc_socketfd, | ||
343 | IPC_COMMAND, bind->command, &len)); | ||
344 | } | ||
345 | |||
322 | bool ipc_initialize(struct swaybar *bar, const char *bar_id) { | 346 | bool ipc_initialize(struct swaybar *bar, const char *bar_id) { |
323 | uint32_t len = strlen(bar_id); | 347 | uint32_t len = strlen(bar_id); |
324 | char *res = ipc_single_command(bar->ipc_socketfd, | 348 | char *res = ipc_single_command(bar->ipc_socketfd, |