diff options
47 files changed, 749 insertions, 381 deletions
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 57ad13c0b..3aa31ad6f 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.3 2004/02/25 21:46:31 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA @@ -77,7 +77,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/extensions/xtrapddmi.h> #include <X11/extensions/xtrapproto.h> #include "colormapst.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #include "cursor.h" @@ -1559,7 +1559,7 @@ void XETrapStampAndMail(xEvent *x_event) /* Copy the event information into our local memory */ (void)memcpy(&(data.u.event),x_event,sizeof(xEvent)); -#ifdef XINERAMA +#ifdef PANORAMIX if (!noPanoramiXExtension && (data.u.event.u.u.type == MotionNotify || data.u.event.u.u.type == ButtonPress || diff --git a/Xext/saver.c b/Xext/saver.c index 6b9ee5997..2a9371e0a 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */ /* * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * @@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium. #include "gcstruct.h" #include "cursorstr.h" #include "colormapst.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -677,7 +677,7 @@ ScreenSaverHandle (pScreen, xstate, force) ret = TRUE; } -#ifdef XINERAMA +#ifdef PANORAMIX if(noPanoramiXExtension || !pScreen->myNum) #endif SendScreenSaverNotify (pScreen, state, force); @@ -1195,7 +1195,7 @@ ScreenSaverUnsetAttributes (ClientPtr client) static int ProcScreenSaverSetAttributes (ClientPtr client) { -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { REQUEST(xScreenSaverSetAttributesReq); PanoramiXRes *draw; @@ -1274,7 +1274,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) static int ProcScreenSaverUnsetAttributes (ClientPtr client) { -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { REQUEST(xScreenSaverUnsetAttributesReq); PanoramiXRes *draw; diff --git a/Xext/shape.c b/Xext/shape.c index dfa7825ea..26f289fc4 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.4 2004/02/25 21:46:33 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */ /************************************************************ @@ -113,7 +113,7 @@ static DISPATCH_PROC(SProcShapeQueryVersion); static DISPATCH_PROC(SProcShapeRectangles); static DISPATCH_PROC(SProcShapeSelectInput); -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -376,9 +376,9 @@ ProcShapeRectangles (client) stuff->xOff, stuff->yOff, createDefault); } -#ifdef XINERAMA +#ifdef PANORAMIX static int -ProcXineramaShapeRectangles( +ProcPanoramiXShapeRectangles( register ClientPtr client) { REQUEST(xShapeRectanglesReq); @@ -465,9 +465,9 @@ ProcShapeMask (client) stuff->xOff, stuff->yOff, createDefault); } -#ifdef XINERAMA +#ifdef PANORAMIX static int -ProcXineramaShapeMask( +ProcPanoramiXShapeMask( register ClientPtr client) { REQUEST(xShapeMaskReq); @@ -580,9 +580,9 @@ ProcShapeCombine (client) } -#ifdef XINERAMA +#ifdef PANORAMIX static int -ProcXineramaShapeCombine( +ProcPanoramiXShapeCombine( register ClientPtr client) { REQUEST(xShapeCombineReq); @@ -649,9 +649,9 @@ ProcShapeOffset (client) } -#ifdef XINERAMA +#ifdef PANORAMIX static int -ProcXineramaShapeOffset( +ProcPanoramiXShapeOffset( register ClientPtr client) { REQUEST(xShapeOffsetReq); @@ -1065,30 +1065,30 @@ ProcShapeDispatch (client) case X_ShapeQueryVersion: return ProcShapeQueryVersion (client); case X_ShapeRectangles: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShapeRectangles (client); + return ProcPanoramiXShapeRectangles (client); else #endif return ProcShapeRectangles (client); case X_ShapeMask: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShapeMask (client); + return ProcPanoramiXShapeMask (client); else #endif return ProcShapeMask (client); case X_ShapeCombine: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShapeCombine (client); + return ProcPanoramiXShapeCombine (client); else #endif return ProcShapeCombine (client); case X_ShapeOffset: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShapeOffset (client); + return ProcPanoramiXShapeOffset (client); else #endif return ProcShapeOffset (client); diff --git a/Xext/shm.c b/Xext/shm.c index d39e16bab..cab5beeec 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.4 2003/12/20 00:28:24 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.5 2004/02/25 21:46:33 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ * /************************************************************ @@ -63,7 +63,7 @@ in this Software without prior written authorization from The Open Group. #include "xf86_ansic.h" #endif -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -561,9 +561,9 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) } -#ifdef XINERAMA +#ifdef PANORAMIX static int -ProcXineramaShmPutImage(register ClientPtr client) +ProcPanoramiXShmPutImage(register ClientPtr client) { int j, result = 0, orig_x, orig_y; PanoramiXRes *draw, *gc; @@ -580,8 +580,7 @@ ProcXineramaShmPutImage(register ClientPtr client) client, stuff->gc, XRT_GC, SecurityReadAccess))) return BadGC; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; orig_x = stuff->dstX; orig_y = stuff->dstY; @@ -602,7 +601,7 @@ ProcXineramaShmPutImage(register ClientPtr client) } static int -ProcXineramaShmGetImage(ClientPtr client) +ProcPanoramiXShmGetImage(ClientPtr client) { PanoramiXRes *draw; DrawablePtr drawables[MAXSCREENS]; @@ -641,8 +640,7 @@ ProcXineramaShmGetImage(ClientPtr client) format = stuff->format; planemask = stuff->planeMask; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; if(isRoot) { if( /* check for being onscreen */ @@ -717,7 +715,7 @@ ProcXineramaShmGetImage(ClientPtr client) } static int -ProcXineramaShmCreatePixmap( +ProcPanoramiXShmCreatePixmap( register ClientPtr client) { ScreenPtr pScreen = NULL; @@ -1083,11 +1081,9 @@ CreatePmap: shmdesc->addr + stuff->offset); if (pMap) { -#ifdef NO_XINERAMA_PORT #ifdef PIXPRIV pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; #endif -#endif shmdesc->refcnt++; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.id = stuff->pid; @@ -1113,21 +1109,21 @@ ProcShmDispatch (client) case X_ShmDetach: return ProcShmDetach(client); case X_ShmPutImage: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShmPutImage(client); + return ProcPanoramiXShmPutImage(client); #endif return ProcShmPutImage(client); case X_ShmGetImage: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShmGetImage(client); + return ProcPanoramiXShmGetImage(client); #endif return ProcShmGetImage(client); case X_ShmCreatePixmap: -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) - return ProcXineramaShmCreatePixmap(client); + return ProcPanoramiXShmCreatePixmap(client); #endif return ProcShmCreatePixmap(client); default: diff --git a/Xext/xtest.c b/Xext/xtest.c index 2e7eeec62..c1216b83e 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.4 2004/02/25 21:46:33 kaleb Exp $ */ /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* @@ -64,7 +64,7 @@ static unsigned char XTestReqCode; extern int DeviceValuator; #endif /* XINPUT */ -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -391,7 +391,7 @@ ProcXTestFakeInput(client) return BadValue; } -#ifdef XINERAMA +#ifdef PANORAMIX if (!noPanoramiXExtension) { ScreenPtr pScreen = root->drawable.pScreen; BoxRec box; @@ -426,7 +426,7 @@ ProcXTestFakeInput(client) else if (ev->u.keyButtonPointer.rootY >= root->drawable.height) ev->u.keyButtonPointer.rootY = root->drawable.height - 1; -#ifdef XINERAMA +#ifdef PANORAMIX if ((!noPanoramiXExtension && root->drawable.pScreen->myNum != XineramaGetCursorScreen()) || (noPanoramiXExtension && root != GetCurrentRootWindow())) diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 9eeb7b17a..fa53b6b9c 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -73,7 +73,7 @@ SOFTWARE. #include "xvdisp.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" @@ -233,14 +233,14 @@ ProcXvDispatch(ClientPtr client) case xv_QueryAdaptors: return(ProcXvQueryAdaptors(client)); case xv_QueryEncodings: return(ProcXvQueryEncodings(client)); case xv_PutVideo: -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return(XineramaXvPutVideo(client)); else #endif return(ProcXvPutVideo(client)); case xv_PutStill: -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return(XineramaXvPutStill(client)); else @@ -253,14 +253,14 @@ ProcXvDispatch(ClientPtr client) case xv_SelectVideoNotify: return(ProcXvSelectVideoNotify(client)); case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client)); case xv_StopVideo: -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return(XineramaXvStopVideo(client)); else #endif return(ProcXvStopVideo(client)); case xv_SetPortAttribute: -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return(XineramaXvSetPortAttribute(client)); else @@ -270,7 +270,7 @@ ProcXvDispatch(ClientPtr client) case xv_QueryBestSize: return(ProcXvQueryBestSize(client)); case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client)); case xv_PutImage: -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return(XineramaXvPutImage(client)); else @@ -278,7 +278,7 @@ ProcXvDispatch(ClientPtr client) return(ProcXvPutImage(client)); #ifdef MITSHM case xv_ShmPutImage: -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return(XineramaXvShmPutImage(client)); else @@ -1863,7 +1863,7 @@ SWriteListImageFormatsReply( } -#ifdef XINERAMA +#ifdef PANORAMIX @@ -1942,8 +1942,7 @@ XineramaXvShmPutImage(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; @@ -1990,8 +1989,7 @@ XineramaXvPutImage(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; @@ -2036,8 +2034,7 @@ XineramaXvPutVideo(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; @@ -2082,8 +2079,7 @@ XineramaXvPutStill(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 5e163827d..668eebf52 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -99,7 +99,7 @@ SOFTWARE. #include "xf86_ansic.h" #endif -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #include "xvdisp.h" @@ -172,7 +172,7 @@ XvExtensionInit() ErrorF("XvExtensionInit: Unable to allocate screen private index\n"); return; } -#ifdef XINERAMA +#ifdef PANORAMIX XineramaRegisterConnectionBlockCallback(XineramifyXv); #endif XvScreenGeneration = serverGeneration; @@ -271,7 +271,7 @@ XvScreenInit(ScreenPtr pScreen) ErrorF("XvScreenInit: Unable to allocate screen private index\n"); return BadAlloc; } -#ifdef XINERAMA +#ifdef PANORAMIX XineramaRegisterConnectionBlockCallback(XineramifyXv); #endif XvScreenGeneration = serverGeneration; diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index e564b4d6e..04a190006 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.4 2004/02/25 21:46:36 kaleb Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** @@ -59,11 +59,9 @@ SOFTWARE. #include "cfbmskbits.h" #include "mi.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" -extern Bool noPanoramiXExtension; -extern WindowPtr *WindowTable; #endif void @@ -100,11 +98,9 @@ cfbPaintWindow(pWin, pRegion, what) } else { -#ifndef NO_XINERAMA_PORT int xorg = pWin->drawable.x; int yorg = pWin->drawable.y; -#endif -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pWin) { @@ -117,11 +113,7 @@ cfbPaintWindow(pWin, pRegion, what) (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->background.pixmap, -#ifndef NO_XINERAMA_PORT xorg, yorg); -#else - (int)pWin->drawable.x, (int)pWin->drawable.y); -#endif } break; case BackgroundPixel: @@ -149,20 +141,16 @@ cfbPaintWindow(pWin, pRegion, what) } else { -#ifndef NO_XINERAMA_PORT int xorg, yorg; -#endif for (pBgWin = pWin; pBgWin->backgroundState == ParentRelative; pBgWin = pBgWin->parent); -#ifndef NO_XINERAMA_PORT xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#endif -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pBgWin) { @@ -176,12 +164,7 @@ cfbPaintWindow(pWin, pRegion, what) (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->border.pixmap, -#ifndef NO_XINERAMA_PORT xorg, yorg); -#else - (int) pBgWin->drawable.x, - (int) pBgWin->drawable.y); -#endif } break; } @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.1.4.3 2004/02/25 21:46:38 kaleb Exp $ */ /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * @@ -1821,8 +1821,7 @@ DbeExtensionInit() int nStubbedScreens = 0; Bool ddxInitSuccess; -#ifdef XINERAMA - extern Bool noPanoramiXExtension; +#ifdef PANORAMIX if(!noPanoramiXExtension) return; #endif diff --git a/dix/colormap.c b/dix/colormap.c index 19d08d98b..a2bc2d5fa 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */ /*********************************************************** @@ -62,11 +62,6 @@ SOFTWARE. #ifdef LBX #include "lbxserve.h" #endif -#ifdef XINERAMA -#include "panoramiX.h" -#include "panoramiXsrv.h" -extern Bool noPanoramiXExtension; -#endif extern XID clientErrorValue; extern int colormapPrivateCount; @@ -480,23 +475,16 @@ TellNoMap (pwin, pmid) if (wColormap(pwin) == *pmid) { -#ifdef XINERAMA - /* - * Only deliver event for Screen 0 when Xinerama enabled - */ - if (noPanoramiXExtension || - (!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum))) { -#endif /* This should be call to DeliverEvent */ xE.u.u.type = ColormapNotify; xE.u.colormap.window = pwin->drawable.id; xE.u.colormap.colormap = None; xE.u.colormap.new = TRUE; xE.u.colormap.state = ColormapUninstalled; - DeliverEvents(pwin, &xE, 1, (WindowPtr)NULL); -#ifdef XINERAMA - } +#ifdef PANORAMIX + if(noPanoramiXExtension || !pwin->drawable.pScreen->myNum) #endif + DeliverEvents(pwin, &xE, 1, (WindowPtr)NULL); if (pwin->optional) { pwin->optional->colormap = None; CheckWindowOptionalNeed (pwin); @@ -515,12 +503,9 @@ TellLostMap (pwin, value) Colormap *pmid = (Colormap *)value; xEvent xE; -#ifdef XINERAMA - /* - * Only deliver event for Screen 0 when Xinerama enabled - */ - if (noPanoramiXExtension || - (!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum))) +#ifdef PANORAMIX + if(!noPanoramiXExtension && pwin->drawable.pScreen->myNum) + return WT_STOPWALKING; #endif if (wColormap(pwin) == *pmid) { @@ -545,12 +530,9 @@ TellGainedMap (pwin, value) Colormap *pmid = (Colormap *)value; xEvent xE; -#ifdef XINERAMA - /* - * Only deliver event for Screen 0 when Xinerama enabled - */ - if (noPanoramiXExtension || - (!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum))) +#ifdef PANORAMIX + if(!noPanoramiXExtension && pwin->drawable.pScreen->myNum) + return WT_STOPWALKING; #endif if (wColormap (pwin) == *pmid) { diff --git a/dix/dispatch.c b/dix/dispatch.c index 01f9e2694..f9ab9c458 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -47,7 +47,7 @@ SOFTWARE. ********************************************************/ -/* The Xinerama components contained the following notice */ +/* The panoramix components contained the following notice */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * @@ -71,7 +71,7 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.33 2003/11/17 22:20:33 dawes Exp $ */ -#ifdef XINERAMA_DEBUG +#ifdef PANORAMIX_DEBUG #include <stdio.h> int ProcInitialConnection(); #endif @@ -92,7 +92,7 @@ int ProcInitialConnection(); #include "dispatch.h" #include "swaprep.h" #include "swapreq.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -2642,7 +2642,7 @@ ProcAllocColor(client) else return (retval); } -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension || !pmap->pScreen->myNum) #endif WriteReplyToClient(client, sizeof(xAllocColorReply), &acr); @@ -2701,7 +2701,7 @@ ProcAllocNamedColor (client) else return(retval); } -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension || !pcmp->pScreen->myNum) #endif WriteReplyToClient(client, sizeof (xAllocNamedColorReply), &ancr); @@ -2771,7 +2771,7 @@ ProcAllocColorCells (client) else return(retval); } -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension || !pcmp->pScreen->myNum) #endif { @@ -2850,7 +2850,7 @@ ProcAllocColorPlanes(client) return(retval); } acpr.length = length >> 2; -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension || !pcmp->pScreen->myNum) #endif { @@ -3933,7 +3933,7 @@ SendConnSetup(client, reason) #endif /* fill in the "currentInputMask" */ root = (xWindowRoot *)(lConnectionInfo + connBlockScreenStart); -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension) numScreens = screenInfo.numScreens; else diff --git a/dix/dixfonts.c b/dix/dixfonts.c index c8567cf74..aa03e7360 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -42,7 +42,7 @@ SOFTWARE. #include <stdio.h> #endif -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #endif @@ -1399,7 +1399,7 @@ bail: if (c->err != Success) err = c->err; if (err != Success && c->client != serverClient) { -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension || !c->pGC->pScreen->myNum) #endif SendErrorToClient(c->client, c->reqType, 0, 0, err); diff --git a/dix/events.c b/dix/events.c index 227d62934..2853e1013 100644 --- a/dix/events.c +++ b/dix/events.c @@ -46,7 +46,7 @@ SOFTWARE. ********************************************************/ -/* The Xinerama components contained the following notice */ +/* The panoramix components contained the following notice */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * @@ -82,7 +82,7 @@ SOFTWARE. #include "cursorstr.h" #include "dixstruct.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -140,6 +140,7 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #define XE_KBPTR (xE->u.keyButtonPointer) + #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) CallbackListPtr EventCallback; @@ -182,14 +183,14 @@ static struct { CursorPtr current; BoxRec hotLimits; /* logical constraints of hot spot */ Bool confined; /* confined to screen */ -#if defined(SHAPE) || defined(XINERAMA) +#if defined(SHAPE) || defined(PANORAMIX) RegionPtr hotShape; /* additional logical shape constraint */ #endif BoxRec physLimits; /* physical constraints of hot spot */ WindowPtr win; /* window of logical position */ HotSpot hot; /* logical pointer position */ HotSpot hotPhys; /* physical pointer position */ -#ifdef XINERAMA +#ifdef PANORAMIX ScreenPtr screen; /* all others are in Screen 0 coordinates */ RegionRec Reg1; /* Region 1 for confining motion */ RegionRec Reg2; /* Region 2 for confining virtual motion */ @@ -262,8 +263,9 @@ static CARD8 criticalEvents[32] = 0x7c /* key and button events */ }; -#ifdef XINERAMA +#ifdef PANORAMIX +static void ConfineToShape(RegionPtr shape, int *px, int *py); static void SyntheticMotion(int x, int y); static void PostNewCursor(void); @@ -326,11 +328,6 @@ XineramaConstrainCursor(void) (* pScreen->ConstrainCursor)(pScreen, &newBox); } -#ifdef SHAPE -static void -ConfineToShape(RegionPtr, int *, int *); -#endif - static void XineramaCheckPhysLimits( CursorPtr cursor, @@ -586,7 +583,7 @@ XineramaChangeToCursor(CursorPtr cursor) } -#endif /* XINERAMA */ +#endif /* PANORAMIX */ void SetMaskForEvent(mask, event) @@ -612,7 +609,7 @@ SyntheticMotion(int x, int y) { xEvent xE; -#ifdef XINERAMA +#ifdef PANORAMIX /* Translate back to the sprite screen since processInputProc will translate from sprite screen to screen 0 upon reentry to the DIX layer */ @@ -719,8 +716,7 @@ CheckVirtualMotion( register QdEventPtr qe, register WindowPtr pWin) { - -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { XineramaCheckVirtualMotion(qe, pWin); return; @@ -771,7 +767,7 @@ ConfineCursorToWindow(WindowPtr pWin, Bool generateEvents, Bool confineToScreen) { ScreenPtr pScreen = pWin->drawable.pScreen; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { XineramaConfineCursorToWindow(pWin, generateEvents); return; @@ -804,7 +800,7 @@ PointerConfinedToScreen() static void ChangeToCursor(CursorPtr cursor) { -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { XineramaChangeToCursor(cursor); return; @@ -889,7 +885,7 @@ GetSpritePosition(px, py) *py = sprite.hotPhys.y; } -#ifdef XINERAMA +#ifdef PANORAMIX int XineramaGetCursorScreen() { @@ -899,7 +895,7 @@ XineramaGetCursorScreen() return 0; } } -#endif /* XINERAMA */ +#endif /* PANORAMIX */ #define TIMESLOP (5 * 60 * 1000) /* 5 minutes */ @@ -974,7 +970,7 @@ EnqueueEvent(xE, device, count) } if (xE->u.u.type == MotionNotify) { -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { XE_KBPTR.rootX += panoramiXdataPtr[sprite.screen->myNum].x - panoramiXdataPtr[0].x; @@ -1030,7 +1026,7 @@ PlayReleasedEvents(void) CheckVirtualMotion(qe, NullWindow); syncEvents.time.months = qe->months; syncEvents.time.milliseconds = qe->event->u.keyButtonPointer.time; -#ifdef XINERAMA +#ifdef PANORAMIX /* Translate back to the sprite screen since processInputProc will translate from sprite screen to screen 0 upon reentry to the DIX layer */ @@ -1672,7 +1668,7 @@ DeliverEventsToWindow(pWin, pEvents, count, filter, grab, mskidx) Only works for core events. */ -#ifdef XINERAMA +#ifdef PANORAMIX static int XineramaTryClientEventsResult( ClientPtr client, @@ -1705,7 +1701,7 @@ MaybeDeliverEventsToClient(pWin, pEvents, count, filter, dontClient) { if (wClient(pWin) == dontClient) return 0; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return XineramaTryClientEventsResult( wClient(pWin), NullGrab, pWin->eventMask, filter); @@ -1719,7 +1715,7 @@ MaybeDeliverEventsToClient(pWin, pEvents, count, filter, dontClient) { if (SameClient(other, dontClient)) return 0; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return XineramaTryClientEventsResult( rClient(other), NullGrab, other->mask, filter); @@ -1862,7 +1858,7 @@ DeliverEvents(pWin, xE, count, otherParent) Mask filter; int deliveries; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return count; #endif @@ -1893,7 +1889,7 @@ DeliverEvents(pWin, xE, count, otherParent) return deliveries; } -#ifndef NO_XINERAMA_PORT + static Bool PointInBorderSize(WindowPtr pWin, int x, int y) { @@ -1902,7 +1898,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y) if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box)) return TRUE; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) { int i; @@ -1918,7 +1914,6 @@ PointInBorderSize(WindowPtr pWin, int x, int y) #endif return FALSE; } -#endif /* NO_XINERAMA_PORT */ static WindowPtr XYToWindow(int x, int y) @@ -1941,13 +1936,7 @@ XYToWindow(int x, int y) * is made to see if the point is inside * borderSize */ -#ifndef NO_XINERAMA_PORT && (!wBoundingShape(pWin) || PointInBorderSize(pWin, x, y)) -#else - && (!wBoundingShape(pWin) || - POINT_IN_REGION(pWin->drawable.pScreen, - &pWin->borderSize, x, y, &box)) -#endif #endif ) { @@ -1973,7 +1962,7 @@ CheckMotion(xEvent *xE) { WindowPtr prevSpriteWin = sprite.win; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return XineramaCheckMotion(xE); #endif @@ -2062,7 +2051,7 @@ DefineInitialRootWindow(win) (*pScreen->SetCursorPosition) (pScreen, sprite.hot.x, sprite.hot.y, FALSE); (*pScreen->DisplayCursor) (pScreen, sprite.current); -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { sprite.hotLimits.x1 = -panoramiXdataPtr[0].x; sprite.hotLimits.y1 = -panoramiXdataPtr[0].y; @@ -2103,7 +2092,7 @@ NewCurrentScreen(newScreen, x, y) { sprite.hotPhys.x = x; sprite.hotPhys.y = y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { sprite.hotPhys.x += panoramiXdataPtr[newScreen->myNum].x - panoramiXdataPtr[0].x; @@ -2131,7 +2120,7 @@ NewCurrentScreen(newScreen, x, y) ConfineCursorToWindow(WindowTable[newScreen->myNum], TRUE, FALSE); } -#ifdef XINERAMA +#ifdef PANORAMIX static Bool XineramaPointInWindowIsVisible( @@ -2238,7 +2227,7 @@ XineramaWarpPointer(ClientPtr client) return Success; } -#endif /* XINERAMA */ +#endif int @@ -2253,7 +2242,7 @@ ProcWarpPointer(client) REQUEST_SIZE_MATCH(xWarpPointerReq); -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) return XineramaWarpPointer(client); #endif @@ -2331,14 +2320,13 @@ ProcWarpPointer(client) return Success; } -#ifndef NO_XINERAMA_PORT static Bool BorderSizeNotEmpty(WindowPtr pWin) { if(REGION_NOTEMPTY(sprite.hotPhys.pScreen, &pWin->borderSize)) return TRUE; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) { int i; @@ -2350,7 +2338,6 @@ BorderSizeNotEmpty(WindowPtr pWin) #endif return FALSE; } -#endif /* NO_XINERAMA_PORT */ /* "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a passive grab set on the window to be activated. */ @@ -2406,12 +2393,7 @@ CheckPassiveGrabsOnWindow( if (GrabMatchesSecond(&tempGrab, grab) && (!grab->confineTo || (grab->confineTo->realized && -#ifndef NO_XINERAMA_PORT - BorderSizeNotEmpty(grab->confineTo)))) -#else - REGION_NOTEMPTY( grab->confineTo->drawable.pScreen, - &grab->confineTo->borderSize)))) -#endif + BorderSizeNotEmpty(grab->confineTo)))) { #ifdef XCSECURITY if (!SecurityCheckDeviceAccess(wClient(pWin), device, FALSE)) @@ -3353,7 +3335,7 @@ DoFocusEvents(dev, fromWin, toWin, mode) FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer, TRUE); /* Notify all the roots */ -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) FocusEvent(dev, FocusOut, mode, out, WindowTable[0]); else @@ -3372,7 +3354,7 @@ DoFocusEvents(dev, fromWin, toWin, mode) NotifyNonlinearVirtual, FALSE); } /* Notify all the roots */ -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) FocusEvent(dev, FocusIn, mode, in, WindowTable[0]); else @@ -3390,7 +3372,7 @@ DoFocusEvents(dev, fromWin, toWin, mode) if (fromWin == PointerRootWin) FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer, TRUE); -#ifdef XINERAMA +#ifdef PANORAMIX if ( !noPanoramiXExtension ) FocusEvent(dev, FocusOut, mode, out, WindowTable[0]); else @@ -3904,7 +3886,7 @@ ProcQueryPointer(client) rep.winY = 0; } -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { rep.rootX += panoramiXdataPtr[0].x; rep.rootY += panoramiXdataPtr[0].y; @@ -4372,7 +4354,7 @@ CheckCursorConfinement(pWin) GrabPtr grab = inputInfo.pointer->grab; WindowPtr confineTo; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return; #endif @@ -4432,7 +4414,7 @@ ProcRecolorCursor(client) for (nscr = 0; nscr < screenInfo.numScreens; nscr++) { pscr = screenInfo.screens[nscr]; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) displayed = (pscr == sprite.screen); else @@ -4450,7 +4432,7 @@ WriteEventsToClient(pClient, count, events) int count; xEvent *events; { -#ifdef XINERAMA +#ifdef PANORAMIX xEvent eventCopy; #endif xEvent eventTo, *eventFrom; @@ -4461,7 +4443,7 @@ WriteEventsToClient(pClient, count, events) return; #endif -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && (panoramiXdataPtr[0].x || panoramiXdataPtr[0].y)) { diff --git a/dix/main.c b/dix/main.c index c3e578ef1..945bb562e 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.4 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5 2004/02/25 21:46:40 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ /*********************************************************** @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* The Xinerama components contained the following notice */ +/* The panoramix components contained the following notice */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * @@ -93,8 +93,8 @@ SOFTWARE. #include "site.h" #include "dixfont.h" #include "extnsionst.h" -#ifdef XINERAMA -extern Bool noPanoramiXExtension; +#ifdef PANORAMIX +#include "panoramiXsrv.h" #else #include "dixevents.h" /* InitEvents() */ #include "dispatch.h" /* InitProcVectors() */ @@ -123,7 +123,7 @@ extern int screenPrivateCount; extern void InitProcVectors(void); extern Bool CreateGCperDepthArray(void); -#ifndef XINERAMA +#ifndef PANORAMIX static #endif Bool CreateConnectionBlock(void); @@ -403,7 +403,7 @@ main(int argc, char *argv[], char *envp[]) DPMSEnabled = FALSE; #endif -#ifdef XINERAMA +#ifdef PANORAMIX /* * Consolidate window and colourmap information for each screen */ @@ -419,7 +419,7 @@ main(int argc, char *argv[], char *envp[]) SetDPMSTimers(); #endif -#ifdef XINERAMA +#ifdef PANORAMIX if (!noPanoramiXExtension) { if (!PanoramiXCreateConnectionBlock()) FatalError("could not create connection block info"); @@ -438,7 +438,7 @@ main(int argc, char *argv[], char *envp[]) FreeScreenSaverTimer(); CloseDownExtensions(); -#ifdef XINERAMA +#ifdef PANORAMIX { Bool remember_it = noPanoramiXExtension; noPanoramiXExtension = TRUE; @@ -493,7 +493,7 @@ main(int argc, char *argv[], char *envp[]) static int padlength[4] = {0, 3, 2, 1}; -#ifndef XINERAMA +#ifndef PANORAMIX static #endif Bool diff --git a/dix/resource.c b/dix/resource.c index 2caee99fc..d885c03ef 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -88,7 +88,7 @@ SOFTWARE. #include "dixevents.h" #include "dixgrabs.h" #include "cursor.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -672,7 +672,7 @@ FindAllClientResources( } } -#ifndef NO_XINERAMA_PORT + pointer LookupClientResourceComplex( ClientPtr client, @@ -698,7 +698,7 @@ LookupClientResourceComplex( } return NULL; } -#endif /* NO_XINERAMA_PORT */ + void FreeClientNeverRetainResources(ClientPtr client) @@ -797,7 +797,7 @@ LegalNewID(id, client) register ClientPtr client; { -#ifdef XINERAMA +#ifdef PANORAMIX XID minid, maxid; if (!noPanoramiXExtension) { @@ -807,7 +807,7 @@ LegalNewID(id, client) if ((id >= minid) && (id <= maxid)) return TRUE; } -#endif /* XINERAMA */ +#endif /* PANORAMIX */ return ((client->clientAsMask == (id & ~RESOURCE_ID_MASK)) && ((clientTable[client->index].expectID <= id) || !LookupIDByClass(id, RC_ANY))); diff --git a/dix/window.c b/dix/window.c index cd0007f66..eeb45bc8a 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.1.4.4 2004/02/25 21:46:40 kaleb Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* @@ -49,7 +49,7 @@ SOFTWARE. */ -/* The Xinerama components contained the following notice */ +/* The panoramix components contained the following notice */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * @@ -86,7 +86,7 @@ SOFTWARE. #include "dixstruct.h" #include "gcstruct.h" #include "servermd.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -2321,7 +2321,7 @@ ConfigureWindow(pWin, mask, vlist, client) event.u.u.detail = Above; event.u.configureRequest.x = x; event.u.configureRequest.y = y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && (!pParent || !pParent->parent)) { event.u.configureRequest.x += panoramiXdataPtr[0].x; event.u.configureRequest.y += panoramiXdataPtr[0].y; @@ -2407,7 +2407,7 @@ ActuallyDoSomething: event.u.configureNotify.aboveSibling = None; event.u.configureNotify.x = x; event.u.configureNotify.y = y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && (!pParent || !pParent->parent)) { event.u.configureNotify.x += panoramiXdataPtr[0].x; event.u.configureNotify.y += panoramiXdataPtr[0].y; @@ -2565,7 +2565,7 @@ ReparentWindow(pWin, pParent, x, y, client) event.u.reparent.parent = pParent->drawable.id; event.u.reparent.x = x; event.u.reparent.y = y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && !pParent->parent) { event.u.reparent.x += panoramiXdataPtr[0].x; event.u.reparent.y += panoramiXdataPtr[0].y; @@ -2938,7 +2938,7 @@ UnrealizeTree( { pChild->realized = FALSE; pChild->visibility = VisibilityNotViewable; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) { PanoramiXRes *win; win = (PanoramiXRes*)LookupIDByType(pChild->drawable.id, @@ -3220,10 +3220,9 @@ SendVisibilityNotify(pWin) WindowPtr pWin; { xEvent event; -#ifndef NO_XINERAMA_PORT unsigned int visibility = pWin->visibility; -#endif -#ifdef XINERAMA + +#ifdef PANORAMIX /* This is not quite correct yet, but it's close */ if(!noPanoramiXExtension) { PanoramiXRes *win; @@ -3277,6 +3276,7 @@ SendVisibilityNotify(pWin) win->u.win.visibility = visibility; } #endif + event.u.u.type = VisibilityNotify; event.u.visibility.window = pWin->drawable.id; event.u.visibility.state = visibility; diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 25f2b4130..5d778049b 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.1.4.3 2004/02/25 21:46:42 kaleb Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -224,7 +224,7 @@ fbFillRegionSolid (DrawablePtr pDrawable, } } -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -248,7 +248,7 @@ fbFillRegionTiled (DrawablePtr pDrawable, int xRot = pDrawable->x; int yRot = pDrawable->y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pDrawable->pScreen->myNum; diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj index 1e71fb3a4..54b1d7180 100644 --- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj +++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj @@ -1792,13 +1792,13 @@ F5269C2D01D5BC3501000001 = { fileEncoding = 30; isa = PBXFileReference; - path = pseudorama.c; + path = pseudoramiX.c; refType = 4; }; F5269C2E01D5BC3501000001 = { fileEncoding = 30; isa = PBXFileReference; - path = pseudorama.h; + path = pseudoramiX.h; refType = 4; }; F53321390193CB6A01000001 = { diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m index 0f767e1ba..b5f51a0de 100644 --- a/hw/darwin/quartz/cr/crScreen.m +++ b/hw/darwin/quartz/cr/crScreen.m @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */ /* * Cocoa rootless implementation initialization */ @@ -40,7 +40,7 @@ #include "quartzCursor.h" #include "rootless.h" #include "safeAlpha.h" -#include "pseudorama.h" +#include "pseudoramiX.h" #include "applewmExt.h" #include "regionstr.h" @@ -59,8 +59,8 @@ static Class classXView = nil; * CRDisplayInit * Find all screens. * - * Multihead note: When rootless mode uses Pseudorama, the - * X server only sees one screen; only Pseudorama itself knows + * Multihead note: When rootless mode uses PseudoramiX, the + * X server only sees one screen; only PseudoramiX itself knows * about all of the screens. */ static void @@ -68,10 +68,10 @@ CRDisplayInit(void) { ErrorF("Display mode: Rootless Quartz -- Cocoa implementation\n"); - if (noPseudoramaExtension) { + if (noPseudoramiXExtension) { darwinScreensFound = [[NSScreen screens] count]; } else { - darwinScreensFound = 1; // only Pseudorama knows about the rest + darwinScreensFound = 1; // only PseudoramiX knows about the rest } CRAppleWMInit(); @@ -89,7 +89,7 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb) dfb->bitsPerPixel = CGDisplayBitsPerPixel(kCGDirectMainDisplay); dfb->colorBitsPerPixel = 3 * dfb->bitsPerComponent; - if (noPseudoramaExtension) { + if (noPseudoramiXExtension) { NSScreen *screen = [[NSScreen screens] objectAtIndex:index]; NSRect frame = [screen frame]; @@ -133,7 +133,7 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb) dfb->height = unionRect.size.height; dfb->pitch = (dfb->width) * (dfb->bitsPerPixel) / 8; - // Tell Pseudorama about the real screens. + // Tell PseudoramiX about the real screens. // InitOutput() will move the big screen to (0,0), // so compensate for that here. for (i = 0; i < [screens count]; i++) { @@ -144,7 +144,7 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb) // Skip this screen if it's a mirrored copy of an earlier screen. for (j = 0; j < i; j++) { if (NSEqualRects(frame, [[screens objectAtIndex:j] frame])) { - ErrorF("Pseudorama screen %d is a mirror of screen %d.\n", + ErrorF("PseudoramiX screen %d is a mirror of screen %d.\n", i, j); break; } @@ -159,17 +159,17 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb) frame.size.height -= aquaMenuBarHeight; } - ErrorF("Pseudorama screen %d added: %dx%d @ (%d,%d).\n", i, + ErrorF("PseudoramiX screen %d added: %dx%d @ (%d,%d).\n", i, (int)frame.size.width, (int)frame.size.height, (int)frame.origin.x, (int)frame.origin.y); frame.origin.x -= unionRect.origin.x; frame.origin.y -= unionRect.origin.y; - ErrorF("Pseudorama screen %d placed at X11 coordinate (%d,%d).\n", + ErrorF("PseudoramiX screen %d placed at X11 coordinate (%d,%d).\n", i, (int)frame.origin.x, (int)frame.origin.y); - PseudoramaAddScreen(frame.origin.x, frame.origin.y, + PseudoramiXAddScreen(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height); } } @@ -219,7 +219,7 @@ CRAddScreen(int index, ScreenPtr pScreen) // This X11 screen covers all CoreGraphics displays we just found. // If there's more than one CG display, then video mirroring is on - // or Pseudorama is on. + // or PseudoramiX is on. displayInfo->displayCount = allocatedDisplays; displayInfo->displayIDs = displays; diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c new file mode 100644 index 000000000..e55aabd6f --- /dev/null +++ b/hw/darwin/quartz/pseudoramiX.c @@ -0,0 +1,420 @@ +/* + * Minimal implementation of PanoramiX/Xinerama + * + * This is used in rootless mode where the underlying window server + * already provides an abstracted view of multiple screens as one + * large screen area. + * + * This code is largely based on panoramiX.c, which contains the + * following copyright notice: + */ +/***************************************************************** +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. +******************************************************************/ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.2 2002/10/16 21:13:33 dawes Exp $ */ + +#include "pseudoramiX.h" + +#include "extnsionst.h" +#include "dixstruct.h" +#include "window.h" +#include "panoramiXproto.h" +#include "globals.h" + +extern int ProcPanoramiXQueryVersion (ClientPtr client); + +static void PseudoramiXResetProc(ExtensionEntry *extEntry); + +static int ProcPseudoramiXQueryVersion(ClientPtr client); +static int ProcPseudoramiXGetState(ClientPtr client); +static int ProcPseudoramiXGetScreenCount(ClientPtr client); +static int ProcPseudoramiXGetScreenSize(ClientPtr client); +static int ProcPseudoramiXIsActive(ClientPtr client); +static int ProcPseudoramiXQueryScreens(ClientPtr client); +static int ProcPseudoramiXDispatch(ClientPtr client); + +static int SProcPseudoramiXQueryVersion(ClientPtr client); +static int SProcPseudoramiXGetState(ClientPtr client); +static int SProcPseudoramiXGetScreenCount(ClientPtr client); +static int SProcPseudoramiXGetScreenSize(ClientPtr client); +static int SProcPseudoramiXIsActive(ClientPtr client); +static int SProcPseudoramiXQueryScreens(ClientPtr client); +static int SProcPseudoramiXDispatch(ClientPtr client); + + +typedef struct { + int x; + int y; + int w; + int h; +} PseudoramiXScreenRec; + +static PseudoramiXScreenRec *pseudoramiXScreens = NULL; +static int pseudoramiXScreensAllocated = 0; +static int pseudoramiXNumScreens = 0; +static unsigned long pseudoramiXGeneration = 0; + + +// Add a PseudoramiX screen. +// The rest of the X server will know nothing about this screen. +// Can be called before or after extension init. +// Screens must be re-added once per generation. +void +PseudoramiXAddScreen(int x, int y, int w, int h) +{ + PseudoramiXScreenRec *s; + + if (noPseudoramiXExtension) return; + + if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) { + pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1; + pseudoramiXScreens = xrealloc(pseudoramiXScreens, + pseudoramiXScreensAllocated * + sizeof(PseudoramiXScreenRec)); + } + + s = &pseudoramiXScreens[pseudoramiXNumScreens++]; + s->x = x; + s->y = y; + s->w = w; + s->h = h; +} + + +// Initialize PseudoramiX. +// Copied from PanoramiXExtensionInit +void PseudoramiXExtensionInit(int argc, char *argv[]) +{ + Bool success = FALSE; + ExtensionEntry *extEntry; + + if (noPseudoramiXExtension) return; + + if (pseudoramiXNumScreens == 1 || aquaNumScreens == 1) { + // Only one screen - disable Xinerama extension. + noPseudoramiXExtension = TRUE; + return; + } + + // The server must not run the PanoramiX operations. + noPanoramiXExtension = TRUE; + + if (pseudoramiXGeneration != serverGeneration) { + extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0, + ProcPseudoramiXDispatch, + SProcPseudoramiXDispatch, + PseudoramiXResetProc, + StandardMinorOpcode); + if (!extEntry) { + ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n"); + } else { + pseudoramiXGeneration = serverGeneration; + success = TRUE; + } + } + + if (!success) { + ErrorF("%s Extension (PseudoramiX) failed to initialize\n", + PANORAMIX_PROTOCOL_NAME); + return; + } +} + + +static void PseudoramiXResetProc(ExtensionEntry *extEntry) +{ + pseudoramiXNumScreens = 0; +} + + +// was PanoramiX +static int ProcPseudoramiXQueryVersion(ClientPtr client) +{ + return ProcPanoramiXQueryVersion(client); +} + + +// was PanoramiX +static int ProcPseudoramiXGetState(ClientPtr client) +{ + REQUEST(xPanoramiXGetStateReq); + WindowPtr pWin; + xPanoramiXGetStateReply rep; + register int n; + + REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); + pWin = LookupWindow (stuff->window, client); + if (!pWin) + return BadWindow; + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; + rep.state = !noPseudoramiXExtension; + if (client->swapped) { + swaps (&rep.sequenceNumber, n); + swapl (&rep.length, n); + swaps (&rep.state, n); + } + WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep); + return client->noClientException; +} + + +// was PanoramiX +static int ProcPseudoramiXGetScreenCount(ClientPtr client) +{ + REQUEST(xPanoramiXGetScreenCountReq); + WindowPtr pWin; + xPanoramiXGetScreenCountReply rep; + register int n; + + REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); + pWin = LookupWindow (stuff->window, client); + if (!pWin) + return BadWindow; + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; + rep.ScreenCount = pseudoramiXNumScreens; + if (client->swapped) { + swaps (&rep.sequenceNumber, n); + swapl (&rep.length, n); + swaps (&rep.ScreenCount, n); + } + WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep); + return client->noClientException; +} + + +// was PanoramiX +static int ProcPseudoramiXGetScreenSize(ClientPtr client) +{ + REQUEST(xPanoramiXGetScreenSizeReq); + WindowPtr pWin; + xPanoramiXGetScreenSizeReply rep; + register int n; + + REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); + pWin = LookupWindow (stuff->window, client); + if (!pWin) + return BadWindow; + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; + /* screen dimensions */ + rep.width = pseudoramiXScreens[stuff->screen].w; + // was panoramiXdataPtr[stuff->screen].width; + rep.height = pseudoramiXScreens[stuff->screen].h; + // was panoramiXdataPtr[stuff->screen].height; + if (client->swapped) { + swaps (&rep.sequenceNumber, n); + swapl (&rep.length, n); + swaps (&rep.width, n); + swaps (&rep.height, n); + } + WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep); + return client->noClientException; +} + + +// was Xinerama +static int ProcPseudoramiXIsActive(ClientPtr client) +{ + /* REQUEST(xXineramaIsActiveReq); */ + xXineramaIsActiveReply rep; + + REQUEST_SIZE_MATCH(xXineramaIsActiveReq); + + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; + rep.state = !noPseudoramiXExtension; + if (client->swapped) { + register int n; + swaps (&rep.sequenceNumber, n); + swapl (&rep.length, n); + swapl (&rep.state, n); + } + WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep); + return client->noClientException; +} + + +// was Xinerama +static int ProcPseudoramiXQueryScreens(ClientPtr client) +{ + /* REQUEST(xXineramaQueryScreensReq); */ + xXineramaQueryScreensReply rep; + + REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens; + rep.length = rep.number * sz_XineramaScreenInfo >> 2; + if (client->swapped) { + register int n; + swaps (&rep.sequenceNumber, n); + swapl (&rep.length, n); + swapl (&rep.number, n); + } + WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep); + + if (!noPseudoramiXExtension) { + xXineramaScreenInfo scratch; + int i; + + for(i = 0; i < pseudoramiXNumScreens; i++) { + scratch.x_org = pseudoramiXScreens[i].x; + scratch.y_org = pseudoramiXScreens[i].y; + scratch.width = pseudoramiXScreens[i].w; + scratch.height = pseudoramiXScreens[i].h; + + if(client->swapped) { + register int n; + swaps (&scratch.x_org, n); + swaps (&scratch.y_org, n); + swaps (&scratch.width, n); + swaps (&scratch.height, n); + } + WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch); + } + } + + return client->noClientException; +} + + +// was PanoramiX +static int ProcPseudoramiXDispatch (ClientPtr client) +{ REQUEST(xReq); + switch (stuff->data) + { + case X_PanoramiXQueryVersion: + return ProcPseudoramiXQueryVersion(client); + case X_PanoramiXGetState: + return ProcPseudoramiXGetState(client); + case X_PanoramiXGetScreenCount: + return ProcPseudoramiXGetScreenCount(client); + case X_PanoramiXGetScreenSize: + return ProcPseudoramiXGetScreenSize(client); + case X_XineramaIsActive: + return ProcPseudoramiXIsActive(client); + case X_XineramaQueryScreens: + return ProcPseudoramiXQueryScreens(client); + } + return BadRequest; +} + + + +static int +SProcPseudoramiXQueryVersion (ClientPtr client) +{ + REQUEST(xPanoramiXQueryVersionReq); + register int n; + + swaps(&stuff->length,n); + REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq); + return ProcPseudoramiXQueryVersion(client); +} + +static int +SProcPseudoramiXGetState(ClientPtr client) +{ + REQUEST(xPanoramiXGetStateReq); + register int n; + + swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); + return ProcPseudoramiXGetState(client); +} + +static int +SProcPseudoramiXGetScreenCount(ClientPtr client) +{ + REQUEST(xPanoramiXGetScreenCountReq); + register int n; + + swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); + return ProcPseudoramiXGetScreenCount(client); +} + +static int +SProcPseudoramiXGetScreenSize(ClientPtr client) +{ + REQUEST(xPanoramiXGetScreenSizeReq); + register int n; + + swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); + return ProcPseudoramiXGetScreenSize(client); +} + + +static int +SProcPseudoramiXIsActive(ClientPtr client) +{ + REQUEST(xXineramaIsActiveReq); + register int n; + + swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xXineramaIsActiveReq); + return ProcPseudoramiXIsActive(client); +} + + +static int +SProcPseudoramiXQueryScreens(ClientPtr client) +{ + REQUEST(xXineramaQueryScreensReq); + register int n; + + swaps (&stuff->length, n); + REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); + return ProcPseudoramiXQueryScreens(client); +} + + +static int +SProcPseudoramiXDispatch (ClientPtr client) +{ REQUEST(xReq); + switch (stuff->data) + { + case X_PanoramiXQueryVersion: + return SProcPseudoramiXQueryVersion(client); + case X_PanoramiXGetState: + return SProcPseudoramiXGetState(client); + case X_PanoramiXGetScreenCount: + return SProcPseudoramiXGetScreenCount(client); + case X_PanoramiXGetScreenSize: + return SProcPseudoramiXGetScreenSize(client); + case X_XineramaIsActive: + return SProcPseudoramiXIsActive(client); + case X_XineramaQueryScreens: + return SProcPseudoramiXQueryScreens(client); + } + return BadRequest; +} diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h new file mode 100644 index 000000000..d0d596686 --- /dev/null +++ b/hw/darwin/quartz/pseudoramiX.h @@ -0,0 +1,10 @@ +/* + * Minimal implementation of PanoramiX/Xinerama + */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ + +extern int noPseudoramiXExtension; +extern int aquaNumScreens; + +void PseudoramiXAddScreen(int x, int y, int w, int h); +void PseudoramiXExtensionInit(int argc, char *argv[]); diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index b5fff69a3..b4b2b407c 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server @@ -36,7 +36,7 @@ #include "quartz.h" #include "darwin.h" #include "quartzAudio.h" -#include "pseudorama.h" +#include "pseudoramiX.h" #define _APPLEWM_SERVER_ #include "applewm.h" #include "applewmExt.h" @@ -61,7 +61,7 @@ int quartzServerVisible = TRUE; int quartzServerQuitting = FALSE; int quartzScreenIndex = 0; int aquaMenuBarHeight = 0; -int noPseudoramaExtension = TRUE; +int noPseudoramiXExtension = TRUE; QuartzModeProcsPtr quartzProcs = NULL; const char *quartzOpenGLBundle = NULL; @@ -140,11 +140,11 @@ void DarwinModeInitOutput( // Do display mode specific initialization quartzProcs->DisplayInit(); - // Init Pseudorama implementation of Xinerama. + // Init PseudoramiX implementation of Xinerama. // This should be in InitExtensions, but that causes link errors - // for servers that don't link in pseudorama.c. - if (!noPseudoramaExtension) { - PseudoramaExtensionInit(argc, argv); + // for servers that don't link in pseudoramiX.c. + if (!noPseudoramiXExtension) { + PseudoramiXExtensionInit(argc, argv); } } diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m index d824ce471..15d0de56f 100644 --- a/hw/darwin/quartz/quartzCocoa.m +++ b/hw/darwin/quartz/quartzCocoa.m @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.1.4.3 2004/02/25 21:46:45 kaleb Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server @@ -45,7 +45,7 @@ #include <Cocoa/Cocoa.h> #import "Preferences.h" -#include "pseudorama.h" +#include "pseudoramiX.h" extern void FatalError(const char *, ...); extern char *display; @@ -68,14 +68,14 @@ void QuartzReadPreferences(void) // quartzRootless has already been set if (quartzRootless) { - // Use Pseudorama instead of Xinerama + // Use PseudoramiX instead of Xinerama noPanoramiXExtension = TRUE; - noPseudoramaExtension = ![Preferences xinerama]; + noPseudoramiXExtension = ![Preferences xinerama]; quartzUseAGL = [Preferences useAGL]; } else { noPanoramiXExtension = ![Preferences xinerama]; - noPseudoramaExtension = TRUE; + noPseudoramiXExtension = TRUE; // Full screen can't use AGL for GLX quartzUseAGL = FALSE; diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index 9c61adda3..dc382dff7 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ /* * quartzCommon.h * @@ -53,7 +53,7 @@ typedef struct { // List of CoreGraphics displays that this X11 screen covers. // This is more than one CG display for video mirroring and - // rootless Pseudorama mode. + // rootless PseudoramiX mode. // No CG display will be covered by more than one X11 screen. int displayCount; CGDirectDisplayID *displayIDs; diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index 8a234a8f9..705363f5a 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */ /* * Xplugin rootless implementation screen functions */ @@ -33,7 +33,7 @@ #include "quartzCommon.h" #include "quartz.h" #include "xpr.h" -#include "pseudorama.h" +#include "pseudoramiX.h" #include "darwin.h" #include "rootless.h" #include "safeAlpha.h" @@ -139,11 +139,11 @@ displayScreenBounds(CGDirectDisplayID id) /* - * addPseudoramaScreens - * Add a physical screen with Pseudorama. + * addPseudoramiXScreens + * Add a physical screen with PseudoramiX. */ static void -addPseudoramaScreens(int *x, int *y, int *width, int *height) +addPseudoramiXScreens(int *x, int *y, int *width, int *height) { CGDisplayCount i, displayCount; CGDirectDisplayID *displayList = NULL; @@ -168,24 +168,24 @@ addPseudoramaScreens(int *x, int *y, int *width, int *height) *width = unionRect.size.width; *height = unionRect.size.height; - /* Tell Pseudorama about the real screens. */ + /* Tell PseudoramiX about the real screens. */ for (i = 0; i < displayCount; i++) { CGDirectDisplayID dpy = displayList[i]; frame = displayScreenBounds(dpy); - ErrorF("Pseudorama screen %d added: %dx%d @ (%d,%d).\n", i, + ErrorF("PseudoramiX screen %d added: %dx%d @ (%d,%d).\n", i, (int)frame.size.width, (int)frame.size.height, (int)frame.origin.x, (int)frame.origin.y); frame.origin.x -= unionRect.origin.x; frame.origin.y -= unionRect.origin.y; - ErrorF("Pseudorama screen %d placed at X11 coordinate (%d,%d).\n", + ErrorF("PseudoramiX screen %d placed at X11 coordinate (%d,%d).\n", i, (int)frame.origin.x, (int)frame.origin.y); - PseudoramaAddScreen(frame.origin.x, frame.origin.y, + PseudoramiXAddScreen(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height); } @@ -206,10 +206,10 @@ xprDisplayInit(void) CGGetActiveDisplayList(0, NULL, &displayCount); - /* With Pseudorama, the X server only sees one screen; only Pseudorama + /* With PseudoramiX, the X server only sees one screen; only PseudoramiX itself knows about all of the screens. */ - if (noPseudoramaExtension) + if (noPseudoramiXExtension) darwinScreensFound = displayCount; else darwinScreensFound = 1; @@ -270,7 +270,7 @@ xprAddScreen(int index, ScreenPtr pScreen) dfb->colorBitsPerPixel = 8; } - if (noPseudoramaExtension) + if (noPseudoramiXExtension) { CGDirectDisplayID dpy; CGRect frame; @@ -286,7 +286,7 @@ xprAddScreen(int index, ScreenPtr pScreen) } else { - addPseudoramaScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height); + addPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height); } /* Passing zero width (pitch) makes miCreateScreenResources set the diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index d214163d5..1bdd34145 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.3 2003/12/18 19:29:13 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.4 2004/02/25 21:46:46 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */ @@ -1058,7 +1058,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) } #endif -#ifdef XINERAMA +#ifdef PANORAMIX from = X_DEFAULT; if (!noPanoramiXExtension) from = X_CMDLINE; diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 21552d485..aff615bd4 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.3 2004/02/25 21:46:46 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. @@ -140,7 +140,7 @@ DGAInit( for(i = 0; i < num; i++) modes[i].num = i + 1; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) for(i = 0; i < num; i++) modes[i].flags &= ~DGA_PIXMAP_AVAILABLE; diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index ab428e0b0..6d3b940b1 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.3 2004/02/25 21:46:46 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -1682,7 +1682,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, /* Lookup each mode */ #ifdef RANDR if (!xf86Info.disableRandR -#ifdef XINERAMA +#ifdef PANORAMIX && noPanoramiXExtension #endif ) diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index d98f36f1c..1e55c4f7c 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.3 2004/02/25 21:46:46 kaleb Exp $ */ /* * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $ * @@ -244,7 +244,7 @@ xf86RandRInit (ScreenPtr pScreen) XF86RandRInfoPtr randrp; ScrnInfoPtr scrp = XF86SCRNINFO(pScreen); -#ifdef XINERAMA +#ifdef PANORAMIX /* XXX disable RandR when using Xinerama */ if (!noPanoramiXExtension) return TRUE; diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index f2a0561ad..551a3c2a8 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -66,7 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mi.h" #include "mipointer.h" -#if defined(XFree86LOADER) && !defined(XINERAMA) +#if defined(XFree86LOADER) && !defined(PANORAMIX) extern Bool noPanoramiXExtension; #endif @@ -129,14 +129,14 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) * If Xinerama is on, don't allow DRI to initialise. It won't be usable * anyway. */ -#if defined(XINERAMA) && !defined(XFree86LOADER) +#if defined(PANORAMIX) && !defined(XFree86LOADER) xineramaInCore = TRUE; #elif defined(XFree86LOADER) if (xf86LoaderCheckSymbol("noPanoramiXExtension")) xineramaInCore = TRUE; #endif -#if defined(XINERAMA) || defined(XFree86LOADER) +#if defined(PANORAMIX) || defined(XFree86LOADER) if (xineramaInCore) { if (!noPanoramiXExtension) { DRIDrvMsg(pScreen->myNum, X_WARNING, diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 873f3428a..a23322b49 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/GL/dri/drimodule.c,v 1.1.4.1 2003/12/18 19:29:12 kaleb Exp $ */ /************************************************************************** Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. @@ -110,7 +110,7 @@ driSetup(pointer module, pointer opts, int *errmaj, int *errmin) } else { LoaderReqSymLists(drmSymbols, NULL); - LoaderRefSymbols("noXineramaExtension", NULL); + LoaderRefSymbols("noPanoramiXExtension", NULL); LoadExtension(&XF86DRIExt, FALSE); } } else { diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 558533f4d..12ec03b8d 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.1.4.3 2003/12/18 19:29:14 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.1.4.4 2003/12/20 00:28:30 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 * 17:11:29 tsi Exp $ */ @@ -171,7 +171,7 @@ LOOKUP dixLookupTab[] = { SYMVAR(EventCallback) SYMVAR(inputInfo) SYMVAR(SetCriticalEvent) -#ifdef XINERAMA +#ifdef PANORAMIX SYMVAR(XineramaGetCursorScreen) #endif /* property.c */ diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c index 9423b8c83..ad7605bf3 100644 --- a/hw/xfree86/loader/extsym.c +++ b/hw/xfree86/loader/extsym.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.1.4.3 2004/02/25 21:46:53 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */ /* @@ -28,7 +28,7 @@ #include "resource.h" #include "sym.h" #include "misc.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #endif #include "sleepuntil.h" @@ -39,7 +39,7 @@ extern int BadShmSegCode; extern RESTYPE ShmSegType, ShmPixType; #endif -#ifdef XINERAMA +#ifdef PANORAMIX extern Bool noPanoramiXExtension; extern int PanoramiXNumScreens; extern PanoramiXData *panoramiXdataPtr; @@ -63,7 +63,7 @@ LOOKUP extLookupTab[] = { SYMVAR(ShmSegType) #endif -#ifdef XINERAMA +#ifdef PANORAMIX SYMFUNC(XineramaRegisterConnectionBlockCallback) SYMFUNC(XineramaDeleteResource) SYMVAR(noPanoramiXExtension) diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index b90c4a577..06e0c502e 100644 --- a/hw/xfree86/loader/misym.c +++ b/hw/xfree86/loader/misym.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */ /* @@ -65,9 +65,9 @@ #include "mifillarc.h" #include "micmap.h" #include "mioverlay.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "resource.h" -#include "xinerama.h" +#include "panoramiX.h" #endif #ifdef RENDER #include "mipict.h" diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index e08284879..927f4807c 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.1.4.3 2004/02/25 21:46:55 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */ #include "misc.h" @@ -17,7 +17,7 @@ #include "pixmapstr.h" #include "mioverlay.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -167,7 +167,7 @@ XAAPaintWindow8_32( xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pScreen->myNum; if(WindowTable[index] == pBgWin) { diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 30f35aab5..8d287c9fd 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.1.4.2 2004/02/25 21:46:56 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */ #include "misc.h" @@ -16,7 +16,7 @@ #include "pixmapstr.h" #include "xaawrap.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -92,7 +92,7 @@ XAAPaintWindow( xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pScreen->myNum; if(WindowTable[index] == pBgWin) { diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 6ea5fa3fa..65f0b548b 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.2 2004/02/25 21:46:57 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */ #include "X.h" @@ -15,7 +15,7 @@ #include "cfb8_32.h" #include "mi.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -44,7 +44,7 @@ cfb8_32PaintWindow( case BackgroundPixmap: xorg = pWin->drawable.x; yorg = pWin->drawable.y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pWin) { @@ -92,7 +92,7 @@ cfb8_32PaintWindow( xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int index = pWin->drawable.pScreen->myNum; if(WindowTable[index] == pBgWin) { diff --git a/include/cursor.h b/include/cursor.h index 69e8ed731..a4450c7a7 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.1.4.4 2003/12/18 19:29:15 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ /*********************************************************** @@ -141,8 +141,8 @@ extern void GetSpritePosition( int * /*px*/, int * /*py*/); -#ifdef XINERAMA +#ifdef PANORAMIX extern int XineramaGetCursorScreen(void); -#endif /* XINERAMA */ +#endif /* PANORAMIX */ #endif /* CURSOR_H */ diff --git a/include/globals.h b/include/globals.h index be3a2b071..f474817b4 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.1.4.2 2004/02/25 21:47:00 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */ #ifndef _XSERV_GLOBAL_H_ @@ -41,7 +41,7 @@ extern Bool DPMSDisabledSwitch; extern Bool DPMSCapableFlag; #endif -#ifdef XINERAMA +#ifdef PANORAMIX extern Bool noPanoramiXExtension; extern Bool PanoramiXMapped; extern Bool PanoramiXVisibilityNotifySent; diff --git a/mi/miexpose.c b/mi/miexpose.c index fc0969864..77aae9e43 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.1.4.3 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.1.4.4 2004/02/25 21:47:02 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */ /*********************************************************** @@ -68,7 +68,7 @@ SOFTWARE. #include "globals.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -426,7 +426,7 @@ miSendExposures(pWin, pRgn, dx, dy) pe->u.expose.count = i; } -#ifdef XINERAMA +#ifdef PANORAMIX if(!noPanoramiXExtension) { int scrnum = pWin->drawable.pScreen->myNum; int x = 0, y = 0; diff --git a/mi/miinitext.c b/mi/miinitext.c index 764ec7901..796b20bb3 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.3 2004/02/25 21:47:02 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */ /*********************************************************** @@ -62,7 +62,7 @@ SOFTWARE. #undef GLXEXT #endif -#ifdef XINERAMA +#ifdef PANORAMIX extern Bool noPanoramiXExtension; #endif extern Bool noTestExtensions; @@ -103,7 +103,7 @@ typedef void (*InitExtension)(INITARGS); #define _SECURITY_SERVER #include "securstr.h" #endif -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiXproto.h" #endif #ifdef XF86BIGFONT @@ -135,7 +135,7 @@ extern void PexExtensionInit(INITARGS); #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #endif -#ifdef XINERAMA +#ifdef PANORAMIX extern void PanoramiXExtensionInit(INITARGS); #endif #ifdef XINPUT @@ -247,8 +247,8 @@ InitExtensions(argc, argv) int argc; char *argv[]; { -#ifdef XINERAMA -# if !defined(PRINT_ONLY_SERVER) && !defined(NO_XINERAMA) +#ifdef PANORAMIX +# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX) if (!noPanoramiXExtension) PanoramiXExtensionInit(); # endif #endif @@ -437,7 +437,7 @@ ExtensionModule extension[] = { NULL, "GLX", NULL, NULL }, { NULL, "TOG-CUP", NULL, NULL }, { NULL, "Extended-Visual-Information", NULL, NULL }, -#ifdef XINERAMA +#ifdef PANORAMIX { NULL, "XINERAMA", &noPanoramiXExtension, NULL }, #else { NULL, "NOXINERAMA", NULL, NULL }, @@ -488,7 +488,7 @@ static ExtensionModule staticExtensions[] = { #ifdef XPRINT { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, #endif -#ifdef XINERAMA +#ifdef PANORAMIX { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL }, #endif #ifdef XF86BIGFONT diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index 381380e50..07eac7579 100644 --- a/miext/rootless/safeAlpha/safeAlphaWindow.c +++ b/miext/rootless/safeAlpha/safeAlphaWindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1.4.2 2004/02/23 21:37:25 kaleb Exp $ */ /* * Specialized window functions to protect the alpha channel */ @@ -38,9 +38,9 @@ #include "safeAlpha.h" #include "rootlessCommon.h" -#ifdef XINERAMA -#include "xinerama.h" -#include "xineramaSrv.h" +#ifdef PANORAMIX +#include "panoramiX.h" +#include "panoramiXsrv.h" #endif /* @@ -69,14 +69,14 @@ SafeAlphaFillRegionTiled( int yRot = pDrawable->y; FbBits planeMask; -#ifdef XINERAMA - if(!noXineramaExtension) +#ifdef PANORAMIX + if(!noPanoramiXExtension) { int index = pDrawable->pScreen->myNum; if(&WindowTable[index]->drawable == pDrawable) { - xRot -= xineramaDataPtr[index].x; - yRot -= xineramaDataPtr[index].y; + xRot -= panoramiXdataPtr[index].x; + yRot -= panoramiXdataPtr[index].y; } } #endif diff --git a/os/utils.c b/os/utils.c index 2f7ad4944..df073a562 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.5 2004/02/23 21:37:27 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.6 2004/02/25 21:47:04 kaleb Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -129,8 +129,8 @@ OR PERFORMANCE OF THIS SOFTWARE. Bool CoreDump; Bool noTestExtensions; +#ifdef PANORAMIX Bool noPanoramiXExtension = TRUE; -#ifdef XINERAMA Bool PanoramiXVisibilityNotifySent = FALSE; Bool PanoramiXMapped = FALSE; Bool PanoramiXWindowExposureSent = FALSE; @@ -539,7 +539,7 @@ void UseMsg(void) ErrorF("-wm WhenMapped default backing-store\n"); ErrorF("-x string loads named extension at init time \n"); ErrorF("-maxbigreqsize set maximal bigrequest size \n"); -#ifdef XINERAMA +#ifdef PANORAMIX ErrorF("+xinerama Enable XINERAMA extension\n"); ErrorF("-xinerama Disable XINERAMA extension\n"); #endif @@ -884,7 +884,7 @@ ProcessCommandLine(int argc, char *argv[]) UseMsg(); } } -#ifdef XINERAMA +#ifdef PANORAMIX else if ( strcmp( argv[i], "+xinerama") == 0){ noPanoramiXExtension = FALSE; } diff --git a/record/record.c b/record/record.c index a7e8dc6a0..82edb17f8 100644 --- a/record/record.c +++ b/record/record.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.1.4.3 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.1.4.4 2004/02/25 21:47:07 kaleb Exp $ */ /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -27,7 +27,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. -Author: David P. Wiggins, X Consortium, Inc. +Author: David P. Wiggins, The Open Group This work benefited from earlier work done by Martha Zimet of NCD and Jim Haggerty of Metheus. @@ -49,7 +49,7 @@ and Jim Haggerty of Metheus. #include "xf86_ansic.h" #endif -#ifdef XINERAMA +#ifdef PANORAMIX #include "globals.h" #include "panoramiX.h" #include "panoramiXsrv.h" @@ -871,7 +871,7 @@ RecordADeviceEvent(pcbl, nulldata, calldata) { xEvent swappedEvent; xEvent *pEvToRecord = pev; -#ifdef XINERAMA +#ifdef PANORAMIX xEvent shiftedEvent; if (!noPanoramiXExtension && @@ -890,7 +890,7 @@ RecordADeviceEvent(pcbl, nulldata, calldata) panoramiXdataPtr[0].y; pEvToRecord = &shiftedEvent; } -#endif /* XINERAMA */ +#endif /* PANORAMIX */ if (pContext->pRecordingClient->swapped) { diff --git a/render/picturestr.h b/render/picturestr.h index d7ae83385..7b129eb24 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.1.4.2 2004/02/25 21:47:08 kaleb Exp $ */ /* * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $ * @@ -494,7 +494,7 @@ AnimCurInit (ScreenPtr pScreen); int AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor); -#ifdef XINERAMA +#ifdef PANORAMIX void PanoramiXRenderInit (void); void PanoramiXRenderReset (void); #endif diff --git a/render/render.c b/render/render.c index c096f292c..6a32010b0 100644 --- a/render/render.c +++ b/render/render.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.3 2004/02/25 21:47:08 kaleb Exp $ */ /* * $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $ * @@ -337,7 +337,7 @@ ProcRenderQueryPictFormats (ClientPtr client) REQUEST_SIZE_MATCH(xRenderQueryPictFormatsReq); -#ifdef XINERAMA +#ifdef PANORAMIX if (noPanoramiXExtension) numScreens = screenInfo.numScreens; else @@ -2284,7 +2284,7 @@ SProcRenderDispatch (ClientPtr client) return BadRequest; } -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" @@ -2304,12 +2304,12 @@ SProcRenderDispatch (ClientPtr client) } \ } \ -int (*XineramaSaveRenderVector[RenderNumberRequests])(ClientPtr); +int (*PanoramiXSaveRenderVector[RenderNumberRequests])(ClientPtr); unsigned long XRT_PICTURE; static int -XineramaRenderCreatePicture (ClientPtr client) +PanoramiXRenderCreatePicture (ClientPtr client) { REQUEST(xRenderCreatePictureReq); PanoramiXRes *refDraw, *newPict; @@ -2338,7 +2338,7 @@ XineramaRenderCreatePicture (ClientPtr client) FOR_NSCREENS_BACKWARD(j) { stuff->pid = newPict->info[j].id; stuff->drawable = refDraw->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderCreatePicture]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderCreatePicture]) (client); if(result != Success) break; } @@ -2351,7 +2351,7 @@ XineramaRenderCreatePicture (ClientPtr client) } static int -XineramaRenderChangePicture (ClientPtr client) +PanoramiXRenderChangePicture (ClientPtr client) { PanoramiXRes *pict; int result = Success, j; @@ -2364,7 +2364,7 @@ XineramaRenderChangePicture (ClientPtr client) FOR_NSCREENS_BACKWARD(j) { stuff->picture = pict->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderChangePicture]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderChangePicture]) (client); if(result != Success) break; } @@ -2372,7 +2372,7 @@ XineramaRenderChangePicture (ClientPtr client) } static int -XineramaRenderSetPictureClipRectangles (ClientPtr client) +PanoramiXRenderSetPictureClipRectangles (ClientPtr client) { REQUEST(xRenderSetPictureClipRectanglesReq); int result = Success, j; @@ -2385,7 +2385,7 @@ XineramaRenderSetPictureClipRectangles (ClientPtr client) FOR_NSCREENS_BACKWARD(j) { stuff->picture = pict->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderSetPictureClipRectangles]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderSetPictureClipRectangles]) (client); if(result != Success) break; } @@ -2393,7 +2393,7 @@ XineramaRenderSetPictureClipRectangles (ClientPtr client) } static int -XineramaRenderSetPictureTransform (ClientPtr client) +PanoramiXRenderSetPictureTransform (ClientPtr client) { REQUEST(xRenderSetPictureTransformReq); int result = Success, j; @@ -2406,7 +2406,7 @@ XineramaRenderSetPictureTransform (ClientPtr client) FOR_NSCREENS_BACKWARD(j) { stuff->picture = pict->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderSetPictureTransform]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderSetPictureTransform]) (client); if(result != Success) break; } @@ -2414,7 +2414,7 @@ XineramaRenderSetPictureTransform (ClientPtr client) } static int -XineramaRenderSetPictureFilter (ClientPtr client) +PanoramiXRenderSetPictureFilter (ClientPtr client) { REQUEST(xRenderSetPictureFilterReq); int result = Success, j; @@ -2427,7 +2427,7 @@ XineramaRenderSetPictureFilter (ClientPtr client) FOR_NSCREENS_BACKWARD(j) { stuff->picture = pict->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderSetPictureFilter]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderSetPictureFilter]) (client); if(result != Success) break; } @@ -2435,7 +2435,7 @@ XineramaRenderSetPictureFilter (ClientPtr client) } static int -XineramaRenderFreePicture (ClientPtr client) +PanoramiXRenderFreePicture (ClientPtr client) { PanoramiXRes *pict; int result = Success, j; @@ -2451,7 +2451,7 @@ XineramaRenderFreePicture (ClientPtr client) FOR_NSCREENS_BACKWARD(j) { stuff->picture = pict->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderFreePicture]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderFreePicture]) (client); if(result != Success) break; } @@ -2462,7 +2462,7 @@ XineramaRenderFreePicture (ClientPtr client) } static int -XineramaRenderComposite (ClientPtr client) +PanoramiXRenderComposite (ClientPtr client) { PanoramiXRes *src, *msk, *dst; int result = Success, j; @@ -2502,7 +2502,7 @@ XineramaRenderComposite (ClientPtr client) stuff->yMask = orig.yMask - panoramiXdataPtr[j].y; } } - result = (*XineramaSaveRenderVector[X_RenderComposite]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderComposite]) (client); if(result != Success) break; } @@ -2510,7 +2510,7 @@ XineramaRenderComposite (ClientPtr client) } static int -XineramaRenderCompositeGlyphs (ClientPtr client) +PanoramiXRenderCompositeGlyphs (ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2544,7 +2544,7 @@ XineramaRenderCompositeGlyphs (ClientPtr client) elt->deltax = origElt.deltax - panoramiXdataPtr[j].x; elt->deltay = origElt.deltay - panoramiXdataPtr[j].y; } - result = (*XineramaSaveRenderVector[stuff->renderReqType]) (client); + result = (*PanoramiXSaveRenderVector[stuff->renderReqType]) (client); if(result != Success) break; } } @@ -2553,7 +2553,7 @@ XineramaRenderCompositeGlyphs (ClientPtr client) } static int -XineramaRenderFillRectangles (ClientPtr client) +PanoramiXRenderFillRectangles (ClientPtr client) { PanoramiXRes *dst; int result = Success, j; @@ -2589,7 +2589,7 @@ XineramaRenderFillRectangles (ClientPtr client) } } stuff->dst = dst->info[j].id; - result = (*XineramaSaveRenderVector[X_RenderFillRectangles]) (client); + result = (*PanoramiXSaveRenderVector[X_RenderFillRectangles]) (client); if(result != Success) break; } DEALLOCATE_LOCAL(extra); @@ -2599,7 +2599,7 @@ XineramaRenderFillRectangles (ClientPtr client) } static int -XineramaRenderTrapezoids(ClientPtr client) +PanoramiXRenderTrapezoids(ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2649,7 +2649,7 @@ XineramaRenderTrapezoids(ClientPtr client) stuff->src = src->info[j].id; stuff->dst = dst->info[j].id; result = - (*XineramaSaveRenderVector[X_RenderTrapezoids]) (client); + (*PanoramiXSaveRenderVector[X_RenderTrapezoids]) (client); if(result != Success) break; } @@ -2661,7 +2661,7 @@ XineramaRenderTrapezoids(ClientPtr client) } static int -XineramaRenderTriangles(ClientPtr client) +PanoramiXRenderTriangles(ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2707,7 +2707,7 @@ XineramaRenderTriangles(ClientPtr client) stuff->src = src->info[j].id; stuff->dst = dst->info[j].id; result = - (*XineramaSaveRenderVector[X_RenderTriangles]) (client); + (*PanoramiXSaveRenderVector[X_RenderTriangles]) (client); if(result != Success) break; } @@ -2719,7 +2719,7 @@ XineramaRenderTriangles(ClientPtr client) } static int -XineramaRenderTriStrip(ClientPtr client) +PanoramiXRenderTriStrip(ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2761,7 +2761,7 @@ XineramaRenderTriStrip(ClientPtr client) stuff->src = src->info[j].id; stuff->dst = dst->info[j].id; result = - (*XineramaSaveRenderVector[X_RenderTriStrip]) (client); + (*PanoramiXSaveRenderVector[X_RenderTriStrip]) (client); if(result != Success) break; } @@ -2773,7 +2773,7 @@ XineramaRenderTriStrip(ClientPtr client) } static int -XineramaRenderTriFan(ClientPtr client) +PanoramiXRenderTriFan(ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2815,7 +2815,7 @@ XineramaRenderTriFan(ClientPtr client) stuff->src = src->info[j].id; stuff->dst = dst->info[j].id; result = - (*XineramaSaveRenderVector[X_RenderTriFan]) (client); + (*PanoramiXSaveRenderVector[X_RenderTriFan]) (client); if(result != Success) break; } @@ -2829,7 +2829,7 @@ XineramaRenderTriFan(ClientPtr client) #if 0 /* Not implemented yet */ static int -XineramaRenderColorTrapezoids(ClientPtr client) +PanoramiXRenderColorTrapezoids(ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2861,7 +2861,7 @@ XineramaRenderColorTrapezoids(ClientPtr client) stuff->dst = dst->info[j].id; result = - (*XineramaSaveRenderVector[X_RenderColorTrapezoids]) (client); + (*PanoramiXSaveRenderVector[X_RenderColorTrapezoids]) (client); if(result != Success) break; } @@ -2873,7 +2873,7 @@ XineramaRenderColorTrapezoids(ClientPtr client) } static int -XineramaRenderColorTriangles(ClientPtr client) +PanoramiXRenderColorTriangles(ClientPtr client) { PanoramiXRes *src, *dst; int result = Success, j; @@ -2905,7 +2905,7 @@ XineramaRenderColorTriangles(ClientPtr client) stuff->dst = dst->info[j].id; result = - (*XineramaSaveRenderVector[X_RenderColorTriangles]) (client); + (*PanoramiXSaveRenderVector[X_RenderColorTriangles]) (client); if(result != Success) break; } @@ -2925,26 +2925,26 @@ PanoramiXRenderInit (void) XRT_PICTURE = CreateNewResourceType (XineramaDeleteResource); for (i = 0; i < RenderNumberRequests; i++) - XineramaSaveRenderVector[i] = ProcRenderVector[i]; + PanoramiXSaveRenderVector[i] = ProcRenderVector[i]; /* * Stuff in Xinerama aware request processing hooks */ - ProcRenderVector[X_RenderCreatePicture] = XineramaRenderCreatePicture; - ProcRenderVector[X_RenderChangePicture] = XineramaRenderChangePicture; - ProcRenderVector[X_RenderSetPictureTransform] = XineramaRenderSetPictureTransform; - ProcRenderVector[X_RenderSetPictureFilter] = XineramaRenderSetPictureFilter; - ProcRenderVector[X_RenderSetPictureClipRectangles] = XineramaRenderSetPictureClipRectangles; - ProcRenderVector[X_RenderFreePicture] = XineramaRenderFreePicture; - ProcRenderVector[X_RenderComposite] = XineramaRenderComposite; - ProcRenderVector[X_RenderCompositeGlyphs8] = XineramaRenderCompositeGlyphs; - ProcRenderVector[X_RenderCompositeGlyphs16] = XineramaRenderCompositeGlyphs; - ProcRenderVector[X_RenderCompositeGlyphs32] = XineramaRenderCompositeGlyphs; - ProcRenderVector[X_RenderFillRectangles] = XineramaRenderFillRectangles; - - ProcRenderVector[X_RenderTrapezoids] = XineramaRenderTrapezoids; - ProcRenderVector[X_RenderTriangles] = XineramaRenderTriangles; - ProcRenderVector[X_RenderTriStrip] = XineramaRenderTriStrip; - ProcRenderVector[X_RenderTriFan] = XineramaRenderTriFan; + ProcRenderVector[X_RenderCreatePicture] = PanoramiXRenderCreatePicture; + ProcRenderVector[X_RenderChangePicture] = PanoramiXRenderChangePicture; + ProcRenderVector[X_RenderSetPictureTransform] = PanoramiXRenderSetPictureTransform; + ProcRenderVector[X_RenderSetPictureFilter] = PanoramiXRenderSetPictureFilter; + ProcRenderVector[X_RenderSetPictureClipRectangles] = PanoramiXRenderSetPictureClipRectangles; + ProcRenderVector[X_RenderFreePicture] = PanoramiXRenderFreePicture; + ProcRenderVector[X_RenderComposite] = PanoramiXRenderComposite; + ProcRenderVector[X_RenderCompositeGlyphs8] = PanoramiXRenderCompositeGlyphs; + ProcRenderVector[X_RenderCompositeGlyphs16] = PanoramiXRenderCompositeGlyphs; + ProcRenderVector[X_RenderCompositeGlyphs32] = PanoramiXRenderCompositeGlyphs; + ProcRenderVector[X_RenderFillRectangles] = PanoramiXRenderFillRectangles; + + ProcRenderVector[X_RenderTrapezoids] = PanoramiXRenderTrapezoids; + ProcRenderVector[X_RenderTriangles] = PanoramiXRenderTriangles; + ProcRenderVector[X_RenderTriStrip] = PanoramiXRenderTriStrip; + ProcRenderVector[X_RenderTriFan] = PanoramiXRenderTriFan; } void @@ -2952,7 +2952,7 @@ PanoramiXRenderReset (void) { int i; for (i = 0; i < RenderNumberRequests; i++) - ProcRenderVector[i] = XineramaSaveRenderVector[i]; + ProcRenderVector[i] = PanoramiXSaveRenderVector[i]; } -#endif /* XINERAMA */ +#endif /* PANORAMIX */ diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index 57751a0c0..63fcb9e6d 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.1.4.4 2003/12/18 19:29:15 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.1.4.5 2004/02/25 21:47:10 kaleb Exp $ */ /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "XKBsrv.h" #include "XI.h" -#ifdef XINERAMA +#ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif @@ -55,7 +55,7 @@ ScreenPtr pScreen, oldScreen; GetSpritePosition(&oldX, &oldY); pScreen = oldScreen = GetSpriteWindow()->drawable.pScreen; -#ifdef XINERAMA +#ifdef PANORAMIX if (!noPanoramiXExtension) { BoxRec box; int i; |