diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-27 19:35:49 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-27 19:35:49 +0000 |
| commit | bb93fef9877a885da2c6108410155fa996b19abf (patch) | |
| tree | ab50f938d3b3b70fac22ff5c9139ba396f821acf | |
| parent | cb718ce08eb25c3999c91b8d614fb88237fad03d (diff) | |
bug #238 test for root-window that XFree86 fixed in theirXINERAMA_2
programs/Xserver/Xext/shm.c
3.37 and programs/Xserver/Xext/xvdisp.c 1.26 got zapped when Xinerama2 was
merged into the tree. (Xinerama has since been reverted to 1.1, but
that's another story.)
| -rw-r--r-- | Xext/shm.c | 9 | ||||
| -rw-r--r-- | Xext/xvdisp.c | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/Xext/shm.c b/Xext/shm.c index d39e16bab..6ecfbe94c 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,5 +1,4 @@ -/* $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 $ * +/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -580,8 +579,7 @@ ProcXineramaShmPutImage(register ClientPtr client) client, stuff->gc, XRT_GC, SecurityReadAccess))) return BadGC; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; orig_x = stuff->dstX; orig_y = stuff->dstY; @@ -641,8 +639,7 @@ ProcXineramaShmGetImage(ClientPtr client) format = stuff->format; planemask = stuff->planeMask; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; if(isRoot) { if( /* check for being onscreen */ diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 9eeb7b17a..b377defb6 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -1942,8 +1942,7 @@ XineramaXvShmPutImage(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; @@ -1990,8 +1989,7 @@ XineramaXvPutImage(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; @@ -2036,8 +2034,7 @@ XineramaXvPutVideo(ClientPtr client) client, stuff->port, XvXRTPort, SecurityReadAccess))) return _XvBadPort; - isRoot = (draw->type == XRT_WINDOW) && - (stuff->drawable == WindowTable[0]->drawable.id); + isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; x = stuff->drw_x; y = stuff->drw_y; |