[Xorg-commit] xc/programs/Xserver/hw/xwin winmultiwindowshape.c,1.1,1.1.4.1 winwindow.c,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xwin
Modified Files:
Tag: XORG-CURRENT
winmultiwindowshape.c winwindow.c
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: winmultiwindowshape.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/winmultiwindowshape.c 25 Nov 2003 19:28:56 -0000 1.1
+++ b/winmultiwindowshape.c 23 Feb 2004 21:37:21 -0000 1.1.4.1
@@ -28,7 +28,7 @@
* Authors: Kensuke Matsuzaki
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.3 2003/12/22 01:34:20 dickey Exp $ */
#ifdef SHAPE
@@ -117,9 +117,9 @@
if (!wBoundingShape (pWin))
return;
- REGION_NULL(pScreen, &rrNewShape);
- REGION_COPY(pScreen, &rrNewShape, wBoundingShape(pWin));
- REGION_TRANSLATE(pScreen,
+ REGION_NULL(pWin->drawable.pScreen, &rrNewShape);
+ REGION_COPY(pWin->drawable.pScreen, &rrNewShape, wBoundingShape(pWin));
+ REGION_TRANSLATE(pWin->drawable.pScreen,
&rrNewShape,
pWin->borderWidth,
pWin->borderWidth);
@@ -138,7 +138,7 @@
if (!GetClientRect (pWinPriv->hWnd, &rcClient))
{
ErrorF ("winReshape - GetClientRect failed, bailing: %d\n",
- GetLastError ());
+ (int) GetLastError ());
return;
}
@@ -150,7 +150,7 @@
if (!GetWindowRect (pWinPriv->hWnd, &rcWindow))
{
ErrorF ("winReshape - GetWindowRect failed, bailing: %d\n",
- GetLastError ());
+ (int) GetLastError ());
return;
}
@@ -165,7 +165,7 @@
{
ErrorF ("winReshape - Initial CreateRectRgn (%d, %d, %d, %d) "
"failed: %d\n",
- 0, 0, rcWindow.right, iOffsetY, GetLastError ());
+ 0, 0, (int) rcWindow.right, iOffsetY, (int) GetLastError ());
}
/* Loop through all rectangles in the X region */
@@ -185,7 +185,7 @@
pRects->y1 + iOffsetY - 1,
pRects->x2 + iOffsetX - 1,
pRects->y2 + iOffsetY - 1,
- GetLastError (),
+ (int) GetLastError (),
pRects->x1, pRects->x2, iOffsetX,
pRects->y1, pRects->y2, iOffsetY);
}
@@ -194,7 +194,7 @@
if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)
{
ErrorF ("winReshape - CombineRgn () failed: %d\n",
- GetLastError ());
+ (int) GetLastError ());
}
/* Delete the temporary Windows region */
@@ -205,7 +205,7 @@
pWinPriv->hRgn = hRgn;
}
- REGION_UNINIT(pScreen, &rrNewShape);
+ REGION_UNINIT(pWin->drawable.pScreen, &rrNewShape);
return;
}
Index: winwindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winwindow.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
--- a/winwindow.c 26 Nov 2003 22:49:06 -0000 1.1.4.1
+++ b/winwindow.c 23 Feb 2004 21:37:21 -0000 1.1.4.2
@@ -28,7 +28,7 @@
* Authors: Harold L Hunt II
* Kensuke Matsuzaki
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.10 2003/12/22 01:34:20 dickey Exp $ */
#include "win.h"
@@ -98,7 +98,7 @@
int dx, dy;
int i, nbox;
WindowPtr pwinRoot;
- BoxPtr pBoxDst, pBoxSrc;
+ BoxPtr pBoxDst;
ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen);
@@ -465,9 +465,7 @@
winReshapePRootless (WindowPtr pWin)
{
int nRects;
-#if 0
ScreenPtr pScreen = pWin->drawable.pScreen;
-#endif
RegionRec rrNewShape;
BoxPtr pShape, pRects, pEnd;
HRGN hRgn, hRgnRect;
More information about the xorg-commit
mailing list