mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove 'input' field of IPC command return json

Browse source 
This field is not in i3 and provides imprecise and redundant information.
(Specifically, when swaymsg is given a list of commands, the IPC return
array already indicates precisely which number command failed; knowing
the name of the command is not useful when multiple commands of the
same type are provided.)
This commit is contained in:
M Stoeckl 2019-01-10 08:27:52 -05:00
parent 64ef936673
commit 6d392150a7
3 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/config.c
View file

@ -710,11 +710,12 @@ bool read_config(FILE *file, struct sway_config *config,
config->current_config_line_number = line_number;
config->current_config_line = line;
struct cmd_results *res;
char *new_block = NULL;
if (block && strcmp(block, "<commands>") == 0) {
// Special case
res = config_commands_command(expanded);
} else {
res = config_command(expanded);
res = config_command(expanded, &new_block);
}
switch(res->status) {
case CMD_FAILURE:
@ -740,9 +741,9 @@ bool read_config(FILE *file, struct sway_config *config,
break;
case CMD_BLOCK:
wlr_log(WLR_DEBUG, "Entering block '%s'", res->input);
list_insert(stack, 0, strdup(res->input));
if (strcmp(res->input, "bar") == 0) {
wlr_log(WLR_DEBUG, "Entering block '%s'", new_block);
list_insert(stack, 0, strdup(new_block));
if (strcmp(new_block, "bar") == 0) {
config->current_bar = NULL;
}
break;
@ -764,6 +765,7 @@ bool read_config(FILE *file, struct sway_config *config,
sizeof(config->handler_context));
default:;
}
free(new_block);
free(expanded);
free_cmd_results(res);
}