diff options
| author | Yaroslav de la Peña Smirnov <yps@yaroslavps.com> | 2022-10-23 03:09:38 +0300 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-10-23 11:56:29 +0200 |
| commit | 9d99bb956fea8922f8e0196d67eabbd510c53f1f (patch) | |
| tree | 446b69802f7a1278710bb90d56f017d2d29ff439 /sway/input/libinput.c | |
| parent | 5e514e6474754ea6a4b4d1bfc5738457a0fb41cf (diff) | |
Fix keymap being NULL and segfaulting on dev add
Moved `libinput_config` to the callers of
`sway_input_configure_libinput_device` so that we send the event after
the added event.
Diffstat (limited to 'sway/input/libinput.c')
| -rw-r--r-- | sway/input/libinput.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sway/input/libinput.c b/sway/input/libinput.c index 3c0f359d..1bac72c9 100644 --- a/sway/input/libinput.c +++ b/sway/input/libinput.c @@ -187,10 +187,10 @@ static bool set_calibration_matrix(struct libinput_device *dev, float mat[6]) { return changed; } -void sway_input_configure_libinput_device(struct sway_input_device *input_device) { +bool sway_input_configure_libinput_device(struct sway_input_device *input_device) { struct input_config *ic = input_device_get_config(input_device); if (!ic || !wlr_input_device_is_libinput(input_device->wlr_device)) { - return; + return false; } struct libinput_device *device = @@ -259,9 +259,7 @@ void sway_input_configure_libinput_device(struct sway_input_device *input_device changed |= set_calibration_matrix(device, ic->calibration_matrix.matrix); } - if (changed) { - ipc_event_input("libinput_config", input_device); - } + return changed; } void sway_input_reset_libinput_device(struct sway_input_device *input_device) { |