aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-12-27 00:32:15 -0500
committerLibravatar emersion <contact@emersion.fr>2018-12-30 14:17:24 +0100
commit4d88c957905e7f6b2c8188d218ca22b3e6986fe4 (patch)
tree5f34ad1667607315cfbcb786ce71845a36595d82 /include
parentVerify seat fallback settings on reload (diff)
downloadsway-4d88c957905e7f6b2c8188d218ca22b3e6986fe4.tar.gz
sway-4d88c957905e7f6b2c8188d218ca22b3e6986fe4.tar.zst
sway-4d88c957905e7f6b2c8188d218ca22b3e6986fe4.zip
hide_cursor: change to a seat subcommand
This makes hide_cursor a seat subcommand, which allows for seat specific timeouts.
Diffstat (limited to 'include')
-rw-r--r--include/sway/commands.h4
-rw-r--r--include/sway/config.h3
-rw-r--r--include/sway/input/cursor.h2
-rw-r--r--include/sway/input/seat.h2
4 files changed, 7 insertions, 4 deletions
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;
133sway_cmd cmd_force_focus_wrapping; 133sway_cmd cmd_force_focus_wrapping;
134sway_cmd cmd_fullscreen; 134sway_cmd cmd_fullscreen;
135sway_cmd cmd_gaps; 135sway_cmd cmd_gaps;
136sway_cmd cmd_hide_cursor;
137sway_cmd cmd_hide_edge_borders; 136sway_cmd cmd_hide_edge_borders;
138sway_cmd cmd_include; 137sway_cmd cmd_include;
139sway_cmd cmd_input; 138sway_cmd cmd_input;
@@ -260,8 +259,9 @@ sway_cmd output_cmd_scale;
260sway_cmd output_cmd_transform; 259sway_cmd output_cmd_transform;
261 260
262sway_cmd seat_cmd_attach; 261sway_cmd seat_cmd_attach;
263sway_cmd seat_cmd_fallback;
264sway_cmd seat_cmd_cursor; 262sway_cmd seat_cmd_cursor;
263sway_cmd seat_cmd_fallback;
264sway_cmd seat_cmd_hide_cursor;
265 265
266sway_cmd cmd_ipc_cmd; 266sway_cmd cmd_ipc_cmd;
267sway_cmd cmd_ipc_events; 267sway_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 {
140 char *name; 140 char *name;
141 int fallback; // -1 means not set 141 int fallback; // -1 means not set
142 list_t *attachments; // list of seat_attachment configs 142 list_t *attachments; // list of seat_attachment configs
143 int hide_cursor_timeout;
143}; 144};
144 145
145enum config_dpms { 146enum config_dpms {
@@ -436,8 +437,6 @@ struct sway_config {
436 enum edge_border_types hide_edge_borders; 437 enum edge_border_types hide_edge_borders;
437 enum edge_border_types saved_edge_borders; 438 enum edge_border_types saved_edge_borders;
438 439
439 int hide_cursor_timeout;
440
441 // border colors 440 // border colors
442 struct { 441 struct {
443 struct border_colors focused; 442 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);
60 */ 60 */
61void cursor_rebase(struct sway_cursor *cursor); 61void cursor_rebase(struct sway_cursor *cursor);
62 62
63void cursor_handle_activity(struct sway_cursor *cursor);
64
63/** 65/**
64 * Like cursor_rebase, but also allows focus to change when the cursor enters a 66 * Like cursor_rebase, but also allows focus to change when the cursor enters a
65 * new container. 67 * 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);
174 174
175struct seat_config *seat_get_config(struct sway_seat *seat); 175struct seat_config *seat_get_config(struct sway_seat *seat);
176 176
177struct seat_config *seat_get_config_by_name(const char *name);
178
177bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface); 179bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
178 180
179void drag_icon_update_position(struct sway_drag_icon *icon); 181void drag_icon_update_position(struct sway_drag_icon *icon);