summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-09-03 17:33:40 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2015-09-03 17:33:40 +1000
commit19b42f242dddef7d6381b74b13930d6dd2734898 (patch)
tree6f7d3c13628238edbfe9f8e6b44437b630e17572
parentf48b64c8cd6f280ba8c589842ec2522a4bfe9b5c (diff)
downloadxorg-driver-xf86-input-libinput-19b42f242dddef7d6381b74b13930d6dd2734898.tar.gz
Move the read-only properties into the same condition
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86libinput.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 7ecc0e6..0f48ea0 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -2176,20 +2176,14 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
rc = LibinputSetPropertyAccel(dev, atom, val, checkonly);
else if (atom == prop_natural_scroll)
rc = LibinputSetPropertyNaturalScroll(dev, atom, val, checkonly);
- else if (atom == prop_sendevents_available)
- return BadAccess; /* read-only */
else if (atom == prop_sendevents_enabled)
rc = LibinputSetPropertySendEvents(dev, atom, val, checkonly);
else if (atom == prop_left_handed)
rc = LibinputSetPropertyLeftHanded(dev, atom, val, checkonly);
- else if (atom == prop_scroll_methods_available)
- return BadAccess; /* read-only */
else if (atom == prop_scroll_method_enabled)
rc = LibinputSetPropertyScrollMethods(dev, atom, val, checkonly);
else if (atom == prop_scroll_button)
rc = LibinputSetPropertyScrollButton(dev, atom, val, checkonly);
- else if (atom == prop_click_methods_available)
- return BadAccess; /* read-only */
else if (atom == prop_click_method_enabled)
rc = LibinputSetPropertyClickMethod(dev, atom, val, checkonly);
else if (atom == prop_middle_emulation)
@@ -2207,10 +2201,13 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
atom == prop_accel_default ||
atom == prop_natural_scroll_default ||
atom == prop_sendevents_default ||
+ atom == prop_sendevents_available ||
atom == prop_left_handed_default ||
atom == prop_scroll_method_default ||
+ atom == prop_scroll_methods_available ||
atom == prop_scroll_button_default ||
atom == prop_click_method_default ||
+ atom == prop_click_methods_available ||
atom == prop_middle_emulation_default ||
atom == prop_disable_while_typing_default)
return BadAccess; /* read-only */