Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 122 insertions, 129 deletions

diff --git a/xorg-server/hw/xfree86/xaa/xaaOverlay.c b/xorg-server/hw/xfree86/xaa/xaaOverlay.c
index 176a2d891..25d18da96 100644
--- a/xorg-server/hw/xfree86/xaa/xaaOverlay.c
+++ b/xorg-server/hw/xfree86/xaa/xaaOverlay.c
@@ -1,129 +1,122 @@
-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "xf86str.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaawrap.h"

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "mioverlay.h"

-

-#ifdef PANORAMIX

-#include "panoramiX.h"

-#include "panoramiXsrv.h"

-#endif

-

-static void

-XAACopyWindow8_32(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc

-){

-    DDXPointPtr pptSrc, ppt;

-    RegionRec rgnDst;

-    BoxPtr pbox;

-    int dx, dy, nbox;

-    WindowPtr pwinRoot;

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    XAAInfoRecPtr infoRec = 

-	GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable));

-    Bool doUnderlay = miOverlayCopyUnderlay(pScreen);

-    RegionPtr borderClip = &pWin->borderClip;

-    Bool freeReg = FALSE;

-

-    if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt ||

-	(infoRec->ScreenToScreenBitBltFlags & NO_PLANEMASK)) 

-    { 

-	XAA_SCREEN_PROLOGUE (pScreen, CopyWindow);

-	if(infoRec->pScrn->vtSema && infoRec->NeedToSync) {

-	    (*infoRec->Sync)(infoRec->pScrn);

-	    infoRec->NeedToSync = FALSE;

-	}

-        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);

-	XAA_SCREEN_EPILOGUE (pScreen, CopyWindow, XAACopyWindow8_32);

-    	return;

-    }

-

-    pwinRoot = pScreen->root;

-

-    if(doUnderlay)

-	freeReg = miOverlayCollectUnderlayRegions(pWin, &borderClip);

-

-    RegionNull(&rgnDst);

-

-    dx = ptOldOrg.x - pWin->drawable.x;

-    dy = ptOldOrg.y - pWin->drawable.y;

-    RegionTranslate(prgnSrc, -dx, -dy);

-    RegionIntersect(&rgnDst, borderClip, prgnSrc);

-

-    pbox = RegionRects(&rgnDst);

-    nbox = RegionNumRects(&rgnDst);

-    if(!nbox || 

-      !(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec)))) {

-	RegionUninit(&rgnDst);

-	return;

-    }

-    ppt = pptSrc;

-

-    while(nbox--) {

-	ppt->x = pbox->x1 + dx;

-	ppt->y = pbox->y1 + dy;

-	ppt++; pbox++;

-    }

-    

-    infoRec->ScratchGC.planemask = doUnderlay ? 0x00ffffff : 0xff000000;

-    infoRec->ScratchGC.alu = GXcopy;

-

-    XAADoBitBlt((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,

-        		&(infoRec->ScratchGC), &rgnDst, pptSrc);

-

-    free(pptSrc);

-    RegionUninit(&rgnDst);

-    if(freeReg) 

-	RegionDestroy(borderClip);

-}

-

-static void

-XAASetColorKey8_32(

-    ScreenPtr pScreen,

-    int nbox,

-    BoxPtr pbox

-){

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    ScrnInfoPtr pScrn = infoRec->pScrn;

-

-    /* I'm counting on writes being clipped away while switched away.

-       If this isn't going to be true then I need to be wrapping instead. */

-    if(!infoRec->pScrn->vtSema) return;

-

-    (*infoRec->FillSolidRects)(pScrn, pScrn->colorKey << 24, GXcopy, 

-					0xff000000, nbox, pbox);

-  

-    SET_SYNC_FLAG(infoRec);

-}

-

-void

-XAASetupOverlay8_32Planar(ScreenPtr pScreen)

