diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2016-07-11 18:23:09 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2016-07-26 18:45:26 +0200 |
commit | 7e3f96d972449b300d51d01397d7f52231668202 (patch) | |
tree | ff81c679295fe6c65fb88e10b34a5854a2b35eea | |
parent | 5f91d34f88daa51563973aa032addfbe7c4b9335 (diff) | |
download | mutter-wip/garnacho/virtual-input-device.tar.gz |
backends: Prepare for virtual deviceswip/garnacho/virtual-input-device
Those have no backing libinput_device, and configuration does not
apply to those.
https://bugzilla.gnome.org/show_bug.cgi?id=765009
-rw-r--r-- | src/backends/native/meta-input-settings-native.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c index 2479c5fb9..1d7de45dd 100644 --- a/src/backends/native/meta-input-settings-native.c +++ b/src/backends/native/meta-input-settings-native.c @@ -54,6 +54,8 @@ meta_input_settings_native_set_send_events (MetaInputSettings *settings, } libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; libinput_device_config_send_events_set_mode (libinput_device, libinput_mode); } @@ -65,6 +67,8 @@ meta_input_settings_native_set_matrix (MetaInputSettings *settings, struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; if (libinput_device_config_calibration_has_matrix (libinput_device) > 0) libinput_device_config_calibration_set_matrix (libinput_device, matrix); @@ -78,6 +82,8 @@ meta_input_settings_native_set_speed (MetaInputSettings *settings, struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; libinput_device_config_accel_set_speed (libinput_device, CLAMP (speed, -1, 1)); } @@ -90,6 +96,8 @@ meta_input_settings_native_set_left_handed (MetaInputSettings *settings, struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; if (libinput_device_config_left_handed_is_available (libinput_device)) libinput_device_config_left_handed_set (libinput_device, enabled); @@ -103,6 +111,8 @@ meta_input_settings_native_set_tap_enabled (MetaInputSettings *settings, struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; if (libinput_device_config_tap_get_finger_count (libinput_device) > 0) libinput_device_config_tap_set_enabled (libinput_device, @@ -119,6 +129,8 @@ meta_input_settings_native_set_invert_scroll (MetaInputSettings *settings, struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; if (libinput_device_config_scroll_has_natural_scroll (libinput_device)) libinput_device_config_scroll_set_natural_scroll_enabled (libinput_device, @@ -163,6 +175,8 @@ meta_input_settings_native_set_edge_scroll (MetaInputSettings *settin enum libinput_config_scroll_method supported; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; supported = libinput_device_config_scroll_get_methods (libinput_device); if (supported & LIBINPUT_CONFIG_SCROLL_2FG) @@ -190,6 +204,8 @@ meta_input_settings_native_set_scroll_button (MetaInputSettings *settings, struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; if (!device_set_scroll_method (libinput_device, LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN)) @@ -207,6 +223,8 @@ meta_input_settings_native_set_click_method (MetaInputSettings *settin struct libinput_device *libinput_device; libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return; switch (mode) { |