diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-08-23 16:22:31 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-01-17 19:20:56 +1000 |
commit | cb883766ec07b3380541fe9248aa46f07c39c338 (patch) | |
tree | 3d9b6495cd63260aad8611fb9ab47849747bf3c8 | |
parent | 7d1df986e1330a02cfb74a0babae1ae78768aa52 (diff) |
Recognise the soft button area property before clickpad is enabled
Otherwise the driver has no internal reference to the soft button area
property and will ignore any setting.
Also, if a client sets this property, we claim it as our own and disallow
deletion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 86460318ba5606ef41712b52e50bf7b2ba083226)
-rw-r--r-- | src/properties.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/properties.c b/src/properties.c index 3b3f1c5..83f370d 100644 --- a/src/properties.c +++ b/src/properties.c @@ -839,6 +839,16 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, } else if (property == prop_product_id || property == prop_device_node) return BadValue; /* read-only */ + else { /* unknown property */ + if (strcmp(SYNAPTICS_PROP_SOFTBUTTON_AREAS, NameForAtom(property)) == 0) + { + prop_softbutton_areas = property; + if (SetProperty(dev, property, prop, checkonly) != Success) + prop_softbutton_areas = 0; + else if (!checkonly) + XISetDevicePropertyDeletable(dev, property, FALSE); + } + } return Success; } |