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

cmd_seat: split action and config handlers

Browse source 
This separates the logic for seat subcommand handlers that only perform
actions on the seat and handlers that alter the seat config. The former
group can immediately free the seat config after running the command as
it is only used by the subcommand to find the name of the seat to
operate on. The latter group alters the seat config so it will need to
go through the storage and application stage (assuming success).
This commit is contained in:
Brian Ashworth 2019-06-19 01:34:07 -04:00 committed by Simon Ser
parent c346c020bf
commit fc3253cc35
1 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
sway/commands/seat.c
View file

@ -7,15 +7,45 @@
#include "stringop.h" #include "stringop.h"
// must be in order for the bsearch // must be in order for the bsearch
// these handlers perform actions on the seat
static struct cmd_handler seat_action_handlers[] = {
{ "cursor", seat_cmd_cursor },
};
// must be in order for the bsearch
// these handlers alter the seat config
static struct cmd_handler seat_handlers[] = { static struct cmd_handler seat_handlers[] = {
{ "attach", seat_cmd_attach }, { "attach", seat_cmd_attach },
{ "cursor", seat_cmd_cursor },
{ "fallback", seat_cmd_fallback }, { "fallback", seat_cmd_fallback },
{ "hide_cursor", seat_cmd_hide_cursor }, { "hide_cursor", seat_cmd_hide_cursor },
{ "pointer_constraint", seat_cmd_pointer_constraint }, { "pointer_constraint", seat_cmd_pointer_constraint },
{ "xcursor_theme", seat_cmd_xcursor_theme }, { "xcursor_theme", seat_cmd_xcursor_theme },
}; };
static struct cmd_results *action_handlers(int argc, char **argv) {
struct cmd_results *res = config_subcommand(argv, argc,
seat_action_handlers, sizeof(seat_action_handlers));
free_seat_config(config->handler_context.seat_config);
config->handler_context.seat_config = NULL;
return res;
}
static struct cmd_results *config_handlers(int argc, char **argv) {
struct cmd_results *res = config_subcommand(argv, argc,
seat_handlers, sizeof(seat_handlers));
if (res && res->status != CMD_SUCCESS) {
free_seat_config(config->handler_context.seat_config);
} else {
struct seat_config *sc =
store_seat_config(config->handler_context.seat_config);
if (!config->reading) {
input_manager_apply_seat_config(sc);
}
}
config->handler_context.seat_config = NULL;
return res;
}
struct cmd_results *cmd_seat(int argc, char **argv) { struct cmd_results *cmd_seat(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "seat", EXPECTED_AT_LEAST, 2))) { if ((error = checkarg(argc, "seat", EXPECTED_AT_LEAST, 2))) {
@ -36,20 +66,12 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "Couldn't allocate config"); return cmd_results_new(CMD_FAILURE, "Couldn't allocate config");
} }
struct cmd_results *res = config_subcommand(argv + 1, argc - 1, struct cmd_results *res = NULL;
seat_handlers, sizeof(seat_handlers)); if (find_handler(argv[1], seat_action_handlers,
if (res && res->status != CMD_SUCCESS) { sizeof(seat_action_handlers))) {
free_seat_config(config->handler_context.seat_config); res = action_handlers(argc - 1, argv + 1);
config->handler_context.seat_config = NULL; } else {
return res; res = config_handlers(argc - 1, argv + 1);
} }
struct seat_config *sc =
store_seat_config(config->handler_context.seat_config);
if (!config->reading) {
input_manager_apply_seat_config(sc);
}
config->handler_context.seat_config = NULL;
return res ? res : cmd_results_new(CMD_SUCCESS, NULL); return res ? res : cmd_results_new(CMD_SUCCESS, NULL);
} }