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, 107 insertions, 137 deletions

diff --git a/xorg-server/fb/fbtrap.c b/xorg-server/fb/fbtrap.c
index 0b5a6382e..bf82f8f2c 100644
--- a/xorg-server/fb/fbtrap.c
+++ b/xorg-server/fb/fbtrap.c
@@ -32,184 +32,154 @@
 #include "damage.h"
 
 void
-fbAddTraps (PicturePtr	pPicture,
-	    INT16	x_off,
-	    INT16	y_off,
-	    int		ntrap,
-	    xTrap	*traps)
+fbAddTraps(PicturePtr pPicture,
+           INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
 {
     pixman_image_t *image;
     int dst_xoff, dst_yoff;
 
-    if (!(image = image_from_pict (pPicture, FALSE, &dst_xoff, &dst_yoff)))
-	return;
-    
-    pixman_add_traps (image, x_off + dst_xoff, y_off + dst_yoff,
-		      ntrap, (pixman_trap_t *)traps);
+    if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
+        return;
 
-    free_pixman_pict (pPicture, image);
+    pixman_add_traps(image, x_off + dst_xoff, y_off + dst_yoff,
+                     ntrap, (pixman_trap_t *) traps);
+
+    free_pixman_pict(pPicture, image);
 }
 
 void
-fbRasterizeTrapezoid (PicturePtr    pPicture,
-		      xTrapezoid  *trap,
-		      int	    x_off,
-		      int	    y_off)
+fbRasterizeTrapezoid(PicturePtr pPicture,
+                     xTrapezoid * trap, int x_off, int y_off)
 {
     pixman_image_t *image;
-    int	dst_xoff, dst_yoff;
+    int dst_xoff, dst_yoff;
 
-    if (!(image = image_from_pict (pPicture, FALSE, &dst_xoff, &dst_yoff)))
-	return;
+    if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
+        return;
 
-    pixman_rasterize_trapezoid (image, (pixman_trapezoid_t *)trap,
-				x_off + dst_xoff,
-				y_off + dst_yoff);
+    pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *) trap,
+                               x_off + dst_xoff, y_off + dst_yoff);
 
-    free_pixman_pict (pPicture, image);
+    free_pixman_pict(pPicture, image);
 }
 
 void
-fbAddTriangles (PicturePtr  pPicture,
-		INT16	    x_off,
-		INT16	    y_off,
-		int	    ntri,
-		xTriangle *tris)
+fbAddTriangles(PicturePtr pPicture,
+               INT16 x_off, INT16 y_off, int ntri, xTriangle * tris)
 {
     pixman_image_t *image;
     int dst_xoff, dst_yoff;
 
-    if (!(image = image_from_pict (pPicture, FALSE, &dst_xoff, &dst_yoff)))
-	return;
-    
-    pixman_add_triangles (image,
-			  dst_xoff + x_off, dst_yoff + y_off,
-			  ntri, (pixman_triangle_t *)tris);
+    if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
+        return;
+
+    pixman_add_triangles(image,
+                         dst_xoff + x_off, dst_yoff + y_off,
+                         ntri, (pixman_triangle_t *) tris);
 
-    free_pixman_pict (pPicture, image);
+    free_pixman_pict(pPicture, image);
 }
 
-typedef void (* CompositeShapesFunc) (pixman_op_t op,
-				      pixman_image_t *src,
-				      pixman_image_t *dst,
-				      pixman_format_code_t mask_format,
-				      int x_src, int y_src,
-				      int x_dst, int y_dst,
-				      int n_shapes, const uint8_t *shapes);
+typedef void (*CompositeShapesFunc) (pixman_op_t op,
+                                     pixman_image_t * src,
+                                     pixman_image_t * dst,
+                                     pixman_format_code_t mask_format,
+                                     int x_src, int y_src,
+                                     int x_dst, int y_dst,
+                                     int n_shapes, const uint8_t * shapes);
 
 static void
