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, 152 insertions, 196 deletions

diff --git a/xorg-server/fb/fbstipple.c b/xorg-server/fb/fbstipple.c
index dc1fd468f..f6c84a212 100644
--- a/xorg-server/fb/fbstipple.c
+++ b/xorg-server/fb/fbstipple.c
@@ -42,29 +42,26 @@
 #define LaneCases64(c,a)    LaneCases32(c,a); LaneCases32(c+32,a)
 #define LaneCases128(c,a)   LaneCases64(c,a); LaneCases64(c+64,a)
 #define LaneCases256(c,a)   LaneCases128(c,a); LaneCases128(c+128,a)
-    
+
 #if FB_SHIFT == 6
 #define LaneCases(a)	    LaneCases256(0,a)
 #endif
-    
+
 #if FB_SHIFT == 5
 #define LaneCases(a)	    LaneCases16(0,a)
 #endif
-							   
+
 /*
  * Repeat a transparent stipple across a scanline n times
  */
 
 void
-fbTransparentSpan (FbBits   *dst,
-		   FbBits   stip,
-		   FbBits   fgxor,
-		   int	    n)
+fbTransparentSpan(FbBits * dst, FbBits stip, FbBits fgxor, int n)
 {
-    FbStip  s;
+    FbStip s;
 
-    s  = ((FbStip) (stip      ) & 0x01);
-    s |= ((FbStip) (stip >>  8) & 0x02);
+    s = ((FbStip) (stip) & 0x01);
+    s |= ((FbStip) (stip >> 8) & 0x02);
     s |= ((FbStip) (stip >> 16) & 0x04);
     s |= ((FbStip) (stip >> 24) & 0x08);
 #if FB_SHIFT > 5
@@ -74,235 +71,194 @@ fbTransparentSpan (FbBits   *dst,
     s |= ((FbStip) (stip >> 56) & 0x80);
 #endif
     switch (s) {
-	LaneCases(dst);
+        LaneCases(dst);
     }
 }
 
 void
-fbEvenStipple (FbBits	*dst,
-	       FbStride	dstStride,
-	       int	dstX,
-	       int	dstBpp,
-
-	       int	width,
-	       int	height,
-
-	       FbStip	*stip,
-	       FbStride	stipStride,
-	       int	stipHeight,
-
-	       FbBits	fgand,
-	       FbBits	fgxor,
-	       FbBits	bgand,
-	       FbBits	bgxor,
-
-	       int	xRot,
-	       int	yRot)
+fbEvenStipple(FbBits * dst,
+              FbStride dstStride,
+              int dstX,
+              int dstBpp,
+              int width,
+              int height,
+              FbStip * stip,
+              FbStride stipStride,
+              int stipHeight,
+              FbBits fgand,
+              FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot)
 {
-    FbBits	startmask, endmask;
-    FbBits	mask, and, xor;
-    int		nmiddle, n;
-    FbStip	*s, *stipEnd, bits;
-    int		rot, stipX, stipY;
-    int		pixelsPerDst;
-    const FbBits    *fbBits;
-    Bool	transparent;
-    int		startbyte, endbyte;
-    
+    FbBits startmask, endmask;
+    FbBits mask, and, xor;
+    int nmiddle, n;
+    FbStip *s, *stipEnd, bits;
+    int rot, stipX, stipY;
+    int pixelsPerDst;
+    const FbBits *fbBits;
+    Bool transparent;
+    int startbyte, endbyte;
+
     /*
      * Check for a transparent stipple (stencil)
      */
     transparent = FALSE;
-    if (dstBpp >= 8 &&
-	fgand == 0 && bgand == FB_ALLONES && bgxor == 0)
-	transparent = TRUE;
-    
+    if (dstBpp >= 8 && fgand == 0 && bgand == FB_ALLONES && bgxor == 0)
+        transparent = TRUE;
+
     pixelsPerDst = FB_UNIT / dstBpp;
     /*
      * Adjust dest pointers
      */
     dst += dstX >> FB_SHIFT;
     dstX &= FB_MASK;
-    FbMaskBitsBytes (dstX, width, fgand == 0 && bgand == 0,
-		     startmask, startbyte, nmiddle, endmask, endbyte);
-		     
+    FbMaskBitsBytes(dstX, width, fgand == 0 && bgand == 0,
+                    startmask, startbyte, nmiddle, endmask, endbyte);
+
     if (startmask)
-	dstStride--;
+        dstStride--;
     dstStride -= nmiddle;
-    
+
     xRot *= dstBpp;
     /*
      * Compute stip start scanline and rotation parameters
      */
     stipEnd = stip + stipStride * stipHeight;
-    modulus (- yRot, stipHeight, stipY);
+    modulus(-yRot, stipHeight, stipY);
     s = stip + stipStride * stipY;
-    modulus (- xRot, FB_UNIT, stipX);
+    modulus(-xRot, FB_UNIT, stipX);
     rot = stipX;
-    
+
     /*
      * Get pointer to stipple mask array for this depth
      */
     /* fbStippleTable covers all valid bpp (4,8,16,32) */
     fbBits = fbStippleTable[pixelsPerDst];
-    
-    while (height--)
-    {
-	/*
-	 * Extract stipple bits for this scanline;
-	 */
-	bits = READ(s);
-	s += stipStride;
-	if (s == stipEnd)
-	    s = stip;
+
+    while (height--) {
+        /*
+         * Extract stipple bits for this scanline;
+         */
+        bits = READ(s);
+        s += stipStride;
+        if (s == stipEnd)
+            s = stip;
 #if FB_UNIT > 32
-	if (pixelsPerDst == 16)
-	    mask = FbStipple16Bits(FbLeftStipBits(bits,16));
-	else
+        if (pixelsPerDst == 16)
+            mask = FbStipple16Bits(FbLeftStipBits(bits, 16));
+        else
 #endif
-	    mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
-	/*
-	 * Rotate into position and compute reduced rop values
-	 */
-	mask = FbRotLeft(mask, rot);
-	and = (fgand & mask) | (bgand & ~mask);
-	xor = (fgxor & mask) | (bgxor & ~mask);
-	
-	if (transparent)
-	{
-	    if (startmask)
-	    {
-		fbTransparentSpan(dst, mask&startmask, fgxor, 1);
-		dst++;
-	    }
-	    fbTransparentSpan (dst, mask, fgxor, nmiddle);
-	    dst += nmiddle;
-	    if (endmask)
-		fbTransparentSpan(dst, mask&endmask, fgxor, 1);
-	}
-	else
-	{
-	    /*
-	     * Fill scanline
-	     */
-	    if (startmask)
-	    {
-		FbDoLeftMaskByteRRop (dst, startbyte, startmask, and, xor);
-		dst++;
-	    }
-	    n = nmiddle;
-	    if (!and)
-		while (n--)
-		    WRITE(dst++, xor);
-	    else
-	    {
-		while (n--)
-		{
-		    WRITE(dst, FbDoRRop (READ(dst), and, xor));
-		    dst++;
-		}
-	    }
-	    if (endmask)
-		FbDoRightMaskByteRRop(dst, endbyte, endmask, and, xor);
-	}
-	dst += dstStride;
+            mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)];
+        /*
+         * Rotate into position and compute reduced rop values
+         */
+        mask = FbRotLeft(mask, rot);
+        and = (fgand & mask) | (bgand & ~mask);
+        xor = (fgxor & mask) | (bgxor & ~mask);
+
+        if (transparent) {
+            if (startmask) {
+                fbTransparentSpan(dst, mask & startmask, fgxor, 1);
+                dst++;
+            }
+            fbTransparentSpan(dst, mask, fgxor, nmiddle);
+            dst += nmiddle;
+            if (endmask)
+                fbTransparentSpan(dst, mask & endmask, fgxor, 1);
+        }
+        else {
+            /*
+             * Fill scanline
+             */
+            if (startmask) {
+                FbDoLeftMaskByteRRop(dst, startbyte, startmask, and, xor);
+                dst++;
+            }
+            n = nmiddle;
+            if (!and)
+                while (n--)
+                    WRITE(dst++, xor);
+            else {
+                while (n--) {
+                    WRITE(dst, FbDoRRop(READ(dst), and, xor));
+                    dst++;
+                }
+            }
+            if (endmask)
+                FbDoRightMaskByteRRop(dst, endbyte, endmask, and, xor);
+        }
+        dst += dstStride;
     }
 }
 
 void
