From 4d88c957905e7f6b2c8188d218ca22b3e6986fe4 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Thu, 27 Dec 2018 00:32:15 -0500
Subject: hide_cursor: change to a seat subcommand

This makes hide_cursor a seat subcommand, which allows for seat specific
timeouts.
---
 include/sway/commands.h     | 4 ++--
 include/sway/config.h       | 3 +--
 include/sway/input/cursor.h | 2 ++
 include/sway/input/seat.h   | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 89e18c66..7bee2538 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -133,7 +133,6 @@ sway_cmd cmd_force_display_urgency_hint;
 sway_cmd cmd_force_focus_wrapping;
 sway_cmd cmd_fullscreen;
 sway_cmd cmd_gaps;
-sway_cmd cmd_hide_cursor;
 sway_cmd cmd_hide_edge_borders;
 sway_cmd cmd_include;
 sway_cmd cmd_input;
@@ -260,8 +259,9 @@ sway_cmd output_cmd_scale;
 sway_cmd output_cmd_transform;
 
 sway_cmd seat_cmd_attach;
-sway_cmd seat_cmd_fallback;
 sway_cmd seat_cmd_cursor;
+sway_cmd seat_cmd_fallback;
+sway_cmd seat_cmd_hide_cursor;
 
 sway_cmd cmd_ipc_cmd;
 sway_cmd cmd_ipc_events;
diff --git a/include/sway/config.h b/include/sway/config.h
index 6610f009..86473e17 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -140,6 +140,7 @@ struct seat_config {
 	char *name;
 	int fallback; // -1 means not set
 	list_t *attachments; // list of seat_attachment configs
+	int hide_cursor_timeout;
 };
 
 enum config_dpms {
@@ -436,8 +437,6 @@ struct sway_config {
 	enum edge_border_types hide_edge_borders;
 	enum edge_border_types saved_edge_borders;
 
-	int hide_cursor_timeout;
-
 	// border colors
 	struct {
 		struct border_colors focused;
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 21a26f68..78489e21 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -60,6 +60,8 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
  */
 void cursor_rebase(struct sway_cursor *cursor);
 
+void cursor_handle_activity(struct sway_cursor *cursor);
+
 /**
  * Like cursor_rebase, but also allows focus to change when the cursor enters a
  * new container.
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index bef2af77..d665c86e 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -174,6 +174,8 @@ void seat_apply_config(struct sway_seat *seat, struct seat_config *seat_config);
 
 struct seat_config *seat_get_config(struct sway_seat *seat);
 
+struct seat_config *seat_get_config_by_name(const char *name);
+
 bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
 
 void drag_icon_update_position(struct sway_drag_icon *icon);
-- 
cgit v1.2.3