diff options
author | Tadeo Kondrak <me@tadeo.ca> | 2019-10-28 18:26:00 -0600 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-11-17 13:34:24 +0100 |
commit | 4829f1c26a521a4ef6659d91505112cc0be8d237 (patch) | |
tree | 4e0987c668241600401755630afe40c3879ca06a /sway/config/input.c | |
parent | xwayland: get_constraints using size hints (diff) | |
download | sway-4829f1c26a521a4ef6659d91505112cc0be8d237.tar.gz sway-4829f1c26a521a4ef6659d91505112cc0be8d237.tar.zst sway-4829f1c26a521a4ef6659d91505112cc0be8d237.zip |
Implement input map_to_region command
Diffstat (limited to 'sway/config/input.c')
-rw-r--r-- | sway/config/input.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c index ad4a64ee..294ed08f 100644 --- a/sway/config/input.c +++ b/sway/config/input.c | |||
@@ -138,6 +138,13 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { | |||
138 | free(dst->mapped_to_output); | 138 | free(dst->mapped_to_output); |
139 | dst->mapped_to_output = strdup(src->mapped_to_output); | 139 | dst->mapped_to_output = strdup(src->mapped_to_output); |
140 | } | 140 | } |
141 | if (src->mapped_to_region) { | ||
142 | free(dst->mapped_to_region); | ||
143 | dst->mapped_to_region = | ||
144 | malloc(sizeof(struct wlr_box)); | ||
145 | memcpy(dst->mapped_to_region, src->mapped_to_region, | ||
146 | sizeof(struct wlr_box)); | ||
147 | } | ||
141 | if (src->calibration_matrix.configured) { | 148 | if (src->calibration_matrix.configured) { |
142 | dst->calibration_matrix.configured = src->calibration_matrix.configured; | 149 | dst->calibration_matrix.configured = src->calibration_matrix.configured; |
143 | memcpy(dst->calibration_matrix.matrix, src->calibration_matrix.matrix, | 150 | memcpy(dst->calibration_matrix.matrix, src->calibration_matrix.matrix, |
@@ -323,6 +330,7 @@ void free_input_config(struct input_config *ic) { | |||
323 | free(ic->xkb_variant); | 330 | free(ic->xkb_variant); |
324 | free(ic->mapped_from_region); | 331 | free(ic->mapped_from_region); |
325 | free(ic->mapped_to_output); | 332 | free(ic->mapped_to_output); |
333 | free(ic->mapped_to_region); | ||
326 | free(ic); | 334 | free(ic); |
327 | } | 335 | } |
328 | 336 | ||