-fbOddStipple (FbBits	*dst,
-	      FbStride	dstStride,
-	      int	dstX,
-	      int	dstBpp,
-
-	      int	width,
-	      int	height,
-
-	      FbStip	*stip,
-	      FbStride	stipStride,
-	      int	stipWidth,
-	      int	stipHeight,
-
-	      FbBits	fgand,
-	      FbBits	fgxor,
-	      FbBits	bgand,
-	      FbBits	bgxor,
-
-	      int	xRot,
-	      int	yRot)
+fbOddStipple(FbBits * dst,
+             FbStride dstStride,
+             int dstX,
+             int dstBpp,
+             int width,
+             int height,
+             FbStip * stip,
+             FbStride stipStride,
+             int stipWidth,
+             int stipHeight,
+             FbBits fgand,
+             FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot)
 {
-    int		stipX, stipY, sx;
-    int		widthTmp;
-    int		h, w;
-    int		x, y;
+    int stipX, stipY, sx;
+    int widthTmp;
+    int h, w;
+    int x, y;
 
-    modulus (- yRot, stipHeight, stipY);
-    modulus (dstX / dstBpp - xRot, stipWidth, stipX);
+    modulus(-yRot, stipHeight, stipY);
+    modulus(dstX / dstBpp - xRot, stipWidth, stipX);
     y = 0;
-    while (height)
-    {
-	h = stipHeight - stipY;
-	if (h > height)
-	    h = height;
-	height -= h;
-	widthTmp = width;
-	x = dstX;
-	sx = stipX;
-	while (widthTmp)
-	{
-	    w = (stipWidth - sx) * dstBpp;
-	    if (w > widthTmp)
-		w = widthTmp;
-	    widthTmp -= w;
-	    fbBltOne (stip + stipY * stipStride,
-		      stipStride,
-		      sx,
-
-		      dst + y * dstStride,
-		      dstStride,
-		      x,
-		      dstBpp,
-
-		      w, h,
-
-		      fgand, fgxor, bgand, bgxor);
-	    x += w;
-	    sx = 0;
-	}
-	y += h;
-	stipY = 0;
+    while (height) {
+        h = stipHeight - stipY;
+        if (h > height)
+            h = height;
+        height -= h;
+        widthTmp = width;
+        x = dstX;
+        sx = stipX;
+        while (widthTmp) {
+            w = (stipWidth - sx) * dstBpp;
+            if (w > widthTmp)
+                w = widthTmp;
+            widthTmp -= w;
+            fbBltOne(stip + stipY * stipStride,
+                     stipStride,
+                     sx,
+                     dst + y * dstStride,
+                     dstStride, x, dstBpp, w, h, fgand, fgxor, bgand, bgxor);
+            x += w;
+            sx = 0;
+        }
+        y += h;
+        stipY = 0;
     }
 }
 
 void
-fbStipple (FbBits	*dst,
-	   FbStride	dstStride,
-	   int		dstX,
-	   int		dstBpp,
-
-	   int		width,
-	   int		height,
-
-	   FbStip	*stip,
-	   FbStride	stipStride,
-	   int		stipWidth,
-	   int		stipHeight,
-	   Bool		even,
-
-	   FbBits	fgand,
-	   FbBits	fgxor,
-	   FbBits	bgand,
-	   FbBits	bgxor,
-
-	   int		xRot,
-	   int		yRot)
+fbStipple(FbBits * dst,
+          FbStride dstStride,
+          int dstX,
+          int dstBpp,
+          int width,
+          int height,
+          FbStip * stip,
+          FbStride stipStride,
+          int stipWidth,
+          int stipHeight,
+          Bool even,
+          FbBits fgand,
+          FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot)
 {
     if (even)
-	fbEvenStipple (dst, dstStride, dstX, dstBpp, width, height,
-		       stip, stipStride, stipHeight,
-		       fgand, fgxor, bgand, bgxor, xRot, yRot);
+        fbEvenStipple(dst, dstStride, dstX, dstBpp, width, height,
+                      stip, stipStride, stipHeight,
+                      fgand, fgxor, bgand, bgxor, xRot, yRot);
     else
-	fbOddStipple (dst, dstStride, dstX, dstBpp, width, height,
-		      stip, stipStride, stipWidth, stipHeight,
-		      fgand, fgxor, bgand, bgxor, xRot, yRot);
+        fbOddStipple(dst, dstStride, dstX, dstBpp, width, height,
+                     stip, stipStride, stipWidth, stipHeight,
+                     fgand, fgxor, bgand, bgxor, xRot, yRot);
 }