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, 303 insertions, 329 deletions

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 669da0d5b..95a78921d 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -52,10 +52,10 @@
  * that it's handling the screen transform, then this returns RR_Rotate_0.
  */
 static Rotation
-xf86_crtc_cursor_rotation (xf86CrtcPtr crtc)
+xf86_crtc_cursor_rotation(xf86CrtcPtr crtc)
 {
     if (crtc->driverIsPerformingTransform)
-	return RR_Rotate_0;
+        return RR_Rotate_0;
     return crtc->rotation;
 }
 
@@ -63,38 +63,34 @@ xf86_crtc_cursor_rotation (xf86CrtcPtr crtc)
  * Given a screen coordinate, rotate back to a cursor source coordinate
  */
 static void
-xf86_crtc_rotate_coord (Rotation    rotation,
-			int	    width,
-			int	    height,
-			int	    x_dst,
-			int	    y_dst,
-			int	    *x_src,
-			int	    *y_src)
+xf86_crtc_rotate_coord(Rotation rotation,
+                       int width,
+                       int height, int x_dst, int y_dst, int *x_src, int *y_src)
 {
     int t;
-    
+
     switch (rotation & 0xf) {
     case RR_Rotate_0:
-	break;
+        break;
     case RR_Rotate_90:
-	t = x_dst;
-	x_dst = height - y_dst - 1;
-	y_dst = t;
-	break;
+        t = x_dst;
+        x_dst = height - y_dst - 1;
+        y_dst = t;
+        break;
     case RR_Rotate_180:
-	x_dst = width - x_dst - 1;
-	y_dst = height - y_dst - 1;
-	break;
+        x_dst = width - x_dst - 1;
+        y_dst = height - y_dst - 1;
+        break;
     case RR_Rotate_270:
-	t = x_dst;
-	x_dst = y_dst;
-	y_dst = width - t - 1;
-	break;
+        t = x_dst;
+        x_dst = y_dst;
+        y_dst = width - t - 1;
+        break;
     }
     if (rotation & RR_Reflect_X)
-	x_dst = width - x_dst - 1;
+        x_dst = width - x_dst - 1;
     if (rotation & RR_Reflect_Y)
-	y_dst = height - y_dst - 1;
+        y_dst = height - y_dst - 1;
     *x_src = x_dst;
     *y_src = y_dst;
 }
@@ -103,38 +99,35 @@ xf86_crtc_rotate_coord (Rotation    rotation,
  * Given a cursor source  coordinate, rotate to a screen coordinate
  */
 static void
-xf86_crtc_rotate_coord_back (Rotation    rotation,
-			     int	    width,
-			     int	    height,
-			     int	    x_dst,
-			     int	    y_dst,
-			     int	    *x_src,
-			     int	    *y_src)
+xf86_crtc_rotate_coord_back(Rotation rotation,
+                            int width,
+                            int height,
+                            int x_dst, int y_dst, int *x_src, int *y_src)
 {
     int t;
-    
+
     if (rotation & RR_Reflect_X)
-	x_dst = width - x_dst - 1;
+        x_dst = width - x_dst - 1;
     if (rotation & RR_Reflect_Y)
-	y_dst = height - y_dst - 1;
+        y_dst = height - y_dst - 1;
 
     switch (rotation & 0xf) {
     case RR_Rotate_0:
-	break;
+        break;
     case RR_Rotate_90:
-	t = x_dst;
-	x_dst = y_dst;
-	y_dst = width - t - 1;
-	break;
+        t = x_dst;
+        x_dst = y_dst;
+        y_dst = width - t - 1;
+        break;
     case RR_Rotate_180:
-	x_dst = width - x_dst - 1;
-	y_dst = height - y_dst - 1;
-	break;
+        x_dst = width - x_dst - 1;
+        y_dst = height - y_dst - 1;
+        break;
     case RR_Rotate_270:
-	t = x_dst;
-	x_dst = height - y_dst - 1;
-	y_dst = t;
-	break;
+        t = x_dst;
+        x_dst = height - y_dst - 1;
+        y_dst = t;
+        break;
     }
     *x_src = x_dst;
     *y_src = y_dst;
@@ -149,16 +142,16 @@ struct cursor_bit {
  * Convert an x coordinate to a position within the cursor bitmap
  */
 static struct cursor_bit
-cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
-	       Bool mask)
+cursor_bitpos(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
+              Bool mask)
 {
     const int flags = cursor_info->Flags;
     const Bool interleaved =
-	!!(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 |
-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64));
+        ! !(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 |
+                     HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64));
     const int width = cursor_info->MaxWidth;
     const int height = cursor_info->MaxHeight;
     const int stride = interleaved ? width / 4 : width / 8;
@@ -168,24 +161,24 @@ cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
     image += y * stride;
 
     if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK)
