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 86460318ba)
This commit is contained in:
Peter Hutterer
2012-08-23 16:22:31 +10:00
parent 7d1df986e1
commit cb883766ec

View File

@@ -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;
}