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

Merge pull request #3337 from RedSoxFan/fix-seat-cmd-cursor

Browse source 
seat_cmd_cursor: work on seat name provided
This commit is contained in:
emersion 2019-01-08 09:44:11 +01:00 committed by GitHub
parent 327236a7ab 6ec2983d96
commit 353d9ed74f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
sway/commands/seat/cursor.c
View file

@ -17,18 +17,8 @@ static const char *expected_syntax = "Expected 'cursor <move> <x> <y>' or "
"'cursor <set> <x> <y>' or " "'cursor <set> <x> <y>' or "
"'curor <press|release> <left|right|1|2|3...>'"; "'curor <press|release> <left|right|1|2|3...>'";
struct cmd_results *seat_cmd_cursor(int argc, char **argv) { static struct cmd_results *handle_command(struct sway_cursor *cursor,
struct cmd_results *error = NULL; int argc, char **argv) {
if ((error = checkarg(argc, "cursor", EXPECTED_AT_LEAST, 2))) {
return error;
}
struct sway_seat *seat = config->handler_context.seat;
if (!seat) {
return cmd_results_new(CMD_FAILURE, "cursor", "No seat defined");
}
struct sway_cursor *cursor = seat->cursor;
if (strcasecmp(argv[0], "move") == 0) { if (strcasecmp(argv[0], "move") == 0) {
if (argc < 3) { if (argc < 3) {
return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
@ -50,6 +40,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
if (argc < 2) { if (argc < 2) {
return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
} }
struct cmd_results *error = NULL;
if ((error = press_or_release(cursor, argv[0], argv[1]))) { if ((error = press_or_release(cursor, argv[0], argv[1]))) {
return error; return error;
} }
@ -58,6 +49,40 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "cursor", EXPECTED_AT_LEAST, 2))) {
return error;
}
struct seat_config *sc = config->handler_context.seat_config;
if (!sc) {
return cmd_results_new(CMD_FAILURE, "cursor", "No seat defined");
}
if (config->reading || !config->active) {
return cmd_results_new(CMD_DEFER, NULL, NULL);
}
if (strcmp(sc->name, "*") != 0) {
struct sway_seat *seat = input_manager_get_seat(sc->name);
if (!seat) {
return cmd_results_new(CMD_FAILURE, "cursor",
"Failed to get seat");
}
error = handle_command(seat->cursor, argc, argv);
} else {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) {
error = handle_command(seat->cursor, argc, argv);
if ((error && error->status != CMD_SUCCESS)) {
break;
}
}
}
return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
static struct cmd_results *press_or_release(struct sway_cursor *cursor, static struct cmd_results *press_or_release(struct sway_cursor *cursor,
char *action, char *button_str) { char *action, char *button_str) {
enum wlr_button_state state; enum wlr_button_state state;