summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-02-01 09:26:30 +0100
committerLibravatar GitHub <noreply@github.com>2019-02-01 09:26:30 +0100
commit47271552b0f5ae5dbba6efd3882e5cce2d83070e (patch)
treeca0bff9d26283b0fa790855e7379e8da2e89166b /include
parentRebase #1636 against current master (diff)
parentpointer_constraint: change to a seat subcommand (diff)
downloadsway-47271552b0f5ae5dbba6efd3882e5cce2d83070e.tar.gz
sway-47271552b0f5ae5dbba6efd3882e5cce2d83070e.tar.zst
sway-47271552b0f5ae5dbba6efd3882e5cce2d83070e.zip
Merge pull request #3550 from RedSoxFan/seat-pointer-constraint
pointer_constraint: change to a seat subcommand
Diffstat (limited to 'include')
-rw-r--r--include/sway/commands.h2
-rw-r--r--include/sway/config.h8
2 files changed, 8 insertions, 2 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 2877c370..3ed00763 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -153,7 +153,6 @@ sway_cmd cmd_new_window;
153sway_cmd cmd_no_focus; 153sway_cmd cmd_no_focus;
154sway_cmd cmd_output; 154sway_cmd cmd_output;
155sway_cmd cmd_permit; 155sway_cmd cmd_permit;
156sway_cmd cmd_pointer_constraint;
157sway_cmd cmd_popup_during_fullscreen; 156sway_cmd cmd_popup_during_fullscreen;
158sway_cmd cmd_reject; 157sway_cmd cmd_reject;
159sway_cmd cmd_reload; 158sway_cmd cmd_reload;
@@ -268,6 +267,7 @@ sway_cmd seat_cmd_attach;
268sway_cmd seat_cmd_cursor; 267sway_cmd seat_cmd_cursor;
269sway_cmd seat_cmd_fallback; 268sway_cmd seat_cmd_fallback;
270sway_cmd seat_cmd_hide_cursor; 269sway_cmd seat_cmd_hide_cursor;
270sway_cmd seat_cmd_pointer_constraint;
271 271
272sway_cmd cmd_ipc_cmd; 272sway_cmd cmd_ipc_cmd;
273sway_cmd cmd_ipc_events; 273sway_cmd cmd_ipc_events;
diff --git a/include/sway/config.h b/include/sway/config.h
index e63b9895..43ea7778 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -135,6 +135,12 @@ struct seat_attachment_config {
135 // TODO other things are configured here for some reason 135 // TODO other things are configured here for some reason
136}; 136};
137 137
138enum seat_config_allow_constrain {
139 CONSTRAIN_DEFAULT, // the default is currently enabled
140 CONSTRAIN_ENABLE,
141 CONSTRAIN_DISABLE
142};
143
138/** 144/**
139 * Options for multiseat and other misc device configurations 145 * Options for multiseat and other misc device configurations
140 */ 146 */
@@ -143,7 +149,7 @@ struct seat_config {
143 int fallback; // -1 means not set 149 int fallback; // -1 means not set
144 list_t *attachments; // list of seat_attachment configs 150 list_t *attachments; // list of seat_attachment configs
145 int hide_cursor_timeout; 151 int hide_cursor_timeout;
146 bool allow_constrain; 152 enum seat_config_allow_constrain allow_constrain;
147}; 153};
148 154
149enum config_dpms { 155enum config_dpms {