frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #238 test for root-window that XFree86 fixed in their 

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.)
This commit is contained in:
Kaleb Keithley 2004-02-27 19:35:49 +00:00
parent cb718ce08e
commit bb93fef987
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/shm.c
View File

@ -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 Copyright 1989, 1998 The Open Group
@ -580,8 +579,7 @@ ProcXineramaShmPutImage(register ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess))) client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC; return BadGC;
isRoot = (draw->type == XRT_WINDOW) && isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
(stuff->drawable == WindowTable[0]->drawable.id);
orig_x = stuff->dstX; orig_x = stuff->dstX;
orig_y = stuff->dstY; orig_y = stuff->dstY;
@ -641,8 +639,7 @@ ProcXineramaShmGetImage(ClientPtr client)
format = stuff->format; format = stuff->format;
planemask = stuff->planeMask; planemask = stuff->planeMask;
isRoot = (draw->type == XRT_WINDOW) && isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
(stuff->drawable == WindowTable[0]->drawable.id);
if(isRoot) { if(isRoot) {
if( /* check for being onscreen */ if( /* check for being onscreen */

11
Xext/xvdisp.c
View File

@ -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, Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts. and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@ -1942,8 +1942,7 @@ XineramaXvShmPutImage(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess))) client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort; return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) && isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
(stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x; x = stuff->drw_x;
y = stuff->drw_y; y = stuff->drw_y;
@ -1990,8 +1989,7 @@ XineramaXvPutImage(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess))) client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort; return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) && isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
(stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x; x = stuff->drw_x;
y = stuff->drw_y; y = stuff->drw_y;
@ -2036,8 +2034,7 @@ XineramaXvPutVideo(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess))) client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort; return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) && isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
(stuff->drawable == WindowTable[0]->drawable.id);
x = stuff->drw_x; x = stuff->drw_x;
y = stuff->drw_y; y = stuff->drw_y;