diff options
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/seat.c | 12 | ||||
| -rw-r--r-- | sway/commands/seat/attach.c | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/sway/commands/seat.c b/sway/commands/seat.c index 81bb5f5d..5b23dcc6 100644 --- a/sway/commands/seat.c +++ b/sway/commands/seat.c @@ -2,6 +2,7 @@ #include <strings.h> #include "sway/commands.h" #include "sway/input/input-manager.h" +#include "sway/input/seat.h" #include "log.h" #include "stringop.h" @@ -20,7 +21,16 @@ struct cmd_results *cmd_seat(int argc, char **argv) { return error; } - config->handler_context.seat_config = new_seat_config(argv[0]); + if (!strcmp(argv[0], "-")) { + if (config->reading) { + return cmd_results_new(CMD_FAILURE, + "Current seat alias (-) cannot be used in the config"); + } + config->handler_context.seat_config = + new_seat_config(config->handler_context.seat->wlr_seat->name); + } else { + config->handler_context.seat_config = new_seat_config(argv[0]); + } if (!config->handler_context.seat_config) { return cmd_results_new(CMD_FAILURE, "Couldn't allocate config"); } diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c index 1e509a58..7615eef9 100644 --- a/sway/commands/seat/attach.c +++ b/sway/commands/seat/attach.c @@ -12,6 +12,9 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) { if (!config->handler_context.seat_config) { return cmd_results_new(CMD_FAILURE, "No seat defined"); } + if (config->reading) { + return cmd_results_new(CMD_DEFER, NULL); + } struct seat_attachment_config *attachment = seat_attachment_config_new(); if (!attachment) { |