aboutsummaryrefslogtreecommitdiff
path: root/sway/config
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-02-01 09:26:30 +0100
committerGitHub <noreply@github.com>2019-02-01 09:26:30 +0100
commit47271552b0f5ae5dbba6efd3882e5cce2d83070e (patch)
treeca0bff9d26283b0fa790855e7379e8da2e89166b /sway/config
parent204e1f47122d5a48865802dd1fb94fe0f05c2401 (diff)
parentebe5399ed6bfa59f5f5d289bf3d46b08f60787b3 (diff)
downloadsway-47271552b0f5ae5dbba6efd3882e5cce2d83070e.tar.xz
Merge pull request #3550 from RedSoxFan/seat-pointer-constraint
pointer_constraint: change to a seat subcommand
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/seat.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 541c4f99..04a44e3a 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -26,7 +26,7 @@ struct seat_config *new_seat_config(const char* name) {
return NULL;
}
seat->hide_cursor_timeout = -1;
- seat->allow_constrain = true;
+ seat->allow_constrain = CONSTRAIN_DEFAULT;
return seat;
}
@@ -143,6 +143,10 @@ void merge_seat_config(struct seat_config *dest, struct seat_config *source) {
if (source->hide_cursor_timeout != -1) {
dest->hide_cursor_timeout = source->hide_cursor_timeout;
}
+
+ if (source->allow_constrain != CONSTRAIN_DEFAULT) {
+ dest->allow_constrain = source->allow_constrain;
+ }
}
struct seat_config *copy_seat_config(struct seat_config *seat) {