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, 190 insertions, 213 deletions

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index 9b3e687c1..ace078a00 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -29,30 +29,30 @@
 #include "fb.h"
 
 PixmapPtr
-fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
-		   unsigned usage_hint)
+fbCreatePixmapBpp(ScreenPtr pScreen, int width, int height, int depth, int bpp,
+                  unsigned usage_hint)
 {
-    PixmapPtr	pPixmap;
-    size_t	datasize;
-    size_t	paddedWidth;
-    int		adjust;
-    int		base;
+    PixmapPtr pPixmap;
+    size_t datasize;
+    size_t paddedWidth;
+    int adjust;
+    int base;
 
-    paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
+    paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof(FbBits);
     if (paddedWidth / 4 > 32767 || height > 32767)
-	return NullPixmap;
+        return NullPixmap;
     datasize = height * paddedWidth;
     base = pScreen->totalPixmapSize;
     adjust = 0;
     if (base & 7)
-	adjust = 8 - (base & 7);
+        adjust = 8 - (base & 7);
     datasize += adjust;
 #ifdef FB_DEBUG
     datasize += 2 * paddedWidth;
 #endif
     pPixmap = AllocatePixmap(pScreen, datasize);
     if (!pPixmap)
-	return NullPixmap;
+        return NullPixmap;
     pPixmap->drawable.type = DRAWABLE_PIXMAP;
     pPixmap->drawable.class = 0;
     pPixmap->drawable.pScreen = pScreen;
@@ -66,11 +66,12 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     pPixmap->drawable.height = height;
     pPixmap->devKind = paddedWidth;
     pPixmap->refcnt = 1;
-    pPixmap->devPrivate.ptr = (pointer) ((char *)pPixmap + base + adjust);
+    pPixmap->devPrivate.ptr = (pointer) ((char *) pPixmap + base + adjust);
 
 #ifdef FB_DEBUG
-    pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth);
-    fbInitializeDrawable (&pPixmap->drawable);
+    pPixmap->devPrivate.ptr =
+        (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth);
+    fbInitializeDrawable(&pPixmap->drawable);
 #endif
 
 #ifdef COMPOSITE
@@ -84,21 +85,22 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
 }
 
 PixmapPtr
-fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
-		unsigned usage_hint)
+fbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
+               unsigned usage_hint)
 {
-    int	bpp;
-    bpp = BitsPerPixel (depth);
+    int bpp;
+
+    bpp = BitsPerPixel(depth);
     if (bpp == 32 && depth <= 24)
-	bpp = fbGetScreenPrivate(pScreen)->pix32bpp;
-    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);
+        bpp = fbGetScreenPrivate(pScreen)->pix32bpp;
+    return fbCreatePixmapBpp(pScreen, width, height, depth, bpp, usage_hint);
 }
 
 Bool
-fbDestroyPixmap (PixmapPtr pPixmap)
+fbDestroyPixmap(PixmapPtr pPixmap)
 {
-    if(--pPixmap->refcnt)
-	return TRUE;
+    if (--pPixmap->refcnt)
+        return TRUE;
     FreePixmap(pPixmap);
     return TRUE;
 }
