Commit 7e92aca6 changed the length of the Wacom Button Actions property to be dynamically calculated, but did not take this into account for the property setter (preventing xsetwacom from updating them). This patch replaces the constant length with an identical calculation to ensure we check for the proper size.
Signed-off-by: Jason Gerecke <[email protected]> --- src/wcmXCommand.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c index d0963f1..0fd5664 100644 --- a/src/wcmXCommand.c +++ b/src/wcmXCommand.c @@ -849,7 +849,8 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, #endif } else if (property == prop_btnactions) { - if (prop->size != WCM_MAX_BUTTONS) + int nbuttons = min(max(priv->nbuttons + 4, 7), WCM_MAX_BUTTONS); + if (prop->size != nbuttons) return BadMatch; wcmSetPropertyButtonActions(dev, property, prop, checkonly); } else -- 1.7.8.4 ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
