The properties cannot match up in height _and_ width, only one of the two. Which one depends on the TwinView settings.
Signed-off-by: Peter Hutterer <[email protected]> --- src/wcmXCommand.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c index ed14de5..9e1b5fa 100644 --- a/src/wcmXCommand.c +++ b/src/wcmXCommand.c @@ -843,11 +843,24 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, /* non-TwinView settings can not set TwinView RESOLUTION */ if ((priv->twinview == TV_NONE) || (values[0] < 0) || - (values[1] < 0) || (values[2] < 0) || (values[3] < 0) || - ((values[0] + values[2]) != screenInfo.screens[0]->width) || - ((values[1] + values[3]) != screenInfo.screens[0]->height)) + (values[1] < 0) || (values[2] < 0) || (values[3] < 0)) return BadValue; + switch(priv->twinview) + { + case TV_NONE: break; + case TV_ABOVE_BELOW: + case TV_BELOW_ABOVE: + if ((values[1] + values[3]) != screenInfo.screens[0]->height) + return BadValue; + break; + case TV_LEFT_RIGHT: + case TV_RIGHT_LEFT: + if ((values[0] + values[2]) != screenInfo.screens[0]->width) + return BadValue; + break; + } + if (!checkonly) { priv->tvResolution[0] = values[0]; -- 1.7.2.2 ------------------------------------------------------------------------------ Sell apps to millions through the Intel(R) Atom(Tm) Developer Program Be part of this innovative community and reach millions of netbook users worldwide. Take advantage of special opportunities to increase revenue and speed time-to-market. Join now, and jumpstart your future. http://p.sf.net/sfu/intel-atom-d2d _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