@@ -138,183 +140,160 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
 RegionPtr
 fbPixmapToRegion(PixmapPtr pPix)
 {
-    register RegionPtr	pReg;
-    FbBits		*pw, w;
-    register int	ib;
-    int			width, h, base, rx1 = 0, crects;
-    FbBits		*pwLineEnd;
-    int			irectPrevStart, irectLineStart;
-    register BoxPtr	prectO, prectN;
-    BoxPtr		FirstRect, rects, prectLineStart;
-    Bool		fInBox, fSame;
-    register FbBits	mask0 = FB_ALLONES & ~FbScrRight(FB_ALLONES, 1);
-    FbBits		*pwLine;
-    int			nWidth;
-    
+    register RegionPtr pReg;
+    FbBits *pw, w;
+    register int ib;
+    int width, h, base, rx1 = 0, crects;
+    FbBits *pwLineEnd;
+    int irectPrevStart, irectLineStart;
+    register BoxPtr prectO, prectN;
+    BoxPtr FirstRect, rects, prectLineStart;
+    Bool fInBox, fSame;
+    register FbBits mask0 = FB_ALLONES & ~FbScrRight(FB_ALLONES, 1);
+    FbBits *pwLine;
+    int nWidth;
+
     pReg = RegionCreate(NULL, 1);
-    if(!pReg)
-	return NullRegion;
+    if (!pReg)
+        return NullRegion;
     FirstRect = RegionBoxptr(pReg);
     rects = FirstRect;
 
     fbPrepareAccess(&pPix->drawable);
 
     pwLine = (FbBits *) pPix->devPrivate.ptr;
-    nWidth = pPix->devKind >> (FB_SHIFT-3);
+    nWidth = pPix->devKind >> (FB_SHIFT - 3);
 
     width = pPix->drawable.width;
     pReg->extents.x1 = width - 1;
     pReg->extents.x2 = 0;
     irectPrevStart = -1;
-    for(h = 0; h < pPix->drawable.height; h++)
-    {
-	pw = pwLine;
-	pwLine += nWidth;
-	irectLineStart = rects - FirstRect;
-	/* If the Screen left most bit of the word is set, we're starting in
-	 * a box */
-	if(READ(pw) & mask0)
-	{
-	    fInBox = TRUE;
-	    rx1 = 0;
-	}
-	else
-	    fInBox = FALSE;
-	/* Process all words which are fully in the pixmap */
-	pwLineEnd = pw + (width >> FB_SHIFT);
-	for (base = 0; pw < pwLineEnd; base += FB_UNIT)
-	{
-	    w = READ(pw++);
-	    if (fInBox)
-	    {
-		if (!~w)
-		    continue;
-	    }
-	    else
-	    {
-		if (!w)
-		    continue;
-	    }
-	    for(ib = 0; ib < FB_UNIT; ib++)
-	    {
-	        /* If the Screen left most bit of the word is set, we're
-		 * starting a box */
-		if(w & mask0)
-		{
-		    if(!fInBox)
-		    {
-			rx1 = base + ib;
-			/* start new box */
-			fInBox = TRUE;
-		    }
-		}
-		else
-		{
-		    if(fInBox)
-		    {
-			/* end box */
-			ADDRECT(pReg, rects, FirstRect,
-				rx1, h, base + ib, h + 1);
-			fInBox = FALSE;
-		    }
-		}
-		/* Shift the word VISUALLY left one. */
-		w = FbScrLeft(w, 1);
-	    }
-	}
-	if(width & FB_MASK)
-	{
-	    /* Process final partial word on line */
-	    w = READ(pw++);
-	    for(ib = 0; ib < (width & FB_MASK); ib++)
-	    {
-	        /* If the Screen left most bit of the word is set, we're
-		 * starting a box */
-		if(w & mask0)
-		{
-		    if(!fInBox)
-		    {
-			rx1 = base + ib;
-			/* start new box */
-			fInBox = TRUE;
-		    }
-		}
-		else
-		{
-		    if(fInBox)
-		    {
-			/* end box */
-			ADDRECT(pReg, rects, FirstRect,
-				rx1, h, base + ib, h + 1);
-			fInBox = FALSE;
-		    }
-		}
-		/* Shift the word VISUALLY left one. */
-		w = FbScrLeft(w, 1);
-	    }
-	}
-	/* If scanline ended with last bit set, end the box */
-	if(fInBox)
-	{
-	    ADDRECT(pReg, rects, FirstRect,
-		    rx1, h, base + (width & FB_MASK), h + 1);
-	}
-	/* if all rectangles on this line have the same x-coords as
-	 * those on the previous line, then add 1 to all the previous  y2s and 
-	 * throw away all the rectangles from this line 
-	 */
-	fSame = FALSE;
-	if(irectPrevStart != -1)
-	{
-	    crects = irectLineStart - irectPrevStart;
-	    if(crects == ((rects - FirstRect) - irectLineStart))
-	    {
-	        prectO = FirstRect + irectPrevStart;
-	        prectN = prectLineStart = FirstRect + irectLineStart;
-		fSame = TRUE;
-	        while(prectO < prectLineStart)
-		{
-		    if((prectO->x1 != prectN->x1) || (prectO->x2 != prectN->x2))
-		    {
-			  fSame = FALSE;
-			  break;
-		    }
-		    prectO++;
-		    prectN++;
-		}
-		if (fSame)
-		{
-		    prectO = FirstRect + irectPrevStart;
-		    while(prectO < prectLineStart)
-		    {
-			prectO->y2 += 1;
-			prectO++;
-		    }
-		    rects -= crects;
-		    pReg->data->numRects -= crects;
-		}
-	    }
-	}
-	if(!fSame)
-	    irectPrevStart = irectLineStart;
+    for (h = 0; h < pPix->drawable.height; h++) {
+        pw = pwLine;
+        pwLine += nWidth;
+        irectLineStart = rects - FirstRect;
+        /* If the Screen left most bit of the word is set, we're starting in
+         * a box */
+        if (READ(pw) & mask0) {
+            fInBox = TRUE;
+            rx1 = 0;
+        }
+        else
+            fInBox = FALSE;
+        /* Process all words which are fully in the pixmap */
+        pwLineEnd = pw + (width >> FB_SHIFT);
+        for (base = 0; pw < pwLineEnd; base += FB_UNIT) {
+            w = READ(pw++);
+            if (fInBox) {
+                if (!~w)
+                    continue;
+            }
+            else {
+                if (!w)
+                    continue;
+            }
+            for (ib = 0; ib < FB_UNIT; ib++) {
+                /* If the Screen left most bit of the word is set, we're
+                 * starting a box */
+                if (w & mask0) {
+                    if (!fInBox) {
+                        rx1 = base + ib;
+                        /* start new box */
+                        fInBox = TRUE;
+                    }
+                }
+                else {
+                    if (fInBox) {
+                        /* end box */
+                        ADDRECT(pReg, rects, FirstRect,
+                                rx1, h, base + ib, h + 1);
+                        fInBox = FALSE;
+                    }
+                }
+                /* Shift the word VISUALLY left one. */
+                w = FbScrLeft(w, 1);
+            }
+        }
+        if (width & FB_MASK) {
+            /* Process final partial word on line */
+            w = READ(pw++);
+            for (ib = 0; ib < (width & FB_MASK); ib++) {
+                /* If the Screen left most bit of the word is set, we're
+                 * starting a box */
+                if (w & mask0) {
+                    if (!fInBox) {
+                        rx1 = base + ib;
+                        /* start new box */
+                        fInBox = TRUE;
+                    }
+                }
+                else {
+                    if (fInBox) {
+                        /* end box */
+                        ADDRECT(pReg, rects, FirstRect,
+                                rx1, h, base + ib, h + 1);
+                        fInBox = FALSE;
+                    }
+                }
+                /* Shift the word VISUALLY left one. */
+                w = FbScrLeft(w, 1);
+            }
+        }
+        /* If scanline ended with last bit set, end the box */
+        if (fInBox) {
+            ADDRECT(pReg, rects, FirstRect,
+                    rx1, h, base + (width & FB_MASK), h + 1);
+        }
+        /* if all rectangles on this line have the same x-coords as
+         * those on the previous line, then add 1 to all the previous  y2s and 
+         * throw away all the rectangles from this line 
+         */
+        fSame = FALSE;
+        if (irectPrevStart != -1) {
+            crects = irectLineStart - irectPrevStart;
+            if (crects == ((rects - FirstRect) - irectLineStart)) {
+                prectO = FirstRect + irectPrevStart;
+                prectN = prectLineStart = FirstRect + irectLineStart;
+                fSame = TRUE;
+                while (prectO < prectLineStart) {
+                    if ((prectO->x1 != prectN->x1) ||
+                        (prectO->x2 != prectN->x2)) {
+                        fSame = FALSE;
+                        break;
+                    }
+                    prectO++;
+                    prectN++;
+                }
+                if (fSame) {
+                    prectO = FirstRect + irectPrevStart;
+                    while (prectO < prectLineStart) {
+                        prectO->y2 += 1;
+                        prectO++;
+                    }
+                    rects -= crects;
+                    pReg->data->numRects -= crects;
+                }
+            }
+        }
+        if (!fSame)
+            irectPrevStart = irectLineStart;
     }
     if (!pReg->data->numRects)
-	pReg->extents.x1 = pReg->extents.x2 = 0;
-    else
-    {
-	pReg->extents.y1 = RegionBoxptr(pReg)->y1;
-	pReg->extents.y2 = RegionEnd(pReg)->y2;
-	if (pReg->data->numRects == 1)
-	{
-	    free(pReg->data);
-	    pReg->data = (RegDataPtr)NULL;
-	}
+        pReg->extents.x1 = pReg->extents.x2 = 0;
+    else {
+        pReg->extents.y1 = RegionBoxptr(pReg)->y1;
+        pReg->extents.y2 = RegionEnd(pReg)->y2;
+        if (pReg->data->numRects == 1) {
+            free(pReg->data);
+            pReg->data = (RegDataPtr) NULL;
+        }
     }
 
     fbFinishAccess(&pPix->drawable);
 #ifdef DEBUG
     if (!RegionIsValid(pReg))
-	FatalError("Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__);
+        FatalError("Assertion failed file %s, line %d: expr\n", __FILE__,
+                   __LINE__);
 #endif
     return pReg;
 }
@@ -324,58 +303,56 @@ fbPixmapToRegion(PixmapPtr pPix)
 #include <stdio.h>
 
 static Bool
-fbValidateBits (FbStip *bits, int stride, FbStip data)
+fbValidateBits(FbStip * bits, int stride, FbStip data)
 {
-    while (stride--)
-    {
-	if (*bits != data)
-	{
-	    fprintf (stderr, "fbValidateBits failed at 0x%x (is 0x%x want 0x%x)\n",bits, *bits, data);
-	    return FALSE;
-	}
-	bits++;
+    while (stride--) {
+        if (*bits != data) {
+            fprintf (stderr, "fbValidateBits failed at 0x%x (is 0x%x want 0x%x)\n",bits, *bits, data);
+            return FALSE;
+        }
+        bits++;
     }
 }
 
 void
-fbValidateDrawable (DrawablePtr pDrawable)
+fbValidateDrawable(DrawablePtr pDrawable)
 {
-    FbStip	*bits, *first, *last;
-    int		stride, bpp;
-    int		xoff, yoff;
-    int		height;
-    Bool	failed;
-    
+    FbStip *bits, *first, *last;
+    int stride, bpp;
+    int xoff, yoff;
+    int height;
+    Bool failed;
+
     if (pDrawable->type != DRAWABLE_PIXMAP)
-	pDrawable = (DrawablePtr) fbGetWindowPixmap(pDrawable);
+        pDrawable = (DrawablePtr) fbGetWindowPixmap(pDrawable);
     fbGetStipDrawable(pDrawable, bits, stride, bpp, xoff, yoff);
     first = bits - stride;
     last = bits + stride * pDrawable->height;
-    if (!fbValidateBits (first, stride, FB_HEAD_BITS) ||
-	!fbValidateBits (last, stride, FB_TAIL_BITS))
-	fbInitializeDrawable(pDrawable);
-    fbFinishAccess (pDrawable);
+    if (!fbValidateBits(first, stride, FB_HEAD_BITS) ||
+        !fbValidateBits(last, stride, FB_TAIL_BITS))
+        fbInitializeDrawable(pDrawable);
+    fbFinishAccess(pDrawable);
 }
 
 void
-fbSetBits (FbStip *bits, int stride, FbStip data)
+fbSetBits(FbStip * bits, int stride, FbStip data)
 {
     while (stride--)
-	*bits++ = data;
+        *bits++ = data;
 }
 
 void
-fbInitializeDrawable (DrawablePtr pDrawable)
+fbInitializeDrawable(DrawablePtr pDrawable)
 {
-    FbStip  *bits, *first, *last;
-    int	    stride, bpp;
-    int	    xoff, yoff;
-    
+    FbStip *bits, *first, *last;
+    int stride, bpp;
+    int xoff, yoff;
+
     fbGetStipDrawable(pDrawable, bits, stride, bpp, xoff, yoff);
     first = bits - stride;
     last = bits + stride * pDrawable->height;
-    fbSetBits (first, stride, FB_HEAD_BITS);
-    fbSetBits (last, stride, FB_TAIL_BITS);
-    fbFinishAccess (pDrawable);
+    fbSetBits(first, stride, FB_HEAD_BITS);
+    fbSetBits(last, stride, FB_TAIL_BITS);
+    fbFinishAccess(pDrawable);
 }
-#endif /* FB_DEBUG */
+#endif                          /* FB_DEBUG */