[Xorg-commit] xc/programs/Xserver/Xext Imakefile,1.1.4.2,1.1.4.3 saver.c,1.1.4.1,1.1.4.2 shape.c,1.1.4.2,1.1.4.3 shm.c,1.1.4.2,1.1.4.3 xinerama.c,1.1.4.2,1.1.4.3 xinerama.h,1.1.4.1,1.1.4.2 xineramaP.h,1.1,1.1.4.1 xineramaProcs.c,1.1.4.2,1.1.4.3 xineramaSrv.h,1.1,1.1.4.1 xineramaSwap.c,1.1.4.2,1.1.4.3 xtest.c,1.1.4.2,1.1.4.3 xvdisp.c,1.1.4.1,1.1.4.2 xvmain.c,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Thu Dec 18 21:29:45 EET 2003
- Previous message: [Xorg-commit] xc/programs/Xserver/dbe dbe.c,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/programs/Xserver/dix colormap.c,1.1.4.2,1.1.4.3 dispatch.c,1.1.4.2,1.1.4.3 dixfonts.c,1.1.4.2,1.1.4.3 events.c,1.1.4.2,1.1.4.3 main.c,1.1.4.3,1.1.4.4 resource.c,1.1.4.2,1.1.4.3 window.c,1.1.4.2,1.1.4.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Update of /cvs/xorg/xc/programs/Xserver/Xext
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/Xext
Modified Files:
Tag: XORG-CURRENT
Imakefile saver.c shape.c shm.c xinerama.c xinerama.h
xineramaP.h xineramaProcs.c xineramaSrv.h xineramaSwap.c
xtest.c xvdisp.c xvmain.c
Log Message:
First pass at "Standard" Xinerama.
The sources for this came from Heather Lanigan's xinerama tree on
Sourceforge.Net.
No attempt has been made to handle previous, non-standard versions of
the protocol. Nor has any attempt been made to preserve the ABI of
previous versions -- that part will be added at a later time, and
then probably only on systems that have nice object/linker semantics,
e.g. ELF systems with weak symbols.
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Imakefile 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ Imakefile 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:47:55 cpqbld Exp $
@@ -84,9 +85,9 @@
CUPOBJS = cup.o
#endif
#if BuildXinerama
- PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c
- PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
- PNRXINCLUDES = -I$(FONTINCSRC) -I../mi -I../render
+ XINERAMASRCS = xinerama.c xineramaSwap.c xineramaProcs.c
+ XINERAMAOBJS = xinerama.o xineramaSwap.o xineramaProcs.o
+ XINERAMAINCS = -I$(FONTINCSRC) -I../mi -I../render
#endif
#if BuildDPMS
DPMSSRCS = dpms.c
@@ -106,18 +107,18 @@
mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \
bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \
$(XF86MISCSRCS) $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \
- $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \
+ $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(XINERAMASRCS) $(DPMSSRCS) \
$(EVISRCS) $(XVSRCS) $(FONTCACHESRCS) $(XRESSRCS)
OBJS = shape.o $(SHMOBJS) $(MULTIBUFOBJ) \
mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \
bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \
$(XF86MISCOBJS) $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \
- $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \
+ $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(XINERAMAOBJS) $(DPMSOBJS) \
$(EVIOBJS) $(XVOBJS) $(FONTCACHEOBJS) $(XRESOBJS)
SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) xprint.o \
- xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
+ xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(XINERAMAOBJS) \
$(XF86BIGFOBJS)
#ifdef XFree86Version
@@ -125,7 +126,7 @@
XF86INCLUDES = -I$(XF86COMSRC)
#endif
INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- $(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) \
+ $(XINERAMAINCS) $(XF86INCLUDES) -I$(FONTINCSRC) \
$(FONTCACHEINCLUDES)
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
Index: saver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/saver.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- saver.c 26 Nov 2003 22:48:41 -0000 1.1.4.1
+++ saver.c 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/*
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
*
@@ -46,9 +47,9 @@
#include "gcstruct.h"
#include "cursorstr.h"
#include "colormapst.h"
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
#endif
@@ -676,8 +677,8 @@
ret = TRUE;
}
-#ifdef PANORAMIX
- if(noPanoramiXExtension || !pScreen->myNum)
+#ifdef XINERAMA
+ if(noXineramaExtension || !pScreen->myNum)
#endif
SendScreenSaverNotify (pScreen, state, force);
return ret;
@@ -1194,20 +1195,20 @@
static int
ProcScreenSaverSetAttributes (ClientPtr client)
{
-#ifdef PANORAMIX
- if(!noPanoramiXExtension) {
+#ifdef XINERAMA
+ if(!noXineramaExtension) {
REQUEST(xScreenSaverSetAttributesReq);
- PanoramiXRes *draw;
- PanoramiXRes *backPix = NULL;
- PanoramiXRes *bordPix = NULL;
- PanoramiXRes *cmap = NULL;
+ XineramaRes *draw;
+ XineramaRes *backPix = NULL;
+ XineramaRes *bordPix = NULL;
+ XineramaRes *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 = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
@@ -1219,7 +1220,7 @@
pback_offset = Ones((Mask)stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) {
- if(!(backPix = (PanoramiXRes*) SecurityLookupIDByType(
+ if(!(backPix = (XineramaRes*) SecurityLookupIDByType(
client, tmp, XRT_PIXMAP, SecurityReadAccess)))
return BadPixmap;
}
@@ -1229,7 +1230,7 @@
pbord_offset = Ones((Mask)stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) {
- if(!(bordPix = (PanoramiXRes*) SecurityLookupIDByType(
+ if(!(bordPix = (XineramaRes*) SecurityLookupIDByType(
client, tmp, XRT_PIXMAP, SecurityReadAccess)))
return BadPixmap;
}
@@ -1239,7 +1240,7 @@
cmap_offset = Ones((Mask)stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) {
- if(!(cmap = (PanoramiXRes*) SecurityLookupIDByType(
+ if(!(cmap = (XineramaRes*) SecurityLookupIDByType(
client, tmp, XRT_COLORMAP, SecurityReadAccess)))
return BadColor;
}
@@ -1258,7 +1259,7 @@
if (orig_visual != CopyFromParent)
stuff->visualID =
- PanoramiXVisualTable[(orig_visual*MAXSCREENS) + i];
+ XineramaVisualTable[(orig_visual*MAXSCREENS) + i];
status = ScreenSaverSetAttributes(client);
}
@@ -1273,17 +1274,17 @@
static int
ProcScreenSaverUnsetAttributes (ClientPtr client)
{
-#ifdef PANORAMIX
- if(!noPanoramiXExtension) {
+#ifdef XINERAMA
+ if(!noXineramaExtension) {
REQUEST(xScreenSaverUnsetAttributesReq);
- PanoramiXRes *draw;
+ XineramaRes *draw;
int i;
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- for(i = PanoramiXNumScreens - 1; i > 0; i--) {
+ for(i = XineramaNumScreens - 1; i > 0; i--) {
stuff->drawable = draw->info[i].id;
ScreenSaverUnsetAttributes(client);
}
Index: shape.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/shape.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- shape.c 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ shape.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
/************************************************************
@@ -112,9 +113,9 @@
static DISPATCH_PROC(SProcShapeRectangles);
static DISPATCH_PROC(SProcShapeSelectInput);
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
#endif
#if 0
@@ -375,18 +376,18 @@
stuff->xOff, stuff->yOff, createDefault);
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
static int
-ProcPanoramiXShapeRectangles(
+ProcXineramaShapeRectangles(
register ClientPtr client)
{
REQUEST(xShapeRectanglesReq);
- PanoramiXRes *win;
+ XineramaRes *win;
int j, result = 0;
REQUEST_AT_LEAST_SIZE (xShapeRectanglesReq);
- if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(win = (XineramaRes *)SecurityLookupIDByType(
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
return BadWindow;
@@ -464,23 +465,23 @@
stuff->xOff, stuff->yOff, createDefault);
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
static int
-ProcPanoramiXShapeMask(
+ProcXineramaShapeMask(
register ClientPtr client)
{
REQUEST(xShapeMaskReq);
- PanoramiXRes *win, *pmap;
+ XineramaRes *win, *pmap;
int j, result = 0;
REQUEST_SIZE_MATCH (xShapeMaskReq);
- if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(win = (XineramaRes *)SecurityLookupIDByType(
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
return BadWindow;
if(stuff->src != None) {
- if(!(pmap = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(pmap = (XineramaRes *)SecurityLookupIDByType(
client, stuff->src, XRT_PIXMAP, SecurityReadAccess)))
return BadPixmap;
} else
@@ -579,22 +580,22 @@
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
static int
-ProcPanoramiXShapeCombine(
+ProcXineramaShapeCombine(
register ClientPtr client)
{
REQUEST(xShapeCombineReq);
- PanoramiXRes *win, *win2;
+ XineramaRes *win, *win2;
int j, result = 0;
REQUEST_AT_LEAST_SIZE (xShapeCombineReq);
- if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(win = (XineramaRes *)SecurityLookupIDByType(
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
return BadWindow;
- if(!(win2 = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(win2 = (XineramaRes *)SecurityLookupIDByType(
client, stuff->src, XRT_WINDOW, SecurityReadAccess)))
return BadWindow;
@@ -648,18 +649,18 @@
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
static int
-ProcPanoramiXShapeOffset(
+ProcXineramaShapeOffset(
register ClientPtr client)
{
REQUEST(xShapeOffsetReq);
- PanoramiXRes *win;
+ XineramaRes *win;
int j, result = 0;
REQUEST_AT_LEAST_SIZE (xShapeOffsetReq);
- if(!(win = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(win = (XineramaRes *)SecurityLookupIDByType(
client, stuff->dest, XRT_WINDOW, SecurityWriteAccess)))
return BadWindow;
@@ -1064,30 +1065,30 @@
case X_ShapeQueryVersion:
return ProcShapeQueryVersion (client);
case X_ShapeRectangles:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShapeRectangles (client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShapeRectangles (client);
else
#endif
return ProcShapeRectangles (client);
case X_ShapeMask:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShapeMask (client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShapeMask (client);
else
#endif
return ProcShapeMask (client);
case X_ShapeCombine:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShapeCombine (client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShapeCombine (client);
else
#endif
return ProcShapeCombine (client);
case X_ShapeOffset:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShapeOffset (client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShapeOffset (client);
else
#endif
return ProcShapeOffset (client);
Index: shm.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/shm.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- shm.c 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ shm.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */
/************************************************************
@@ -62,9 +63,9 @@
#include "xf86_ansic.h"
#endif
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
#endif
#include "modinit.h"
@@ -560,26 +561,27 @@
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
static int
-ProcPanoramiXShmPutImage(register ClientPtr client)
+ProcXineramaShmPutImage(register ClientPtr client)
{
int j, result = 0, orig_x, orig_y;
- PanoramiXRes *draw, *gc;
+ XineramaRes *draw, *gc;
Bool sendEvent, isRoot;
REQUEST(xShmPutImageReq);
REQUEST_SIZE_MATCH(xShmPutImageReq);
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(gc = (XineramaRes *)SecurityLookupIDByType(
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
- isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
+ isRoot = (draw->type == XRT_WINDOW) &&
+ (stuff->drawable == WindowTable[0]->drawable.id);
orig_x = stuff->dstX;
orig_y = stuff->dstY;
@@ -590,8 +592,8 @@
stuff->drawable = draw->info[j].id;
stuff->gc = gc->info[j].id;
if (isRoot) {
- stuff->dstX = orig_x - panoramiXdataPtr[j].x;
- stuff->dstY = orig_y - panoramiXdataPtr[j].y;
+ stuff->dstX = orig_x - xineramaDataPtr[j].x;
+ stuff->dstY = orig_y - xineramaDataPtr[j].y;
}
result = ProcShmPutImage(client);
if(result != client->noClientException) break;
@@ -600,9 +602,9 @@
}
static int
-ProcPanoramiXShmGetImage(ClientPtr client)
+ProcXineramaShmGetImage(ClientPtr client)
{
- PanoramiXRes *draw;
+ XineramaRes *draw;
DrawablePtr drawables[MAXSCREENS];
DrawablePtr pDraw;
xShmGetImageReply xgi;
@@ -621,7 +623,7 @@
return(BadValue);
}
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
@@ -639,19 +641,20 @@
format = stuff->format;
planemask = stuff->planeMask;
- isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
+ isRoot = (draw->type == XRT_WINDOW) &&
+ (stuff->drawable == WindowTable[0]->drawable.id);
if(isRoot) {
if( /* check for being onscreen */
- x < 0 || x + w > PanoramiXPixWidth ||
- y < 0 || y + h > PanoramiXPixHeight )
+ x < 0 || x + w > XineramaPixWidth ||
+ y < 0 || y + h > XineramaPixHeight )
return(BadMatch);
} else {
if( /* check for being onscreen */
- 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 ||
+ 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 ||
/* check for being inside of border */
x < - wBorderWidth((WindowPtr)pDraw) ||
x + w > wBorderWidth((WindowPtr)pDraw) + (int)pDraw->width ||
@@ -661,7 +664,7 @@
}
drawables[0] = pDraw;
- for(i = 1; i < PanoramiXNumScreens; i++)
+ for(i = 1; i < XineramaNumScreens; i++)
VERIFY_DRAWABLE(drawables[i], draw->info[i].id, client);
xgi.visual = wVisual(((WindowPtr)pDraw));
@@ -714,7 +717,7 @@
}
static int
-ProcPanoramiXShmCreatePixmap(
+ProcXineramaShmCreatePixmap(
register ClientPtr client)
{
ScreenPtr pScreen = NULL;
@@ -724,7 +727,7 @@
int i, j, result;
ShmDescPtr shmdesc;
REQUEST(xShmCreatePixmapReq);
- PanoramiXRes *newPix;
+ XineramaRes *newPix;
REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
client->errorValue = stuff->pid;
@@ -752,13 +755,13 @@
PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
client);
- if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+ if(!(newPix = (XineramaRes *) xalloc(sizeof(XineramaRes))))
return BadAlloc;
newPix->type = XRT_PIXMAP;
newPix->u.pix.shared = TRUE;
newPix->info[0].id = stuff->pid;
- for(j = 1; j < PanoramiXNumScreens; j++)
+ for(j = 1; j < XineramaNumScreens; j++)
newPix->info[j].id = FakeClientID(client->index);
result = (client->noClientException);
@@ -1080,9 +1083,11 @@
shmdesc->addr + stuff->offset);
if (pMap)
{
+#ifdef NO_XINERAMA_PORT
#ifdef PIXPRIV
pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
#endif
+#endif
shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid;
@@ -1108,21 +1113,21 @@
case X_ShmDetach:
return ProcShmDetach(client);
case X_ShmPutImage:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShmPutImage(client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShmPutImage(client);
#endif
return ProcShmPutImage(client);
case X_ShmGetImage:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShmGetImage(client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShmGetImage(client);
#endif
return ProcShmGetImage(client);
case X_ShmCreatePixmap:
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return ProcPanoramiXShmCreatePixmap(client);
+#ifdef XINERAMA
+ if ( !noXineramaExtension )
+ return ProcXineramaShmCreatePixmap(client);
#endif
return ProcShmCreatePixmap(client);
default:
Index: xinerama.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xinerama.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xinerama.c 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ xinerama.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,4 +1,5 @@
-/* $Xorg: panoramiX.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */
+/* $XdotOrg$ */
+/* $Xorg: xinerama.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,7 +24,7 @@
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */
[...1306 lines suppressed...]
@@ -1176,7 +1072,7 @@
if(sizeNeeded > size) {
char *tmpdata = ScratchMem;
- ScratchMem = xrealloc(ScratchMem, sizeNeeded);
+ ScratchMem = (char *)xrealloc(ScratchMem, sizeNeeded);
if(ScratchMem)
size = sizeNeeded;
else {
@@ -1185,8 +1081,8 @@
}
}
- x = pbox->x1 - pDraw->x - panoramiXdataPtr[i].x;
- y = pbox->y1 - pDraw->y - panoramiXdataPtr[i].y;
+ x = pbox->x1 - pDraw->x - xineramaDataPtr[i].x;
+ y = pbox->y1 - pDraw->y - xineramaDataPtr[i].y;
(*pDraw->pScreen->GetImage)(pDraw, x, y, w, h,
format, planemask, ScratchMem);
Index: xinerama.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xinerama.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- xinerama.h 26 Nov 2003 22:48:41 -0000 1.1.4.1
+++ xinerama.h 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,4 +1,5 @@
-/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
+/* $XdotOrg$ */
+/* $TOG: xinerama.h /main/4 1998/03/17 06:51:02 kaleb $ */
/****************************************************************
* *
* Copyright (c) Digital Equipment Corporation, 1991, 1997 *
@@ -19,40 +20,38 @@
* or in FAR 52.227-19, as applicable. *
* *
*****************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xinerama.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */
/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
/*
- * PanoramiX definitions
+ * Xinerama definitions
*/
-#ifndef _PANORAMIX_H_
-#define _PANORAMIX_H_
+#ifndef _XINERAMA_H_
+#define _XINERAMA_H_
-#include "panoramiXext.h"
#include "gcstruct.h"
-typedef struct _PanoramiXData {
+typedef struct _XineramaData {
int x;
int y;
int width;
int height;
-} PanoramiXData;
+} XineramaData;
-typedef struct _PanoramiXInfo {
+typedef struct _XineramaInfo {
XID id ;
-} PanoramiXInfo;
+} XineramaInfo;
typedef struct {
- PanoramiXInfo info[MAXSCREENS];
+ XineramaInfo info[MAXSCREENS];
RESTYPE type;
union {
struct {
char visibility;
char class;
- char root;
} win;
struct {
Bool shared;
@@ -64,10 +63,10 @@
#endif
char raw_data[4];
} u;
-} PanoramiXRes;
+} XineramaRes;
-#define FOR_NSCREENS_FORWARD(j) for(j = 0; j < PanoramiXNumScreens; j++)
-#define FOR_NSCREENS_BACKWARD(j) for(j = PanoramiXNumScreens - 1; j >= 0; j--)
+#define FOR_NSCREENS_FORWARD(j) for(j = 0; j < XineramaNumScreens; j++)
+#define FOR_NSCREENS_BACKWARD(j) for(j = XineramaNumScreens - 1; j >= 0; j--)
#define FOR_NSCREENS(j) FOR_NSCREENS_FORWARD(j)
#define BREAK_IF(a) if ((a)) break
@@ -75,22 +74,22 @@
#define FORCE_ROOT(a) { \
int _j; \
- for (_j = PanoramiXNumScreens - 1; _j; _j--) \
+ for (_j = XineramaNumScreens - 1; _j; _j--) \
if ((a).root == WindowTable[_j]->drawable.id) \
break; \
- (a).rootX += panoramiXdataPtr[_j].x; \
- (a).rootY += panoramiXdataPtr[_j].y; \
+ (a).rootX += xineramaDataPtr[_j].x; \
+ (a).rootY += xineramaDataPtr[_j].y; \
(a).root = WindowTable[0]->drawable.id; \
}
#define FORCE_WIN(a) { \
- if ((win = PanoramiXFindIDOnAnyScreen(XRT_WINDOW, a))) { \
+ if ((win = XineramaFindIDOnAnyScreen(XRT_WINDOW, a))) { \
(a) = win->info[0].id; /* Real ID */ \
} \
}
#define FORCE_CMAP(a) { \
- if ((win = PanoramiXFindIDOnAnyScreen(XRT_COLORMAP, a))) { \
+ if ((win = XineramaFindIDOnAnyScreen(XRT_COLORMAP, a))) { \
(a) = win->info[0].id; /* Real ID */ \
} \
}
@@ -99,4 +98,4 @@
#define SKIP_FAKE_WINDOW(a) if(!LookupIDByType(a, XRT_WINDOW)) return
-#endif /* _PANORAMIX_H_ */
+#endif /* _XINERAMA_H_ */
Index: xineramaP.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xineramaP.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- xineramaP.h 25 Nov 2003 19:28:22 -0000 1.1
+++ xineramaP.h 18 Dec 2003 19:29:12 -0000 1.1.4.1
@@ -1,78 +1,69 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */
-
+/* $XdotOrg$ */
/*
* Server dispatcher function replacements
*/
-extern int PanoramiXCreateWindow(ClientPtr client);
-extern int PanoramiXChangeWindowAttributes(ClientPtr client);
-extern int PanoramiXDestroyWindow(ClientPtr client);
-extern int PanoramiXDestroySubwindows(ClientPtr client);
-extern int PanoramiXChangeSaveSet(ClientPtr client);
-extern int PanoramiXReparentWindow(ClientPtr client);
-extern int PanoramiXMapWindow(ClientPtr client);
-extern int PanoramiXMapSubwindows(ClientPtr client);
-extern int PanoramiXUnmapWindow(ClientPtr client);
-extern int PanoramiXUnmapSubwindows(ClientPtr client);
-extern int PanoramiXConfigureWindow(ClientPtr client);
-extern int PanoramiXCirculateWindow(ClientPtr client);
-extern int PanoramiXGetGeometry(ClientPtr client);
-extern int PanoramiXTranslateCoords(ClientPtr client);
-extern int PanoramiXCreatePixmap(ClientPtr client);
-extern int PanoramiXFreePixmap(ClientPtr client);
-extern int PanoramiXCreateGC(ClientPtr client);
-extern int PanoramiXChangeGC(ClientPtr client);
-extern int PanoramiXCopyGC(ClientPtr client);
-extern int PanoramiXCopyColormapAndFree(ClientPtr client);
-extern int PanoramiXSetDashes(ClientPtr client);
-extern int PanoramiXSetClipRectangles(ClientPtr client);
-extern int PanoramiXFreeGC(ClientPtr client);
-extern int PanoramiXClearToBackground(ClientPtr client);
-extern int PanoramiXCopyArea(ClientPtr client);
-extern int PanoramiXCopyPlane(ClientPtr client);
-extern int PanoramiXPolyPoint(ClientPtr client);
-extern int PanoramiXPolyLine(ClientPtr client);
-extern int PanoramiXPolySegment(ClientPtr client);
-extern int PanoramiXPolyRectangle(ClientPtr client);
-extern int PanoramiXPolyArc(ClientPtr client);
-extern int PanoramiXFillPoly(ClientPtr client);
-extern int PanoramiXPolyFillArc(ClientPtr client);
-extern int PanoramiXPolyFillRectangle(ClientPtr client);
-extern int PanoramiXPutImage(ClientPtr client);
-extern int PanoramiXGetImage(ClientPtr client);
-extern int PanoramiXPolyText8(ClientPtr client);
-extern int PanoramiXPolyText16(ClientPtr client);
-extern int PanoramiXImageText8(ClientPtr client);
-extern int PanoramiXImageText16(ClientPtr client);
-extern int PanoramiXCreateColormap(ClientPtr client);
-extern int PanoramiXFreeColormap(ClientPtr client);
-extern int PanoramiXInstallColormap(ClientPtr client);
-extern int PanoramiXUninstallColormap(ClientPtr client);
-extern int PanoramiXAllocColor(ClientPtr client);
-extern int PanoramiXAllocNamedColor(ClientPtr client);
-extern int PanoramiXAllocColorCells(ClientPtr client);
-extern int PanoramiXStoreNamedColor(ClientPtr client);
-extern int PanoramiXFreeColors(ClientPtr client);
-extern int PanoramiXStoreColors(ClientPtr client);
-extern int PanoramiXAllocColorPlanes(ClientPtr client);
-
-#define PROC_EXTERN(pfunc) extern int pfunc(ClientPtr)
-
-PROC_EXTERN(ProcPanoramiXQueryVersion);
-PROC_EXTERN(ProcPanoramiXGetState);
-PROC_EXTERN(ProcPanoramiXGetScreenCount);
-PROC_EXTERN(ProcPanoramiXGetScreenSize);
-
-PROC_EXTERN(ProcXineramaQueryScreens);
-PROC_EXTERN(ProcXineramaIsActive);
-extern Bool XineramaCreateGC(GCPtr pGC);
+extern int XineramaCreateWindow(ClientPtr client);
+extern int XineramaChangeWindowAttributes(ClientPtr client);
+extern int XineramaDestroyWindow(ClientPtr client);
+extern int XineramaDestroySubwindows(ClientPtr client);
+extern int XineramaChangeSaveSet(ClientPtr client);
+extern int XineramaReparentWindow(ClientPtr client);
+extern int XineramaMapWindow(ClientPtr client);
+extern int XineramaMapSubwindows(ClientPtr client);
+extern int XineramaUnmapWindow(ClientPtr client);
+extern int XineramaUnmapSubwindows(ClientPtr client);
+extern int XineramaConfigureWindow(ClientPtr client);
+extern int XineramaCirculateWindow(ClientPtr client);
+extern int XineramaGetGeometry(ClientPtr client);
+extern int XineramaTranslateCoords(ClientPtr client);
+extern int XineramaCreatePixmap(ClientPtr client);
+extern int XineramaFreePixmap(ClientPtr client);
+extern int XineramaCreateGC(ClientPtr client);
+extern int XineramaCopyColormapAndFree(ClientPtr client);
+extern int XineramaSetDashes(ClientPtr client);
+extern int XineramaSetClipRectangles(ClientPtr client);
+extern int XineramaChangeGC(ClientPtr client);
+extern int XineramaCopyGC(ClientPtr client);
+extern int XineramaFreeGC(ClientPtr client);
+extern int XineramaClearToBackground(ClientPtr client);
+extern int XineramaCopyArea(ClientPtr client);
+extern int XineramaCopyPlane(ClientPtr client);
+extern int XineramaPolyPoint(ClientPtr client);
+extern int XineramaPolyLine(ClientPtr client);
+extern int XineramaPolySegment(ClientPtr client);
+extern int XineramaPolyRectangle(ClientPtr client);
+extern int XineramaPolyArc(ClientPtr client);
+extern int XineramaFillPoly(ClientPtr client);
+extern int XineramaPolyFillArc(ClientPtr client);
+extern int XineramaPolyFillRectangle(ClientPtr client);
+extern int XineramaPutImage(ClientPtr client);
+extern int XineramaGetImage(ClientPtr client);
+extern int XineramaPolyText8(ClientPtr client);
+extern int XineramaPolyText16(ClientPtr client);
+extern int XineramaImageText8(ClientPtr client);
+extern int XineramaImageText16(ClientPtr client);
+extern int XineramaCreateColormap(ClientPtr client);
+extern int XineramaFreeColormap(ClientPtr client);
+extern int XineramaInstallColormap(ClientPtr client);
+extern int XineramaUninstallColormap(ClientPtr client);
+extern int XineramaAllocColor(ClientPtr client);
+extern int XineramaAllocNamedColor(ClientPtr client);
+extern int XineramaAllocColorCells(ClientPtr client);
+extern int XineramaStoreNamedColor(ClientPtr client);
+extern int XineramaFreeColors(ClientPtr client);
+extern int XineramaStoreColors(ClientPtr client);
+extern int XineramaAllocColorPlanes(ClientPtr client);
-extern int SProcPanoramiXDispatch(ClientPtr client);
+extern int SProcXineramaDispatch(ClientPtr);
+extern int ProcXineramaQueryVersion(ClientPtr);
+extern int ProcXineramaActive(ClientPtr);
+extern int ProcXineramaGetData(ClientPtr);
extern char *ConnectionInfo;
extern int connBlockScreenStart;
extern xConnSetupPrefix connSetupPrefix;
extern ScreenInfo *GlobalScrInfo;
-extern int (* SavedProcVector[256]) (ClientPtr client);
+extern int (* SavedProcVector[256]) (ClientPtr);
Index: xineramaProcs.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xineramaProcs.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xineramaProcs.c 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ xineramaProcs.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,4 +1,5 @@
-/* $Xorg: panoramiXprocs.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */
+/* $XdotOrg$ */
+/* $Xorg: xineramaprocs.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,7 +27,7 @@
/* Massively rewritten by Mark Vojkovich <markv at valinux.com> */
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */
[...2112 lines suppressed...]
-int PanoramiXStoreNamedColor(ClientPtr client)
+int XineramaStoreNamedColor(ClientPtr client)
{
- int result = 0, j;
- PanoramiXRes *cmap;
+ int result, j;
+ XineramaRes *cmap;
REQUEST(xStoreNamedColorReq);
REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);
client->errorValue = stuff->cmap;
- if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(cmap = (XineramaRes *)SecurityLookupIDByType(
client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess)))
return BadColor;
Index: xineramaSrv.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xineramaSrv.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- xineramaSrv.h 14 Nov 2003 16:48:52 -0000 1.1
+++ xineramaSrv.h 18 Dec 2003 19:29:12 -0000 1.1.4.1
@@ -1,22 +1,21 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */
-
-#ifndef _PANORAMIXSRV_H_
-#define _PANORAMIXSRV_H_
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/Xext/xineramaSrv.h,v 1.7 2001/01/03 02:54:17 keithp Exp $ */
-#include "panoramiX.h"
+#ifndef _XINERAMASRV_H_
+#define _XINERAMASRV_H_
-extern int PanoramiXNumScreens;
-extern PanoramiXData *panoramiXdataPtr;
-extern int PanoramiXPixWidth;
-extern int PanoramiXPixHeight;
-extern RegionRec PanoramiXScreenRegion;
-extern XID *PanoramiXVisualTable;
+extern int XineramaNumScreens;
+extern XineramaData *xineramaDataPtr;
+extern int XineramaPixWidth;
+extern int XineramaPixHeight;
+extern RegionRec XineramaScreenRegion;
+extern XID XineramaVisualTable[256][MAXSCREENS];
-extern void PanoramiXConsolidate(void);
-extern Bool PanoramiXCreateConnectionBlock(void);
-extern PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
-extern PanoramiXRes * PanoramiXFindIDOnAnyScreen(RESTYPE, XID);
-extern WindowPtr PanoramiXChangeWindow(int, WindowPtr);
+extern void XineramaConsolidate(void);
+extern Bool XineramaCreateConnectionBlock(void);
+extern XineramaRes * XineramaFindIDByScrnum(RESTYPE, XID, int);
+extern XineramaRes * XineramaFindIDOnAnyScreen(RESTYPE, XID);
+extern WindowPtr XineramaChangeWindow(int, WindowPtr);
extern Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
extern int XineramaDeleteResource(pointer, XID);
@@ -41,4 +40,4 @@
Bool isRoot
);
-#endif /* _PANORAMIXSRV_H_ */
+#endif /* _XINERAMASRV_H_ */
Index: xineramaSwap.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xineramaSwap.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xineramaSwap.c 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ xineramaSwap.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,4 +1,5 @@
-/* $Xorg: panoramiXSwap.c,v 1.4 2000/08/17 19:47:57 cpqbld Exp $ */
+/* $XdotOrg$ */
+/* $Xorg: xineramaSwap.c,v 1.4 2000/08/17 19:47:57 cpqbld Exp $ */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,7 +24,7 @@
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xineramaSwap.c,v 3.7 2001/01/17 22:13:15 dawes Exp $ */
#include <stdio.h>
#include "X.h"
@@ -43,98 +44,68 @@
#include <sys/workstation.h>
#include <X11/Xserver/ws.h>
#endif
-#include "panoramiX.h"
-#include "panoramiXproto.h"
-#include "panoramiXsrv.h"
+#include "xinerama.h"
+#include "xineramaP.h"
+#include "xineramaProto.h"
+#include "xineramaSrv.h"
#include "globals.h"
-#include "panoramiXh.h"
-static int
-SProcPanoramiXQueryVersion (ClientPtr client)
-{
- REQUEST(xPanoramiXQueryVersionReq);
- register int n;
- swaps(&stuff->length,n);
- REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
- return ProcPanoramiXQueryVersion(client);
-}
+/*
+ * External references for data variables
+ */
static int
-SProcPanoramiXGetState(ClientPtr client)
-{
- REQUEST(xPanoramiXGetStateReq);
- register int n;
-
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
- return ProcPanoramiXGetState(client);
-}
-
-static int
-SProcPanoramiXGetScreenCount(ClientPtr client)
+SProcXineramaQueryVersion (ClientPtr client)
{
- REQUEST(xPanoramiXGetScreenCountReq);
- register int n;
+ REQUEST(xXineramaQueryVersionReq);
+ int n;
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
- return ProcPanoramiXGetScreenCount(client);
+ swaps(&stuff->length,n);
+ REQUEST_SIZE_MATCH (xXineramaQueryVersionReq);
+ swaps(&stuff->client_major_version,n);
+ swaps(&stuff->client_minor_version,n);
+ return ProcXineramaQueryVersion(client);
}
-static int
-SProcPanoramiXGetScreenSize(ClientPtr client)
+static int
+SProcXineramaActive (ClientPtr client)
{
- REQUEST(xPanoramiXGetScreenSizeReq);
- register int n;
+ REQUEST(xXineramaActiveReq);
+ int n;
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
- return ProcPanoramiXGetScreenSize(client);
+ swaps(&stuff->length,n);
+ REQUEST_SIZE_MATCH (xXineramaActiveReq);
+ swapl(&stuff->window, n);
+ return ProcXineramaActive(client);
}
-
-static int
-SProcXineramaIsActive(ClientPtr client)
+static int
+SProcXineramaGetData (ClientPtr client)
{
- REQUEST(xXineramaIsActiveReq);
- register int n;
+ REQUEST(xXineramaGetDataReq);
+ int n;
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
- return ProcXineramaIsActive(client);
+ swaps(&stuff->length,n);
+ REQUEST_SIZE_MATCH (xXineramaGetDataReq);
+ swapl(&stuff->window, n);
+ return ProcXineramaGetData(client);
}
-
-static int
-SProcXineramaQueryScreens(ClientPtr client)
+int
+SProcXineramaDispatch (ClientPtr client)
{
- REQUEST(xXineramaQueryScreensReq);
- register int n;
-
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
- return ProcXineramaQueryScreens(client);
-}
-
+ REQUEST(xReq);
-int
-SProcPanoramiXDispatch (ClientPtr client)
-{ REQUEST(xReq);
- switch (stuff->data)
- {
- case X_PanoramiXQueryVersion:
- return SProcPanoramiXQueryVersion(client);
- case X_PanoramiXGetState:
- return SProcPanoramiXGetState(client);
- case X_PanoramiXGetScreenCount:
- return SProcPanoramiXGetScreenCount(client);
- case X_PanoramiXGetScreenSize:
- return SProcPanoramiXGetScreenSize(client);
- case X_XineramaIsActive:
- return SProcXineramaIsActive(client);
- case X_XineramaQueryScreens:
- return SProcXineramaQueryScreens(client);
+ switch (stuff->data) {
+ case X_XineramaQueryVersion:
+ return SProcXineramaQueryVersion(client);
+ case X_XineramaActive:
+ return SProcXineramaActive(client);
+ case X_XineramaGetData:
+ return SProcXineramaGetData(client);
+ default: break;
}
return BadRequest;
}
+
Index: xtest.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xtest.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xtest.c 26 Nov 2003 22:48:41 -0000 1.1.4.2
+++ xtest.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/*
@@ -63,9 +64,9 @@
extern int DeviceValuator;
#endif /* XINPUT */
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
#endif
static void XTestResetProc(
@@ -390,13 +391,13 @@
return BadValue;
}
-#ifdef PANORAMIX
- if (!noPanoramiXExtension) {
+#ifdef XINERAMA
+ if (!noXineramaExtension) {
ScreenPtr pScreen = root->drawable.pScreen;
BoxRec box;
int i;
- int x = ev->u.keyButtonPointer.rootX + panoramiXdataPtr[0].x;
- int y = ev->u.keyButtonPointer.rootY + panoramiXdataPtr[0].y;
+ int x = ev->u.keyButtonPointer.rootX + xineramaDataPtr[0].x;
+ int y = ev->u.keyButtonPointer.rootY + xineramaDataPtr[0].y;
if (!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum],
x, y, &box)) {
FOR_NSCREENS(i) {
@@ -405,8 +406,8 @@
&XineramaScreenRegions[i],
x, y, &box)) {
root = WindowTable[i];
- x -= panoramiXdataPtr[i].x;
- y -= panoramiXdataPtr[i].y;
+ x -= xineramaDataPtr[i].x;
+ y -= xineramaDataPtr[i].y;
ev->u.keyButtonPointer.rootX = x;
ev->u.keyButtonPointer.rootY = y;
break;
@@ -425,10 +426,10 @@
else if (ev->u.keyButtonPointer.rootY >= root->drawable.height)
ev->u.keyButtonPointer.rootY = root->drawable.height - 1;
-#ifdef PANORAMIX
- if ((!noPanoramiXExtension
+#ifdef XINERAMA
+ if ((!noXineramaExtension
&& root->drawable.pScreen->myNum != XineramaGetCursorScreen())
- || (noPanoramiXExtension && root != GetCurrentRootWindow()))
+ || (noXineramaExtension && root != GetCurrentRootWindow()))
#else
if (root != GetCurrentRootWindow())
Index: xvdisp.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xvdisp.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- xvdisp.c 26 Nov 2003 22:48:41 -0000 1.1.4.1
+++ xvdisp.c 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -72,9 +73,9 @@
#include "xvdisp.h"
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
unsigned long XvXRTPort;
@@ -232,15 +233,15 @@
case xv_QueryAdaptors: return(ProcXvQueryAdaptors(client));
case xv_QueryEncodings: return(ProcXvQueryEncodings(client));
case xv_PutVideo:
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
return(XineramaXvPutVideo(client));
else
#endif
return(ProcXvPutVideo(client));
case xv_PutStill:
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
return(XineramaXvPutStill(client));
else
#endif
@@ -252,15 +253,15 @@
case xv_SelectVideoNotify: return(ProcXvSelectVideoNotify(client));
case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client));
case xv_StopVideo:
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
return(XineramaXvStopVideo(client));
else
#endif
return(ProcXvStopVideo(client));
case xv_SetPortAttribute:
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
return(XineramaXvSetPortAttribute(client));
else
#endif
@@ -269,16 +270,16 @@
case xv_QueryBestSize: return(ProcXvQueryBestSize(client));
case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client));
case xv_PutImage:
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
return(XineramaXvPutImage(client));
else
#endif
return(ProcXvPutImage(client));
#ifdef MITSHM
case xv_ShmPutImage:
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
+#ifdef XINERAMA
+ if(!noXineramaExtension)
return(XineramaXvShmPutImage(client));
else
#endif
@@ -1862,7 +1863,7 @@
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
@@ -1871,15 +1872,15 @@
XineramaXvStopVideo(ClientPtr client)
{
int result = Success, i;
- PanoramiXRes *draw, *port;
+ XineramaRes *draw, *port;
REQUEST(xvStopVideoReq);
REQUEST_SIZE_MATCH(xvStopVideoReq);
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(port = (XineramaRes *)SecurityLookupIDByType(
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
@@ -1898,12 +1899,12 @@
XineramaXvSetPortAttribute(ClientPtr client)
{
REQUEST(xvSetPortAttributeReq);
- PanoramiXRes *port;
+ XineramaRes *port;
int result = Success, i;
REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
- if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(port = (XineramaRes *)SecurityLookupIDByType(
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
@@ -1922,26 +1923,27 @@
XineramaXvShmPutImage(ClientPtr client)
{
REQUEST(xvShmPutImageReq);
- PanoramiXRes *draw, *gc, *port;
+ XineramaRes *draw, *gc, *port;
Bool send_event = stuff->send_event;
Bool isRoot;
int result = Success, i, x, y;
REQUEST_SIZE_MATCH(xvShmPutImageReq);
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(gc = (XineramaRes *)SecurityLookupIDByType(
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
- if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(port = (XineramaRes *)SecurityLookupIDByType(
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
- isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
+ isRoot = (draw->type == XRT_WINDOW) &&
+ (stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x;
y = stuff->drw_y;
@@ -1954,8 +1956,8 @@
stuff->drw_x = x;
stuff->drw_y = y;
if(isRoot) {
- stuff->drw_x -= panoramiXdataPtr[i].x;
- stuff->drw_y -= panoramiXdataPtr[i].y;
+ stuff->drw_x -= xineramaDataPtr[i].x;
+ stuff->drw_y -= xineramaDataPtr[i].y;
}
stuff->send_event = (send_event && !i) ? 1 : 0;
@@ -1970,25 +1972,26 @@
XineramaXvPutImage(ClientPtr client)
{
REQUEST(xvPutImageReq);
- PanoramiXRes *draw, *gc, *port;
+ XineramaRes *draw, *gc, *port;
Bool isRoot;
int result = Success, i, x, y;
REQUEST_AT_LEAST_SIZE(xvPutImageReq);
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(gc = (XineramaRes *)SecurityLookupIDByType(
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
- if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(port = (XineramaRes *)SecurityLookupIDByType(
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
- isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
+ isRoot = (draw->type == XRT_WINDOW) &&
+ (stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x;
y = stuff->drw_y;
@@ -2001,8 +2004,8 @@
stuff->drw_x = x;
stuff->drw_y = y;
if(isRoot) {
- stuff->drw_x -= panoramiXdataPtr[i].x;
- stuff->drw_y -= panoramiXdataPtr[i].y;
+ stuff->drw_x -= xineramaDataPtr[i].x;
+ stuff->drw_y -= xineramaDataPtr[i].y;
}
result = ProcXvPutImage(client);
@@ -2015,25 +2018,26 @@
XineramaXvPutVideo(ClientPtr client)
{
REQUEST(xvPutImageReq);
- PanoramiXRes *draw, *gc, *port;
+ XineramaRes *draw, *gc, *port;
Bool isRoot;
int result = Success, i, x, y;
REQUEST_AT_LEAST_SIZE(xvPutVideoReq);
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(gc = (XineramaRes *)SecurityLookupIDByType(
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
- if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(port = (XineramaRes *)SecurityLookupIDByType(
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
- isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
+ isRoot = (draw->type == XRT_WINDOW) &&
+ (stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x;
y = stuff->drw_y;
@@ -2046,8 +2050,8 @@
stuff->drw_x = x;
stuff->drw_y = y;
if(isRoot) {
- stuff->drw_x -= panoramiXdataPtr[i].x;
- stuff->drw_y -= panoramiXdataPtr[i].y;
+ stuff->drw_x -= xineramaDataPtr[i].x;
+ stuff->drw_y -= xineramaDataPtr[i].y;
}
result = ProcXvPutVideo(client);
@@ -2060,25 +2064,26 @@
XineramaXvPutStill(ClientPtr client)
{
REQUEST(xvPutImageReq);
- PanoramiXRes *draw, *gc, *port;
+ XineramaRes *draw, *gc, *port;
Bool isRoot;
int result = Success, i, x, y;
REQUEST_AT_LEAST_SIZE(xvPutImageReq);
- if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+ if(!(draw = (XineramaRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
- if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(gc = (XineramaRes *)SecurityLookupIDByType(
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
- if(!(port = (PanoramiXRes *)SecurityLookupIDByType(
+ if(!(port = (XineramaRes *)SecurityLookupIDByType(
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
- isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
+ isRoot = (draw->type == XRT_WINDOW) &&
+ (stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x;
y = stuff->drw_y;
@@ -2091,8 +2096,8 @@
stuff->drw_x = x;
stuff->drw_y = y;
if(isRoot) {
- stuff->drw_x -= panoramiXdataPtr[i].x;
- stuff->drw_y -= panoramiXdataPtr[i].y;
+ stuff->drw_x -= xineramaDataPtr[i].x;
+ stuff->drw_y -= xineramaDataPtr[i].y;
}
result = ProcXvPutStill(client);
@@ -2110,7 +2115,7 @@
XvAttributePtr pAttr;
XvScreenPtr xvsp;
Bool isOverlay, hasOverlay;
- PanoramiXRes *port;
+ XineramaRes *port;
XvAdaptorPtr MatchingAdaptors[MAXSCREENS];
int i, j, k, l;
@@ -2136,7 +2141,7 @@
}
}
- for(j = 1; j < PanoramiXNumScreens; j++) {
+ for(j = 1; j < XineramaNumScreens; j++) {
pScreen = screenInfo.screens[j];
xvsp = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
@@ -2194,12 +2199,12 @@
/* now create a resource for each port */
for(j = 0; j < refAdapt->nPorts; j++) {
- if(!(port = xalloc(sizeof(PanoramiXRes))))
+ if(!(port = xalloc(sizeof(XineramaRes))))
break;
port->info[0].id = MatchingAdaptors[0]->base_id + j;
AddResource(port->info[0].id, XvXRTPort, port);
- for(k = 1; k < PanoramiXNumScreens; k++) {
+ for(k = 1; k < XineramaNumScreens; k++) {
if(MatchingAdaptors[k] && (MatchingAdaptors[k]->nPorts > j))
port->info[k].id = MatchingAdaptors[k]->base_id + j;
else
Index: xvmain.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xvmain.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- xvmain.c 26 Nov 2003 22:48:41 -0000 1.1.4.1
+++ xvmain.c 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -98,9 +99,9 @@
#include "xf86_ansic.h"
#endif
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
#include "xvdisp.h"
#endif
@@ -171,7 +172,7 @@
ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
return;
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
XineramaRegisterConnectionBlockCallback(XineramifyXv);
#endif
XvScreenGeneration = serverGeneration;
@@ -270,7 +271,7 @@
ErrorF("XvScreenInit: Unable to allocate screen private index\n");
return BadAlloc;
}
-#ifdef PANORAMIX
+#ifdef XINERAMA
XineramaRegisterConnectionBlockCallback(XineramifyXv);
#endif
XvScreenGeneration = serverGeneration;
- Previous message: [Xorg-commit] xc/programs/Xserver/dbe dbe.c,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/programs/Xserver/dix colormap.c,1.1.4.2,1.1.4.3 dispatch.c,1.1.4.2,1.1.4.3 dixfonts.c,1.1.4.2,1.1.4.3 events.c,1.1.4.2,1.1.4.3 main.c,1.1.4.3,1.1.4.4 resource.c,1.1.4.2,1.1.4.3 window.c,1.1.4.2,1.1.4.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list