diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-18 19:32:17 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-18 19:32:17 +0000 |
| commit | 4b75c7f6358b28978b05ffa4b73853d936454f50 (patch) | |
| tree | fcaa243699c1f97e88799d303c0cc81a06b08de4 /Xext/xtest.c | |
| parent | 8a7481a27496c842ec2ef5bac5e4d0b5e6279deb (diff) | |
First pass at "Standard" Xinerama. The sources for this came from Heather
Lanigan's xinerama tree on Sourceforge.Net. No attempt has been made to
handle previous, non-standard versions of the protocol. Nor has any
attempt been made to preserve the ABI of previous versions -- that part
will be added at a later time, and then probably only on systems that
have nice object/linker semantics, e.g. ELF systems with weak symbols.
Diffstat (limited to 'Xext/xtest.c')
| -rw-r--r-- | Xext/xtest.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index 89bcae3a4..0dec3b623 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* @@ -63,9 +64,9 @@ static unsigned char XTestReqCode; extern int DeviceValuator; #endif /* XINPUT */ -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" +#ifdef XINERAMA +#include "xinerama.h" +#include "xineramaSrv.h" #endif static void XTestResetProc( @@ -390,13 +391,13 @@ ProcXTestFakeInput(client) return BadValue; } -#ifdef PANORAMIX - if (!noPanoramiXExtension) { +#ifdef XINERAMA + if (!noXineramaExtension) { ScreenPtr pScreen = root->drawable.pScreen; BoxRec box; int i; - int x = ev->u.keyButtonPointer.rootX + panoramiXdataPtr[0].x; - int y = ev->u.keyButtonPointer.rootY + panoramiXdataPtr[0].y; + int x = ev->u.keyButtonPointer.rootX + xineramaDataPtr[0].x; + int y = ev->u.keyButtonPointer.rootY + xineramaDataPtr[0].y; if (!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum], x, y, &box)) { FOR_NSCREENS(i) { @@ -405,8 +406,8 @@ ProcXTestFakeInput(client) &XineramaScreenRegions[i], x, y, &box)) { root = WindowTable[i]; - x -= panoramiXdataPtr[i].x; - y -= panoramiXdataPtr[i].y; + x -= xineramaDataPtr[i].x; + y -= xineramaDataPtr[i].y; ev->u.keyButtonPointer.rootX = x; ev->u.keyButtonPointer.rootY = y; break; @@ -425,10 +426,10 @@ ProcXTestFakeInput(client) else if (ev->u.keyButtonPointer.rootY >= root->drawable.height) ev->u.keyButtonPointer.rootY = root->drawable.height - 1; -#ifdef PANORAMIX - if ((!noPanoramiXExtension +#ifdef XINERAMA + if ((!noXineramaExtension && root->drawable.pScreen->myNum != XineramaGetCursorScreen()) - || (noPanoramiXExtension && root != GetCurrentRootWindow())) + || (noXineramaExtension && root != GetCurrentRootWindow())) #else if (root != GetCurrentRootWindow()) |