alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ipc: add barconfig_update event on config reload

Browse source
This commit is contained in:
Ian Fan 2018-07-13 23:22:34 +01:00
parent 686c084cec
commit dd6debf367
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sway/commands/reload.c
View file

@ -1,17 +1,45 @@
#define _XOPEN_SOURCE 500
#include <string.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/ipc-server.h"
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "list.h"
struct cmd_results *cmd_reload(int argc, char **argv) { struct cmd_results *cmd_reload(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) { if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) {
return error; return error;
} }
// store bar ids to check against new bars for barconfig_update events
list_t *bar_ids = create_list();
for (int i = 0; i < config->bars->length; ++i) {
struct bar_config *bar = config->bars->items[i];
list_add(bar_ids, strdup(bar->id));
}
if (!load_main_config(config->current_config_path, true)) { if (!load_main_config(config->current_config_path, true)) {
return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config."); return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
} }
load_swaybars(); load_swaybars();
for (int i = 0; i < config->bars->length; ++i) {
struct bar_config *bar = config->bars->items[i];
for (int j = 0; j < bar_ids->length; ++j) {
if (strcmp(bar->id, bar_ids->items[j]) == 0) {
ipc_event_barconfig_update(bar);
break;
}
}
}
for (int i = 0; i < bar_ids->length; ++i) {
free(bar_ids->items[i]);
}
list_free(bar_ids);
arrange_windows(&root_container); arrange_windows(&root_container);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }