aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2018-12-27 00:32:15 -0500
committeremersion <contact@emersion.fr>2018-12-30 14:17:24 +0100
commit4d88c957905e7f6b2c8188d218ca22b3e6986fe4 (patch)
tree5f34ad1667607315cfbcb786ce71845a36595d82 /sway/commands
parent09bb71f6507d86d98b5b9825f28b91ddd4b9a09b (diff)
hide_cursor: change to a seat subcommand
This makes hide_cursor a seat subcommand, which allows for seat specific timeouts.
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/seat.c1
-rw-r--r--sway/commands/seat/hide_cursor.c (renamed from sway/commands/hide_cursor.c)14
2 files changed, 6 insertions, 9 deletions
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 56acd204..3e7ffed9 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -10,6 +10,7 @@ static struct cmd_handler seat_handlers[] = {
{ "attach", seat_cmd_attach },
{ "cursor", seat_cmd_cursor },
{ "fallback", seat_cmd_fallback },
+ { "hide_cursor", seat_cmd_hide_cursor },
};
struct cmd_results *cmd_seat(int argc, char **argv) {
diff --git a/sway/commands/hide_cursor.c b/sway/commands/seat/hide_cursor.c
index 3778fcff..343573b5 100644
--- a/sway/commands/hide_cursor.c
+++ b/sway/commands/seat/hide_cursor.c
@@ -2,15 +2,17 @@
#include <string.h>
#include "sway/commands.h"
#include "sway/config.h"
-#include "sway/input/cursor.h"
#include "sway/input/seat.h"
#include "stringop.h"
-struct cmd_results *cmd_hide_cursor(int argc, char **argv) {
+struct cmd_results *seat_cmd_hide_cursor(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "hide_cursor", EXPECTED_EQUAL_TO, 1))) {
return error;
}
+ if (!config->handler_context.seat_config) {
+ return cmd_results_new(CMD_FAILURE, "hide_cursor", "No seat defined");
+ }
char *end;
int timeout = strtol(argv[0], &end, 10);
@@ -21,13 +23,7 @@ struct cmd_results *cmd_hide_cursor(int argc, char **argv) {
if (timeout < 100 && timeout != 0) {
timeout = 100;
}
- config->hide_cursor_timeout = timeout;
-
- struct sway_seat *seat;
- wl_list_for_each(seat, &server.input->seats, link) {
- wl_event_source_timer_update(seat->cursor->hide_source,
- config->hide_cursor_timeout);
- }
+ config->handler_context.seat_config->hide_cursor_timeout = timeout;
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}