mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-10 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address first round of review for generic blocks

Browse source
This commit is contained in:
Brian Ashworth 2018-05-30 22:23:11 -04:00
parent 51bb9d8573
commit 8bfa2def88
10 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/bar.c
View file

@ -52,7 +52,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "bar",
"Can only be used in config file.");
}
return subcommand(argv, argc, bar_config_handlers,
return config_subcommand(argv, argc, bar_config_handlers,
sizeof(bar_config_handlers));
}
@ -111,5 +111,5 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
wlr_log(L_DEBUG, "Creating bar %s", bar->id);
}
return subcommand(argv, argc, bar_handlers, sizeof(bar_handlers));
return config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers));
}

2
sway/commands/bar/colors.c
View file

@ -52,7 +52,7 @@ static struct cmd_results *parse_three_colors(char ***colors,
}
struct cmd_results *bar_cmd_colors(int argc, char **argv) {
return subcommand(argv, argc, bar_colors_handlers,
return config_subcommand(argv, argc, bar_colors_handlers,
sizeof(bar_colors_handlers));
}

4
sway/commands/input.c
View file

@ -42,8 +42,8 @@ struct cmd_results *cmd_input(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
}
struct cmd_results *res = subcommand(argv + 1, argc - 1, input_handlers,
sizeof(input_handlers));
struct cmd_results *res = config_subcommand(argv + 1, argc - 1,
input_handlers, sizeof(input_handlers));
free_input_config(config->handler_context.input_config);
config->handler_context.input_config = NULL;

4
sway/commands/mode.c
View file

@ -65,8 +65,8 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
}
// Create binding
struct cmd_results *result = subcommand(argv + 1, argc - 1, mode_handlers,
sizeof(mode_handlers));
struct cmd_results *result = config_subcommand(argv + 1, argc - 1,
mode_handlers, sizeof(mode_handlers));
config->current_mode = config->modes->items[0];
return result;

4
sway/commands/seat.c
View file

@ -24,8 +24,8 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
"Couldn't allocate config");
}
struct cmd_results *res = subcommand(argv + 1, argc - 1, seat_handlers,
sizeof(seat_handlers));
struct cmd_results *res = config_subcommand(argv + 1, argc - 1,
seat_handlers, sizeof(seat_handlers));
free_seat_config(config->handler_context.seat_config);
config->handler_context.seat_config = NULL;