-fbShapes (CompositeShapesFunc	composite,
-	  pixman_op_t		op,
-	  PicturePtr		pSrc,
-	  PicturePtr		pDst,
-	  PictFormatPtr		maskFormat,
-	  int16_t		xSrc,
-	  int16_t		ySrc,
-	  int			nshapes,
-	  int			shape_size,
-	  const uint8_t *	shapes)
+fbShapes(CompositeShapesFunc composite,
+         pixman_op_t op,
+         PicturePtr pSrc,
+         PicturePtr pDst,
+         PictFormatPtr maskFormat,
+         int16_t xSrc,
+         int16_t ySrc, int nshapes, int shape_size, const uint8_t * shapes)
 {
     pixman_image_t *src, *dst;
     int src_xoff, src_yoff;
     int dst_xoff, dst_yoff;
 
-    miCompositeSourceValidate (pSrc);
-
-    src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
-    dst = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
-
-    if (src && dst)
-    {
-	pixman_format_code_t format;
-
-	DamageRegionAppend (pDst->pDrawable, pDst->pCompositeClip);
-
-	if (!maskFormat)
-	{
-	    int i;
-
-	    if (pDst->polyEdge == PolyEdgeSharp)
-		format = PIXMAN_a1;
-	    else
-		format = PIXMAN_a8;
-
-	    for (i = 0; i < nshapes; ++i)
-	    {
-		composite (op, src, dst, format,
-			   xSrc + src_xoff,
-			   ySrc + src_yoff,
-			   dst_xoff,
-			   dst_yoff,
-			   1, shapes + i * shape_size);
-	    }
-	}
-	else
-	{
-	    switch (PICT_FORMAT_A (maskFormat->format))
-	    {
-	    case 1:
-		format = PIXMAN_a1;
-		break;
-
-	    case 4:
-		format = PIXMAN_a4;
-		break;
-
-	    default:
-	    case 8:
-		format = PIXMAN_a8;
-		break;
-	    }
-	    
-	    composite (op, src, dst, format,
-		       xSrc + src_xoff,
-		       ySrc + src_yoff,
-		       dst_xoff,
-		       dst_yoff,
-		       nshapes, shapes);
-	}
-
-	DamageRegionProcessPending (pDst->pDrawable);
+    miCompositeSourceValidate(pSrc);
+
+    src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
+    dst = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);
+
+    if (src && dst) {
+        pixman_format_code_t format;
+
+        DamageRegionAppend(pDst->pDrawable, pDst->pCompositeClip);
+
+        if (!maskFormat) {
+            int i;
+
+            if (pDst->polyEdge == PolyEdgeSharp)
+                format = PIXMAN_a1;
+            else
+                format = PIXMAN_a8;
+
+            for (i = 0; i < nshapes; ++i) {
+                composite(op, src, dst, format,
+                          xSrc + src_xoff,
+                          ySrc + src_yoff,
+                          dst_xoff, dst_yoff, 1, shapes + i * shape_size);
+            }
+        }
+        else {
+            switch (PICT_FORMAT_A(maskFormat->format)) {
+            case 1:
+                format = PIXMAN_a1;
+                break;
+
+            case 4:
+                format = PIXMAN_a4;
+                break;
+
+            default:
+            case 8:
+                format = PIXMAN_a8;
+                break;
+            }
+
+            composite(op, src, dst, format,
+                      xSrc + src_xoff,
+                      ySrc + src_yoff, dst_xoff, dst_yoff, nshapes, shapes);
+        }
+
+        DamageRegionProcessPending(pDst->pDrawable);
     }
 
-    free_pixman_pict (pSrc, src);
-    free_pixman_pict (pDst, dst);
+    free_pixman_pict(pSrc, src);
+    free_pixman_pict(pDst, dst);
 }
 
 void
-fbTrapezoids (CARD8	    op,
-	      PicturePtr    pSrc,
-	      PicturePtr    pDst,
-	      PictFormatPtr maskFormat,
-	      INT16	    xSrc,
-	      INT16	    ySrc,
-	      int	    ntrap,
-	      xTrapezoid    *traps)
+fbTrapezoids(CARD8 op,
+             PicturePtr pSrc,
+             PicturePtr pDst,
+             PictFormatPtr maskFormat,
+             INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps)
 {
     xSrc -= (traps[0].left.p1.x >> 16);
     ySrc -= (traps[0].left.p1.y >> 16);
-    
-    fbShapes ((CompositeShapesFunc)pixman_composite_trapezoids,
-	      op, pSrc, pDst, maskFormat,
-	      xSrc, ySrc,
-	      ntrap, sizeof (xTrapezoid), (const uint8_t *)traps);
+
+    fbShapes((CompositeShapesFunc) pixman_composite_trapezoids,
+             op, pSrc, pDst, maskFormat,
+             xSrc, ySrc, ntrap, sizeof(xTrapezoid), (const uint8_t *) traps);
 }
 
 void
-fbTriangles (CARD8	    op,
-	     PicturePtr    pSrc,
-	     PicturePtr    pDst,
-	     PictFormatPtr maskFormat,
-	     INT16	    xSrc,
-	     INT16	    ySrc,
-	     int	    ntris,
-	     xTriangle    *tris)
-{ 
+fbTriangles(CARD8 op,
+            PicturePtr pSrc,
+            PicturePtr pDst,
+            PictFormatPtr maskFormat,
+            INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris)
+{
     xSrc -= (tris[0].p1.x >> 16);
     ySrc -= (tris[0].p1.y >> 16);
-    
-    fbShapes ((CompositeShapesFunc)pixman_composite_triangles,
-	      op, pSrc, pDst, maskFormat,
-	      xSrc, ySrc,
-	      ntris, sizeof (xTriangle), (const uint8_t *)tris);
+
+    fbShapes((CompositeShapesFunc) pixman_composite_triangles,
+             op, pSrc, pDst, maskFormat,
+             xSrc, ySrc, ntris, sizeof(xTriangle), (const uint8_t *) tris);
 }