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

pointer_constraint: change to a seat subcommand

Browse source 
This changes the `pointer_constraint` command to be a subcommand of seat
to allow for per-seat settings. The current implementation that is not a
seat subcommand will only operate on the current seat and will segfault
in the config due to `config->handler_context.seat` only being set at
runtime.

This also allows for the wildcard identifier to be used to alter the
pointer constraint settings on all seats and allows for the setting to
be merged with the rest of the seat config.
This commit is contained in:
Brian Ashworth 2019-01-31 22:58:52 -05:00
parent 204e1f4712
commit ebe5399ed6
10 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/commands/seat.c
View file

@ -11,6 +11,7 @@ static struct cmd_handler seat_handlers[] = {
{ "cursor", seat_cmd_cursor },
{ "fallback", seat_cmd_fallback },
{ "hide_cursor", seat_cmd_hide_cursor },
{ "pointer_constraint", seat_cmd_pointer_constraint },
};
struct cmd_results *cmd_seat(int argc, char **argv) {

23
sway/commands/pointer_constraint.c → sway/commands/seat/pointer_constraint.c
View file

@ -12,11 +12,14 @@ enum operation {
};
// pointer_constraint [enable|disable|escape]
struct cmd_results *cmd_pointer_constraint(int argc, char **argv) {
struct cmd_results *seat_cmd_pointer_constraint(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "pointer_constraint", EXPECTED_EQUAL_TO, 1))) {
return error;
}
if (!config->handler_context.seat_config) {
return cmd_results_new(CMD_FAILURE, "No seat defined");
}
enum operation op;
if (strcmp(argv[0], "enable") == 0) {
@ -33,19 +36,23 @@ struct cmd_results *cmd_pointer_constraint(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "Can only escape at runtime.");
}
struct sway_cursor *cursor = config->handler_context.seat->cursor;
struct seat_config *seat_config = seat_get_config(cursor->seat);
struct seat_config *seat_config = config->handler_context.seat_config;
switch (op) {
case OP_ENABLE:
seat_config->allow_constrain = true;
seat_config->allow_constrain = CONSTRAIN_ENABLE;
break;
case OP_DISABLE:
seat_config->allow_constrain = false;
seat_config->allow_constrain = CONSTRAIN_DISABLE;
/* fallthrough */
case OP_ESCAPE:
sway_cursor_constrain(cursor, NULL);
case OP_ESCAPE:;
bool wildcard = !strcmp(seat_config->name, "*");
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) {
if (wildcard || !strcmp(seat->wlr_seat->name, seat_config->name)) {
sway_cursor_constrain(seat->cursor, NULL);
}
}
break;
}
return cmd_results_new(CMD_SUCCESS, NULL);
}