summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-08-23 16:22:31 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-10-24 16:47:26 +1000
commit86460318ba5606ef41712b52e50bf7b2ba083226 (patch)
treefe24b473512978bd5798f0d70304144ab312ab95 /src
parent3cb14dcccf5574366d90e24f351e3ad04b35e35f (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>
Diffstat (limited to 'src')
-rw-r--r--src/properties.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/properties.c b/src/properties.c
index 72ba896..dd88fc7 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -707,6 +707,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;
}