-	mask = !mask;
+        mask = !mask;
     if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
-	x = (x & ~3) | (3 - (x & 3));
+        x = (x & ~3) | (3 - (x & 3));
     if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
-	(X_BYTE_ORDER == X_BIG_ENDIAN))
-	x = (x & ~7) | (7 - (x & 7));
+        (X_BYTE_ORDER == X_BIG_ENDIAN))
+        x = (x & ~7) | (7 - (x & 7));
     if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
-	x = (x << 1) + mask;
+        x = (x << 1) + mask;
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)
-	x = ((x & ~7) << 1) | (mask << 3) | (x & 7);
+        x = ((x & ~7) << 1) | (mask << 3) | (x & 7);
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16)
-	x = ((x & ~15) << 1) | (mask << 4) | (x & 15);
+        x = ((x & ~15) << 1) | (mask << 4) | (x & 15);
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32)
-	x = ((x & ~31) << 1) | (mask << 5) | (x & 31);
+        x = ((x & ~31) << 1) | (mask << 5) | (x & 31);
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)
-	x = ((x & ~63) << 1) | (mask << 6) | (x & 63);
+        x = ((x & ~63) << 1) | (mask << 6) | (x & 63);
     else if (mask)
-	image += stride * height;
+        image += stride * height;
 
     ret.byte = image + (x / 8);
     ret.bitpos = x & 7;
@@ -197,9 +190,10 @@ cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
  * Fetch one bit from a cursor bitmap
  */
 static CARD8
-get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
+get_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
 {
     struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);
+
     return (*bit.byte >> bit.bitpos) & 1;
 }
 
@@ -207,185 +201,177 @@ get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
  * Set one bit in a cursor bitmap
  */
 static void
-set_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
+set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
 {
     struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);
+
     *bit.byte |= 1 << bit.bitpos;
 }
-    
+
 /*
  * Load a two color cursor into a driver that supports only ARGB cursors
  */
 static void
-xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src)
+xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
-    int			x, y;
-    int			xin, yin;
-    int			flags = cursor_info->Flags;
-    CARD32		bits;
-    const Rotation	rotation = xf86_crtc_cursor_rotation(crtc);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    CARD32 *cursor_image = (CARD32 *) xf86_config->cursor_image;
+    int x, y;
+    int xin, yin;
+    int flags = cursor_info->Flags;
+    CARD32 bits;
+    const Rotation rotation = xf86_crtc_cursor_rotation(crtc);
 
 #ifdef ARGB_CURSOR
     crtc->cursor_argb = FALSE;
 #endif
 
     for (y = 0; y < cursor_info->MaxHeight; y++)
