[xorg-commit-diffs] xc/programs/Xserver/dix colormap.c, 1.1.4.5,
1.1.4.6 dispatch.c, 1.1.4.8, 1.1.4.9 dixfonts.c, 1.1.4.6,
1.1.4.7 events.c, 1.1.4.9, 1.1.4.10 main.c, 1.1.4.7,
1.1.4.8 resource.c, 1.1.4.6, 1.1.4.7 window.c, 1.1.4.8, 1.1.4.9
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:15:50 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/programs/Xserver/dix
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/dix
Modified Files:
Tag: XORG-CURRENT
colormap.c dispatch.c dixfonts.c events.c main.c resource.c
window.c
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: colormap.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/colormap.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/colormap.c 5 Mar 2004 13:39:57 -0000 1.1.4.5
+++ b/colormap.c 15 Apr 2004 10:15:45 -0000 1.1.4.6
@@ -62,11 +62,6 @@
#ifdef LBX
#include "lbxserve.h"
#endif
-#ifdef XINERAMA
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-extern Bool noPanoramiXExtension;
-#endif
extern XID clientErrorValue;
extern int colormapPrivateCount;
@@ -480,23 +475,16 @@
if (wColormap(pwin) == *pmid)
{
-#ifdef XINERAMA
- /*
- * Only deliver event for Screen 0 when Xinerama enabled
- */
- if (noPanoramiXExtension ||
- (!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum))) {
-#endif
/* This should be call to DeliverEvent */
xE.u.u.type = ColormapNotify;
xE.u.colormap.window = pwin->drawable.id;
xE.u.colormap.colormap = None;
xE.u.colormap.new = TRUE;
xE.u.colormap.state = ColormapUninstalled;
- DeliverEvents(pwin, &xE, 1, (WindowPtr)NULL);
-#ifdef XINERAMA
- }
+#ifdef PANORAMIX
+ if(noPanoramiXExtension || !pwin->drawable.pScreen->myNum)
#endif
+ DeliverEvents(pwin, &xE, 1, (WindowPtr)NULL);
if (pwin->optional) {
pwin->optional->colormap = None;
CheckWindowOptionalNeed (pwin);
@@ -515,12 +503,9 @@
Colormap *pmid = (Colormap *)value;
xEvent xE;
-#ifdef XINERAMA
- /*
- * Only deliver event for Screen 0 when Xinerama enabled
- */
- if (noPanoramiXExtension ||
- (!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum)))
+#ifdef PANORAMIX
+ if(!noPanoramiXExtension && pwin->drawable.pScreen->myNum)
+ return WT_STOPWALKING;
#endif
if (wColormap(pwin) == *pmid)
{
@@ -545,12 +530,9 @@
Colormap *pmid = (Colormap *)value;
xEvent xE;
-#ifdef XINERAMA
- /*
- * Only deliver event for Screen 0 when Xinerama enabled
- */
- if (noPanoramiXExtension ||
- (!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum)))
+#ifdef PANORAMIX
+ if(!noPanoramiXExtension && pwin->drawable.pScreen->myNum)
+ return WT_STOPWALKING;
#endif
if (wColormap (pwin) == *pmid)
{
Index: dispatch.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/dispatch.c,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -d -r1.1.4.8 -r1.1.4.9
--- a/dispatch.c 26 Mar 2004 01:20:55 -0000 1.1.4.8
+++ b/dispatch.c 15 Apr 2004 10:15:46 -0000 1.1.4.9
@@ -47,7 +47,7 @@
********************************************************/
-/* The Xinerama components contained the following notice */
+/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -75,9 +75,10 @@
Equipment Corporation.
******************************************************************/
+
/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */
-#ifdef XINERAMA_DEBUG
+#ifdef PANORAMIX_DEBUG
#include <stdio.h>
int ProcInitialConnection();
#endif
@@ -98,7 +99,7 @@
#include "dispatch.h"
#include "swaprep.h"
#include "swapreq.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@@ -2648,7 +2649,7 @@
else
return (retval);
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (noPanoramiXExtension || !pmap->pScreen->myNum)
#endif
WriteReplyToClient(client, sizeof(xAllocColorReply), &acr);
@@ -2707,7 +2708,7 @@
else
return(retval);
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
#endif
WriteReplyToClient(client, sizeof (xAllocNamedColorReply), &ancr);
@@ -2777,7 +2778,7 @@
else
return(retval);
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
#endif
{
@@ -2856,7 +2857,7 @@
return(retval);
}
acpr.length = length >> 2;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
#endif
{
@@ -3939,7 +3940,7 @@
#endif
/* fill in the "currentInputMask" */
root = (xWindowRoot *)(lConnectionInfo + connBlockScreenStart);
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (noPanoramiXExtension)
numScreens = screenInfo.numScreens;
else
Index: dixfonts.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/dixfonts.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/dixfonts.c 7 Mar 2004 23:45:09 -0000 1.1.4.6
+++ b/dixfonts.c 15 Apr 2004 10:15:46 -0000 1.1.4.7
@@ -22,8 +22,8 @@
SOFTWARE.
************************************************************************/
-/*****************************************************************
-
+/* The panoramix components contained the following notice */
+/*
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -68,7 +68,7 @@
#include <stdio.h>
#endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
#include "panoramiX.h"
#endif
@@ -1425,7 +1425,7 @@
if (c->err != Success) err = c->err;
if (err != Success && c->client != serverClient) {
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (noPanoramiXExtension || !c->pGC->pScreen->myNum)
#endif
SendErrorToClient(c->client, c->reqType, 0, 0, err);
Index: events.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/events.c,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.10
diff -u -d -r1.1.4.9 -r1.1.4.10
--- a/events.c 26 Mar 2004 01:21:54 -0000 1.1.4.9
+++ b/events.c 15 Apr 2004 10:15:46 -0000 1.1.4.10
@@ -47,7 +47,7 @@
********************************************************/
-/* The Xinerama components contained the following notice */
+/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -90,7 +90,7 @@
#include "cursorstr.h"
#include "dixstruct.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@@ -148,6 +148,7 @@
#define XE_KBPTR (xE->u.keyButtonPointer)
+
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
CallbackListPtr EventCallback;
@@ -190,14 +191,14 @@
CursorPtr current;
BoxRec hotLimits; /* logical constraints of hot spot */
Bool confined; /* confined to screen */
-#if defined(SHAPE) || defined(XINERAMA)
+#if defined(SHAPE) || defined(PANORAMIX)
RegionPtr hotShape; /* additional logical shape constraint */
#endif
BoxRec physLimits; /* physical constraints of hot spot */
WindowPtr win; /* window of logical position */
HotSpot hot; /* logical pointer position */
HotSpot hotPhys; /* physical pointer position */
-#ifdef XINERAMA
+#ifdef PANORAMIX
ScreenPtr screen; /* all others are in Screen 0 coordinates */
RegionRec Reg1; /* Region 1 for confining motion */
RegionRec Reg2; /* Region 2 for confining virtual motion */
@@ -270,8 +271,9 @@
0x7c /* key and button events */
};
-#ifdef XINERAMA
+#ifdef PANORAMIX
+static void ConfineToShape(RegionPtr shape, int *px, int *py);
static void SyntheticMotion(int x, int y);
static void PostNewCursor(void);
@@ -334,11 +336,6 @@
(* pScreen->ConstrainCursor)(pScreen, &newBox);
}
-#ifdef SHAPE
-static void
-ConfineToShape(RegionPtr, int *, int *);
-#endif
-
static void
XineramaCheckPhysLimits(
CursorPtr cursor,
@@ -594,7 +591,7 @@
}
-#endif /* XINERAMA */
+#endif /* PANORAMIX */
void
SetMaskForEvent(mask, event)
@@ -620,7 +617,7 @@
{
xEvent xE;
-#ifdef XINERAMA
+#ifdef PANORAMIX
/* Translate back to the sprite screen since processInputProc
will translate from sprite screen to screen 0 upon reentry
to the DIX layer */
@@ -727,8 +724,7 @@
register QdEventPtr qe,
register WindowPtr pWin)
{
-
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaCheckVirtualMotion(qe, pWin);
return;
@@ -779,7 +775,7 @@
{
ScreenPtr pScreen = pWin->drawable.pScreen;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaConfineCursorToWindow(pWin, generateEvents);
return;
@@ -812,7 +808,7 @@
static void
ChangeToCursor(CursorPtr cursor)
{
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaChangeToCursor(cursor);
return;
@@ -897,7 +893,7 @@
*py = sprite.hotPhys.y;
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
int
XineramaGetCursorScreen()
{
@@ -907,7 +903,7 @@
return 0;
}
}
-#endif /* XINERAMA */
+#endif /* PANORAMIX */
#define TIMESLOP (5 * 60 * 1000) /* 5 minutes */
@@ -982,7 +978,7 @@
}
if (xE->u.u.type == MotionNotify)
{
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XE_KBPTR.rootX += panoramiXdataPtr[sprite.screen->myNum].x -
panoramiXdataPtr[0].x;
@@ -1038,7 +1034,7 @@
CheckVirtualMotion(qe, NullWindow);
syncEvents.time.months = qe->months;
syncEvents.time.milliseconds = qe->event->u.keyButtonPointer.time;
-#ifdef XINERAMA
+#ifdef PANORAMIX
/* Translate back to the sprite screen since processInputProc
will translate from sprite screen to screen 0 upon reentry
to the DIX layer */
@@ -1680,7 +1676,7 @@
Only works for core events.
*/
-#ifdef XINERAMA
+#ifdef PANORAMIX
static int
XineramaTryClientEventsResult(
ClientPtr client,
@@ -1713,7 +1709,7 @@
{
if (wClient(pWin) == dontClient)
return 0;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
return XineramaTryClientEventsResult(
wClient(pWin), NullGrab, pWin->eventMask, filter);
@@ -1727,7 +1723,7 @@
{
if (SameClient(other, dontClient))
return 0;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
return XineramaTryClientEventsResult(
rClient(other), NullGrab, other->mask, filter);
@@ -1870,7 +1866,7 @@
Mask filter;
int deliveries;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
return count;
#endif
@@ -1901,7 +1897,7 @@
return deliveries;
}
-#ifndef NO_XINERAMA_PORT
+
static Bool
PointInBorderSize(WindowPtr pWin, int x, int y)
{
@@ -1910,7 +1906,7 @@
if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box))
return TRUE;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) {
int i;
@@ -1926,7 +1922,6 @@
#endif
return FALSE;
}
-#endif /* NO_XINERAMA_PORT */
static WindowPtr
XYToWindow(int x, int y)
@@ -1949,13 +1944,7 @@
* is made to see if the point is inside
* borderSize
*/
-#ifndef NO_XINERAMA_PORT
&& (!wBoundingShape(pWin) || PointInBorderSize(pWin, x, y))
-#else
- && (!wBoundingShape(pWin) ||
- POINT_IN_REGION(pWin->drawable.pScreen,
- &pWin->borderSize, x, y, &box))
-#endif
#endif
)
{
@@ -1981,7 +1970,7 @@
{
WindowPtr prevSpriteWin = sprite.win;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension)
return XineramaCheckMotion(xE);
#endif
@@ -2070,7 +2059,7 @@
(*pScreen->SetCursorPosition) (pScreen, sprite.hot.x, sprite.hot.y, FALSE);
(*pScreen->DisplayCursor) (pScreen, sprite.current);
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
sprite.hotLimits.x1 = -panoramiXdataPtr[0].x;
sprite.hotLimits.y1 = -panoramiXdataPtr[0].y;
@@ -2111,7 +2100,7 @@
{
sprite.hotPhys.x = x;
sprite.hotPhys.y = y;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
sprite.hotPhys.x += panoramiXdataPtr[newScreen->myNum].x -
panoramiXdataPtr[0].x;
@@ -2139,7 +2128,7 @@
ConfineCursorToWindow(WindowTable[newScreen->myNum], TRUE, FALSE);
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
static Bool
XineramaPointInWindowIsVisible(
@@ -2246,7 +2235,7 @@
return Success;
}
-#endif /* XINERAMA */
+#endif
int
@@ -2261,7 +2250,7 @@
REQUEST_SIZE_MATCH(xWarpPointerReq);
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension)
return XineramaWarpPointer(client);
#endif
@@ -2339,14 +2328,13 @@
return Success;
}
-#ifndef NO_XINERAMA_PORT
static Bool
BorderSizeNotEmpty(WindowPtr pWin)
{
if(REGION_NOTEMPTY(sprite.hotPhys.pScreen, &pWin->borderSize))
return TRUE;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) {
int i;
@@ -2358,7 +2346,6 @@
#endif
return FALSE;
}
-#endif /* NO_XINERAMA_PORT */
/* "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a
passive grab set on the window to be activated. */
@@ -2414,12 +2401,7 @@
if (GrabMatchesSecond(&tempGrab, grab) &&
(!grab->confineTo ||
(grab->confineTo->realized &&
-#ifndef NO_XINERAMA_PORT
- BorderSizeNotEmpty(grab->confineTo))))
-#else
- REGION_NOTEMPTY( grab->confineTo->drawable.pScreen,
- &grab->confineTo->borderSize))))
-#endif
+ BorderSizeNotEmpty(grab->confineTo))))
{
#ifdef XCSECURITY
if (!SecurityCheckDeviceAccess(wClient(pWin), device, FALSE))
@@ -3361,7 +3343,7 @@
FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer,
TRUE);
/* Notify all the roots */
-#ifdef XINERAMA
+#ifdef PANORAMIX
if ( !noPanoramiXExtension )
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
else
@@ -3380,7 +3362,7 @@
NotifyNonlinearVirtual, FALSE);
}
/* Notify all the roots */
-#ifdef XINERAMA
+#ifdef PANORAMIX
if ( !noPanoramiXExtension )
FocusEvent(dev, FocusIn, mode, in, WindowTable[0]);
else
@@ -3398,7 +3380,7 @@
if (fromWin == PointerRootWin)
FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer,
TRUE);
-#ifdef XINERAMA
+#ifdef PANORAMIX
if ( !noPanoramiXExtension )
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
else
@@ -3912,7 +3894,7 @@
rep.winY = 0;
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
rep.rootX += panoramiXdataPtr[0].x;
rep.rootY += panoramiXdataPtr[0].y;
@@ -4380,7 +4362,7 @@
GrabPtr grab = inputInfo.pointer->grab;
WindowPtr confineTo;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return;
#endif
@@ -4440,7 +4422,7 @@
for (nscr = 0; nscr < screenInfo.numScreens; nscr++)
{
pscr = screenInfo.screens[nscr];
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension)
displayed = (pscr == sprite.screen);
else
@@ -4458,7 +4440,7 @@
int count;
xEvent *events;
{
-#ifdef XINERAMA
+#ifdef PANORAMIX
xEvent eventCopy;
#endif
xEvent eventTo, *eventFrom;
@@ -4469,7 +4451,7 @@
return;
#endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension &&
(panoramiXdataPtr[0].x || panoramiXdataPtr[0].y))
{
Index: main.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/main.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/main.c 7 Mar 2004 23:45:09 -0000 1.1.4.7
+++ b/main.c 15 Apr 2004 10:15:46 -0000 1.1.4.8
@@ -48,7 +48,7 @@
******************************************************************/
/* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
-/* The Xinerama components contained the following notice */
+/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -100,8 +100,8 @@
#include "site.h"
#include "dixfont.h"
#include "extnsionst.h"
-#ifdef XINERAMA
-extern Bool noPanoramiXExtension;
+#ifdef PANORAMIX
+#include "panoramiXsrv.h"
#else
#include "dixevents.h" /* InitEvents() */
#include "dispatch.h" /* InitProcVectors() */
@@ -130,7 +130,7 @@
extern void InitProcVectors(void);
extern Bool CreateGCperDepthArray(void);
-#ifndef XINERAMA
+#ifndef PANORAMIX
static
#endif
Bool CreateConnectionBlock(void);
@@ -410,7 +410,7 @@
DPMSEnabled = FALSE;
#endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
/*
* Consolidate window and colourmap information for each screen
*/
@@ -426,7 +426,7 @@
SetDPMSTimers();
#endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
if (!noPanoramiXExtension) {
if (!PanoramiXCreateConnectionBlock())
FatalError("could not create connection block info");
@@ -445,7 +445,7 @@
FreeScreenSaverTimer();
CloseDownExtensions();
-#ifdef XINERAMA
+#ifdef PANORAMIX
{
Bool remember_it = noPanoramiXExtension;
noPanoramiXExtension = TRUE;
@@ -500,7 +500,7 @@
static int padlength[4] = {0, 3, 2, 1};
-#ifndef XINERAMA
+#ifndef PANORAMIX
static
#endif
Bool
Index: resource.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/resource.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/resource.c 7 Mar 2004 23:45:09 -0000 1.1.4.6
+++ b/resource.c 15 Apr 2004 10:15:46 -0000 1.1.4.7
@@ -44,6 +44,7 @@
SOFTWARE.
********************************************************/
+/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -71,9 +72,9 @@
Equipment Corporation.
******************************************************************/
-/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
-
+/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
+/* $XdotOrg$ */
/* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
/* Routines to manage various kinds of resources:
@@ -114,7 +115,7 @@
#include "dixevents.h"
#include "dixgrabs.h"
#include "cursor.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@@ -698,7 +699,7 @@
}
}
-#ifndef NO_XINERAMA_PORT
+
pointer
LookupClientResourceComplex(
ClientPtr client,
@@ -724,7 +725,7 @@
}
return NULL;
}
-#endif /* NO_XINERAMA_PORT */
+
void
FreeClientNeverRetainResources(ClientPtr client)
@@ -823,7 +824,7 @@
register ClientPtr client;
{
-#ifdef XINERAMA
+#ifdef PANORAMIX
XID minid, maxid;
if (!noPanoramiXExtension) {
@@ -833,7 +834,7 @@
if ((id >= minid) && (id <= maxid))
return TRUE;
}
-#endif /* XINERAMA */
+#endif /* PANORAMIX */
return ((client->clientAsMask == (id & ~RESOURCE_ID_MASK)) &&
((clientTable[client->index].expectID <= id) ||
!LookupIDByClass(id, RC_ANY)));
Index: window.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/window.c,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -d -r1.1.4.8 -r1.1.4.9
--- a/window.c 26 Mar 2004 01:22:18 -0000 1.1.4.8
+++ b/window.c 15 Apr 2004 10:15:46 -0000 1.1.4.9
@@ -49,7 +49,7 @@
*/
-/* The Xinerama components contained the following notice */
+/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -93,7 +93,7 @@
#include "dixstruct.h"
#include "gcstruct.h"
#include "servermd.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@@ -2328,7 +2328,7 @@
event.u.u.detail = Above;
event.u.configureRequest.x = x;
event.u.configureRequest.y = y;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && (!pParent || !pParent->parent)) {
event.u.configureRequest.x += panoramiXdataPtr[0].x;
event.u.configureRequest.y += panoramiXdataPtr[0].y;
@@ -2414,7 +2414,7 @@
event.u.configureNotify.aboveSibling = None;
event.u.configureNotify.x = x;
event.u.configureNotify.y = y;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && (!pParent || !pParent->parent)) {
event.u.configureNotify.x += panoramiXdataPtr[0].x;
event.u.configureNotify.y += panoramiXdataPtr[0].y;
@@ -2572,7 +2572,7 @@
event.u.reparent.parent = pParent->drawable.id;
event.u.reparent.x = x;
event.u.reparent.y = y;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && !pParent->parent) {
event.u.reparent.x += panoramiXdataPtr[0].x;
event.u.reparent.y += panoramiXdataPtr[0].y;
@@ -2945,7 +2945,7 @@
{
pChild->realized = FALSE;
pChild->visibility = VisibilityNotViewable;
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
PanoramiXRes *win;
win = (PanoramiXRes*)LookupIDByType(pChild->drawable.id,
@@ -3227,10 +3227,9 @@
WindowPtr pWin;
{
xEvent event;
-#ifndef NO_XINERAMA_PORT
unsigned int visibility = pWin->visibility;
-#endif
-#ifdef XINERAMA
+
+#ifdef PANORAMIX
/* This is not quite correct yet, but it's close */
if(!noPanoramiXExtension) {
PanoramiXRes *win;
@@ -3284,6 +3283,7 @@
win->u.win.visibility = visibility;
}
#endif
+
event.u.u.type = VisibilityNotify;
event.u.visibility.window = pWin->drawable.id;
event.u.visibility.state = visibility;
More information about the xorg-commit-diffs
mailing list