bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has
been decided that the priority is to preserve the server's internal API/ABI so that third-party drivers that depend on symbols like noPanoramiXExtension, etc., would not need to be recompiled. Too bad gcc on Linux doesn't support ELF's weak symbols as that would have been a reasonable solution for preserving the ABI. N.B.: While symbols, i.e. functions and variables revert to the old name, I did not revert build names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and it's just a build issue that has no impact on the binary output of the build.
This commit is contained in:
parent
14ab4ade74
commit
b052486adb
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.2 2003/12/18 19:29:12 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
|
||||
|
@ -78,8 +78,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <X11/extensions/xtrapproto.h>
|
||||
#include "colormapst.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#include "cursor.h"
|
||||
#endif
|
||||
|
||||
|
@ -1560,7 +1560,7 @@ void XETrapStampAndMail(xEvent *x_event)
|
|||
(void)memcpy(&(data.u.event),x_event,sizeof(xEvent));
|
||||
|
||||
#ifdef XINERAMA
|
||||
if (!noXineramaExtension &&
|
||||
if (!noPanoramiXExtension &&
|
||||
(data.u.event.u.u.type == MotionNotify ||
|
||||
data.u.event.u.u.type == ButtonPress ||
|
||||
data.u.event.u.u.type == ButtonRelease ||
|
||||
|
@ -1568,9 +1568,9 @@ void XETrapStampAndMail(xEvent *x_event)
|
|||
data.u.event.u.u.type == KeyRelease)) {
|
||||
int scr = XineramaGetCursorScreen();
|
||||
data.u.event.u.keyButtonPointer.rootX +=
|
||||
xineramaDataPtr[scr].x - xineramaDataPtr[0].x;
|
||||
panoramiXdataPtr[scr].x - panoramiXdataPtr[0].x;
|
||||
data.u.event.u.keyButtonPointer.rootY +=
|
||||
xineramaDataPtr[scr].y - xineramaDataPtr[0].y;
|
||||
panoramiXdataPtr[scr].y - panoramiXdataPtr[0].y;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
36
Xext/saver.c
36
Xext/saver.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/*
|
||||
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
|
||||
*
|
||||
|
@ -48,8 +48,8 @@ in this Software without prior written authorization from the X Consortium.
|
|||
#include "cursorstr.h"
|
||||
#include "colormapst.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -678,7 +678,7 @@ ScreenSaverHandle (pScreen, xstate, force)
|
|||
|
||||
}
|
||||
#ifdef XINERAMA
|
||||
if(noXineramaExtension || !pScreen->myNum)
|
||||
if(noPanoramiXExtension || !pScreen->myNum)
|
||||
#endif
|
||||
SendScreenSaverNotify (pScreen, state, force);
|
||||
return ret;
|
||||
|
@ -1196,19 +1196,19 @@ static int
|
|||
ProcScreenSaverSetAttributes (ClientPtr client)
|
||||
{
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
REQUEST(xScreenSaverSetAttributesReq);
|
||||
XineramaRes *draw;
|
||||
XineramaRes *backPix = NULL;
|
||||
XineramaRes *bordPix = NULL;
|
||||
XineramaRes *cmap = NULL;
|
||||
PanoramiXRes *draw;
|
||||
PanoramiXRes *backPix = NULL;
|
||||
PanoramiXRes *bordPix = NULL;
|
||||
PanoramiXRes *cmap = NULL;
|
||||
int i, status = 0, len;
|
||||
int pback_offset = 0, pbord_offset = 0, cmap_offset = 0;
|
||||
XID orig_visual, tmp;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE (xScreenSaverSetAttributesReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
|
@ -1220,7 +1220,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
|
|||
pback_offset = Ones((Mask)stuff->mask & (CWBackPixmap - 1));
|
||||
tmp = *((CARD32 *) &stuff[1] + pback_offset);
|
||||
if ((tmp != None) && (tmp != ParentRelative)) {
|
||||
if(!(backPix = (XineramaRes*) SecurityLookupIDByType(
|
||||
if(!(backPix = (PanoramiXRes*) SecurityLookupIDByType(
|
||||
client, tmp, XRT_PIXMAP, SecurityReadAccess)))
|
||||
return BadPixmap;
|
||||
}
|
||||
|
@ -1230,7 +1230,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
|
|||
pbord_offset = Ones((Mask)stuff->mask & (CWBorderPixmap - 1));
|
||||
tmp = *((CARD32 *) &stuff[1] + pbord_offset);
|
||||
if (tmp != CopyFromParent) {
|
||||
if(!(bordPix = (XineramaRes*) SecurityLookupIDByType(
|
||||
if(!(bordPix = (PanoramiXRes*) SecurityLookupIDByType(
|
||||
client, tmp, XRT_PIXMAP, SecurityReadAccess)))
|
||||
return BadPixmap;
|
||||
}
|
||||
|
@ -1240,7 +1240,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
|
|||
cmap_offset = Ones((Mask)stuff->mask & (CWColormap - 1));
|
||||
tmp = *((CARD32 *) &stuff[1] + cmap_offset);
|
||||
if ((tmp != CopyFromParent) && (tmp != None)) {
|
||||
if(!(cmap = (XineramaRes*) SecurityLookupIDByType(
|
||||
if(!(cmap = (PanoramiXRes*) SecurityLookupIDByType(
|
||||
client, tmp, XRT_COLORMAP, SecurityReadAccess)))
|
||||
return BadColor;
|
||||
}
|
||||
|
@ -1259,7 +1259,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
|
|||
|
||||
if (orig_visual != CopyFromParent)
|
||||
stuff->visualID =
|
||||
XineramaVisualTable[(orig_visual*MAXSCREENS) + i];
|
||||
PanoramiXVisualTable[(orig_visual*MAXSCREENS) + i];
|
||||
|
||||
status = ScreenSaverSetAttributes(client);
|
||||
}
|
||||
|
@ -1275,16 +1275,16 @@ static int
|
|||
ProcScreenSaverUnsetAttributes (ClientPtr client)
|
||||
{
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
REQUEST(xScreenSaverUnsetAttributesReq);
|
||||
XineramaRes *draw;
|
||||
PanoramiXRes *draw;
|
||||
int i;
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
for(i = XineramaNumScreens - 1; i > 0; i--) {
|
||||
for(i = PanoramiXNumScreens - 1; i > 0; i--) {
|
||||
stuff->drawable = draw->info[i].id;
|
||||
ScreenSaverUnsetAttributes(client);
|
||||
}
|
||||
|
|
34
Xext/shape.c
34
Xext/shape.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
|
||||
/************************************************************
|
||||
|
||||
|
@ -114,8 +114,8 @@ static DISPATCH_PROC(SProcShapeRectangles);
|
|||
static DISPATCH_PROC(SProcShapeSelectInput);
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
|
@ -382,12 +382,12 @@ ProcXineramaShapeRectangles(
|
|||
register ClientPtr client)
|
||||
{
|
||||
REQUEST(xShapeRectanglesReq);
|
||||
XineramaRes *win;
|
||||
PanoramiXRes *win;
|
||||
int j, result = 0;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE (xShapeRectanglesReq);
|
||||
|
||||
if(!(win = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
|
||||
return BadWindow;
|
||||
|
||||
|
@ -471,17 +471,17 @@ ProcXineramaShapeMask(
|
|||
register ClientPtr client)
|
||||
{
|
||||
REQUEST(xShapeMaskReq);
|
||||
XineramaRes *win, *pmap;
|
||||
PanoramiXRes *win, *pmap;
|
||||
int j, result = 0;
|
||||
|
||||
REQUEST_SIZE_MATCH (xShapeMaskReq);
|
||||
|
||||
if(!(win = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
|
||||
return BadWindow;
|
||||
|
||||
if(stuff->src != None) {
|
||||
if(!(pmap = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(pmap = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->src, XRT_PIXMAP, SecurityReadAccess)))
|
||||
return BadPixmap;
|
||||
} else
|
||||
|
@ -586,16 +586,16 @@ ProcXineramaShapeCombine(
|
|||
register ClientPtr client)
|
||||
{
|
||||
REQUEST(xShapeCombineReq);
|
||||
XineramaRes *win, *win2;
|
||||
PanoramiXRes *win, *win2;
|
||||
int j, result = 0;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE (xShapeCombineReq);
|
||||
|
||||
if(!(win = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
|
||||
return BadWindow;
|
||||
|
||||
if(!(win2 = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(win2 = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->src, XRT_WINDOW, SecurityReadAccess)))
|
||||
return BadWindow;
|
||||
|
||||
|
@ -655,12 +655,12 @@ ProcXineramaShapeOffset(
|
|||
register ClientPtr client)
|
||||
{
|
||||
REQUEST(xShapeOffsetReq);
|
||||
XineramaRes *win;
|
||||
PanoramiXRes *win;
|
||||
int j, result = 0;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE (xShapeOffsetReq);
|
||||
|
||||
if(!(win = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
|
||||
return BadWindow;
|
||||
|
||||
|
@ -1066,28 +1066,28 @@ ProcShapeDispatch (client)
|
|||
return ProcShapeQueryVersion (client);
|
||||
case X_ShapeRectangles:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShapeRectangles (client);
|
||||
else
|
||||
#endif
|
||||
return ProcShapeRectangles (client);
|
||||
case X_ShapeMask:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShapeMask (client);
|
||||
else
|
||||
#endif
|
||||
return ProcShapeMask (client);
|
||||
case X_ShapeCombine:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShapeCombine (client);
|
||||
else
|
||||
#endif
|
||||
return ProcShapeCombine (client);
|
||||
case X_ShapeOffset:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShapeOffset (client);
|
||||
else
|
||||
#endif
|
||||
|
|
46
Xext/shm.c
46
Xext/shm.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.4 2003/12/20 00:28:24 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ *
|
||||
/************************************************************
|
||||
|
||||
|
@ -64,8 +64,8 @@ in this Software without prior written authorization from The Open Group.
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
#include "modinit.h"
|
||||
|
@ -566,17 +566,17 @@ static int
|
|||
ProcXineramaShmPutImage(register ClientPtr client)
|
||||
{
|
||||
int j, result = 0, orig_x, orig_y;
|
||||
XineramaRes *draw, *gc;
|
||||
PanoramiXRes *draw, *gc;
|
||||
Bool sendEvent, isRoot;
|
||||
|
||||
REQUEST(xShmPutImageReq);
|
||||
REQUEST_SIZE_MATCH(xShmPutImageReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
if(!(gc = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->gc, XRT_GC, SecurityReadAccess)))
|
||||
return BadGC;
|
||||
|
||||
|
@ -592,8 +592,8 @@ ProcXineramaShmPutImage(register ClientPtr client)
|
|||
stuff->drawable = draw->info[j].id;
|
||||
stuff->gc = gc->info[j].id;
|
||||
if (isRoot) {
|
||||
stuff->dstX = orig_x - xineramaDataPtr[j].x;
|
||||
stuff->dstY = orig_y - xineramaDataPtr[j].y;
|
||||
stuff->dstX = orig_x - panoramiXdataPtr[j].x;
|
||||
stuff->dstY = orig_y - panoramiXdataPtr[j].y;
|
||||
}
|
||||
result = ProcShmPutImage(client);
|
||||
if(result != client->noClientException) break;
|
||||
|
@ -604,7 +604,7 @@ ProcXineramaShmPutImage(register ClientPtr client)
|
|||
static int
|
||||
ProcXineramaShmGetImage(ClientPtr client)
|
||||
{
|
||||
XineramaRes *draw;
|
||||
PanoramiXRes *draw;
|
||||
DrawablePtr drawables[MAXSCREENS];
|
||||
DrawablePtr pDraw;
|
||||
xShmGetImageReply xgi;
|
||||
|
@ -623,7 +623,7 @@ ProcXineramaShmGetImage(ClientPtr client)
|
|||
return(BadValue);
|
||||
}
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
|
@ -646,15 +646,15 @@ ProcXineramaShmGetImage(ClientPtr client)
|
|||
|
||||
if(isRoot) {
|
||||
if( /* check for being onscreen */
|
||||
x < 0 || x + w > XineramaPixWidth ||
|
||||
y < 0 || y + h > XineramaPixHeight )
|
||||
x < 0 || x + w > PanoramiXPixWidth ||
|
||||
y < 0 || y + h > PanoramiXPixHeight )
|
||||
return(BadMatch);
|
||||
} else {
|
||||
if( /* check for being onscreen */
|
||||
xineramaDataPtr[0].x + pDraw->x + x < 0 ||
|
||||
xineramaDataPtr[0].x + pDraw->x + x + w > XineramaPixWidth ||
|
||||
xineramaDataPtr[0].y + pDraw->y + y < 0 ||
|
||||
xineramaDataPtr[0].y + pDraw->y + y + h > XineramaPixHeight ||
|
||||
panoramiXdataPtr[0].x + pDraw->x + x < 0 ||
|
||||
panoramiXdataPtr[0].x + pDraw->x + x + w > PanoramiXPixWidth ||
|
||||
panoramiXdataPtr[0].y + pDraw->y + y < 0 ||
|
||||
panoramiXdataPtr[0].y + pDraw->y + y + h > PanoramiXPixHeight ||
|
||||
/* check for being inside of border */
|
||||
x < - wBorderWidth((WindowPtr)pDraw) ||
|
||||
x + w > wBorderWidth((WindowPtr)pDraw) + (int)pDraw->width ||
|
||||
|
@ -664,7 +664,7 @@ ProcXineramaShmGetImage(ClientPtr client)
|
|||
}
|
||||
|
||||
drawables[0] = pDraw;
|
||||
for(i = 1; i < XineramaNumScreens; i++)
|
||||
for(i = 1; i < PanoramiXNumScreens; i++)
|
||||
VERIFY_DRAWABLE(drawables[i], draw->info[i].id, client);
|
||||
|
||||
xgi.visual = wVisual(((WindowPtr)pDraw));
|
||||
|
@ -727,7 +727,7 @@ ProcXineramaShmCreatePixmap(
|
|||
int i, j, result;
|
||||
ShmDescPtr shmdesc;
|
||||
REQUEST(xShmCreatePixmapReq);
|
||||
XineramaRes *newPix;
|
||||
PanoramiXRes *newPix;
|
||||
|
||||
REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
|
||||
client->errorValue = stuff->pid;
|
||||
|
@ -755,13 +755,13 @@ CreatePmap:
|
|||
PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
|
||||
client);
|
||||
|
||||
if(!(newPix = (XineramaRes *) xalloc(sizeof(XineramaRes))))
|
||||
if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
|
||||
return BadAlloc;
|
||||
|
||||
newPix->type = XRT_PIXMAP;
|
||||
newPix->u.pix.shared = TRUE;
|
||||
newPix->info[0].id = stuff->pid;
|
||||
for(j = 1; j < XineramaNumScreens; j++)
|
||||
for(j = 1; j < PanoramiXNumScreens; j++)
|
||||
newPix->info[j].id = FakeClientID(client->index);
|
||||
|
||||
result = (client->noClientException);
|
||||
|
@ -1114,19 +1114,19 @@ ProcShmDispatch (client)
|
|||
return ProcShmDetach(client);
|
||||
case X_ShmPutImage:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShmPutImage(client);
|
||||
#endif
|
||||
return ProcShmPutImage(client);
|
||||
case X_ShmGetImage:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShmGetImage(client);
|
||||
#endif
|
||||
return ProcShmGetImage(client);
|
||||
case X_ShmCreatePixmap:
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
return ProcXineramaShmCreatePixmap(client);
|
||||
#endif
|
||||
return ProcShmCreatePixmap(client);
|
||||
|
|
20
Xext/xtest.c
20
Xext/xtest.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
|
@ -65,8 +65,8 @@ extern int DeviceValuator;
|
|||
#endif /* XINPUT */
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
static void XTestResetProc(
|
||||
|
@ -392,12 +392,12 @@ ProcXTestFakeInput(client)
|
|||
}
|
||||
|
||||
#ifdef XINERAMA
|
||||
if (!noXineramaExtension) {
|
||||
if (!noPanoramiXExtension) {
|
||||
ScreenPtr pScreen = root->drawable.pScreen;
|
||||
BoxRec box;
|
||||
int i;
|
||||
int x = ev->u.keyButtonPointer.rootX + xineramaDataPtr[0].x;
|
||||
int y = ev->u.keyButtonPointer.rootY + xineramaDataPtr[0].y;
|
||||
int x = ev->u.keyButtonPointer.rootX + panoramiXdataPtr[0].x;
|
||||
int y = ev->u.keyButtonPointer.rootY + panoramiXdataPtr[0].y;
|
||||
if (!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum],
|
||||
x, y, &box)) {
|
||||
FOR_NSCREENS(i) {
|
||||
|
@ -406,8 +406,8 @@ ProcXTestFakeInput(client)
|
|||
&XineramaScreenRegions[i],
|
||||
x, y, &box)) {
|
||||
root = WindowTable[i];
|
||||
x -= xineramaDataPtr[i].x;
|
||||
y -= xineramaDataPtr[i].y;
|
||||
x -= panoramiXdataPtr[i].x;
|
||||
y -= panoramiXdataPtr[i].y;
|
||||
ev->u.keyButtonPointer.rootX = x;
|
||||
ev->u.keyButtonPointer.rootY = y;
|
||||
break;
|
||||
|
@ -427,9 +427,9 @@ ProcXTestFakeInput(client)
|
|||
ev->u.keyButtonPointer.rootY = root->drawable.height - 1;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if ((!noXineramaExtension
|
||||
if ((!noPanoramiXExtension
|
||||
&& root->drawable.pScreen->myNum != XineramaGetCursorScreen())
|
||||
|| (noXineramaExtension && root != GetCurrentRootWindow()))
|
||||
|| (noPanoramiXExtension && root != GetCurrentRootWindow()))
|
||||
|
||||
#else
|
||||
if (root != GetCurrentRootWindow())
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/***********************************************************
|
||||
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
|
||||
|
@ -74,8 +74,8 @@ SOFTWARE.
|
|||
#include "xvdisp.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
|
||||
unsigned long XvXRTPort;
|
||||
|
||||
|
@ -234,14 +234,14 @@ ProcXvDispatch(ClientPtr client)
|
|||
case xv_QueryEncodings: return(ProcXvQueryEncodings(client));
|
||||
case xv_PutVideo:
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return(XineramaXvPutVideo(client));
|
||||
else
|
||||
#endif
|
||||
return(ProcXvPutVideo(client));
|
||||
case xv_PutStill:
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return(XineramaXvPutStill(client));
|
||||
else
|
||||
#endif
|
||||
|
@ -254,14 +254,14 @@ ProcXvDispatch(ClientPtr client)
|
|||
case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client));
|
||||
case xv_StopVideo:
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return(XineramaXvStopVideo(client));
|
||||
else
|
||||
#endif
|
||||
return(ProcXvStopVideo(client));
|
||||
case xv_SetPortAttribute:
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return(XineramaXvSetPortAttribute(client));
|
||||
else
|
||||
#endif
|
||||
|
@ -271,7 +271,7 @@ ProcXvDispatch(ClientPtr client)
|
|||
case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client));
|
||||
case xv_PutImage:
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return(XineramaXvPutImage(client));
|
||||
else
|
||||
#endif
|
||||
|
@ -279,7 +279,7 @@ ProcXvDispatch(ClientPtr client)
|
|||
#ifdef MITSHM
|
||||
case xv_ShmPutImage:
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return(XineramaXvShmPutImage(client));
|
||||
else
|
||||
#endif
|
||||
|
@ -1872,15 +1872,15 @@ static int
|
|||
XineramaXvStopVideo(ClientPtr client)
|
||||
{
|
||||
int result = Success, i;
|
||||
XineramaRes *draw, *port;
|
||||
PanoramiXRes *draw, *port;
|
||||
REQUEST(xvStopVideoReq);
|
||||
REQUEST_SIZE_MATCH(xvStopVideoReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
if(!(port = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->port, XvXRTPort, SecurityReadAccess)))
|
||||
return _XvBadPort;
|
||||
|
||||
|
@ -1899,12 +1899,12 @@ static int
|
|||
XineramaXvSetPortAttribute(ClientPtr client)
|
||||
{
|
||||
REQUEST(xvSetPortAttributeReq);
|
||||
XineramaRes *port;
|
||||
PanoramiXRes *port;
|
||||
int result = Success, i;
|
||||
|
||||
REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
|
||||
|
||||
if(!(port = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->port, XvXRTPort, SecurityReadAccess)))
|
||||
return _XvBadPort;
|
||||
|
||||
|
@ -1923,22 +1923,22 @@ static int
|
|||
XineramaXvShmPutImage(ClientPtr client)
|
||||
{
|
||||
REQUEST(xvShmPutImageReq);
|
||||
XineramaRes *draw, *gc, *port;
|
||||
PanoramiXRes *draw, *gc, *port;
|
||||
Bool send_event = stuff->send_event;
|
||||
Bool isRoot;
|
||||
int result = Success, i, x, y;
|
||||
|
||||
REQUEST_SIZE_MATCH(xvShmPutImageReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
if(!(gc = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->gc, XRT_GC, SecurityReadAccess)))
|
||||
return BadGC;
|
||||
|
||||
if(!(port = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->port, XvXRTPort, SecurityReadAccess)))
|
||||
return _XvBadPort;
|
||||
|
||||
|
@ -1956,8 +1956,8 @@ XineramaXvShmPutImage(ClientPtr client)
|
|||
stuff->drw_x = x;
|
||||
stuff->drw_y = y;
|
||||
if(isRoot) {
|
||||
stuff->drw_x -= xineramaDataPtr[i].x;
|
||||
stuff->drw_y -= xineramaDataPtr[i].y;
|
||||
stuff->drw_x -= panoramiXdataPtr[i].x;
|
||||
stuff->drw_y -= panoramiXdataPtr[i].y;
|
||||
}
|
||||
stuff->send_event = (send_event && !i) ? 1 : 0;
|
||||
|
||||
|
@ -1972,21 +1972,21 @@ static int
|
|||
XineramaXvPutImage(ClientPtr client)
|
||||
{
|
||||
REQUEST(xvPutImageReq);
|
||||
XineramaRes *draw, *gc, *port;
|
||||
PanoramiXRes *draw, *gc, *port;
|
||||
Bool isRoot;
|
||||
int result = Success, i, x, y;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xvPutImageReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
if(!(gc = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->gc, XRT_GC, SecurityReadAccess)))
|
||||
return BadGC;
|
||||
|
||||
if(!(port = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->port, XvXRTPort, SecurityReadAccess)))
|
||||
return _XvBadPort;
|
||||
|
||||
|
@ -2004,8 +2004,8 @@ XineramaXvPutImage(ClientPtr client)
|
|||
stuff->drw_x = x;
|
||||
stuff->drw_y = y;
|
||||
if(isRoot) {
|
||||
stuff->drw_x -= xineramaDataPtr[i].x;
|
||||
stuff->drw_y -= xineramaDataPtr[i].y;
|
||||
stuff->drw_x -= panoramiXdataPtr[i].x;
|
||||
stuff->drw_y -= panoramiXdataPtr[i].y;
|
||||
}
|
||||
|
||||
result = ProcXvPutImage(client);
|
||||
|
@ -2018,21 +2018,21 @@ static int
|
|||
XineramaXvPutVideo(ClientPtr client)
|
||||
{
|
||||
REQUEST(xvPutImageReq);
|
||||
XineramaRes *draw, *gc, *port;
|
||||
PanoramiXRes *draw, *gc, *port;
|
||||
Bool isRoot;
|
||||
int result = Success, i, x, y;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xvPutVideoReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
if(!(gc = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->gc, XRT_GC, SecurityReadAccess)))
|
||||
return BadGC;
|
||||
|
||||
if(!(port = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->port, XvXRTPort, SecurityReadAccess)))
|
||||
return _XvBadPort;
|
||||
|
||||
|
@ -2050,8 +2050,8 @@ XineramaXvPutVideo(ClientPtr client)
|
|||
stuff->drw_x = x;
|
||||
stuff->drw_y = y;
|
||||
if(isRoot) {
|
||||
stuff->drw_x -= xineramaDataPtr[i].x;
|
||||
stuff->drw_y -= xineramaDataPtr[i].y;
|
||||
stuff->drw_x -= panoramiXdataPtr[i].x;
|
||||
stuff->drw_y -= panoramiXdataPtr[i].y;
|
||||
}
|
||||
|
||||
result = ProcXvPutVideo(client);
|
||||
|
@ -2064,21 +2064,21 @@ static int
|
|||
XineramaXvPutStill(ClientPtr client)
|
||||
{
|
||||
REQUEST(xvPutImageReq);
|
||||
XineramaRes *draw, *gc, *port;
|
||||
PanoramiXRes *draw, *gc, *port;
|
||||
Bool isRoot;
|
||||
int result = Success, i, x, y;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xvPutImageReq);
|
||||
|
||||
if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
|
||||
if(!(gc = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->gc, XRT_GC, SecurityReadAccess)))
|
||||
return BadGC;
|
||||
|
||||
if(!(port = (XineramaRes *)SecurityLookupIDByType(
|
||||
if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
|
||||
client, stuff->port, XvXRTPort, SecurityReadAccess)))
|
||||
return _XvBadPort;
|
||||
|
||||
|
@ -2096,8 +2096,8 @@ XineramaXvPutStill(ClientPtr client)
|
|||
stuff->drw_x = x;
|
||||
stuff->drw_y = y;
|
||||
if(isRoot) {
|
||||
stuff->drw_x -= xineramaDataPtr[i].x;
|
||||
stuff->drw_y -= xineramaDataPtr[i].y;
|
||||
stuff->drw_x -= panoramiXdataPtr[i].x;
|
||||
stuff->drw_y -= panoramiXdataPtr[i].y;
|
||||
}
|
||||
|
||||
result = ProcXvPutStill(client);
|
||||
|
@ -2115,7 +2115,7 @@ void XineramifyXv(void)
|
|||
XvAttributePtr pAttr;
|
||||
XvScreenPtr xvsp;
|
||||
Bool isOverlay, hasOverlay;
|
||||
XineramaRes *port;
|
||||
PanoramiXRes *port;
|
||||
XvAdaptorPtr MatchingAdaptors[MAXSCREENS];
|
||||
int i, j, k, l;
|
||||
|
||||
|
@ -2141,7 +2141,7 @@ void XineramifyXv(void)
|
|||
}
|
||||
}
|
||||
|
||||
for(j = 1; j < XineramaNumScreens; j++) {
|
||||
for(j = 1; j < PanoramiXNumScreens; j++) {
|
||||
pScreen = screenInfo.screens[j];
|
||||
xvsp = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
|
||||
|
||||
|
@ -2199,12 +2199,12 @@ void XineramifyXv(void)
|
|||
|
||||
/* now create a resource for each port */
|
||||
for(j = 0; j < refAdapt->nPorts; j++) {
|
||||
if(!(port = xalloc(sizeof(XineramaRes))))
|
||||
if(!(port = xalloc(sizeof(PanoramiXRes))))
|
||||
break;
|
||||
port->info[0].id = MatchingAdaptors[0]->base_id + j;
|
||||
AddResource(port->info[0].id, XvXRTPort, port);
|
||||
|
||||
for(k = 1; k < XineramaNumScreens; k++) {
|
||||
for(k = 1; k < PanoramiXNumScreens; k++) {
|
||||
if(MatchingAdaptors[k] && (MatchingAdaptors[k]->nPorts > j))
|
||||
port->info[k].id = MatchingAdaptors[k]->base_id + j;
|
||||
else
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/***********************************************************
|
||||
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
|
||||
|
@ -100,8 +100,8 @@ SOFTWARE.
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#include "xvdisp.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
|
@ -60,9 +60,9 @@ SOFTWARE.
|
|||
#include "mi.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
extern Bool noXineramaExtension;
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
extern Bool noPanoramiXExtension;
|
||||
extern WindowPtr *WindowTable;
|
||||
#endif
|
||||
|
||||
|
@ -105,11 +105,11 @@ cfbPaintWindow(pWin, pRegion, what)
|
|||
int yorg = pWin->drawable.y;
|
||||
#endif
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int index = pWin->drawable.pScreen->myNum;
|
||||
if(WindowTable[index] == pWin) {
|
||||
xorg -= xineramaDataPtr[index].x;
|
||||
yorg -= xineramaDataPtr[index].y;
|
||||
xorg -= panoramiXdataPtr[index].x;
|
||||
yorg -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -163,11 +163,11 @@ cfbPaintWindow(pWin, pRegion, what)
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int index = pWin->drawable.pScreen->myNum;
|
||||
if(WindowTable[index] == pBgWin) {
|
||||
xorg -= xineramaDataPtr[index].x;
|
||||
yorg -= xineramaDataPtr[index].y;
|
||||
xorg -= panoramiXdataPtr[index].x;
|
||||
yorg -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */
|
||||
/******************************************************************************
|
||||
*
|
||||
|
@ -1822,8 +1822,8 @@ DbeExtensionInit()
|
|||
Bool ddxInitSuccess;
|
||||
|
||||
#ifdef XINERAMA
|
||||
extern Bool noXineramaExtension;
|
||||
if(!noXineramaExtension) return;
|
||||
extern Bool noPanoramiXExtension;
|
||||
if(!noPanoramiXExtension) return;
|
||||
#endif
|
||||
|
||||
/* Allocate private pointers in windows and screens. */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
|
@ -63,9 +63,9 @@ SOFTWARE.
|
|||
#include "lbxserve.h"
|
||||
#endif
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
extern Bool noXineramaExtension;
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
extern Bool noPanoramiXExtension;
|
||||
#endif
|
||||
|
||||
extern XID clientErrorValue;
|
||||
|
@ -484,8 +484,8 @@ TellNoMap (pwin, pmid)
|
|||
/*
|
||||
* Only deliver event for Screen 0 when Xinerama enabled
|
||||
*/
|
||||
if (noXineramaExtension ||
|
||||
(!noXineramaExtension && !(pwin->drawable.pScreen->myNum))) {
|
||||
if (noPanoramiXExtension ||
|
||||
(!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum))) {
|
||||
#endif
|
||||
/* This should be call to DeliverEvent */
|
||||
xE.u.u.type = ColormapNotify;
|
||||
|
@ -519,8 +519,8 @@ TellLostMap (pwin, value)
|
|||
/*
|
||||
* Only deliver event for Screen 0 when Xinerama enabled
|
||||
*/
|
||||
if (noXineramaExtension ||
|
||||
(!noXineramaExtension && !(pwin->drawable.pScreen->myNum)))
|
||||
if (noPanoramiXExtension ||
|
||||
(!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum)))
|
||||
#endif
|
||||
if (wColormap(pwin) == *pmid)
|
||||
{
|
||||
|
@ -549,8 +549,8 @@ TellGainedMap (pwin, value)
|
|||
/*
|
||||
* Only deliver event for Screen 0 when Xinerama enabled
|
||||
*/
|
||||
if (noXineramaExtension ||
|
||||
(!noXineramaExtension && !(pwin->drawable.pScreen->myNum)))
|
||||
if (noPanoramiXExtension ||
|
||||
(!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum)))
|
||||
#endif
|
||||
if (wColormap (pwin) == *pmid)
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
|
||||
/************************************************************
|
||||
|
||||
|
@ -93,8 +93,8 @@ int ProcInitialConnection();
|
|||
#include "swaprep.h"
|
||||
#include "swapreq.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
#ifdef XCSECURITY
|
||||
#define _SECURITY_SERVER
|
||||
|
@ -2643,7 +2643,7 @@ ProcAllocColor(client)
|
|||
return (retval);
|
||||
}
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension || !pmap->pScreen->myNum)
|
||||
if (noPanoramiXExtension || !pmap->pScreen->myNum)
|
||||
#endif
|
||||
WriteReplyToClient(client, sizeof(xAllocColorReply), &acr);
|
||||
return (client->noClientException);
|
||||
|
@ -2702,7 +2702,7 @@ ProcAllocNamedColor (client)
|
|||
return(retval);
|
||||
}
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension || !pcmp->pScreen->myNum)
|
||||
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
|
||||
#endif
|
||||
WriteReplyToClient(client, sizeof (xAllocNamedColorReply), &ancr);
|
||||
return (client->noClientException);
|
||||
|
@ -2772,7 +2772,7 @@ ProcAllocColorCells (client)
|
|||
return(retval);
|
||||
}
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension || !pcmp->pScreen->myNum)
|
||||
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
|
||||
#endif
|
||||
{
|
||||
accr.type = X_Reply;
|
||||
|
@ -2851,7 +2851,7 @@ ProcAllocColorPlanes(client)
|
|||
}
|
||||
acpr.length = length >> 2;
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension || !pcmp->pScreen->myNum)
|
||||
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
|
||||
#endif
|
||||
{
|
||||
WriteReplyToClient(client, sizeof(xAllocColorPlanesReply), &acpr);
|
||||
|
@ -3934,7 +3934,7 @@ SendConnSetup(client, reason)
|
|||
/* fill in the "currentInputMask" */
|
||||
root = (xWindowRoot *)(lConnectionInfo + connBlockScreenStart);
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension)
|
||||
if (noPanoramiXExtension)
|
||||
numScreens = screenInfo.numScreens;
|
||||
else
|
||||
numScreens = ((xConnSetup *)ConnectionInfo)->numRoots;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.3 2003/12/18 19:29:12 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.
|
||||
|
@ -43,8 +43,7 @@ SOFTWARE.
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
extern Bool noXineramaExtension;
|
||||
#include "panoramiX.h"
|
||||
#endif
|
||||
|
||||
#ifdef LBX
|
||||
|
@ -1401,7 +1400,7 @@ bail:
|
|||
if (c->err != Success) err = c->err;
|
||||
if (err != Success && c->client != serverClient) {
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension || !c->pGC->pScreen->myNum)
|
||||
if (noPanoramiXExtension || !c->pGC->pScreen->myNum)
|
||||
#endif
|
||||
SendErrorToClient(c->client, c->reqType, 0, 0, err);
|
||||
}
|
||||
|
|
202
dix/events.c
202
dix/events.c
|
@ -83,8 +83,8 @@ SOFTWARE.
|
|||
|
||||
#include "dixstruct.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
#include "globals.h"
|
||||
|
||||
|
@ -282,8 +282,8 @@ XineramaSetCursorPosition(
|
|||
that screen are. */
|
||||
|
||||
pScreen = sprite.screen;
|
||||
x += xineramaDataPtr[0].x;
|
||||
y += xineramaDataPtr[0].y;
|
||||
x += panoramiXdataPtr[0].x;
|
||||
y += panoramiXdataPtr[0].y;
|
||||
|
||||
if(!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum],
|
||||
x, y, &box))
|
||||
|
@ -301,10 +301,10 @@ XineramaSetCursorPosition(
|
|||
}
|
||||
|
||||
sprite.screen = pScreen;
|
||||
sprite.hotPhys.x = x - xineramaDataPtr[0].x;
|
||||
sprite.hotPhys.y = y - xineramaDataPtr[0].y;
|
||||
x -= xineramaDataPtr[pScreen->myNum].x;
|
||||
y -= xineramaDataPtr[pScreen->myNum].y;
|
||||
sprite.hotPhys.x = x - panoramiXdataPtr[0].x;
|
||||
sprite.hotPhys.y = y - panoramiXdataPtr[0].y;
|
||||
x -= panoramiXdataPtr[pScreen->myNum].x;
|
||||
y -= panoramiXdataPtr[pScreen->myNum].y;
|
||||
|
||||
return (*pScreen->SetCursorPosition)(pScreen, x, y, generateEvent);
|
||||
}
|
||||
|
@ -318,10 +318,10 @@ XineramaConstrainCursor(void)
|
|||
|
||||
/* Translate the constraining box to the screen
|
||||
the sprite is actually on */
|
||||
newBox.x1 += xineramaDataPtr[0].x - xineramaDataPtr[pScreen->myNum].x;
|
||||
newBox.x2 += xineramaDataPtr[0].x - xineramaDataPtr[pScreen->myNum].x;
|
||||
newBox.y1 += xineramaDataPtr[0].y - xineramaDataPtr[pScreen->myNum].y;
|
||||
newBox.y2 += xineramaDataPtr[0].y - xineramaDataPtr[pScreen->myNum].y;
|
||||
newBox.x1 += panoramiXdataPtr[0].x - panoramiXdataPtr[pScreen->myNum].x;
|
||||
newBox.x2 += panoramiXdataPtr[0].x - panoramiXdataPtr[pScreen->myNum].x;
|
||||
newBox.y1 += panoramiXdataPtr[0].y - panoramiXdataPtr[pScreen->myNum].y;
|
||||
newBox.y2 += panoramiXdataPtr[0].y - panoramiXdataPtr[pScreen->myNum].y;
|
||||
|
||||
(* pScreen->ConstrainCursor)(pScreen, &newBox);
|
||||
}
|
||||
|
@ -378,17 +378,17 @@ XineramaSetWindowPntrs(WindowPtr pWin)
|
|||
{
|
||||
if(pWin == WindowTable[0]) {
|
||||
memcpy(sprite.windows, WindowTable,
|
||||
XineramaNumScreens*sizeof(WindowPtr));
|
||||
PanoramiXNumScreens*sizeof(WindowPtr));
|
||||
} else {
|
||||
XineramaRes *win;
|
||||
PanoramiXRes *win;
|
||||
int i;
|
||||
|
||||
win = (XineramaRes*)LookupIDByType(pWin->drawable.id, XRT_WINDOW);
|
||||
win = (PanoramiXRes*)LookupIDByType(pWin->drawable.id, XRT_WINDOW);
|
||||
|
||||
if(!win)
|
||||
return FALSE;
|
||||
|
||||
for(i = 0; i < XineramaNumScreens; i++) {
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
sprite.windows[i] = LookupIDByType(win->info[i].id, RT_WINDOW);
|
||||
if(!sprite.windows[i]) /* window is being unmapped */
|
||||
return FALSE;
|
||||
|
@ -419,16 +419,16 @@ XineramaCheckVirtualMotion(
|
|||
if(!XineramaSetWindowPntrs(pWin))
|
||||
return;
|
||||
|
||||
i = XineramaNumScreens - 1;
|
||||
i = PanoramiXNumScreens - 1;
|
||||
|
||||
REGION_COPY(sprite.screen, &sprite.Reg2,
|
||||
&sprite.windows[i]->borderSize);
|
||||
off_x = xineramaDataPtr[i].x;
|
||||
off_y = xineramaDataPtr[i].y;
|
||||
off_x = panoramiXdataPtr[i].x;
|
||||
off_y = panoramiXdataPtr[i].y;
|
||||
|
||||
while(i--) {
|
||||
x = off_x - xineramaDataPtr[i].x;
|
||||
y = off_y - xineramaDataPtr[i].y;
|
||||
x = off_x - panoramiXdataPtr[i].x;
|
||||
y = off_y - panoramiXdataPtr[i].y;
|
||||
|
||||
if(x || y)
|
||||
REGION_TRANSLATE(sprite.screen, &sprite.Reg2, x, y);
|
||||
|
@ -436,8 +436,8 @@ XineramaCheckVirtualMotion(
|
|||
REGION_UNION(sprite.screen, &sprite.Reg2, &sprite.Reg2,
|
||||
&sprite.windows[i]->borderSize);
|
||||
|
||||
off_x = xineramaDataPtr[i].x;
|
||||
off_y = xineramaDataPtr[i].y;
|
||||
off_x = panoramiXdataPtr[i].x;
|
||||
off_y = panoramiXdataPtr[i].y;
|
||||
}
|
||||
|
||||
lims = *REGION_EXTENTS(sprite.screen, &sprite.Reg2);
|
||||
|
@ -474,10 +474,10 @@ XineramaCheckMotion(xEvent *xE)
|
|||
/* Motion events entering DIX get translated to Screen 0
|
||||
coordinates. Replayed events have already been
|
||||
translated since they've entered DIX before */
|
||||
XE_KBPTR.rootX += xineramaDataPtr[sprite.screen->myNum].x -
|
||||
xineramaDataPtr[0].x;
|
||||
XE_KBPTR.rootY += xineramaDataPtr[sprite.screen->myNum].y -
|
||||
xineramaDataPtr[0].y;
|
||||
XE_KBPTR.rootX += panoramiXdataPtr[sprite.screen->myNum].x -
|
||||
panoramiXdataPtr[0].x;
|
||||
XE_KBPTR.rootY += panoramiXdataPtr[sprite.screen->myNum].y -
|
||||
panoramiXdataPtr[0].y;
|
||||
|
||||
sprite.hot.x = XE_KBPTR.rootX;
|
||||
sprite.hot.y = XE_KBPTR.rootY;
|
||||
|
@ -536,16 +536,16 @@ XineramaConfineCursorToWindow(WindowPtr pWin, Bool generateEvents)
|
|||
if(!XineramaSetWindowPntrs(pWin))
|
||||
return;
|
||||
|
||||
i = XineramaNumScreens - 1;
|
||||
i = PanoramiXNumScreens - 1;
|
||||
|
||||
REGION_COPY(sprite.screen, &sprite.Reg1,
|
||||
&sprite.windows[i]->borderSize);
|
||||
off_x = xineramaDataPtr[i].x;
|
||||
off_y = xineramaDataPtr[i].y;
|
||||
off_x = panoramiXdataPtr[i].x;
|
||||
off_y = panoramiXdataPtr[i].y;
|
||||
|
||||
while(i--) {
|
||||
x = off_x - xineramaDataPtr[i].x;
|
||||
y = off_y - xineramaDataPtr[i].y;
|
||||
x = off_x - panoramiXdataPtr[i].x;
|
||||
y = off_y - panoramiXdataPtr[i].y;
|
||||
|
||||
if(x || y)
|
||||
REGION_TRANSLATE(sprite.screen, &sprite.Reg1, x, y);
|
||||
|
@ -553,8 +553,8 @@ XineramaConfineCursorToWindow(WindowPtr pWin, Bool generateEvents)
|
|||
REGION_UNION(sprite.screen, &sprite.Reg1, &sprite.Reg1,
|
||||
&sprite.windows[i]->borderSize);
|
||||
|
||||
off_x = xineramaDataPtr[i].x;
|
||||
off_y = xineramaDataPtr[i].y;
|
||||
off_x = panoramiXdataPtr[i].x;
|
||||
off_y = panoramiXdataPtr[i].y;
|
||||
}
|
||||
|
||||
sprite.hotLimits = *REGION_EXTENTS(sprite.screen, &sprite.Reg1);
|
||||
|
@ -616,9 +616,9 @@ SyntheticMotion(int x, int y)
|
|||
/* Translate back to the sprite screen since processInputProc
|
||||
will translate from sprite screen to screen 0 upon reentry
|
||||
to the DIX layer */
|
||||
if(!noXineramaExtension) {
|
||||
x += xineramaDataPtr[0].x - xineramaDataPtr[sprite.screen->myNum].x;
|
||||
y += xineramaDataPtr[0].y - xineramaDataPtr[sprite.screen->myNum].y;
|
||||
if(!noPanoramiXExtension) {
|
||||
x += panoramiXdataPtr[0].x - panoramiXdataPtr[sprite.screen->myNum].x;
|
||||
y += panoramiXdataPtr[0].y - panoramiXdataPtr[sprite.screen->myNum].y;
|
||||
}
|
||||
#endif
|
||||
xE.u.keyButtonPointer.rootX = x;
|
||||
|
@ -721,7 +721,7 @@ CheckVirtualMotion(
|
|||
{
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
XineramaCheckVirtualMotion(qe, pWin);
|
||||
return;
|
||||
}
|
||||
|
@ -772,7 +772,7 @@ ConfineCursorToWindow(WindowPtr pWin, Bool generateEvents, Bool confineToScreen)
|
|||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
XineramaConfineCursorToWindow(pWin, generateEvents);
|
||||
return;
|
||||
}
|
||||
|
@ -805,7 +805,7 @@ static void
|
|||
ChangeToCursor(CursorPtr cursor)
|
||||
{
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
XineramaChangeToCursor(cursor);
|
||||
return;
|
||||
}
|
||||
|
@ -893,7 +893,7 @@ GetSpritePosition(px, py)
|
|||
int
|
||||
XineramaGetCursorScreen()
|
||||
{
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
return sprite.screen->myNum;
|
||||
} else {
|
||||
return 0;
|
||||
|
@ -975,11 +975,11 @@ EnqueueEvent(xE, device, count)
|
|||
if (xE->u.u.type == MotionNotify)
|
||||
{
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
XE_KBPTR.rootX += xineramaDataPtr[sprite.screen->myNum].x -
|
||||
xineramaDataPtr[0].x;
|
||||
XE_KBPTR.rootY += xineramaDataPtr[sprite.screen->myNum].y -
|
||||
xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension) {
|
||||
XE_KBPTR.rootX += panoramiXdataPtr[sprite.screen->myNum].x -
|
||||
panoramiXdataPtr[0].x;
|
||||
XE_KBPTR.rootY += panoramiXdataPtr[sprite.screen->myNum].y -
|
||||
panoramiXdataPtr[0].y;
|
||||
}
|
||||
#endif
|
||||
sprite.hotPhys.x = XE_KBPTR.rootX;
|
||||
|
@ -1034,13 +1034,13 @@ PlayReleasedEvents(void)
|
|||
/* Translate back to the sprite screen since processInputProc
|
||||
will translate from sprite screen to screen 0 upon reentry
|
||||
to the DIX layer */
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
qe->event->u.keyButtonPointer.rootX +=
|
||||
xineramaDataPtr[0].x -
|
||||
xineramaDataPtr[sprite.screen->myNum].x;
|
||||
panoramiXdataPtr[0].x -
|
||||
panoramiXdataPtr[sprite.screen->myNum].x;
|
||||
qe->event->u.keyButtonPointer.rootY +=
|
||||
xineramaDataPtr[0].y -
|
||||
xineramaDataPtr[sprite.screen->myNum].y;
|
||||
panoramiXdataPtr[0].y -
|
||||
panoramiXdataPtr[sprite.screen->myNum].y;
|
||||
}
|
||||
#endif
|
||||
(*qe->device->public.processInputProc)(qe->event, qe->device,
|
||||
|
@ -1706,7 +1706,7 @@ MaybeDeliverEventsToClient(pWin, pEvents, count, filter, dontClient)
|
|||
if (wClient(pWin) == dontClient)
|
||||
return 0;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && pWin->drawable.pScreen->myNum)
|
||||
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
|
||||
return XineramaTryClientEventsResult(
|
||||
wClient(pWin), NullGrab, pWin->eventMask, filter);
|
||||
#endif
|
||||
|
@ -1720,7 +1720,7 @@ MaybeDeliverEventsToClient(pWin, pEvents, count, filter, dontClient)
|
|||
if (SameClient(other, dontClient))
|
||||
return 0;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && pWin->drawable.pScreen->myNum)
|
||||
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
|
||||
return XineramaTryClientEventsResult(
|
||||
rClient(other), NullGrab, other->mask, filter);
|
||||
#endif
|
||||
|
@ -1863,7 +1863,7 @@ DeliverEvents(pWin, xE, count, otherParent)
|
|||
int deliveries;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && pWin->drawable.pScreen->myNum)
|
||||
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
|
||||
return count;
|
||||
#endif
|
||||
|
||||
|
@ -1903,14 +1903,14 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
|
|||
return TRUE;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && XineramaSetWindowPntrs(pWin)) {
|
||||
if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) {
|
||||
int i;
|
||||
|
||||
for(i = 1; i < XineramaNumScreens; i++) {
|
||||
for(i = 1; i < PanoramiXNumScreens; i++) {
|
||||
if(POINT_IN_REGION(sprite.screen,
|
||||
&sprite.windows[i]->borderSize,
|
||||
x + xineramaDataPtr[0].x - xineramaDataPtr[i].x,
|
||||
y + xineramaDataPtr[0].y - xineramaDataPtr[i].y,
|
||||
x + panoramiXdataPtr[0].x - panoramiXdataPtr[i].x,
|
||||
y + panoramiXdataPtr[0].y - panoramiXdataPtr[i].y,
|
||||
&box))
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -1974,7 +1974,7 @@ CheckMotion(xEvent *xE)
|
|||
WindowPtr prevSpriteWin = sprite.win;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return XineramaCheckMotion(xE);
|
||||
#endif
|
||||
|
||||
|
@ -2063,11 +2063,11 @@ DefineInitialRootWindow(win)
|
|||
(*pScreen->DisplayCursor) (pScreen, sprite.current);
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
sprite.hotLimits.x1 = -xineramaDataPtr[0].x;
|
||||
sprite.hotLimits.y1 = -xineramaDataPtr[0].y;
|
||||
sprite.hotLimits.x2 = XineramaPixWidth - xineramaDataPtr[0].x;
|
||||
sprite.hotLimits.y2 = XineramaPixHeight - xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension) {
|
||||
sprite.hotLimits.x1 = -panoramiXdataPtr[0].x;
|
||||
sprite.hotLimits.y1 = -panoramiXdataPtr[0].y;
|
||||
sprite.hotLimits.x2 = PanoramiXPixWidth - panoramiXdataPtr[0].x;
|
||||
sprite.hotLimits.y2 = PanoramiXPixHeight - panoramiXdataPtr[0].y;
|
||||
sprite.physLimits = sprite.hotLimits;
|
||||
sprite.confineWin = NullWindow;
|
||||
#ifdef SHAPE
|
||||
|
@ -2104,11 +2104,11 @@ NewCurrentScreen(newScreen, x, y)
|
|||
sprite.hotPhys.x = x;
|
||||
sprite.hotPhys.y = y;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
sprite.hotPhys.x += xineramaDataPtr[newScreen->myNum].x -
|
||||
xineramaDataPtr[0].x;
|
||||
sprite.hotPhys.y += xineramaDataPtr[newScreen->myNum].y -
|
||||
xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension) {
|
||||
sprite.hotPhys.x += panoramiXdataPtr[newScreen->myNum].x -
|
||||
panoramiXdataPtr[0].x;
|
||||
sprite.hotPhys.y += panoramiXdataPtr[newScreen->myNum].y -
|
||||
panoramiXdataPtr[0].y;
|
||||
if (newScreen != sprite.screen) {
|
||||
sprite.screen = newScreen;
|
||||
/* Make sure we tell the DDX to update its copy of the screen */
|
||||
|
@ -2120,10 +2120,10 @@ NewCurrentScreen(newScreen, x, y)
|
|||
told of the pointer warp so we reposition it here */
|
||||
if(!syncEvents.playingEvents)
|
||||
(*sprite.screen->SetCursorPosition)(sprite.screen,
|
||||
sprite.hotPhys.x + xineramaDataPtr[0].x -
|
||||
xineramaDataPtr[sprite.screen->myNum].x,
|
||||
sprite.hotPhys.y + xineramaDataPtr[0].y -
|
||||
xineramaDataPtr[sprite.screen->myNum].y, FALSE);
|
||||
sprite.hotPhys.x + panoramiXdataPtr[0].x -
|
||||
panoramiXdataPtr[sprite.screen->myNum].x,
|
||||
sprite.hotPhys.y + panoramiXdataPtr[0].y -
|
||||
panoramiXdataPtr[sprite.screen->myNum].y, FALSE);
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
|
@ -2151,14 +2151,14 @@ XineramaPointInWindowIsVisible(
|
|||
|
||||
if(!XineramaSetWindowPntrs(pWin)) return FALSE;
|
||||
|
||||
xoff = x + xineramaDataPtr[0].x;
|
||||
yoff = y + xineramaDataPtr[0].y;
|
||||
xoff = x + panoramiXdataPtr[0].x;
|
||||
yoff = y + panoramiXdataPtr[0].y;
|
||||
|
||||
for(i = 1; i < XineramaNumScreens; i++) {
|
||||
for(i = 1; i < PanoramiXNumScreens; i++) {
|
||||
pWin = sprite.windows[i];
|
||||
pScreen = pWin->drawable.pScreen;
|
||||
x = xoff - xineramaDataPtr[i].x;
|
||||
y = yoff - xineramaDataPtr[i].y;
|
||||
x = xoff - panoramiXdataPtr[i].x;
|
||||
y = yoff - panoramiXdataPtr[i].y;
|
||||
|
||||
if(POINT_IN_REGION(pScreen, &pWin->borderClip, x, y, &box))
|
||||
return TRUE;
|
||||
|
@ -2198,8 +2198,8 @@ XineramaWarpPointer(ClientPtr client)
|
|||
winX = source->drawable.x;
|
||||
winY = source->drawable.y;
|
||||
if(source == WindowTable[0]) {
|
||||
winX -= xineramaDataPtr[0].x;
|
||||
winY -= xineramaDataPtr[0].y;
|
||||
winX -= panoramiXdataPtr[0].x;
|
||||
winY -= panoramiXdataPtr[0].y;
|
||||
}
|
||||
if (x < winX + stuff->srcX ||
|
||||
y < winY + stuff->srcY ||
|
||||
|
@ -2214,8 +2214,8 @@ XineramaWarpPointer(ClientPtr client)
|
|||
x = dest->drawable.x;
|
||||
y = dest->drawable.y;
|
||||
if(dest == WindowTable[0]) {
|
||||
x -= xineramaDataPtr[0].x;
|
||||
y -= xineramaDataPtr[0].y;
|
||||
x -= panoramiXdataPtr[0].x;
|
||||
y -= panoramiXdataPtr[0].y;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2254,7 +2254,7 @@ ProcWarpPointer(client)
|
|||
REQUEST_SIZE_MATCH(xWarpPointerReq);
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
return XineramaWarpPointer(client);
|
||||
#endif
|
||||
|
||||
|
@ -2339,10 +2339,10 @@ BorderSizeNotEmpty(WindowPtr pWin)
|
|||
return TRUE;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && XineramaSetWindowPntrs(pWin)) {
|
||||
if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) {
|
||||
int i;
|
||||
|
||||
for(i = 1; i < XineramaNumScreens; i++) {
|
||||
for(i = 1; i < PanoramiXNumScreens; i++) {
|
||||
if(REGION_NOTEMPTY(sprite.screen, &sprite.windows[i]->borderSize))
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -3354,7 +3354,7 @@ DoFocusEvents(dev, fromWin, toWin, mode)
|
|||
TRUE);
|
||||
/* Notify all the roots */
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
|
||||
else
|
||||
#endif
|
||||
|
@ -3373,7 +3373,7 @@ DoFocusEvents(dev, fromWin, toWin, mode)
|
|||
}
|
||||
/* Notify all the roots */
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
FocusEvent(dev, FocusIn, mode, in, WindowTable[0]);
|
||||
else
|
||||
#endif
|
||||
|
@ -3391,7 +3391,7 @@ DoFocusEvents(dev, fromWin, toWin, mode)
|
|||
FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer,
|
||||
TRUE);
|
||||
#ifdef XINERAMA
|
||||
if ( !noXineramaExtension )
|
||||
if ( !noPanoramiXExtension )
|
||||
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
|
||||
else
|
||||
#endif
|
||||
|
@ -3905,12 +3905,12 @@ ProcQueryPointer(client)
|
|||
}
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
rep.rootX += xineramaDataPtr[0].x;
|
||||
rep.rootY += xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension) {
|
||||
rep.rootX += panoramiXdataPtr[0].x;
|
||||
rep.rootY += panoramiXdataPtr[0].y;
|
||||
if(stuff->id == rep.root) {
|
||||
rep.winX += xineramaDataPtr[0].x;
|
||||
rep.winY += xineramaDataPtr[0].y;
|
||||
rep.winX += panoramiXdataPtr[0].x;
|
||||
rep.winY += panoramiXdataPtr[0].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -4373,7 +4373,7 @@ CheckCursorConfinement(pWin)
|
|||
WindowPtr confineTo;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && pWin->drawable.pScreen->myNum) return;
|
||||
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return;
|
||||
#endif
|
||||
|
||||
if (grab && (confineTo = grab->confineTo))
|
||||
|
@ -4433,7 +4433,7 @@ ProcRecolorCursor(client)
|
|||
{
|
||||
pscr = screenInfo.screens[nscr];
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
displayed = (pscr == sprite.screen);
|
||||
else
|
||||
#endif
|
||||
|
@ -4462,8 +4462,8 @@ WriteEventsToClient(pClient, count, events)
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension &&
|
||||
(xineramaDataPtr[0].x || xineramaDataPtr[0].y))
|
||||
if(!noPanoramiXExtension &&
|
||||
(panoramiXdataPtr[0].x || panoramiXdataPtr[0].y))
|
||||
{
|
||||
switch(events->u.u.type) {
|
||||
case MotionNotify:
|
||||
|
@ -4480,13 +4480,13 @@ WriteEventsToClient(pClient, count, events)
|
|||
*/
|
||||
count = 1; /* should always be 1 */
|
||||
memcpy(&eventCopy, events, sizeof(xEvent));
|
||||
eventCopy.u.keyButtonPointer.rootX += xineramaDataPtr[0].x;
|
||||
eventCopy.u.keyButtonPointer.rootY += xineramaDataPtr[0].y;
|
||||
eventCopy.u.keyButtonPointer.rootX += panoramiXdataPtr[0].x;
|
||||
eventCopy.u.keyButtonPointer.rootY += panoramiXdataPtr[0].y;
|
||||
if(eventCopy.u.keyButtonPointer.event ==
|
||||
eventCopy.u.keyButtonPointer.root)
|
||||
{
|
||||
eventCopy.u.keyButtonPointer.eventX += xineramaDataPtr[0].x;
|
||||
eventCopy.u.keyButtonPointer.eventY += xineramaDataPtr[0].y;
|
||||
eventCopy.u.keyButtonPointer.eventX += panoramiXdataPtr[0].x;
|
||||
eventCopy.u.keyButtonPointer.eventY += panoramiXdataPtr[0].y;
|
||||
}
|
||||
events = &eventCopy;
|
||||
break;
|
||||
|
|
18
dix/main.c
18
dix/main.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.4 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
|
@ -94,7 +94,7 @@ SOFTWARE.
|
|||
#include "dixfont.h"
|
||||
#include "extnsionst.h"
|
||||
#ifdef XINERAMA
|
||||
extern Bool noXineramaExtension;
|
||||
extern Bool noPanoramiXExtension;
|
||||
#else
|
||||
#include "dixevents.h" /* InitEvents() */
|
||||
#include "dispatch.h" /* InitProcVectors() */
|
||||
|
@ -407,8 +407,8 @@ main(int argc, char *argv[], char *envp[])
|
|||
/*
|
||||
* Consolidate window and colourmap information for each screen
|
||||
*/
|
||||
if (!noXineramaExtension)
|
||||
XineramaConsolidate();
|
||||
if (!noPanoramiXExtension)
|
||||
PanoramiXConsolidate();
|
||||
#endif
|
||||
|
||||
for (i = 0; i < screenInfo.numScreens; i++)
|
||||
|
@ -420,8 +420,8 @@ main(int argc, char *argv[], char *envp[])
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
if (!noXineramaExtension) {
|
||||
if (!XineramaCreateConnectionBlock())
|
||||
if (!noPanoramiXExtension) {
|
||||
if (!PanoramiXCreateConnectionBlock())
|
||||
FatalError("could not create connection block info");
|
||||
} else
|
||||
#endif
|
||||
|
@ -440,10 +440,10 @@ main(int argc, char *argv[], char *envp[])
|
|||
|
||||
#ifdef XINERAMA
|
||||
{
|
||||
Bool remember_it = noXineramaExtension;
|
||||
noXineramaExtension = TRUE;
|
||||
Bool remember_it = noPanoramiXExtension;
|
||||
noPanoramiXExtension = TRUE;
|
||||
FreeAllResources();
|
||||
noXineramaExtension = remember_it;
|
||||
noPanoramiXExtension = remember_it;
|
||||
}
|
||||
#else
|
||||
FreeAllResources();
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
/* $XdotOrg$ */
|
||||
/************************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
@ -90,8 +89,8 @@ SOFTWARE.
|
|||
#include "dixgrabs.h"
|
||||
#include "cursor.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
#include <assert.h>
|
||||
|
||||
|
@ -801,7 +800,7 @@ LegalNewID(id, client)
|
|||
#ifdef XINERAMA
|
||||
XID minid, maxid;
|
||||
|
||||
if (!noXineramaExtension) {
|
||||
if (!noPanoramiXExtension) {
|
||||
minid = client->clientAsMask | (client->index ?
|
||||
SERVER_BIT : SERVER_MINID);
|
||||
maxid = (clientTable[client->index].fakeID | RESOURCE_ID_MASK) + 1;
|
||||
|
|
40
dix/window.c
40
dix/window.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
|
@ -87,8 +87,8 @@ SOFTWARE.
|
|||
#include "gcstruct.h"
|
||||
#include "servermd.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
#include "dixevents.h"
|
||||
#include "globals.h"
|
||||
|
@ -2322,9 +2322,9 @@ ConfigureWindow(pWin, mask, vlist, client)
|
|||
event.u.configureRequest.x = x;
|
||||
event.u.configureRequest.y = y;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && (!pParent || !pParent->parent)) {
|
||||
event.u.configureRequest.x += xineramaDataPtr[0].x;
|
||||
event.u.configureRequest.y += xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension && (!pParent || !pParent->parent)) {
|
||||
event.u.configureRequest.x += panoramiXdataPtr[0].x;
|
||||
event.u.configureRequest.y += panoramiXdataPtr[0].y;
|
||||
}
|
||||
#endif
|
||||
event.u.configureRequest.width = w;
|
||||
|
@ -2408,9 +2408,9 @@ ActuallyDoSomething:
|
|||
event.u.configureNotify.x = x;
|
||||
event.u.configureNotify.y = y;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && (!pParent || !pParent->parent)) {
|
||||
event.u.configureNotify.x += xineramaDataPtr[0].x;
|
||||
event.u.configureNotify.y += xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension && (!pParent || !pParent->parent)) {
|
||||
event.u.configureNotify.x += panoramiXdataPtr[0].x;
|
||||
event.u.configureNotify.y += panoramiXdataPtr[0].y;
|
||||
}
|
||||
#endif
|
||||
event.u.configureNotify.width = w;
|
||||
|
@ -2566,9 +2566,9 @@ ReparentWindow(pWin, pParent, x, y, client)
|
|||
event.u.reparent.x = x;
|
||||
event.u.reparent.y = y;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && !pParent->parent) {
|
||||
event.u.reparent.x += xineramaDataPtr[0].x;
|
||||
event.u.reparent.y += xineramaDataPtr[0].y;
|
||||
if(!noPanoramiXExtension && !pParent->parent) {
|
||||
event.u.reparent.x += panoramiXdataPtr[0].x;
|
||||
event.u.reparent.y += panoramiXdataPtr[0].y;
|
||||
}
|
||||
#endif
|
||||
event.u.reparent.override = pWin->overrideRedirect;
|
||||
|
@ -2939,9 +2939,9 @@ UnrealizeTree(
|
|||
pChild->realized = FALSE;
|
||||
pChild->visibility = VisibilityNotViewable;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension && !pChild->drawable.pScreen->myNum) {
|
||||
XineramaRes *win;
|
||||
win = (XineramaRes*)LookupIDByType(pChild->drawable.id,
|
||||
if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
|
||||
PanoramiXRes *win;
|
||||
win = (PanoramiXRes*)LookupIDByType(pChild->drawable.id,
|
||||
XRT_WINDOW);
|
||||
if(win)
|
||||
win->u.win.visibility = VisibilityNotViewable;
|
||||
|
@ -3225,21 +3225,21 @@ SendVisibilityNotify(pWin)
|
|||
#endif
|
||||
#ifdef XINERAMA
|
||||
/* This is not quite correct yet, but it's close */
|
||||
if(!noXineramaExtension) {
|
||||
XineramaRes *win;
|
||||
if(!noPanoramiXExtension) {
|
||||
PanoramiXRes *win;
|
||||
WindowPtr pWin2;
|
||||
int i, Scrnum;
|
||||
|
||||
Scrnum = pWin->drawable.pScreen->myNum;
|
||||
|
||||
win = XineramaFindIDByScrnum(XRT_WINDOW, pWin->drawable.id, Scrnum);
|
||||
win = PanoramiXFindIDByScrnum(XRT_WINDOW, pWin->drawable.id, Scrnum);
|
||||
|
||||
if(!win || (win->u.win.visibility == visibility))
|
||||
return;
|
||||
|
||||
switch(visibility) {
|
||||
case VisibilityUnobscured:
|
||||
for(i = 0; i < XineramaNumScreens; i++) {
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
if(i == Scrnum) continue;
|
||||
|
||||
pWin2 = (WindowPtr)LookupIDByType(win->info[i].id, RT_WINDOW);
|
||||
|
@ -3259,7 +3259,7 @@ SendVisibilityNotify(pWin)
|
|||
}
|
||||
break;
|
||||
case VisibilityFullyObscured:
|
||||
for(i = 0; i < XineramaNumScreens; i++) {
|
||||
for(i = 0; i < PanoramiXNumScreens; i++) {
|
||||
if(i == Scrnum) continue;
|
||||
|
||||
pWin2 = (WindowPtr)LookupIDByType(win->info[i].id, RT_WINDOW);
|
||||
|
|
|
@ -31,24 +31,24 @@ from The Open Group.
|
|||
#include "font.h"
|
||||
|
||||
Bool
|
||||
XpClientIsBitmapClient(client)
|
||||
ClientPtr client;
|
||||
XpClientIsBitmapClient(
|
||||
ClientPtr client)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Bool
|
||||
XpClientIsPrintClient(client, fpe)
|
||||
ClientPtr client;
|
||||
FontPathElementPtr fpe;
|
||||
XpClientIsPrintClient(
|
||||
ClientPtr client,
|
||||
FontPathElementPtr fpe)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
int
|
||||
XprintOptions(argc, argv, i)
|
||||
int argc;
|
||||
char **argv;
|
||||
int i;
|
||||
XprintOptions(
|
||||
int argc,
|
||||
char **argv,
|
||||
int i)
|
||||
{
|
||||
return i;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/*
|
||||
* Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
|
||||
*
|
||||
|
@ -225,8 +225,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
|
|||
}
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
void
|
||||
|
@ -249,13 +249,13 @@ fbFillRegionTiled (DrawablePtr pDrawable,
|
|||
int yRot = pDrawable->y;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/**************************************************************
|
||||
*
|
||||
* Quartz-specific support for the Darwin X Server
|
||||
|
@ -49,7 +49,7 @@
|
|||
|
||||
extern void FatalError(const char *, ...);
|
||||
extern char *display;
|
||||
extern int noXineramaExtension;
|
||||
extern int noPanoramiXExtension;
|
||||
|
||||
|
||||
/*
|
||||
|
@ -69,12 +69,12 @@ void QuartzReadPreferences(void)
|
|||
// quartzRootless has already been set
|
||||
if (quartzRootless) {
|
||||
// Use Pseudorama instead of Xinerama
|
||||
noXineramaExtension = TRUE;
|
||||
noPanoramiXExtension = TRUE;
|
||||
noPseudoramaExtension = ![Preferences xinerama];
|
||||
|
||||
quartzUseAGL = [Preferences useAGL];
|
||||
} else {
|
||||
noXineramaExtension = ![Preferences xinerama];
|
||||
noPanoramiXExtension = ![Preferences xinerama];
|
||||
noPseudoramaExtension = TRUE;
|
||||
|
||||
// Full screen can't use AGL for GLX
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.3 2003/12/18 19:29:13 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
|
||||
|
||||
|
||||
|
@ -1060,13 +1060,13 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
|
|||
|
||||
#ifdef XINERAMA
|
||||
from = X_DEFAULT;
|
||||
if (!noXineramaExtension)
|
||||
if (!noPanoramiXExtension)
|
||||
from = X_CMDLINE;
|
||||
else if (xf86GetOptValBool(FlagOptions, FLAG_XINERAMA, &value)) {
|
||||
noXineramaExtension = !value;
|
||||
noPanoramiXExtension = !value;
|
||||
from = X_CONFIG;
|
||||
}
|
||||
if (!noXineramaExtension)
|
||||
if (!noPanoramiXExtension)
|
||||
xf86Msg(from, "Xinerama: enabled\n");
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.2 2003/12/18 19:29:13 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.
|
||||
|
@ -141,7 +141,7 @@ DGAInit(
|
|||
modes[i].num = i + 1;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension)
|
||||
if(!noPanoramiXExtension)
|
||||
for(i = 0; i < num; i++)
|
||||
modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.2 2003/12/18 19:29:13 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.
|
||||
|
@ -1683,7 +1683,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
|
|||
#ifdef RANDR
|
||||
if (!xf86Info.disableRandR
|
||||
#ifdef XINERAMA
|
||||
&& noXineramaExtension
|
||||
&& noPanoramiXExtension
|
||||
#endif
|
||||
)
|
||||
validateAllDefaultModes = TRUE;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */
|
||||
/*
|
||||
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
|
||||
*
|
||||
|
@ -246,7 +246,7 @@ xf86RandRInit (ScreenPtr pScreen)
|
|||
|
||||
#ifdef XINERAMA
|
||||
/* XXX disable RandR when using Xinerama */
|
||||
if (!noXineramaExtension)
|
||||
if (!noPanoramiXExtension)
|
||||
return TRUE;
|
||||
#endif
|
||||
if (xf86RandRGeneration != serverGeneration)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1.4.1 2003/12/18 19:29:12 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */
|
||||
|
||||
#ifndef INITARGS
|
||||
|
@ -137,7 +137,7 @@ extern void XpExtensionInit(INITARGS);
|
|||
#endif
|
||||
|
||||
#if 1
|
||||
extern void XineramaExtensionInit(int argc, char *argv[]);
|
||||
extern void PanoramiXExtensionInit(int argc, char *argv[]);
|
||||
#endif
|
||||
|
||||
#if 1
|
||||
|
|
|
@ -67,7 +67,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "mipointer.h"
|
||||
|
||||
#if defined(XFree86LOADER) && !defined(XINERAMA)
|
||||
extern Bool noXineramaExtension;
|
||||
extern Bool noPanoramiXExtension;
|
||||
#endif
|
||||
|
||||
static int DRIScreenPrivIndex = -1;
|
||||
|
@ -132,13 +132,13 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
|
|||
#if defined(XINERAMA) && !defined(XFree86LOADER)
|
||||
xineramaInCore = TRUE;
|
||||
#elif defined(XFree86LOADER)
|
||||
if (xf86LoaderCheckSymbol("noXineramaExtension"))
|
||||
if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
|
||||
xineramaInCore = TRUE;
|
||||
#endif
|
||||
|
||||
#if defined(XINERAMA) || defined(XFree86LOADER)
|
||||
if (xineramaInCore) {
|
||||
if (!noXineramaExtension) {
|
||||
if (!noPanoramiXExtension) {
|
||||
DRIDrvMsg(pScreen->myNum, X_WARNING,
|
||||
"Direct rendering is not supported when Xinerama is enabled\n");
|
||||
return FALSE;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */
|
||||
|
||||
/*
|
||||
|
@ -29,7 +29,7 @@
|
|||
#include "sym.h"
|
||||
#include "misc.h"
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "panoramiX.h"
|
||||
#endif
|
||||
#include "sleepuntil.h"
|
||||
|
||||
|
@ -40,10 +40,10 @@ extern RESTYPE ShmSegType, ShmPixType;
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
extern Bool noXineramaExtension;
|
||||
extern int XineramaNumScreens;
|
||||
extern XineramaData *xineramaDataPtr;
|
||||
extern XID *XineramaVisualTable;
|
||||
extern Bool noPanoramiXExtension;
|
||||
extern int PanoramiXNumScreens;
|
||||
extern PanoramiXData *panoramiXdataPtr;
|
||||
extern XID *PanoramiXVisualTable;
|
||||
extern unsigned long XRT_WINDOW;
|
||||
extern unsigned long XRT_PIXMAP;
|
||||
extern unsigned long XRT_GC;
|
||||
|
@ -66,10 +66,10 @@ LOOKUP extLookupTab[] = {
|
|||
#ifdef XINERAMA
|
||||
SYMFUNC(XineramaRegisterConnectionBlockCallback)
|
||||
SYMFUNC(XineramaDeleteResource)
|
||||
SYMVAR(noXineramaExtension)
|
||||
SYMVAR(XineramaNumScreens)
|
||||
SYMVAR(xineramaDataPtr)
|
||||
SYMVAR(XineramaVisualTable)
|
||||
SYMVAR(noPanoramiXExtension)
|
||||
SYMVAR(PanoramiXNumScreens)
|
||||
SYMVAR(panoramiXdataPtr)
|
||||
SYMVAR(PanoramiXVisualTable)
|
||||
SYMVAR(XRT_WINDOW)
|
||||
SYMVAR(XRT_PIXMAP)
|
||||
SYMVAR(XRT_GC)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.1.4.2 2003/12/18 19:29:15 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"
|
||||
|
@ -18,8 +18,8 @@
|
|||
#include "mioverlay.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
static void
|
||||
|
@ -168,11 +168,11 @@ XAAPaintWindow8_32(
|
|||
yorg = pBgWin->drawable.y;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int index = pScreen->myNum;
|
||||
if(WindowTable[index] == pBgWin) {
|
||||
xorg -= xineramaDataPtr[index].x;
|
||||
yorg -= xineramaDataPtr[index].y;
|
||||
xorg -= panoramiXdataPtr[index].x;
|
||||
yorg -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.1.4.1 2003/12/18 19:29:15 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"
|
||||
|
@ -17,8 +17,8 @@
|
|||
#include "xaawrap.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
void
|
||||
|
@ -93,11 +93,11 @@ XAAPaintWindow(
|
|||
yorg = pBgWin->drawable.y;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int index = pScreen->myNum;
|
||||
if(WindowTable[index] == pBgWin) {
|
||||
xorg -= xineramaDataPtr[index].x;
|
||||
yorg -= xineramaDataPtr[index].y;
|
||||
xorg -= panoramiXdataPtr[index].x;
|
||||
yorg -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.1 2003/12/18 19:29:15 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"
|
||||
|
@ -16,8 +16,8 @@
|
|||
#include "mi.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
void
|
||||
|
@ -45,11 +45,11 @@ cfb8_32PaintWindow(
|
|||
xorg = pWin->drawable.x;
|
||||
yorg = pWin->drawable.y;
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int index = pWin->drawable.pScreen->myNum;
|
||||
if(WindowTable[index] == pWin) {
|
||||
xorg -= xineramaDataPtr[index].x;
|
||||
yorg -= xineramaDataPtr[index].y;
|
||||
xorg -= panoramiXdataPtr[index].x;
|
||||
yorg -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -93,11 +93,11 @@ cfb8_32PaintWindow(
|
|||
yorg = pBgWin->drawable.y;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int index = pWin->drawable.pScreen->myNum;
|
||||
if(WindowTable[index] == pBgWin) {
|
||||
xorg -= xineramaDataPtr[index].x;
|
||||
yorg -= xineramaDataPtr[index].y;
|
||||
xorg -= panoramiXdataPtr[index].x;
|
||||
yorg -= panoramiXdataPtr[index].y;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
|
||||
|
||||
#ifndef _XSERV_GLOBAL_H_
|
||||
|
@ -42,11 +42,11 @@ extern Bool DPMSCapableFlag;
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
extern Bool noXineramaExtension;
|
||||
extern Bool XineramaMapped;
|
||||
extern Bool XineramaVisibilityNotifySent;
|
||||
extern Bool XineramaWindowExposureSent;
|
||||
extern Bool XineramaOneExposeRequest;
|
||||
extern Bool noPanoramiXExtension;
|
||||
extern Bool PanoramiXMapped;
|
||||
extern Bool PanoramiXVisibilityNotifySent;
|
||||
extern Bool PanoramiXWindowExposureSent;
|
||||
extern Bool PanoramiXOneExposeRequest;
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.1.4.3 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
|
@ -69,8 +69,8 @@ SOFTWARE.
|
|||
#include "globals.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -427,19 +427,19 @@ miSendExposures(pWin, pRgn, dx, dy)
|
|||
}
|
||||
|
||||
#ifdef XINERAMA
|
||||
if(!noXineramaExtension) {
|
||||
if(!noPanoramiXExtension) {
|
||||
int scrnum = pWin->drawable.pScreen->myNum;
|
||||
int x = 0, y = 0;
|
||||
XID realWin = 0;
|
||||
|
||||
if(!pWin->parent) {
|
||||
x = xineramaDataPtr[scrnum].x;
|
||||
y = xineramaDataPtr[scrnum].y;
|
||||
x = panoramiXdataPtr[scrnum].x;
|
||||
y = panoramiXdataPtr[scrnum].y;
|
||||
pWin = WindowTable[0];
|
||||
realWin = pWin->drawable.id;
|
||||
} else if (scrnum) {
|
||||
XineramaRes *win;
|
||||
win = XineramaFindIDByScrnum(XRT_WINDOW,
|
||||
PanoramiXRes *win;
|
||||
win = PanoramiXFindIDByScrnum(XRT_WINDOW,
|
||||
pWin->drawable.id, scrnum);
|
||||
if(!win) {
|
||||
DEALLOCATE_LOCAL(pEvent);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
|
@ -63,7 +63,7 @@ SOFTWARE.
|
|||
#endif
|
||||
|
||||
#ifdef XINERAMA
|
||||
extern Bool noXineramaExtension;
|
||||
extern Bool noPanoramiXExtension;
|
||||
#endif
|
||||
extern Bool noTestExtensions;
|
||||
#ifdef XKB
|
||||
|
@ -104,7 +104,7 @@ typedef void (*InitExtension)(INITARGS);
|
|||
#include "securstr.h"
|
||||
#endif
|
||||
#ifdef XINERAMA
|
||||
#include "xineramaProto.h"
|
||||
#include "panoramiXproto.h"
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
#include "xf86bigfstr.h"
|
||||
|
@ -136,7 +136,7 @@ extern void PexExtensionInit(INITARGS);
|
|||
extern void MultibufferExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XINERAMA
|
||||
extern void XineramaExtensionInit(INITARGS);
|
||||
extern void PanoramiXExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
extern void XInputExtensionInit(INITARGS);
|
||||
|
@ -249,7 +249,7 @@ InitExtensions(argc, argv)
|
|||
{
|
||||
#ifdef XINERAMA
|
||||
# if !defined(PRINT_ONLY_SERVER) && !defined(NO_XINERAMA)
|
||||
if (!noXineramaExtension) XineramaExtensionInit();
|
||||
if (!noPanoramiXExtension) PanoramiXExtensionInit();
|
||||
# endif
|
||||
#endif
|
||||
#ifdef BEZIER
|
||||
|
@ -438,7 +438,7 @@ ExtensionModule extension[] =
|
|||
{ NULL, "TOG-CUP", NULL, NULL },
|
||||
{ NULL, "Extended-Visual-Information", NULL, NULL },
|
||||
#ifdef XINERAMA
|
||||
{ NULL, "XINERAMA", &noXineramaExtension, NULL },
|
||||
{ NULL, "XINERAMA", &noPanoramiXExtension, NULL },
|
||||
#else
|
||||
{ NULL, "NOXINERAMA", NULL, NULL },
|
||||
#endif
|
||||
|
@ -489,7 +489,7 @@ static ExtensionModule staticExtensions[] = {
|
|||
{ XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
|
||||
#endif
|
||||
#ifdef XINERAMA
|
||||
{ XineramaExtensionInit, XINERAMA_PROTOCOL_NAME, &noXineramaExtension, NULL, NULL },
|
||||
{ PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
{ XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL },
|
||||
|
|
16
os/utils.c
16
os/utils.c
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.4 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.5 2004/02/23 21:37:27 kaleb Exp $ */
|
||||
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
|
@ -129,12 +129,12 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
Bool CoreDump;
|
||||
Bool noTestExtensions;
|
||||
|
||||
Bool noXineramaExtension = TRUE;
|
||||
Bool noPanoramiXExtension = TRUE;
|
||||
#ifdef XINERAMA
|
||||
Bool XineramaVisibilityNotifySent = FALSE;
|
||||
Bool XineramaMapped = FALSE;
|
||||
Bool XineramaWindowExposureSent = FALSE;
|
||||
Bool XineramaOneExposeRequest = FALSE;
|
||||
Bool PanoramiXVisibilityNotifySent = FALSE;
|
||||
Bool PanoramiXMapped = FALSE;
|
||||
Bool PanoramiXWindowExposureSent = FALSE;
|
||||
Bool PanoramiXOneExposeRequest = FALSE;
|
||||
#endif
|
||||
|
||||
int auditTrailLevel = 1;
|
||||
|
@ -886,10 +886,10 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
}
|
||||
#ifdef XINERAMA
|
||||
else if ( strcmp( argv[i], "+xinerama") == 0){
|
||||
noXineramaExtension = FALSE;
|
||||
noPanoramiXExtension = FALSE;
|
||||
}
|
||||
else if ( strcmp( argv[i], "-xinerama") == 0){
|
||||
noXineramaExtension = TRUE;
|
||||
noPanoramiXExtension = TRUE;
|
||||
}
|
||||
#endif
|
||||
else if ( strcmp( argv[i], "-x") == 0)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.1.4.3 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
|
@ -51,8 +51,8 @@ and Jim Haggerty of Metheus.
|
|||
|
||||
#ifdef XINERAMA
|
||||
#include "globals.h"
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#include "cursor.h"
|
||||
#endif
|
||||
|
||||
|
@ -874,7 +874,7 @@ RecordADeviceEvent(pcbl, nulldata, calldata)
|
|||
#ifdef XINERAMA
|
||||
xEvent shiftedEvent;
|
||||
|
||||
if (!noXineramaExtension &&
|
||||
if (!noPanoramiXExtension &&
|
||||
(pev->u.u.type == MotionNotify ||
|
||||
pev->u.u.type == ButtonPress ||
|
||||
pev->u.u.type == ButtonRelease ||
|
||||
|
@ -883,11 +883,11 @@ RecordADeviceEvent(pcbl, nulldata, calldata)
|
|||
int scr = XineramaGetCursorScreen();
|
||||
memcpy(&shiftedEvent, pev, sizeof(xEvent));
|
||||
shiftedEvent.u.keyButtonPointer.rootX +=
|
||||
xineramaDataPtr[scr].x -
|
||||
xineramaDataPtr[0].x;
|
||||
panoramiXdataPtr[scr].x -
|
||||
panoramiXdataPtr[0].x;
|
||||
shiftedEvent.u.keyButtonPointer.rootY +=
|
||||
xineramaDataPtr[scr].y -
|
||||
xineramaDataPtr[0].y;
|
||||
panoramiXdataPtr[scr].y -
|
||||
panoramiXdataPtr[0].y;
|
||||
pEvToRecord = &shiftedEvent;
|
||||
}
|
||||
#endif /* XINERAMA */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/render/picturestr.h,v 1.1.4.1 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/*
|
||||
* $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $
|
||||
*
|
||||
|
@ -495,8 +495,8 @@ int
|
|||
AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor);
|
||||
|
||||
#ifdef XINERAMA
|
||||
void XineramaRenderInit (void);
|
||||
void XineramaRenderReset (void);
|
||||
void PanoramiXRenderInit (void);
|
||||
void PanoramiXRenderReset (void);
|
||||
#endif
|
||||
|
||||
#endif /* _PICTURESTR_H_ */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */
|
||||
/*
|
||||
* $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $
|
||||
*
|
||||
|
@ -338,7 +338,7 @@ ProcRenderQueryPictFormats (ClientPtr client)
|
|||
REQUEST_SIZE_MATCH(xRenderQueryPictFormatsReq);
|
||||
|
||||
#ifdef XINERAMA
|
||||
if (noXineramaExtension)
|
||||
if (noPanoramiXExtension)
|
||||
numScreens = screenInfo.numScreens;
|
||||
else
|
||||
numScreens = ((xConnSetup *)ConnectionInfo)->numRoots;
|
||||
|
@ -2285,8 +2285,8 @@ SProcRenderDispatch (ClientPtr client)
|
|||
}
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
|
||||
#define VERIFY_XIN_PICTURE(pPicture, pid, client, mode, err) {\
|
||||
pPicture = SecurityLookupIDByType(client, pid, XRT_PICTURE, mode);\
|
||||
|
@ -2312,14 +2312,14 @@ static int
|
|||
XineramaRenderCreatePicture (ClientPtr client)
|
||||
{
|
||||
REQUEST(xRenderCreatePictureReq);
|
||||
XineramaRes *refDraw, *newPict;
|
||||
PanoramiXRes *refDraw, *newPict;
|
||||
int result = Success, j;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
|
||||
if(!(refDraw = (XineramaRes *)SecurityLookupIDByClass(
|
||||
if(!(refDraw = (PanoramiXRes *)SecurityLookupIDByClass(
|
||||
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
|
||||
return BadDrawable;
|
||||
if(!(newPict = (XineramaRes *) xalloc(sizeof(XineramaRes))))
|
||||
if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
|
||||
return BadAlloc;
|
||||
newPict->type = XRT_PICTURE;
|
||||
newPict->info[0].id = stuff->pid;
|
||||
|
@ -2332,7 +2332,7 @@ XineramaRenderCreatePicture (ClientPtr client)
|
|||
else
|
||||
newPict->u.pict.root = FALSE;
|
||||
|
||||
for(j = 1; j < XineramaNumScreens; j++)
|
||||
for(j = 1; j < PanoramiXNumScreens; j++)
|
||||
newPict->info[j].id = FakeClientID(client->index);
|
||||
|
||||
FOR_NSCREENS_BACKWARD(j) {
|
||||
|
@ -2353,7 +2353,7 @@ XineramaRenderCreatePicture (ClientPtr client)
|
|||
static int
|
||||
XineramaRenderChangePicture (ClientPtr client)
|
||||
{
|
||||
XineramaRes *pict;
|
||||
PanoramiXRes *pict;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderChangePictureReq);
|
||||
|
||||
|
@ -2376,7 +2376,7 @@ XineramaRenderSetPictureClipRectangles (ClientPtr client)
|
|||
{
|
||||
REQUEST(xRenderSetPictureClipRectanglesReq);
|
||||
int result = Success, j;
|
||||
XineramaRes *pict;
|
||||
PanoramiXRes *pict;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq);
|
||||
|
||||
|
@ -2397,7 +2397,7 @@ XineramaRenderSetPictureTransform (ClientPtr client)
|
|||
{
|
||||
REQUEST(xRenderSetPictureTransformReq);
|
||||
int result = Success, j;
|
||||
XineramaRes *pict;
|
||||
PanoramiXRes *pict;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xRenderSetPictureTransformReq);
|
||||
|
||||
|
@ -2418,7 +2418,7 @@ XineramaRenderSetPictureFilter (ClientPtr client)
|
|||
{
|
||||
REQUEST(xRenderSetPictureFilterReq);
|
||||
int result = Success, j;
|
||||
XineramaRes *pict;
|
||||
PanoramiXRes *pict;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq);
|
||||
|
||||
|
@ -2437,7 +2437,7 @@ XineramaRenderSetPictureFilter (ClientPtr client)
|
|||
static int
|
||||
XineramaRenderFreePicture (ClientPtr client)
|
||||
{
|
||||
XineramaRes *pict;
|
||||
PanoramiXRes *pict;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderFreePictureReq);
|
||||
|
||||
|
@ -2464,7 +2464,7 @@ XineramaRenderFreePicture (ClientPtr client)
|
|||
static int
|
||||
XineramaRenderComposite (ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *msk, *dst;
|
||||
PanoramiXRes *src, *msk, *dst;
|
||||
int result = Success, j;
|
||||
xRenderCompositeReq orig;
|
||||
REQUEST(xRenderCompositeReq);
|
||||
|
@ -2484,22 +2484,22 @@ XineramaRenderComposite (ClientPtr client)
|
|||
stuff->src = src->info[j].id;
|
||||
if (src->u.pict.root)
|
||||
{
|
||||
stuff->xSrc = orig.xSrc - xineramaDataPtr[j].x;
|
||||
stuff->ySrc = orig.ySrc - xineramaDataPtr[j].y;
|
||||
stuff->xSrc = orig.xSrc - panoramiXdataPtr[j].x;
|
||||
stuff->ySrc = orig.ySrc - panoramiXdataPtr[j].y;
|
||||
}
|
||||
stuff->dst = dst->info[j].id;
|
||||
if (dst->u.pict.root)
|
||||
{
|
||||
stuff->xDst = orig.xDst - xineramaDataPtr[j].x;
|
||||
stuff->yDst = orig.yDst - xineramaDataPtr[j].y;
|
||||
stuff->xDst = orig.xDst - panoramiXdataPtr[j].x;
|
||||
stuff->yDst = orig.yDst - panoramiXdataPtr[j].y;
|
||||
}
|
||||
if (msk)
|
||||
{
|
||||
stuff->mask = msk->info[j].id;
|
||||
if (msk->u.pict.root)
|
||||
{
|
||||
stuff->xMask = orig.xMask - xineramaDataPtr[j].x;
|
||||
stuff->yMask = orig.yMask - xineramaDataPtr[j].y;
|
||||
stuff->xMask = orig.xMask - panoramiXdataPtr[j].x;
|
||||
stuff->yMask = orig.yMask - panoramiXdataPtr[j].y;
|
||||
}
|
||||
}
|
||||
result = (*XineramaSaveRenderVector[X_RenderComposite]) (client);
|
||||
|
@ -2512,7 +2512,7 @@ XineramaRenderComposite (ClientPtr client)
|
|||
static int
|
||||
XineramaRenderCompositeGlyphs (ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderCompositeGlyphsReq);
|
||||
xGlyphElt origElt, *elt;
|
||||
|
@ -2535,14 +2535,14 @@ XineramaRenderCompositeGlyphs (ClientPtr client)
|
|||
stuff->src = src->info[j].id;
|
||||
if (src->u.pict.root)
|
||||
{
|
||||
stuff->xSrc = xSrc - xineramaDataPtr[j].x;
|
||||
stuff->ySrc = ySrc - xineramaDataPtr[j].y;
|
||||
stuff->xSrc = xSrc - panoramiXdataPtr[j].x;
|
||||
stuff->ySrc = ySrc - panoramiXdataPtr[j].y;
|
||||
}
|
||||
stuff->dst = dst->info[j].id;
|
||||
if (dst->u.pict.root)
|
||||
{
|
||||
elt->deltax = origElt.deltax - xineramaDataPtr[j].x;
|
||||
elt->deltay = origElt.deltay - xineramaDataPtr[j].y;
|
||||
elt->deltax = origElt.deltax - panoramiXdataPtr[j].x;
|
||||
elt->deltay = origElt.deltay - panoramiXdataPtr[j].y;
|
||||
}
|
||||
result = (*XineramaSaveRenderVector[stuff->renderReqType]) (client);
|
||||
if(result != Success) break;
|
||||
|
@ -2555,7 +2555,7 @@ XineramaRenderCompositeGlyphs (ClientPtr client)
|
|||
static int
|
||||
XineramaRenderFillRectangles (ClientPtr client)
|
||||
{
|
||||
XineramaRes *dst;
|
||||
PanoramiXRes *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderFillRectanglesReq);
|
||||
char *extra;
|
||||
|
@ -2573,8 +2573,8 @@ XineramaRenderFillRectangles (ClientPtr client)
|
|||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root)
|
||||
{
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
xRectangle *rects = (xRectangle *) (stuff + 1);
|
||||
|
@ -2601,7 +2601,7 @@ XineramaRenderFillRectangles (ClientPtr client)
|
|||
static int
|
||||
XineramaRenderTrapezoids(ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderTrapezoidsReq);
|
||||
char *extra;
|
||||
|
@ -2623,8 +2623,8 @@ XineramaRenderTrapezoids(ClientPtr client)
|
|||
FOR_NSCREENS_FORWARD(j) {
|
||||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root) {
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
xTrapezoid *trap = (xTrapezoid *) (stuff + 1);
|
||||
|
@ -2663,7 +2663,7 @@ XineramaRenderTrapezoids(ClientPtr client)
|
|||
static int
|
||||
XineramaRenderTriangles(ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderTrianglesReq);
|
||||
char *extra;
|
||||
|
@ -2685,8 +2685,8 @@ XineramaRenderTriangles(ClientPtr client)
|
|||
FOR_NSCREENS_FORWARD(j) {
|
||||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root) {
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
xTriangle *tri = (xTriangle *) (stuff + 1);
|
||||
|
@ -2721,7 +2721,7 @@ XineramaRenderTriangles(ClientPtr client)
|
|||
static int
|
||||
XineramaRenderTriStrip(ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderTriStripReq);
|
||||
char *extra;
|
||||
|
@ -2743,8 +2743,8 @@ XineramaRenderTriStrip(ClientPtr client)
|
|||
FOR_NSCREENS_FORWARD(j) {
|
||||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root) {
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
xPointFixed *fixed = (xPointFixed *) (stuff + 1);
|
||||
|
@ -2775,7 +2775,7 @@ XineramaRenderTriStrip(ClientPtr client)
|
|||
static int
|
||||
XineramaRenderTriFan(ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderTriFanReq);
|
||||
char *extra;
|
||||
|
@ -2797,8 +2797,8 @@ XineramaRenderTriFan(ClientPtr client)
|
|||
FOR_NSCREENS_FORWARD(j) {
|
||||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root) {
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
xPointFixed *fixed = (xPointFixed *) (stuff + 1);
|
||||
|
@ -2831,7 +2831,7 @@ XineramaRenderTriFan(ClientPtr client)
|
|||
static int
|
||||
XineramaRenderColorTrapezoids(ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderColorTrapezoidsReq);
|
||||
char *extra;
|
||||
|
@ -2851,8 +2851,8 @@ XineramaRenderColorTrapezoids(ClientPtr client)
|
|||
FOR_NSCREENS_FORWARD(j) {
|
||||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root) {
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
....;
|
||||
|
@ -2875,7 +2875,7 @@ XineramaRenderColorTrapezoids(ClientPtr client)
|
|||
static int
|
||||
XineramaRenderColorTriangles(ClientPtr client)
|
||||
{
|
||||
XineramaRes *src, *dst;
|
||||
PanoramiXRes *src, *dst;
|
||||
int result = Success, j;
|
||||
REQUEST(xRenderColorTrianglesReq);
|
||||
char *extra;
|
||||
|
@ -2895,8 +2895,8 @@ XineramaRenderColorTriangles(ClientPtr client)
|
|||
FOR_NSCREENS_FORWARD(j) {
|
||||
if (j) memcpy (stuff + 1, extra, extra_len);
|
||||
if (dst->u.pict.root) {
|
||||
int x_off = xineramaDataPtr[j].x;
|
||||
int y_off = xineramaDataPtr[j].y;
|
||||
int x_off = panoramiXdataPtr[j].x;
|
||||
int y_off = panoramiXdataPtr[j].y;
|
||||
|
||||
if(x_off || y_off) {
|
||||
....;
|
||||
|
@ -2919,7 +2919,7 @@ XineramaRenderColorTriangles(ClientPtr client)
|
|||
#endif
|
||||
|
||||
void
|
||||
XineramaRenderInit (void)
|
||||
PanoramiXRenderInit (void)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -2948,7 +2948,7 @@ XineramaRenderInit (void)
|
|||
}
|
||||
|
||||
void
|
||||
XineramaRenderReset (void)
|
||||
PanoramiXRenderReset (void)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < RenderNumberRequests; i++)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg$ */
|
||||
/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.1.4.4 2003/12/18 19:29:15 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.
|
||||
|
@ -39,8 +39,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include "XI.h"
|
||||
|
||||
#ifdef XINERAMA
|
||||
#include "xinerama.h"
|
||||
#include "xineramaSrv.h"
|
||||
#include "panoramiX.h"
|
||||
#include "panoramiXsrv.h"
|
||||
#endif
|
||||
|
||||
#include "mipointer.h"
|
||||
|
@ -56,7 +56,7 @@ ScreenPtr pScreen, oldScreen;
|
|||
pScreen = oldScreen = GetSpriteWindow()->drawable.pScreen;
|
||||
|
||||
#ifdef XINERAMA
|
||||
if (!noXineramaExtension) {
|
||||
if (!noPanoramiXExtension) {
|
||||
BoxRec box;
|
||||
int i;
|
||||
|
||||
|
@ -93,8 +93,8 @@ ScreenPtr pScreen, oldScreen;
|
|||
}
|
||||
}
|
||||
}
|
||||
oldX -= xineramaDataPtr[pScreen->myNum].x;
|
||||
oldY -= xineramaDataPtr[pScreen->myNum].y;
|
||||
oldX -= panoramiXdataPtr[pScreen->myNum].x;
|
||||
oldY -= panoramiXdataPtr[pScreen->myNum].y;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user