-	for (x = 0; x < cursor_info->MaxWidth; x++) 
-	{
-	    xf86_crtc_rotate_coord (rotation,
-				    cursor_info->MaxWidth,
-				    cursor_info->MaxHeight,
-				    x, y, &xin, &yin);
-	    if (get_bit (src, cursor_info, xin, yin, TRUE) ==
-		((flags & HARDWARE_CURSOR_INVERT_MASK) == 0))
-	    {
-		if (get_bit (src, cursor_info, xin, yin, FALSE))
-		    bits = xf86_config->cursor_fg;
-		else
-		    bits = xf86_config->cursor_bg;
-	    }
-	    else
-		bits = 0;
-	    cursor_image[y * cursor_info->MaxWidth + x] = bits;
-	}
-    crtc->funcs->load_cursor_argb (crtc, cursor_image);
+        for (x = 0; x < cursor_info->MaxWidth; x++) {
+            xf86_crtc_rotate_coord(rotation,
+                                   cursor_info->MaxWidth,
+                                   cursor_info->MaxHeight, x, y, &xin, &yin);
+            if (get_bit(src, cursor_info, xin, yin, TRUE) ==
+                ((flags & HARDWARE_CURSOR_INVERT_MASK) == 0)) {
+                if (get_bit(src, cursor_info, xin, yin, FALSE))
+                    bits = xf86_config->cursor_fg;
+                else
+                    bits = xf86_config->cursor_bg;
+            }
+            else
+                bits = 0;
+            cursor_image[y * cursor_info->MaxWidth + x] = bits;
+        }
+    crtc->funcs->load_cursor_argb(crtc, cursor_image);
 }
 
 /*
  * Set the colors for a two-color cursor (ignore for ARGB cursors)
  */
 static void
-xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
+xf86_set_cursor_colors(ScrnInfoPtr scrn, int bg, int fg)
 {
-    ScreenPtr		screen = scrn->pScreen;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    CursorPtr		cursor = xf86_config->cursor;
-    int			c;
-    CARD8		*bits = cursor ?
+    ScreenPtr screen = scrn->pScreen;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    CursorPtr cursor = xf86_config->cursor;
+    int c;
+    CARD8 *bits = cursor ?
         dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen)
-      : NULL;
+        : NULL;
 
     /* Save ARGB versions of these colors */
     xf86_config->cursor_fg = (CARD32) fg | 0xff000000;
     xf86_config->cursor_bg = (CARD32) bg | 0xff000000;
-    
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled && !crtc->cursor_argb)
-	{
-	    if (crtc->funcs->load_cursor_image)
-		crtc->funcs->set_cursor_colors (crtc, bg, fg);
-	    else if (bits)
-		xf86_crtc_convert_cursor_to_argb (crtc, bits);
-	}
+
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+        if (crtc->enabled && !crtc->cursor_argb) {
+            if (crtc->funcs->load_cursor_image)
+                crtc->funcs->set_cursor_colors(crtc, bg, fg);
+            else if (bits)
+                xf86_crtc_convert_cursor_to_argb(crtc, bits);
+        }
     }
 }
 
 static void
-xf86_crtc_hide_cursor (xf86CrtcPtr crtc)
+xf86_crtc_hide_cursor(xf86CrtcPtr crtc)
 {
-    if (crtc->cursor_shown)
-    {
-	crtc->funcs->hide_cursor (crtc);
-	crtc->cursor_shown = FALSE;
+    if (crtc->cursor_shown) {
+        crtc->funcs->hide_cursor(crtc);
+        crtc->cursor_shown = FALSE;
     }
 }
 
 void
-xf86_hide_cursors (ScrnInfoPtr scrn)
+xf86_hide_cursors(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     xf86_config->cursor_on = FALSE;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_hide_cursor (crtc);
+        if (crtc->enabled)
+            xf86_crtc_hide_cursor(crtc);
     }
 }
-    
+
 static void
-xf86_crtc_show_cursor (xf86CrtcPtr crtc)
+xf86_crtc_show_cursor(xf86CrtcPtr crtc)
 {
-    if (!crtc->cursor_shown && crtc->cursor_in_range)
-    {
-	crtc->funcs->show_cursor (crtc);
-	crtc->cursor_shown = TRUE;
+    if (!crtc->cursor_shown && crtc->cursor_in_range) {
+        crtc->funcs->show_cursor(crtc);
+        crtc->cursor_shown = TRUE;
     }
 }
 
 void
-xf86_show_cursors (ScrnInfoPtr scrn)
+xf86_show_cursors(ScrnInfoPtr scrn)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     xf86_config->cursor_on = TRUE;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_show_cursor (crtc);
+        if (crtc->enabled)
+            xf86_crtc_show_cursor(crtc);
     }
 }
 
