diff options
author | 2019-02-01 09:26:30 +0100 | |
---|---|---|
committer | 2019-02-01 09:26:30 +0100 | |
commit | 47271552b0f5ae5dbba6efd3882e5cce2d83070e (patch) | |
tree | ca0bff9d26283b0fa790855e7379e8da2e89166b /include | |
parent | Rebase #1636 against current master (diff) | |
parent | pointer_constraint: change to a seat subcommand (diff) | |
download | sway-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.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 8 |
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; | |||
153 | sway_cmd cmd_no_focus; | 153 | sway_cmd cmd_no_focus; |
154 | sway_cmd cmd_output; | 154 | sway_cmd cmd_output; |
155 | sway_cmd cmd_permit; | 155 | sway_cmd cmd_permit; |
156 | sway_cmd cmd_pointer_constraint; | ||
157 | sway_cmd cmd_popup_during_fullscreen; | 156 | sway_cmd cmd_popup_during_fullscreen; |
158 | sway_cmd cmd_reject; | 157 | sway_cmd cmd_reject; |
159 | sway_cmd cmd_reload; | 158 | sway_cmd cmd_reload; |
@@ -268,6 +267,7 @@ sway_cmd seat_cmd_attach; | |||
268 | sway_cmd seat_cmd_cursor; | 267 | sway_cmd seat_cmd_cursor; |
269 | sway_cmd seat_cmd_fallback; | 268 | sway_cmd seat_cmd_fallback; |
270 | sway_cmd seat_cmd_hide_cursor; | 269 | sway_cmd seat_cmd_hide_cursor; |
270 | sway_cmd seat_cmd_pointer_constraint; | ||
271 | 271 | ||
272 | sway_cmd cmd_ipc_cmd; | 272 | sway_cmd cmd_ipc_cmd; |
273 | sway_cmd cmd_ipc_events; | 273 | sway_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 | ||
138 | enum 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 | ||
149 | enum config_dpms { | 155 | enum config_dpms { |