Merge branch 'master' into dcdc_rework

Conflicts:

	Xext/xevie.c
	dix/dispatch.c
This commit is contained in:
Peter Hutterer 2008-04-07 07:56:41 +09:30
commit fd06e8f8c1
182 changed files with 5741 additions and 4820 deletions

View file

@ -89,7 +89,7 @@ xnestCollectExposures(void)
while (XCheckIfEvent(xnestDisplay, &X, xnestExposurePredicate, NULL)) {
pWin = xnestWindowPtr(X.xexpose.window);
if (pWin) {
if (pWin && X.xexpose.width && X.xexpose.height) {
Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + X.xexpose.x;
Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + X.xexpose.y;
Box.x2 = Box.x1 + X.xexpose.width;
@ -97,7 +97,7 @@ xnestCollectExposures(void)
REGION_INIT(pWin->drawable.pScreen, &Rgn, &Box, 1);
miWindowExposures(pWin, &Rgn, NullRegion);
miSendExposures(pWin, &Rgn, Box.x2, Box.y2);
}
}
}