-void xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y)
+void
+xf86CrtcTransformCursorPos(xf86CrtcPtr crtc, int *x, int *y)
 {
     ScrnInfoPtr scrn = crtc->scrn;
     ScreenPtr screen = scrn->pScreen;
     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
     xf86CursorScreenPtr ScreenPriv =
-	(xf86CursorScreenPtr)dixLookupPrivate(&screen->devPrivates,
-					      xf86CursorScreenKey);
+        (xf86CursorScreenPtr) dixLookupPrivate(&screen->devPrivates,
+                                               xf86CursorScreenKey);
     struct pict_f_vector v;
     int dx, dy;
 
     v.v[0] = (*x + ScreenPriv->HotX) + 0.5;
     v.v[1] = (*y + ScreenPriv->HotY) + 0.5;
     v.v[2] = 1;
-    pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);
+    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &v);
     /* cursor will have 0.5 added to it already so floor is sufficent */
-    *x = floor (v.v[0]);
-    *y = floor (v.v[1]);
+    *x = floor(v.v[0]);
+    *y = floor(v.v[1]);
     /*
      * Transform position of cursor upper left corner
      */
-    xf86_crtc_rotate_coord_back (crtc->rotation, cursor_info->MaxWidth,
-				 cursor_info->MaxHeight, ScreenPriv->HotX,
-				 ScreenPriv->HotY, &dx, &dy);
+    xf86_crtc_rotate_coord_back(crtc->rotation, cursor_info->MaxWidth,
+                                cursor_info->MaxHeight, ScreenPriv->HotX,
+                                ScreenPriv->HotY, &dx, &dy);
     *x -= dx;
     *y -= dy;
 }
 
 static void
-xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+xf86_crtc_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    DisplayModePtr	mode = &crtc->mode;
-    Bool		in_range;
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    DisplayModePtr mode = &crtc->mode;
+    Bool in_range;
 
     /*
      * Transform position of cursor on screen
      */
     if (crtc->transform_in_use && !crtc->driverIsPerformingTransform)
-	xf86CrtcTransformCursorPos(crtc, &x, &y);
-    else
-    {
-	x -= crtc->x;
-	y -= crtc->y;
+        xf86CrtcTransformCursorPos(crtc, &x, &y);
+    else {
+        x -= crtc->x;
+        y -= crtc->y;
     }
 
     /*
@@ -393,216 +379,206 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
      */
     in_range = TRUE;
     if (x >= mode->HDisplay || y >= mode->VDisplay ||
-	x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) 
-    {
-	in_range = FALSE;
-	x = 0;
-	y = 0;
+        x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) {
+        in_range = FALSE;
+        x = 0;
+        y = 0;
     }
 
     crtc->cursor_in_range = in_range;
-    
-    if (in_range)
-    {
-	crtc->funcs->set_cursor_position (crtc, x, y);
-	xf86_crtc_show_cursor (crtc);
+
+    if (in_range) {
+        crtc->funcs->set_cursor_position(crtc, x, y);
+        xf86_crtc_show_cursor(crtc);
     }
     else
-	xf86_crtc_hide_cursor (crtc);
+        xf86_crtc_hide_cursor(crtc);
 }
 
 static void
-xf86_set_cursor_position (ScrnInfoPtr scrn, int x, int y)
+xf86_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
     /* undo what xf86HWCurs did to the coordinates */
     x += scrn->frameX0;
     y += scrn->frameY0;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_set_cursor_position (crtc, x, y);
+        if (crtc->enabled)
+            xf86_crtc_set_cursor_position(crtc, x, y);
     }
 }
-    
+
 /*
  * Load a two-color cursor into a crtc, performing rotation as needed
  */
 static void
-xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)
+xf86_crtc_load_cursor_image(xf86CrtcPtr crtc, CARD8 *src)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD8		*cursor_image;
-    const Rotation	rotation = xf86_crtc_cursor_rotation(crtc);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    CARD8 *cursor_image;
+    const Rotation rotation = xf86_crtc_cursor_rotation(crtc);
 
 #ifdef ARGB_CURSOR
     crtc->cursor_argb = FALSE;
 #endif
 
     if (rotation == RR_Rotate_0)
-	cursor_image = src;
-    else
-    {
+        cursor_image = src;
+    else {
         int x, y;
-    	int xin, yin;
-	int stride = cursor_info->MaxWidth >> 2;
-	
-	cursor_image = xf86_config->cursor_image;
-	memset(cursor_image, 0, cursor_info->MaxHeight * stride);
-	
+        int xin, yin;
+        int stride = cursor_info->MaxWidth >> 2;
+
+        cursor_image = xf86_config->cursor_image;
+        memset(cursor_image, 0, cursor_info->MaxHeight * stride);
+
         for (y = 0; y < cursor_info->MaxHeight; y++)
-	    for (x = 0; x < cursor_info->MaxWidth; x++) 
-	    {
-		xf86_crtc_rotate_coord (rotation,
-					cursor_info->MaxWidth,
-					cursor_info->MaxHeight,
-					x, y, &xin, &yin);
-		if (get_bit(src, cursor_info, xin, yin, FALSE))
-		    set_bit(cursor_image, cursor_info, x, y, FALSE);
-		if (get_bit(src, cursor_info, xin, yin, TRUE))
-		    set_bit(cursor_image, cursor_info, x, y, TRUE);
-	    }
+            for (x = 0; x < cursor_info->MaxWidth; x++) {
+                xf86_crtc_rotate_coord(rotation,
+                                       cursor_info->MaxWidth,
+                                       cursor_info->MaxHeight,
+                                       x, y, &xin, &yin);
+                if (get_bit(src, cursor_info, xin, yin, FALSE))
+                    set_bit(cursor_image, cursor_info, x, y, FALSE);
+                if (get_bit(src, cursor_info, xin, yin, TRUE))
+                    set_bit(cursor_image, cursor_info, x, y, TRUE);
+            }
     }
-    crtc->funcs->load_cursor_image (crtc, cursor_image);
+    crtc->funcs->load_cursor_image(crtc, cursor_image);
 }
-    
+
 /*
  * Load a cursor image into all active CRTCs
  */
 static void
-xf86_load_cursor_image (ScrnInfoPtr scrn, unsigned char *src)
+xf86_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	{
-	    if (crtc->funcs->load_cursor_image)
-		xf86_crtc_load_cursor_image (crtc, src);
-	    else if (crtc->funcs->load_cursor_argb)
-		xf86_crtc_convert_cursor_to_argb (crtc, src);
-	}
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
+
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+        if (crtc->enabled) {
+            if (crtc->funcs->load_cursor_image)
+                xf86_crtc_load_cursor_image(crtc, src);
+            else if (crtc->funcs->load_cursor_argb)
+                xf86_crtc_convert_cursor_to_argb(crtc, src);
+        }
     }
 }
 
 static Bool
-xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
+xf86_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
 
     ++cursor->refcnt;
     if (xf86_config->cursor)
-	FreeCursor (xf86_config->cursor, None);
+        FreeCursor(xf86_config->cursor, None);
     xf86_config->cursor = cursor;
 
     if (cursor->bits->width > cursor_info->MaxWidth ||
-	cursor->bits->height> cursor_info->MaxHeight)
-	return FALSE;
+        cursor->bits->height > cursor_info->MaxHeight)
+        return FALSE;
 
     return TRUE;
 }
 
 static Bool
-xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
+xf86_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+
     ++cursor->refcnt;
     if (xf86_config->cursor)
-	FreeCursor (xf86_config->cursor, None);
+        FreeCursor(xf86_config->cursor, None);
     xf86_config->cursor = cursor;
-    
+
     /* Make sure ARGB support is available */
     if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