-{

-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

-    int i;

-

-    pScreen->CopyWindow = XAACopyWindow8_32;

-

-    if(!(infoRec->FillSolidRectsFlags & NO_PLANEMASK))

-	miOverlaySetTransFunction(pScreen, XAASetColorKey8_32);

-

-    infoRec->FullPlanemask = ~0;

-    for(i = 0; i < 32; i++) /* haven't thought about this much */

-	infoRec->FullPlanemasks[i] = ~0;

-}

+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "mioverlay.h"
+
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+#endif
+
+static void
+XAACopyWindow8_32(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    DDXPointPtr pptSrc, ppt;
+    RegionRec rgnDst;
+    BoxPtr pbox;
+    int dx, dy, nbox;
+    WindowPtr pwinRoot;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable));
+    Bool doUnderlay = miOverlayCopyUnderlay(pScreen);
+    RegionPtr borderClip = &pWin->borderClip;
+    Bool freeReg = FALSE;
+
+    if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt ||
+        (infoRec->ScreenToScreenBitBltFlags & NO_PLANEMASK)) {
+        XAA_SCREEN_PROLOGUE(pScreen, CopyWindow);
+        if (infoRec->pScrn->vtSema && infoRec->NeedToSync) {
+            (*infoRec->Sync) (infoRec->pScrn);
+            infoRec->NeedToSync = FALSE;
+        }
+        (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+        XAA_SCREEN_EPILOGUE(pScreen, CopyWindow, XAACopyWindow8_32);
+        return;
+    }
+
+    pwinRoot = pScreen->root;
+
+    if (doUnderlay)
+        freeReg = miOverlayCollectUnderlayRegions(pWin, &borderClip);
+
+    RegionNull(&rgnDst);
+
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
+    RegionTranslate(prgnSrc, -dx, -dy);
+    RegionIntersect(&rgnDst, borderClip, prgnSrc);
+
+    pbox = RegionRects(&rgnDst);
+    nbox = RegionNumRects(&rgnDst);
+    if (!nbox || !(pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec)))) {
+        RegionUninit(&rgnDst);
+        return;
+    }
+    ppt = pptSrc;
+
+    while (nbox--) {
+        ppt->x = pbox->x1 + dx;
+        ppt->y = pbox->y1 + dy;
+        ppt++;
+        pbox++;
+    }
+
+    infoRec->ScratchGC.planemask = doUnderlay ? 0x00ffffff : 0xff000000;
+    infoRec->ScratchGC.alu = GXcopy;
+
+    XAADoBitBlt((DrawablePtr) pwinRoot, (DrawablePtr) pwinRoot,
+                &(infoRec->ScratchGC), &rgnDst, pptSrc);
+
+    free(pptSrc);
+    RegionUninit(&rgnDst);
+    if (freeReg)
+        RegionDestroy(borderClip);
+}
+
+static void
+XAASetColorKey8_32(ScreenPtr pScreen, int nbox, BoxPtr pbox)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = infoRec->pScrn;
+
+    /* I'm counting on writes being clipped away while switched away.
+       If this isn't going to be true then I need to be wrapping instead. */
+    if (!infoRec->pScrn->vtSema)
+        return;
+
+    (*infoRec->FillSolidRects) (pScrn, pScrn->colorKey << 24, GXcopy,
+                                0xff000000, nbox, pbox);
+
+    SET_SYNC_FLAG(infoRec);
+}
+
+void
+XAASetupOverlay8_32Planar(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    int i;
+
+    pScreen->CopyWindow = XAACopyWindow8_32;
+
+    if (!(infoRec->FillSolidRectsFlags & NO_PLANEMASK))
+        miOverlaySetTransFunction(pScreen, XAASetColorKey8_32);
+
+    infoRec->FullPlanemask = ~0;
+    for (i = 0; i < 32; i++)    /* haven't thought about this much */
+        infoRec->FullPlanemasks[i] = ~0;
+}