diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-01-17 09:49:02 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-01-17 09:49:02 -0500 |
commit | 9f54cd89359119897fed2747c373879c09ae8706 (patch) | |
tree | 024ecf284c38c5017068b82902d66ec4342f8291 /sway/input/seat.c | |
parent | Merge pull request #1566 from acrisci/render-loop (diff) | |
download | sway-9f54cd89359119897fed2747c373879c09ae8706.tar.gz sway-9f54cd89359119897fed2747c373879c09ae8706.tar.zst sway-9f54cd89359119897fed2747c373879c09ae8706.zip |
copy config references for input and seat
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 268486ab..d134bc68 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -230,6 +230,7 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) { | |||
230 | void sway_seat_set_config(struct sway_seat *seat, | 230 | void sway_seat_set_config(struct sway_seat *seat, |
231 | struct seat_config *seat_config) { | 231 | struct seat_config *seat_config) { |
232 | // clear configs | 232 | // clear configs |
233 | free_seat_config(seat->config); | ||
233 | seat->config = NULL; | 234 | seat->config = NULL; |
234 | 235 | ||
235 | struct sway_seat_device *seat_device = NULL; | 236 | struct sway_seat_device *seat_device = NULL; |
@@ -242,11 +243,9 @@ void sway_seat_set_config(struct sway_seat *seat, | |||
242 | } | 243 | } |
243 | 244 | ||
244 | // add configs | 245 | // add configs |
245 | seat->config = seat_config; | 246 | seat->config = copy_seat_config(seat_config); |
246 | 247 | ||
247 | wl_list_for_each(seat_device, &seat->devices, link) { | 248 | wl_list_for_each(seat_device, &seat->devices, link) { |
248 | seat_device->attachment_config = | 249 | sway_seat_configure_device(seat, seat_device->input_device); |
249 | seat_config_get_attachment(seat_config, | ||
250 | seat_device->input_device->identifier); | ||
251 | } | 250 | } |
252 | } | 251 | } |