-	return FALSE;
-    
+        return FALSE;
+
     if (cursor->bits->width > cursor_info->MaxWidth ||
-	cursor->bits->height> cursor_info->MaxHeight)
-	return FALSE;
+        cursor->bits->height > cursor_info->MaxHeight)
+        return FALSE;
 
     return TRUE;
 }
 
 static void
-xf86_crtc_load_cursor_argb (xf86CrtcPtr crtc, CursorPtr cursor)
+xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor)
 {
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
-    CARD32		*cursor_source = (CARD32 *) cursor->bits->argb;
-    int			x, y;
-    int			xin, yin;
-    CARD32		bits;
-    int			source_width = cursor->bits->width;
-    int			source_height = cursor->bits->height;
-    int			image_width = cursor_info->MaxWidth;
-    int			image_height = cursor_info->MaxHeight;
-    const Rotation	rotation = xf86_crtc_cursor_rotation(crtc);
+    ScrnInfoPtr scrn = crtc->scrn;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+    CARD32 *cursor_image = (CARD32 *) xf86_config->cursor_image;
+    CARD32 *cursor_source = (CARD32 *) cursor->bits->argb;
+    int x, y;
+    int xin, yin;
+    CARD32 bits;
+    int source_width = cursor->bits->width;
+    int source_height = cursor->bits->height;
+    int image_width = cursor_info->MaxWidth;
+    int image_height = cursor_info->MaxHeight;
+    const Rotation rotation = xf86_crtc_cursor_rotation(crtc);
 
     for (y = 0; y < image_height; y++)
-	for (x = 0; x < image_width; x++)
-	{
-	    xf86_crtc_rotate_coord (rotation, image_width, image_height, x, y,
-				    &xin, &yin);
-	    if (xin < source_width && yin < source_height)
-		bits = cursor_source[yin * source_width + xin];
-	    else
-		bits = 0;
-	    cursor_image[y * image_width + x] = bits;
-	}
-    
-    crtc->funcs->load_cursor_argb (crtc, cursor_image);
+        for (x = 0; x < image_width; x++) {
+            xf86_crtc_rotate_coord(rotation, image_width, image_height, x, y,
+                                   &xin, &yin);
+            if (xin < source_width && yin < source_height)
+                bits = cursor_source[yin * source_width + xin];
+            else
+                bits = 0;
+            cursor_image[y * image_width + x] = bits;
+        }
+
+    crtc->funcs->load_cursor_argb(crtc, cursor_image);
 }
 
 static void
-xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor)
+xf86_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor)
 {
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int c;
 
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[c];
 
-	if (crtc->enabled)
-	    xf86_crtc_load_cursor_argb (crtc, cursor);
+        if (crtc->enabled)
+            xf86_crtc_load_cursor_argb(crtc, cursor);
     }
 }
 
 Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
+xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr cursor_info;
 
     cursor_info = xf86CreateCursorInfoRec();
     if (!cursor_info)
-	return FALSE;
+        return FALSE;
 
     xf86_config->cursor_image = malloc(max_width * max_height * 4);
 
