diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-24 13:55:20 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-29 05:15:03 +1000 |
| commit | 40fbab058623537bdde92b55eddedd3a681958ac (patch) | |
| tree | 8b2a59f8fa21ec89396882b69357554338843132 | |
| parent | 057dc7887d3fd711854ca12602634c076419d66a (diff) | |
| download | xf86-input-wacom-40fbab058623537bdde92b55eddedd3a681958ac.tar.gz | |
Fix build error against current master - ScreenRec has changed.
dixScreenOrigins was removed in xserver commit
commit a83cff9f4d622b069c96a68b4e87a669bf1f6446
Author: Jamey Sharp <jamey@minilop.net>
AuthorDate: Sun May 23 10:11:47 2010 -0700
Move each screen's x/y origin into ScreenRec.
the x/y fields were moved into the ScreenRec. The ABI wasn't bumped (thanks
guys, ...) , so we have to resort to this ifdef check. This leaves us with
unbisectable state between a83cff9f and 1.8.99.901 (83 commits) where the
patch has to be manually applied. Sorry.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>
(cherry picked from commit 23698917748419185217cf891b6aef03dedab093)
| -rw-r--r-- | src/wcmCommon.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 9727123..15e439f 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -1733,10 +1733,20 @@ void wcmInitialScreens(InputInfoPtr pInfo) { if (screenInfo.numScreens > 1) { +/* dixScreenOrigins was removed from xserver without bumping the ABI. + * 1.8.99.901 is the first release after the break. thanks. */ +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 8, 99, 901, 0) priv->screenTopX[i] = dixScreenOrigins[i].x; priv->screenTopY[i] = dixScreenOrigins[i].y; priv->screenBottomX[i] = dixScreenOrigins[i].x; priv->screenBottomY[i] = dixScreenOrigins[i].y; +#else + priv->screenTopX[i] = screenInfo.screens[i]->x; + priv->screenTopY[i] = screenInfo.screens[i]->y; + priv->screenBottomX[i] = screenInfo.screens[i]->x; + priv->screenBottomY[i] = screenInfo.screens[i]->y; + +#endif DBG(10, priv, "from dix: " "ScreenOrigins[%d].x=%d ScreenOrigins[%d].y=%d \n", |