-    if (!xf86_config->cursor_image)
-    {
-	xf86DestroyCursorInfoRec (cursor_info);
-	return FALSE;
+    if (!xf86_config->cursor_image) {
+        xf86DestroyCursorInfoRec(cursor_info);
+        return FALSE;
     }
-	
+
     xf86_config->cursor_info = cursor_info;
 
     cursor_info->MaxWidth = max_width;
@@ -616,17 +592,16 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
     cursor_info->ShowCursor = xf86_show_cursors;
     cursor_info->UseHWCursor = xf86_use_hw_cursor;
 #ifdef ARGB_CURSOR
-    if (flags & HARDWARE_CURSOR_ARGB)
-    {
-	cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;
-	cursor_info->LoadCursorARGB = xf86_load_cursor_argb;
+    if (flags & HARDWARE_CURSOR_ARGB) {
+        cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;
+        cursor_info->LoadCursorARGB = xf86_load_cursor_argb;
     }
 #endif
-    
+
     xf86_config->cursor = NULL;
-    xf86_hide_cursors (scrn);
-    
-    return xf86InitCursor (screen, cursor_info);
+    xf86_hide_cursors(scrn);
+
+    return xf86InitCursor(screen, cursor_info);
 }
 
 /**
@@ -636,25 +611,25 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
  */
 
 void
-xf86_reload_cursors (ScreenPtr screen)
+xf86_reload_cursors(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn;
-    xf86CrtcConfigPtr   xf86_config;
-    xf86CursorInfoPtr   cursor_info;
-    CursorPtr		cursor;
-    int			x, y;
+    ScrnInfoPtr scrn;
+    xf86CrtcConfigPtr xf86_config;
+    xf86CursorInfoPtr cursor_info;
+    CursorPtr cursor;
+    int x, y;
     xf86CursorScreenPtr cursor_screen_priv;
-    
+
     /* initial mode setting will not have set a screen yet.
        May be called before the devices are initialised.
      */
     if (!screen || !inputInfo.pointer)
-	return;
+        return;
     cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
-					  xf86CursorScreenKey);
+                                          xf86CursorScreenKey);
     /* return if HW cursor is inactive, to avoid displaying two cursors */
     if (!cursor_screen_priv || !cursor_screen_priv->isUp)
-	return;
+        return;
 
     scrn = xf86Screens[screen->myNum];
     xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -662,26 +637,27 @@ xf86_reload_cursors (ScreenPtr screen)
     /* make sure the cursor code has been initialized */
     cursor_info = xf86_config->cursor_info;
     if (!cursor_info)
-	return;
+        return;
 
     cursor = xf86_config->cursor;
-    GetSpritePosition (inputInfo.pointer, &x, &y);
+    GetSpritePosition(inputInfo.pointer, &x, &y);
     if (!(cursor_info->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
-	(*cursor_info->HideCursor)(scrn);
+        (*cursor_info->HideCursor) (scrn);
 
-    if (cursor)
-    {
-	void *src = dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen);
+    if (cursor) {
+        void *src =
+            dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey,
+                                   screen);
 #ifdef ARGB_CURSOR
-	if (cursor->bits->argb && cursor_info->LoadCursorARGB)
-	    (*cursor_info->LoadCursorARGB) (scrn, cursor);
-	else if (src)
+        if (cursor->bits->argb && cursor_info->LoadCursorARGB)
+            (*cursor_info->LoadCursorARGB) (scrn, cursor);
+        else if (src)
 #endif
-	    (*cursor_info->LoadCursorImage)(scrn, src);
+            (*cursor_info->LoadCursorImage) (scrn, src);
 
-	x += scrn->frameX0 + cursor_screen_priv->HotX;
-	y += scrn->frameY0 + cursor_screen_priv->HotY;
-	(*cursor_info->SetCursorPosition)(scrn, x, y);
+        x += scrn->frameX0 + cursor_screen_priv->HotX;
+        y += scrn->frameY0 + cursor_screen_priv->HotY;
+        (*cursor_info->SetCursorPosition) (scrn, x, y);
     }
 }
 
@@ -689,21 +665,19 @@ xf86_reload_cursors (ScreenPtr screen)
  * Clean up CRTC-based cursor code
  */
 void
-xf86_cursors_fini (ScreenPtr screen)
+xf86_cursors_fini(ScreenPtr screen)
 {
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    
-    if (xf86_config->cursor_info)
-    {
-	xf86DestroyCursorInfoRec (xf86_config->cursor_info);
-	xf86_config->cursor_info = NULL;
+    ScrnInfoPtr scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    if (xf86_config->cursor_info) {
+        xf86DestroyCursorInfoRec(xf86_config->cursor_info);
+        xf86_config->cursor_info = NULL;
     }
     free(xf86_config->cursor_image);
     xf86_config->cursor_image = NULL;
-    if (xf86_config->cursor)
-    {
-	FreeCursor (xf86_config->cursor, None);
-	xf86_config->cursor = NULL;
+    if (xf86_config->cursor) {
+        FreeCursor(xf86_config->cursor, None);
+        xf86_config->cursor = NULL;
     }
 }