Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

6 files changed, 1133 insertions, 1133 deletions

diff --git a/xorg-server/miext/shadow/shpacked.c b/xorg-server/miext/shadow/shpacked.c
index e5ebbff64..c37dca175 100644
--- a/xorg-server/miext/shadow/shpacked.c
+++ b/xorg-server/miext/shadow/shpacked.c
@@ -1,118 +1,118 @@
-/*

- *

- * Copyright © 2000 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include    <X11/X.h>

-#include    "scrnintstr.h"

-#include    "windowstr.h"

-#include    <X11/fonts/font.h>

-#include    "dixfontstr.h"

-#include    <X11/fonts/fontstruct.h>

-#include    "mi.h"

-#include    "regionstr.h"

-#include    "globals.h"

-#include    "gcstruct.h"

-#include    "shadow.h"

-#include    "fb.h"

-

-void

-shadowUpdatePacked (ScreenPtr	    pScreen,

-		    shadowBufPtr    pBuf)

-{

-    RegionPtr	damage = shadowDamage (pBuf);

-    PixmapPtr	pShadow = pBuf->pPixmap;

-    int		nbox = RegionNumRects (damage);

-    BoxPtr	pbox = RegionRects (damage);

-    FbBits	*shaBase, *shaLine, *sha;

-    FbStride	shaStride;

-    int		scrBase, scrLine, scr;

-    int		shaBpp;

-    int		shaXoff, shaYoff; /* XXX assumed to be zero */

-    int		x, y, w, h, width;

-    int         i;

-    FbBits	*winBase = NULL, *win;

-    CARD32      winSize;

-

-    fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);

-    while (nbox--)

-    {

-	x = pbox->x1 * shaBpp;

-	y = pbox->y1;

-	w = (pbox->x2 - pbox->x1) * shaBpp;

-	h = pbox->y2 - pbox->y1;

-

-	scrLine = (x >> FB_SHIFT);

-	shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);

-				   

-	x &= FB_MASK;

-	w = (w + x + FB_MASK) >> FB_SHIFT;

-	

-	while (h--)

-	{

-	    winSize = 0;

-	    scrBase = 0;

-	    width = w;

-	    scr = scrLine;

-	    sha = shaLine;

-	    while (width) {

-		/* how much remains in this window */

-		i = scrBase + winSize - scr;

-		if (i <= 0 || scr < scrBase)

-		{

-		    winBase = (FbBits *) (*pBuf->window) (pScreen,

-							  y,

-							  scr * sizeof (FbBits),

-							  SHADOW_WINDOW_WRITE,

-							  &winSize,

-							  pBuf->closure);

-		    if(!winBase)

-			return;

-		    scrBase = scr;

-		    winSize /= sizeof (FbBits);

-		    i = winSize;

-		}

-		win = winBase + (scr - scrBase);

-		if (i > width)

-		    i = width;

-		width -= i;

-		scr += i;

-#define PickBit(a,i)	(((a) >> (i)) & 1)

-		memcpy(win, sha, i * sizeof(FbBits));

-		sha += i;

-	    }

-	    shaLine += shaStride;

-	    y++;

-	}

-	pbox++;

-    }

-}

-

-shadowUpdateProc

-shadowUpdatePackedWeak(void) {

-    return shadowUpdatePacked;

-}

+/*
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include    <X11/X.h>
+#include    "scrnintstr.h"
+#include    "windowstr.h"
+#include    <X11/fonts/font.h>
+#include    "dixfontstr.h"
+#include    <X11/fonts/fontstruct.h>
+#include    "mi.h"
+#include    "regionstr.h"
+#include    "globals.h"
+#include    "gcstruct.h"
+#include    "shadow.h"
+#include    "fb.h"
+
+void
+shadowUpdatePacked (ScreenPtr	    pScreen,
+		    shadowBufPtr    pBuf)
+{
+    RegionPtr	damage = shadowDamage (pBuf);
+    PixmapPtr	pShadow = pBuf->pPixmap;
+    int		nbox = RegionNumRects (damage);
+    BoxPtr	pbox = RegionRects (damage);
+    FbBits	*shaBase, *shaLine, *sha;
+    FbStride	shaStride;
+    int		scrBase, scrLine, scr;
+    int		shaBpp;
+    _X_UNUSED int	shaXoff, shaYoff;
+    int		x, y, w, h, width;
+    int         i;
+    FbBits	*winBase = NULL, *win;
+    CARD32      winSize;
+
+    fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);
+    while (nbox--)
+    {
+	x = pbox->x1 * shaBpp;
+	y = pbox->y1;
+	w = (pbox->x2 - pbox->x1) * shaBpp;
+	h = pbox->y2 - pbox->y1;
+
+	scrLine = (x >> FB_SHIFT);
+	shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);
+				   
+	x &= FB_MASK;
+	w = (w + x + FB_MASK) >> FB_SHIFT;
+	
+	while (h--)
+	{
+	    winSize = 0;
+	    scrBase = 0;
+	    width = w;
+	    scr = scrLine;
+	    sha = shaLine;
+	    while (width) {
+		/* how much remains in this window */
+		i = scrBase + winSize - scr;
+		if (i <= 0 || scr < scrBase)
+		{
+		    winBase = (FbBits *) (*pBuf->window) (pScreen,
+							  y,
+							  scr * sizeof (FbBits),
+							  SHADOW_WINDOW_WRITE,
+							  &winSize,
+							  pBuf->closure);
+		    if(!winBase)
+			return;
+		    scrBase = scr;
+		    winSize /= sizeof (FbBits);
+		    i = winSize;
+		}
+		win = winBase + (scr - scrBase);
+		if (i > width)
+		    i = width;
+		width -= i;
+		scr += i;
+#define PickBit(a,i)	(((a) >> (i)) & 1)
+		memcpy(win, sha, i * sizeof(FbBits));
+		sha += i;
+	    }
+	    shaLine += shaStride;
+	    y++;
+	}
+	pbox++;
+    }
+}
+
+shadowUpdateProc
+shadowUpdatePackedWeak(void) {
+    return shadowUpdatePacked;
+}
diff --git a/xorg-server/miext/shadow/shplanar.c b/xorg-server/miext/shadow/shplanar.c
index 381eba986..350405186 100644
--- a/xorg-server/miext/shadow/shplanar.c
+++ b/xorg-server/miext/shadow/shplanar.c
@@ -1,180 +1,180 @@
-/*

- *

- * Copyright © 2000 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include    <X11/X.h>

-#include    "scrnintstr.h"

-#include    "windowstr.h"

-#include    <X11/fonts/font.h>

-#include    "dixfontstr.h"

-#include    <X11/fonts/fontstruct.h>

-#include    "mi.h"

-#include    "regionstr.h"

-#include    "globals.h"

-#include    "gcstruct.h"

-#include    "shadow.h"

-#include    "fb.h"

-

-/*

- * 32 4-bit pixels per write

- */

-

-#define PL_SHIFT    7	    

-#define PL_UNIT	    (1 << PL_SHIFT)

-#define PL_MASK	    (PL_UNIT - 1)

-

-/*

- *  32->8 conversion:

- *

- *      7 6 5 4 3 2 1 0

- *      A B C D E F G H

- *

- *      3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

- *      1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

- * m    . . . H . . . G . . . F . . . E . . . D . . . C . . . B . . . A

- * m1   G . . . F . . . E . . . D . . . C . . . B . . . A . . . . . . .	    m << (7 - (p))

- * m2   . H . . . G . . . F . . . E . . . D . . . C . . . B . . . A . .	    (m >> (p)) << 2

- * m3   G               E               C               A                   m1 & 0x80808080

- * m4     H               F               D               B                 m2 & 0x40404040

- * m5   G H             E F             C D             A B                 m3 | m4

- * m6   G H             E F             C D     G H     A B     E F         m5 | (m5 >> 20)

- * m7   G H             E F             C D     G H     A B C D E F G H     m6 | (m6 >> 10)

- */

-

-#if 0

-#define GetBits(p,o,d) {\

-    m = sha[o]; \

-    m1 = m << (7 - (p)); \

-    m2 = (m >> (p)) << 2; \

-    m3 = m1 & 0x80808080; \

-    m4 = m2 & 0x40404040; \

-    m5 = m3 | m4; \

-    m6 = m5 | (m5 >> 20); \

-    d = m6 | (m6 >> 10); \

-}

-#else

-#define GetBits(p,o,d) {\

-    m = sha[o]; \

-    m5 = ((m << (7 - (p))) & 0x80808080) | (((m >> (p)) << 2) & 0x40404040); \

-    m6 = m5 | (m5 >> 20); \

-    d = m6 | (m6 >> 10); \

-}

-#endif

-

-void

-shadowUpdatePlanar4 (ScreenPtr	    pScreen,

-		     shadowBufPtr   pBuf)

-{

-    RegionPtr	damage = shadowDamage (pBuf);

-    PixmapPtr	pShadow = pBuf->pPixmap;

-    int		nbox = RegionNumRects (damage);

-    BoxPtr	pbox = RegionRects (damage);

-    CARD32	*shaBase, *shaLine, *sha;

-    FbStride	shaStride;

-    int		scrBase, scrLine, scr;

-    int		shaBpp;

-    int		shaXoff, shaYoff;   /* XXX assumed to be zero */

-    int		x, y, w, h, width;

-    int         i;

-    CARD32	*winBase = NULL, *win;

-    CARD32	winSize;

-    int		plane;

-    CARD32	m,m5,m6;

-    CARD8	s1, s2, s3, s4;

-

-    fbGetStipDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);

-    while (nbox--)

-    {

-	x = (pbox->x1) * shaBpp;

-	y = (pbox->y1);

-	w = (pbox->x2 - pbox->x1) * shaBpp;

-	h = pbox->y2 - pbox->y1;

-

-	w = (w + (x & PL_MASK) + PL_MASK) >> PL_SHIFT;

-	x &= ~PL_MASK;

-	

-	scrLine = (x >> PL_SHIFT);

-	shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);

-	

-	while (h--)

-	{

-	    for (plane = 0; plane < 4; plane++)

-	    {

-		width = w;

-		scr = scrLine;

-		sha = shaLine;

-		winSize = 0;

-		scrBase = 0;

-		while (width) {

-		    /* how much remains in this window */

-		    i = scrBase + winSize - scr;

-		    if (i <= 0 || scr < scrBase)

-		    {

-			winBase = (CARD32 *) (*pBuf->window) (pScreen,

-							      y,

-							      (scr << 4) | (plane),

-							      SHADOW_WINDOW_WRITE,

-							      &winSize,

-							      pBuf->closure);

-			if(!winBase)

-			return;

-			winSize >>= 2;

-			scrBase = scr;

-			i = winSize;

-		    }

-		    win = winBase + (scr - scrBase);

-		    if (i > width)

-		    i = width;

-		    width -= i;

-		    scr += i;

-		   

-		    while (i--)

-		    {

-			GetBits(plane,0,s1);

-			GetBits(plane,1,s2);

-			GetBits(plane,2,s3);

-			GetBits(plane,3,s4);

-			*win++ = s1 | (s2 << 8) | (s3 << 16) | (s4 << 24);

-			sha += 4;

-		    }

-		}

-	    }

-	    shaLine += shaStride;

-	    y++;

-	}

-	pbox++;

-    }

-}

-

-shadowUpdateProc shadowUpdatePlanar4Weak(void) {

-    return shadowUpdatePlanar4;

-}

-

-shadowUpdateProc shadowUpdatePlanar4x8Weak(void) {

-    return shadowUpdatePlanar4x8;

-}

+/*
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include    <X11/X.h>
+#include    "scrnintstr.h"
+#include    "windowstr.h"
+#include    <X11/fonts/font.h>
+#include    "dixfontstr.h"
+#include    <X11/fonts/fontstruct.h>
+#include    "mi.h"
+#include    "regionstr.h"
+#include    "globals.h"
+#include    "gcstruct.h"
+#include    "shadow.h"
+#include    "fb.h"
+
+/*
+ * 32 4-bit pixels per write
+ */
+
+#define PL_SHIFT    7	    
+#define PL_UNIT	    (1 << PL_SHIFT)
+#define PL_MASK	    (PL_UNIT - 1)
+
+/*
+ *  32->8 conversion:
+ *
+ *      7 6 5 4 3 2 1 0
+ *      A B C D E F G H
+ *
+ *      3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+ *      1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * m    . . . H . . . G . . . F . . . E . . . D . . . C . . . B . . . A
+ * m1   G . . . F . . . E . . . D . . . C . . . B . . . A . . . . . . .	    m << (7 - (p))
+ * m2   . H . . . G . . . F . . . E . . . D . . . C . . . B . . . A . .	    (m >> (p)) << 2
+ * m3   G               E               C               A                   m1 & 0x80808080
+ * m4     H               F               D               B                 m2 & 0x40404040
+ * m5   G H             E F             C D             A B                 m3 | m4
+ * m6   G H             E F             C D     G H     A B     E F         m5 | (m5 >> 20)
+ * m7   G H             E F             C D     G H     A B C D E F G H     m6 | (m6 >> 10)
+ */
+
+#if 0
+#define GetBits(p,o,d) {\
+    m = sha[o]; \
+    m1 = m << (7 - (p)); \
+    m2 = (m >> (p)) << 2; \
+    m3 = m1 & 0x80808080; \
+    m4 = m2 & 0x40404040; \
+    m5 = m3 | m4; \
+    m6 = m5 | (m5 >> 20); \
+    d = m6 | (m6 >> 10); \
+}
+#else
+#define GetBits(p,o,d) {\
+    m = sha[o]; \
+    m5 = ((m << (7 - (p))) & 0x80808080) | (((m >> (p)) << 2) & 0x40404040); \
+    m6 = m5 | (m5 >> 20); \
+    d = m6 | (m6 >> 10); \
+}
+#endif
+
+void
+shadowUpdatePlanar4 (ScreenPtr	    pScreen,
+		     shadowBufPtr   pBuf)
+{
+    RegionPtr	damage = shadowDamage (pBuf);
+    PixmapPtr	pShadow = pBuf->pPixmap;
+    int		nbox = RegionNumRects (damage);
+    BoxPtr	pbox = RegionRects (damage);
+    CARD32	*shaBase, *shaLine, *sha;
+    FbStride	shaStride;
+    int		scrBase, scrLine, scr;
+    int		shaBpp;
+    _X_UNUSED int	shaXoff, shaYoff;
+    int		x, y, w, h, width;
+    int         i;
+    CARD32	*winBase = NULL, *win;
+    CARD32	winSize;
+    int		plane;
+    CARD32	m,m5,m6;
+    CARD8	s1, s2, s3, s4;
+
+    fbGetStipDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);
+    while (nbox--)
+    {
+	x = (pbox->x1) * shaBpp;
+	y = (pbox->y1);
+	w = (pbox->x2 - pbox->x1) * shaBpp;
+	h = pbox->y2 - pbox->y1;
+
+	w = (w + (x & PL_MASK) + PL_MASK) >> PL_SHIFT;
+	x &= ~PL_MASK;
+	
+	scrLine = (x >> PL_SHIFT);
+	shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);
+	
+	while (h--)
+	{
+	    for (plane = 0; plane < 4; plane++)
+	    {
+		width = w;
+		scr = scrLine;
+		sha = shaLine;
+		winSize = 0;
+		scrBase = 0;
+		while (width) {
+		    /* how much remains in this window */
+		    i = scrBase + winSize - scr;
+		    if (i <= 0 || scr < scrBase)
+		    {
+			winBase = (CARD32 *) (*pBuf->window) (pScreen,
+							      y,
+							      (scr << 4) | (plane),
+							      SHADOW_WINDOW_WRITE,
+							      &winSize,
+							      pBuf->closure);
+			if(!winBase)
+			return;
+			winSize >>= 2;
+			scrBase = scr;
+			i = winSize;
+		    }
+		    win = winBase + (scr - scrBase);
+		    if (i > width)
+		    i = width;
+		    width -= i;
+		    scr += i;
+		   
+		    while (i--)
+		    {
+			GetBits(plane,0,s1);
+			GetBits(plane,1,s2);
+			GetBits(plane,2,s3);
+			GetBits(plane,3,s4);
+			*win++ = s1 | (s2 << 8) | (s3 << 16) | (s4 << 24);
+			sha += 4;
+		    }
+		}
+	    }
+	    shaLine += shaStride;
+	    y++;
+	}
+	pbox++;
+    }
+}
+
+shadowUpdateProc shadowUpdatePlanar4Weak(void) {
+    return shadowUpdatePlanar4;
+}
+
+shadowUpdateProc shadowUpdatePlanar4x8Weak(void) {
+    return shadowUpdatePlanar4x8;
+}
diff --git a/xorg-server/miext/shadow/shplanar8.c b/xorg-server/miext/shadow/shplanar8.c
index 640da5e6f..d0648147a 100644
--- a/xorg-server/miext/shadow/shplanar8.c
+++ b/xorg-server/miext/shadow/shplanar8.c
@@ -1,175 +1,175 @@
-/*

- *

- * Copyright © 2000 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include    <X11/X.h>

-#include    "scrnintstr.h"

-#include    "windowstr.h"

-#include    <X11/fonts/font.h>

-#include    "dixfontstr.h"

-#include    <X11/fonts/fontstruct.h>

-#include    "mi.h"

-#include    "regionstr.h"

-#include    "globals.h"

-#include    "gcstruct.h"

-#include    "shadow.h"

-#include    "fb.h"

-

-/*

- * Expose 8bpp depth 4

- */

-

-/*

- *  32->8 conversion:

- *

- *      7 6 5 4 3 2 1 0

- *      A B C D E F G H

- *

- *      3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

- *      1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

- * m1   D x x x x x x x C x x x x x x x B x x x x x x x A x x x x x x x     sha[0] << (7-(p))

- * m2   x x x x H x x x x x x x G x x x x x x x F x x x x x x x E x x x     sha[1] << (3-(p))

- * m3   D               C               B               A                   m1 & 0x80808080

- * m4           H               G               F               E           m2 & 0x08080808

- * m5   D       H       C       G       B       F       A       E	    m3 | m4

- * m6                     D       H       C       G       B       F         m5 >> 9

- * m7   D       H       C D     G H     B C     F G     A B     E F         m5 | m6

- * m8                                       D       H       C D     G H     m7 >> 18

- * m9   D       H       C D     G H     B C D   F G H   A B C D E F G H     m7 | m8

- */

-

-#define PL_SHIFT    8

-#define PL_UNIT	    (1 << PL_SHIFT)

-#define PL_MASK	    (PL_UNIT - 1)

-

-#if 0

-#define GetBits(p,o,d) { \

-    CARD32	m1,m2,m3,m4,m5,m6,m7,m8; \

-    m1 = sha[o] << (7 - (p)); \

-    m2 = sha[(o)+1] << (3 - (p)); \

-    m3 = m1 & 0x80808080; \

-    m4 = m2 & 0x08080808; \

-    m5 = m3 | m4; \

-    m6 = m5 >> 9; \

-    m7 = m5 | m6; \

-    m8 = m7 >> 18; \

-    d = m7 | m8; \

-}

-#else

-#define GetBits(p,o,d) { \

-    CARD32	m5,m7; \

-    m5 = ((sha[o] << (7 - (p))) & 0x80808080) | ((sha[(o)+1] << (3 - (p))) & 0x08080808); \

-    m7 = m5 | (m5 >> 9); \

-    d = m7 | (m7 >> 18); \

-}

-#endif

-

-void

-shadowUpdatePlanar4x8 (ScreenPtr	pScreen,

-		       shadowBufPtr	pBuf)

-{

-    RegionPtr	damage = shadowDamage (pBuf);

-    PixmapPtr	pShadow = pBuf->pPixmap;

-    int		nbox = RegionNumRects (damage);

-    BoxPtr	pbox = RegionRects (damage);

-    CARD32	*shaBase, *shaLine, *sha;

-    CARD8	s1, s2, s3, s4;

-    FbStride	shaStride;

-    int		scrBase, scrLine, scr;

-    int		shaBpp;

-    int		shaXoff, shaYoff;   /* XXX assumed to be zero */

-    int		x, y, w, h, width;

-    int         i;

-    CARD32	*winBase = NULL, *win;

-    CARD32	winSize;

-    int		plane;

-

-    fbGetStipDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);

-    while (nbox--)

-    {

-	x = pbox->x1 * shaBpp;

-	y = pbox->y1;

-	w = (pbox->x2 - pbox->x1) * shaBpp;

-	h = pbox->y2 - pbox->y1;

-

-	w = (w + (x & PL_MASK) + PL_MASK) >> PL_SHIFT;

-	x &= ~PL_MASK;

-	

-	scrLine = (x >> PL_SHIFT);

-	shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);

-	

-	while (h--)

-	{

-	    for (plane = 0; plane < 4; plane++)

-	    {

-		width = w;

-		scr = scrLine;

-		sha = shaLine;

-		winSize = 0;

-		scrBase = 0;

-		while (width) {

-		    /* how much remains in this window */

-		    i = scrBase + winSize - scr;

-		    if (i <= 0 || scr < scrBase)

-		    {

-			winBase = (CARD32 *) (*pBuf->window) (pScreen,

-							      y,

-							      (scr << 4) | (plane),

-							      SHADOW_WINDOW_WRITE,

-							      &winSize,

-							      pBuf->closure);

-			if(!winBase)

-			    return;

-			winSize >>= 2;

-			scrBase = scr;

-			i = winSize;

-		    }

-		    win = winBase + (scr - scrBase);

-		    if (i > width)

-		    i = width;

-		    width -= i;

-		    scr += i;

-		   

-		    while (i--)

-		    {

-			GetBits(plane,0,s1);

-			GetBits(plane,2,s2);

-			GetBits(plane,4,s3);

-			GetBits(plane,6,s4);

-			*win++ = s1 | (s2 << 8) | (s3 << 16) | (s4 << 24);

-			sha += 8;

-		    }

-		}

-	    }

-	    shaLine += shaStride;

-	    y++;

-	}

-	pbox++;

-    }

-}

-		    

+/*
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include    <X11/X.h>
+#include    "scrnintstr.h"
+#include    "windowstr.h"
+#include    <X11/fonts/font.h>
+#include    "dixfontstr.h"
+#include    <X11/fonts/fontstruct.h>
+#include    "mi.h"
+#include    "regionstr.h"
+#include    "globals.h"
+#include    "gcstruct.h"
+#include    "shadow.h"
+#include    "fb.h"
+
+/*
+ * Expose 8bpp depth 4
+ */
+
+/*
+ *  32->8 conversion:
+ *
+ *      7 6 5 4 3 2 1 0
+ *      A B C D E F G H
+ *
+ *      3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+ *      1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * m1   D x x x x x x x C x x x x x x x B x x x x x x x A x x x x x x x     sha[0] << (7-(p))
+ * m2   x x x x H x x x x x x x G x x x x x x x F x x x x x x x E x x x     sha[1] << (3-(p))
+ * m3   D               C               B               A                   m1 & 0x80808080
+ * m4           H               G               F               E           m2 & 0x08080808
+ * m5   D       H       C       G       B       F       A       E	    m3 | m4
+ * m6                     D       H       C       G       B       F         m5 >> 9
+ * m7   D       H       C D     G H     B C     F G     A B     E F         m5 | m6
+ * m8                                       D       H       C D     G H     m7 >> 18
+ * m9   D       H       C D     G H     B C D   F G H   A B C D E F G H     m7 | m8
+ */
+
+#define PL_SHIFT    8
+#define PL_UNIT	    (1 << PL_SHIFT)
+#define PL_MASK	    (PL_UNIT - 1)
+
+#if 0
+#define GetBits(p,o,d) { \
+    CARD32	m1,m2,m3,m4,m5,m6,m7,m8; \
+    m1 = sha[o] << (7 - (p)); \
+    m2 = sha[(o)+1] << (3 - (p)); \
+    m3 = m1 & 0x80808080; \
+    m4 = m2 & 0x08080808; \
+    m5 = m3 | m4; \
+    m6 = m5 >> 9; \
+    m7 = m5 | m6; \
+    m8 = m7 >> 18; \
+    d = m7 | m8; \
+}
+#else
+#define GetBits(p,o,d) { \
+    CARD32	m5,m7; \
+    m5 = ((sha[o] << (7 - (p))) & 0x80808080) | ((sha[(o)+1] << (3 - (p))) & 0x08080808); \
+    m7 = m5 | (m5 >> 9); \
+    d = m7 | (m7 >> 18); \
+}
+#endif
+
+void
+shadowUpdatePlanar4x8 (ScreenPtr	pScreen,
+		       shadowBufPtr	pBuf)
+{
+    RegionPtr	damage = shadowDamage (pBuf);
+    PixmapPtr	pShadow = pBuf->pPixmap;
+    int		nbox = RegionNumRects (damage);
+    BoxPtr	pbox = RegionRects (damage);
+    CARD32	*shaBase, *shaLine, *sha;
+    CARD8	s1, s2, s3, s4;
+    FbStride	shaStride;
+    int		scrBase, scrLine, scr;
+    int		shaBpp;
+    _X_UNUSED int	shaXoff, shaYoff;
+    int		x, y, w, h, width;
+    int         i;
+    CARD32	*winBase = NULL, *win;
+    CARD32	winSize;
+    int		plane;
+
+    fbGetStipDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff);
+    while (nbox--)
+    {
+	x = pbox->x1 * shaBpp;
+	y = pbox->y1;
+	w = (pbox->x2 - pbox->x1) * shaBpp;
+	h = pbox->y2 - pbox->y1;
+
+	w = (w + (x & PL_MASK) + PL_MASK) >> PL_SHIFT;
+	x &= ~PL_MASK;
+	
+	scrLine = (x >> PL_SHIFT);
+	shaLine = shaBase + y * shaStride + (x >> FB_SHIFT);
+	
+	while (h--)
+	{
+	    for (plane = 0; plane < 4; plane++)
+	    {
+		width = w;
+		scr = scrLine;
+		sha = shaLine;
+		winSize = 0;
+		scrBase = 0;
+		while (width) {
+		    /* how much remains in this window */
+		    i = scrBase + winSize - scr;
+		    if (i <= 0 || scr < scrBase)
+		    {
+			winBase = (CARD32 *) (*pBuf->window) (pScreen,
+							      y,
+							      (scr << 4) | (plane),
+							      SHADOW_WINDOW_WRITE,
+							      &winSize,
+							      pBuf->closure);
+			if(!winBase)
+			    return;
+			winSize >>= 2;
+			scrBase = scr;
+			i = winSize;
+		    }
+		    win = winBase + (scr - scrBase);
+		    if (i > width)
+		    i = width;
+		    width -= i;
+		    scr += i;
+		   
+		    while (i--)
+		    {
+			GetBits(plane,0,s1);
+			GetBits(plane,2,s2);
+			GetBits(plane,4,s3);
+			GetBits(plane,6,s4);
+			*win++ = s1 | (s2 << 8) | (s3 << 16) | (s4 << 24);
+			sha += 8;
+		    }
+		}
+	    }
+	    shaLine += shaStride;
+	    y++;
+	}
+	pbox++;
+    }
+}
+		    
diff --git a/xorg-server/miext/shadow/shrotate.c b/xorg-server/miext/shadow/shrotate.c
index 13e9682ba..090120387 100644
--- a/xorg-server/miext/shadow/shrotate.c
+++ b/xorg-server/miext/shadow/shrotate.c
@@ -1,313 +1,313 @@
-/*

- *

- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include    <X11/X.h>

-#include    "scrnintstr.h"

-#include    "windowstr.h"

-#include    <X11/fonts/font.h>

-#include    "dixfontstr.h"

-#include    <X11/fonts/fontstruct.h>

-#include    "mi.h"

-#include    "regionstr.h"

-#include    "globals.h"

-#include    "gcstruct.h"

-#include    "shadow.h"

-#include    "fb.h"

-

-/*

- * These indicate which way the source (shadow) is scanned when

- * walking the screen in a particular direction

- */

-

-#define LEFT_TO_RIGHT	1

-#define RIGHT_TO_LEFT	-1

-#define TOP_TO_BOTTOM	2

-#define BOTTOM_TO_TOP	-2

-

-void

-shadowUpdateRotatePacked (ScreenPtr	pScreen,

-			  shadowBufPtr	pBuf)

-{

-    RegionPtr	damage = shadowDamage (pBuf);

-    PixmapPtr	pShadow = pBuf->pPixmap;

-    int		nbox = RegionNumRects (damage);

-    BoxPtr	pbox = RegionRects (damage);

-    FbBits	*shaBits;

-    FbStride	shaStride;

-    int		shaBpp;

-    int		shaXoff, shaYoff;

-    int		box_x1, box_x2, box_y1, box_y2;

-    int		sha_x1 = 0, sha_y1 = 0;

-    int		scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h;

-    int		scr_x, scr_y;

-    int		w;

-    int		pixelsPerBits;

-    int		pixelsMask;

-    FbStride	shaStepOverY = 0, shaStepDownY = 0;

-    FbStride	shaStepOverX = 0, shaStepDownX = 0;

-    FbBits	*shaLine, *sha;

-    int		shaHeight = pShadow->drawable.height;

-    int		shaWidth = pShadow->drawable.width;

-    FbBits	shaMask;

-    int		shaFirstShift, shaShift;

-    int		o_x_dir;

-    int		o_y_dir;

-    int		x_dir;

-    int		y_dir;

-

-    fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff);

-    pixelsPerBits = (sizeof (FbBits) * 8) / shaBpp;

-    pixelsMask = ~(pixelsPerBits - 1);

-    shaMask = FbBitsMask (FB_UNIT-shaBpp, shaBpp);

-    /*

-     * Compute rotation related constants to walk the shadow

-     */

-    o_x_dir = LEFT_TO_RIGHT;

-    o_y_dir = TOP_TO_BOTTOM;

-    if (pBuf->randr & SHADOW_REFLECT_X)

-	o_x_dir = -o_x_dir;

-    if (pBuf->randr & SHADOW_REFLECT_Y)

-	o_y_dir = -o_y_dir;

-    switch (pBuf->randr & (SHADOW_ROTATE_ALL)) {

-    case SHADOW_ROTATE_0:	/* upper left shadow -> upper left screen */

-    default:

-	x_dir = o_x_dir;

-	y_dir = o_y_dir;

-	break;

-    case SHADOW_ROTATE_90:    	/* upper right shadow -> upper left screen */

-	x_dir = o_y_dir;

-	y_dir = -o_x_dir;

-	break;

-    case SHADOW_ROTATE_180:	/* lower right shadow -> upper left screen */

-	x_dir = -o_x_dir;

-	y_dir = -o_y_dir;

-	break;

-    case SHADOW_ROTATE_270:	/* lower left shadow -> upper left screen */

-	x_dir = -o_y_dir;

-	y_dir = o_x_dir;

-	break;

-    }

-    switch (x_dir) {

-    case LEFT_TO_RIGHT:

-	shaStepOverX = shaBpp;

-	shaStepOverY = 0;

-	break;

-    case TOP_TO_BOTTOM:

-	shaStepOverX = 0;

-	shaStepOverY = shaStride;

-	break;

-    case RIGHT_TO_LEFT:

-	shaStepOverX = -shaBpp;

-	shaStepOverY = 0;

-	break;

-    case BOTTOM_TO_TOP:

-	shaStepOverX = 0;

-	shaStepOverY = -shaStride;

-	break;

-    }

-    switch (y_dir) {

-    case TOP_TO_BOTTOM:

-	shaStepDownX = 0;

-	shaStepDownY = shaStride;

-	break;

-    case RIGHT_TO_LEFT:

-	shaStepDownX = -shaBpp;

-	shaStepDownY = 0;

-	break;

-    case BOTTOM_TO_TOP:

-	shaStepDownX = 0;

-	shaStepDownY = -shaStride;

-	break;

-    case LEFT_TO_RIGHT:

-	shaStepDownX = shaBpp;

-	shaStepDownY = 0;

-	break;

-    }

-    

-    while (nbox--)

-    {

-        box_x1 = pbox->x1;

-        box_y1 = pbox->y1;

-        box_x2 = pbox->x2;

-        box_y2 = pbox->y2;

-        pbox++;

-

-	/*

-	 * Compute screen and shadow locations for this box

-	 */

-	switch (x_dir) {

-	case LEFT_TO_RIGHT:

-	    scr_x1 = box_x1 & pixelsMask;

-	    scr_x2 = (box_x2 + pixelsPerBits - 1) & pixelsMask;

-	    

-	    sha_x1 = scr_x1;

-	    break;

-	case TOP_TO_BOTTOM:

-	    scr_x1 = box_y1 & pixelsMask;

-	    scr_x2 = (box_y2 + pixelsPerBits - 1) & pixelsMask;

-

-	    sha_y1 = scr_x1;

-	    break;

-	case RIGHT_TO_LEFT:

-	    scr_x1 = (shaWidth - box_x2) & pixelsMask;

-	    scr_x2 = (shaWidth - box_x1 + pixelsPerBits - 1) & pixelsMask;

-

-	    sha_x1 = (shaWidth - scr_x1 - 1);

-	    break;

-	case BOTTOM_TO_TOP:

-	    scr_x1 = (shaHeight - box_y2) & pixelsMask;

-	    scr_x2 = (shaHeight - box_y1 + pixelsPerBits - 1) & pixelsMask;

-	    

-	    sha_y1 = (shaHeight - scr_x1 - 1);

-	    break;

-	}

-	switch (y_dir) {

-	case TOP_TO_BOTTOM:

-	    scr_y1 = box_y1;

-	    scr_y2 = box_y2;

-

-	    sha_y1 = scr_y1;

-	    break;

-	case RIGHT_TO_LEFT:

-	    scr_y1 = (shaWidth - box_x2);

-	    scr_y2 = (shaWidth - box_x1);

-

-	    sha_x1 = box_x2 - 1;

-	    break;

-	case BOTTOM_TO_TOP:

-	    scr_y1 = shaHeight - box_y2;

-	    scr_y2 = shaHeight - box_y1;

-	    

-	    sha_y1 = box_y2 - 1;

-	    break;

-	case LEFT_TO_RIGHT:

-	    scr_y1 = box_x1;

-	    scr_y2 = box_x2;

-

-	    sha_x1 = box_x1;

-	    break;

-	}

-	scr_w = ((scr_x2 - scr_x1) * shaBpp) >> FB_SHIFT;

-	scr_h = scr_y2 - scr_y1;

-	scr_y = scr_y1;

-

-	/* shift amount for first pixel on screen */ 

-	shaFirstShift = FB_UNIT - ((sha_x1 * shaBpp) & FB_MASK) - shaBpp;

-	

-	/* pointer to shadow data first placed on screen */

-	shaLine = (shaBits + 

-		   sha_y1 * shaStride + 

-		   ((sha_x1 * shaBpp) >> FB_SHIFT));

-

-	/*

-	 * Copy the bits, always write across the physical frame buffer

-	 * to take advantage of write combining.

-	 */

-	while (scr_h--)

-	{

-	    int	    p;

-	    FbBits  bits;

-	    FbBits  *win;

-	    int	    i;

-	    CARD32  winSize;

-	    

-	    sha = shaLine;

-	    shaShift = shaFirstShift;

-	    w = scr_w;

-	    scr_x = scr_x1 * shaBpp >> FB_SHIFT;

-

-	    while (w)

-	    {

-		/*

-		 * Map some of this line

-		 */

-		win = (FbBits *) (*pBuf->window) (pScreen,

-						  scr_y,

-						  scr_x << 2,

-						  SHADOW_WINDOW_WRITE,

-						  &winSize,

-						  pBuf->closure);

-		i = (winSize >> 2);

-		if (i > w)

-		    i = w;

-		w -= i;

-		scr_x += i;

-		/*

-		 * Copy the portion of the line mapped

-		 */

-		while (i--)

-		{

-		    bits = 0;

-		    p = pixelsPerBits;

-		    /*

-		     * Build one word of output from multiple inputs

-		     * 

-		     * Note that for 90/270 rotations, this will walk

-		     * down the shadow hitting each scanline once.

-		     * This is probably not very efficient.

-		     */

-		    while (p--)

-		    {

-			bits = FbScrLeft(bits, shaBpp);

-			bits |= FbScrRight (*sha, shaShift) & shaMask;

-

-			shaShift -= shaStepOverX;

-			if (shaShift >= FB_UNIT)

-			{

-			    shaShift -= FB_UNIT;

-			    sha--;

-			}

-			else if (shaShift < 0)

-			{

-			    shaShift += FB_UNIT;

-			    sha++;

-			}

-			sha += shaStepOverY;

-		    }

-		    *win++ = bits;

-		}

-	    }

-	    scr_y++;

-	    shaFirstShift -= shaStepDownX;

-	    if (shaFirstShift >= FB_UNIT)

-	    {

-		shaFirstShift -= FB_UNIT;

-		shaLine--;

-	    }

-	    else if (shaFirstShift < 0)

-	    {

-		shaFirstShift += FB_UNIT;

-		shaLine++;

-	    }

-	    shaLine += shaStepDownY;

-	}

-    }

-}

-

-shadowUpdateProc shadowUpdateRotatePackedWeak(void) {

-    return shadowUpdateRotatePacked;

-}

+/*
+ *
+ * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include    <X11/X.h>
+#include    "scrnintstr.h"
+#include    "windowstr.h"
+#include    <X11/fonts/font.h>
+#include    "dixfontstr.h"
+#include    <X11/fonts/fontstruct.h>
+#include    "mi.h"
+#include    "regionstr.h"
+#include    "globals.h"
+#include    "gcstruct.h"
+#include    "shadow.h"
+#include    "fb.h"
+
+/*
+ * These indicate which way the source (shadow) is scanned when
+ * walking the screen in a particular direction
+ */
+
+#define LEFT_TO_RIGHT	1
+#define RIGHT_TO_LEFT	-1
+#define TOP_TO_BOTTOM	2
+#define BOTTOM_TO_TOP	-2
+
+void
+shadowUpdateRotatePacked (ScreenPtr	pScreen,
+			  shadowBufPtr	pBuf)
+{
+    RegionPtr	damage = shadowDamage (pBuf);
+    PixmapPtr	pShadow = pBuf->pPixmap;
+    int		nbox = RegionNumRects (damage);
+    BoxPtr	pbox = RegionRects (damage);
+    FbBits	*shaBits;
+    FbStride	shaStride;
+    int		shaBpp;
+    _X_UNUSED int	shaXoff, shaYoff;
+    int		box_x1, box_x2, box_y1, box_y2;
+    int		sha_x1 = 0, sha_y1 = 0;
+    int		scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h;
+    int		scr_x, scr_y;
+    int		w;
+    int		pixelsPerBits;
+    int		pixelsMask;
+    FbStride	shaStepOverY = 0, shaStepDownY = 0;
+    FbStride	shaStepOverX = 0, shaStepDownX = 0;
+    FbBits	*shaLine, *sha;
+    int		shaHeight = pShadow->drawable.height;
+    int		shaWidth = pShadow->drawable.width;
+    FbBits	shaMask;
+    int		shaFirstShift, shaShift;
+    int		o_x_dir;
+    int		o_y_dir;
+    int		x_dir;
+    int		y_dir;
+
+    fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff);
+    pixelsPerBits = (sizeof (FbBits) * 8) / shaBpp;
+    pixelsMask = ~(pixelsPerBits - 1);
+    shaMask = FbBitsMask (FB_UNIT-shaBpp, shaBpp);
+    /*
+     * Compute rotation related constants to walk the shadow
+     */
+    o_x_dir = LEFT_TO_RIGHT;
+    o_y_dir = TOP_TO_BOTTOM;
+    if (pBuf->randr & SHADOW_REFLECT_X)
+	o_x_dir = -o_x_dir;
+    if (pBuf->randr & SHADOW_REFLECT_Y)
+	o_y_dir = -o_y_dir;
+    switch (pBuf->randr & (SHADOW_ROTATE_ALL)) {
+    case SHADOW_ROTATE_0:	/* upper left shadow -> upper left screen */
+    default:
+	x_dir = o_x_dir;
+	y_dir = o_y_dir;
+	break;
+    case SHADOW_ROTATE_90:    	/* upper right shadow -> upper left screen */
+	x_dir = o_y_dir;
+	y_dir = -o_x_dir;
+	break;
+    case SHADOW_ROTATE_180:	/* lower right shadow -> upper left screen */
+	x_dir = -o_x_dir;
+	y_dir = -o_y_dir;
+	break;
+    case SHADOW_ROTATE_270:	/* lower left shadow -> upper left screen */
+	x_dir = -o_y_dir;
+	y_dir = o_x_dir;
+	break;
+    }
+    switch (x_dir) {
+    case LEFT_TO_RIGHT:
+	shaStepOverX = shaBpp;
+	shaStepOverY = 0;
+	break;
+    case TOP_TO_BOTTOM:
+	shaStepOverX = 0;
+	shaStepOverY = shaStride;
+	break;
+    case RIGHT_TO_LEFT:
+	shaStepOverX = -shaBpp;
+	shaStepOverY = 0;
+	break;
+    case BOTTOM_TO_TOP:
+	shaStepOverX = 0;
+	shaStepOverY = -shaStride;
+	break;
+    }
+    switch (y_dir) {
+    case TOP_TO_BOTTOM:
+	shaStepDownX = 0;
+	shaStepDownY = shaStride;
+	break;
+    case RIGHT_TO_LEFT:
+	shaStepDownX = -shaBpp;
+	shaStepDownY = 0;
+	break;
+    case BOTTOM_TO_TOP:
+	shaStepDownX = 0;
+	shaStepDownY = -shaStride;
+	break;
+    case LEFT_TO_RIGHT:
+	shaStepDownX = shaBpp;
+	shaStepDownY = 0;
+	break;
+    }
+    
+    while (nbox--)
+    {
+        box_x1 = pbox->x1;
+        box_y1 = pbox->y1;
+        box_x2 = pbox->x2;
+        box_y2 = pbox->y2;
+        pbox++;
+
+	/*
+	 * Compute screen and shadow locations for this box
+	 */
+	switch (x_dir) {
+	case LEFT_TO_RIGHT:
+	    scr_x1 = box_x1 & pixelsMask;
+	    scr_x2 = (box_x2 + pixelsPerBits - 1) & pixelsMask;
+	    
+	    sha_x1 = scr_x1;
+	    break;
+	case TOP_TO_BOTTOM:
+	    scr_x1 = box_y1 & pixelsMask;
+	    scr_x2 = (box_y2 + pixelsPerBits - 1) & pixelsMask;
+
+	    sha_y1 = scr_x1;
+	    break;
+	case RIGHT_TO_LEFT:
+	    scr_x1 = (shaWidth - box_x2) & pixelsMask;
+	    scr_x2 = (shaWidth - box_x1 + pixelsPerBits - 1) & pixelsMask;
+
+	    sha_x1 = (shaWidth - scr_x1 - 1);
+	    break;
+	case BOTTOM_TO_TOP:
+	    scr_x1 = (shaHeight - box_y2) & pixelsMask;
+	    scr_x2 = (shaHeight - box_y1 + pixelsPerBits - 1) & pixelsMask;
+	    
+	    sha_y1 = (shaHeight - scr_x1 - 1);
+	    break;
+	}
+	switch (y_dir) {
+	case TOP_TO_BOTTOM:
+	    scr_y1 = box_y1;
+	    scr_y2 = box_y2;
+
+	    sha_y1 = scr_y1;
+	    break;
+	case RIGHT_TO_LEFT:
+	    scr_y1 = (shaWidth - box_x2);
+	    scr_y2 = (shaWidth - box_x1);
+
+	    sha_x1 = box_x2 - 1;
+	    break;
+	case BOTTOM_TO_TOP:
+	    scr_y1 = shaHeight - box_y2;
+	    scr_y2 = shaHeight - box_y1;
+	    
+	    sha_y1 = box_y2 - 1;
+	    break;
+	case LEFT_TO_RIGHT:
+	    scr_y1 = box_x1;
+	    scr_y2 = box_x2;
+
+	    sha_x1 = box_x1;
+	    break;
+	}
+	scr_w = ((scr_x2 - scr_x1) * shaBpp) >> FB_SHIFT;
+	scr_h = scr_y2 - scr_y1;
+	scr_y = scr_y1;
+
+	/* shift amount for first pixel on screen */ 
+	shaFirstShift = FB_UNIT - ((sha_x1 * shaBpp) & FB_MASK) - shaBpp;
+	
+	/* pointer to shadow data first placed on screen */
+	shaLine = (shaBits + 
+		   sha_y1 * shaStride + 
+		   ((sha_x1 * shaBpp) >> FB_SHIFT));
+
+	/*
+	 * Copy the bits, always write across the physical frame buffer
+	 * to take advantage of write combining.
+	 */
+	while (scr_h--)
+	{
+	    int	    p;
+	    FbBits  bits;
+	    FbBits  *win;
+	    int	    i;
+	    CARD32  winSize;
+	    
+	    sha = shaLine;
+	    shaShift = shaFirstShift;
+	    w = scr_w;
+	    scr_x = scr_x1 * shaBpp >> FB_SHIFT;
+
+	    while (w)
+	    {
+		/*
+		 * Map some of this line
+		 */
+		win = (FbBits *) (*pBuf->window) (pScreen,
+						  scr_y,
+						  scr_x << 2,
+						  SHADOW_WINDOW_WRITE,
+						  &winSize,
+						  pBuf->closure);
+		i = (winSize >> 2);
+		if (i > w)
+		    i = w;
+		w -= i;
+		scr_x += i;
+		/*
+		 * Copy the portion of the line mapped
+		 */
+		while (i--)
+		{
+		    bits = 0;
+		    p = pixelsPerBits;
+		    /*
+		     * Build one word of output from multiple inputs
+		     * 
+		     * Note that for 90/270 rotations, this will walk
+		     * down the shadow hitting each scanline once.
+		     * This is probably not very efficient.
+		     */
+		    while (p--)
+		    {
+			bits = FbScrLeft(bits, shaBpp);
+			bits |= FbScrRight (*sha, shaShift) & shaMask;
+
+			shaShift -= shaStepOverX;
+			if (shaShift >= FB_UNIT)
+			{
+			    shaShift -= FB_UNIT;
+			    sha--;
+			}
+			else if (shaShift < 0)
+			{
+			    shaShift += FB_UNIT;
+			    sha++;
+			}
+			sha += shaStepOverY;
+		    }
+		    *win++ = bits;
+		}
+	    }
+	    scr_y++;
+	    shaFirstShift -= shaStepDownX;
+	    if (shaFirstShift >= FB_UNIT)
+	    {
+		shaFirstShift -= FB_UNIT;
+		shaLine--;
+	    }
+	    else if (shaFirstShift < 0)
+	    {
+		shaFirstShift += FB_UNIT;
+		shaLine++;
+	    }
+	    shaLine += shaStepDownY;
+	}
+    }
+}
+
+shadowUpdateProc shadowUpdateRotatePackedWeak(void) {
+    return shadowUpdateRotatePacked;
+}
diff --git a/xorg-server/miext/shadow/shrotpack.h b/xorg-server/miext/shadow/shrotpack.h
index 1a8af6200..16afff184 100644
--- a/xorg-server/miext/shadow/shrotpack.h
+++ b/xorg-server/miext/shadow/shrotpack.h
@@ -1,187 +1,187 @@
-/*

- *

- * Copyright © 2000 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-/*

- * Thanks to Daniel Chemko <dchemko@intrinsyc.com> for making the 90 and 180

- * orientations work.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include    <X11/X.h>

-#include    "scrnintstr.h"

-#include    "windowstr.h"

-#include    <X11/fonts/font.h>

-#include    "dixfontstr.h"

-#include    <X11/fonts/fontstruct.h>

-#include    "mi.h"

-#include    "regionstr.h"

-#include    "globals.h"

-#include    "gcstruct.h"

-#include    "shadow.h"

-#include    "fb.h"

-

-#define DANDEBUG         0

-

-#if ROTATE == 270

-

-#define SCRLEFT(x,y,w,h)    (pScreen->height - ((y) + (h)))

-#define SCRY(x,y,w,h)	    (x)

-#define SCRWIDTH(x,y,w,h)   (h)

-#define FIRSTSHA(x,y,w,h)   (((y) + (h) - 1) * shaStride + (x))

-#define STEPDOWN(x,y,w,h)   ((w)--)

-#define NEXTY(x,y,w,h)	    ((x)++)

-#define SHASTEPX(stride)    -(stride)

-#define SHASTEPY(stride)    (1)

-

-#elif ROTATE == 90

-

-#define SCRLEFT(x,y,w,h)    (y)

-#define SCRY(x,y,w,h)	    (pScreen->width - ((x) + (w)) - 1)

-#define SCRWIDTH(x,y,w,h)   (h)

-#define FIRSTSHA(x,y,w,h)   ((y) * shaStride + (x + w - 1))

-#define STEPDOWN(x,y,w,h)   ((w)--)

-#define NEXTY(x,y,w,h)	    ((void)(x))

-#define SHASTEPX(stride)    (stride)

-#define SHASTEPY(stride)    (-1)

-

-#elif ROTATE == 180

-

-#define SCRLEFT(x,y,w,h)    (pScreen->width - ((x) + (w)))

-#define SCRY(x,y,w,h)	    (pScreen->height - ((y) + (h)) - 1)

-#define SCRWIDTH(x,y,w,h)   (w)

-#define FIRSTSHA(x,y,w,h)   ((y + h - 1) * shaStride + (x + w - 1))

-#define STEPDOWN(x,y,w,h)   ((h)--)

-#define NEXTY(x,y,w,h)	    ((void)(y))

-#define SHASTEPX(stride)    (-1)

-#define SHASTEPY(stride)    -(stride)

-

-#else

-

-#define SCRLEFT(x,y,w,h)    (x)

-#define SCRY(x,y,w,h)	    (y)

-#define SCRWIDTH(x,y,w,h)   (w)

-#define FIRSTSHA(x,y,w,h)   ((y) * shaStride + (x))

-#define STEPDOWN(x,y,w,h)   ((h)--)

-#define NEXTY(x,y,w,h)	    ((y)++)

-#define SHASTEPX(stride)    (1)

-#define SHASTEPY(stride)    (stride)

-

-#endif

-

-void

-FUNC (ScreenPtr	    pScreen,

-      shadowBufPtr  pBuf)

-{

-    RegionPtr	damage = shadowDamage (pBuf);

-    PixmapPtr	pShadow = pBuf->pPixmap;

-    int		nbox = RegionNumRects (damage);

-    BoxPtr	pbox = RegionRects (damage);

-    FbBits	*shaBits;

-    Data	*shaBase, *shaLine, *sha;

-    FbStride	shaStride;

-    int		scrBase, scrLine, scr;

-    int		shaBpp;

-    int		shaXoff, shaYoff;   /* XXX assumed to be zero */

-    int		x, y, w, h, width;

-    int         i;

-    Data	*winBase = NULL, *win;

-    CARD32	winSize;

-

-    fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff);

-    shaBase = (Data *) shaBits;

-    shaStride = shaStride * sizeof (FbBits) / sizeof (Data);

-#if (DANDEBUG > 1)

-    ErrorF ("-> Entering Shadow Update:\r\n   |- Origins: pShadow=%x, pScreen=%x, damage=%x\r\n   |- Metrics: shaStride=%d, shaBase=%x, shaBpp=%d\r\n   |                                                     \n", pShadow, pScreen, damage, shaStride, shaBase, shaBpp);

-#endif

-    while (nbox--)

-    {

-        x = pbox->x1;

-        y = pbox->y1;

-        w = (pbox->x2 - pbox->x1);

-        h = pbox->y2 - pbox->y1;

-        

-#if (DANDEBUG > 2)

-        ErrorF ("   |-> Redrawing box - Metrics: X=%d, Y=%d, Width=%d, Height=%d\n", x, y, w, h);

-#endif

-        scrLine = SCRLEFT(x,y,w,h);

-        shaLine = shaBase + FIRSTSHA(x,y,w,h);

-        

-        while (STEPDOWN(x,y,w,h))

-        {

-            winSize = 0;

-            scrBase = 0;

-            width = SCRWIDTH(x,y,w,h);

-            scr = scrLine;

-            sha = shaLine;

-#if (DANDEBUG > 3)

-            ErrorF ("   |   |-> StepDown - Metrics: width=%d, scr=%x, sha=%x\n", width, scr, sha);

-#endif

-            while (width)

-            {

-                /*  how much remains in this window */

-                i = scrBase + winSize - scr;

-                if (i <= 0 || scr < scrBase)

-                {

-                    winBase = (Data *) (*pBuf->window) (pScreen,

-							SCRY(x,y,w,h),

-							scr * sizeof (Data),

-							SHADOW_WINDOW_WRITE,

-							&winSize,

-							pBuf->closure);

-                    if(!winBase)

-                        return;

-                    scrBase = scr;

-                    winSize /= sizeof (Data);

-                    i = winSize;

-#if(DANDEBUG > 4)

-                    ErrorF ("   |   |   |-> Starting New Line - Metrics: winBase=%x, scrBase=%x, winSize=%d\r\n   |   |   |   Xstride=%d, Ystride=%d, w=%d h=%d\n", winBase, scrBase, winSize, SHASTEPX(shaStride), SHASTEPY(shaStride), w, h);

-#endif

-                }

-                win = winBase + (scr - scrBase);

-                if (i > width)

-                    i = width;

-                width -= i;

-                scr += i;

-#if(DANDEBUG > 5)

-		ErrorF ("   |   |   |-> Writing Line - Metrics: win=%x, sha=%x\n", win, sha);

-#endif

-                while (i--)

-                {

-#if(DANDEBUG > 6)

-		    ErrorF ("   |   |   |-> Writing Pixel - Metrics: win=%x, sha=%d, remaining=%d\n", win, sha, i);

-#endif

-                    *win++ = *sha;

-                    sha += SHASTEPX(shaStride);

-                } /*  i */

-            } /*  width */

-            shaLine += SHASTEPY(shaStride);

-            NEXTY(x,y,w,h);

-        } /*  STEPDOWN */

-        pbox++;

-    } /*  nbox */

-}

+/*
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Thanks to Daniel Chemko <dchemko@intrinsyc.com> for making the 90 and 180
+ * orientations work.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include    <X11/X.h>
+#include    "scrnintstr.h"
+#include    "windowstr.h"
+#include    <X11/fonts/font.h>
+#include    "dixfontstr.h"
+#include    <X11/fonts/fontstruct.h>
+#include    "mi.h"
+#include    "regionstr.h"
+#include    "globals.h"
+#include    "gcstruct.h"
+#include    "shadow.h"
+#include    "fb.h"
+
+#define DANDEBUG         0
+
+#if ROTATE == 270
+
+#define SCRLEFT(x,y,w,h)    (pScreen->height - ((y) + (h)))
+#define SCRY(x,y,w,h)	    (x)
+#define SCRWIDTH(x,y,w,h)   (h)
+#define FIRSTSHA(x,y,w,h)   (((y) + (h) - 1) * shaStride + (x))
+#define STEPDOWN(x,y,w,h)   ((w)--)
+#define NEXTY(x,y,w,h)	    ((x)++)
+#define SHASTEPX(stride)    -(stride)
+#define SHASTEPY(stride)    (1)
+
+#elif ROTATE == 90
+
+#define SCRLEFT(x,y,w,h)    (y)
+#define SCRY(x,y,w,h)	    (pScreen->width - ((x) + (w)) - 1)
+#define SCRWIDTH(x,y,w,h)   (h)
+#define FIRSTSHA(x,y,w,h)   ((y) * shaStride + (x + w - 1))
+#define STEPDOWN(x,y,w,h)   ((w)--)
+#define NEXTY(x,y,w,h)	    ((void)(x))
+#define SHASTEPX(stride)    (stride)
+#define SHASTEPY(stride)    (-1)
+
+#elif ROTATE == 180
+
+#define SCRLEFT(x,y,w,h)    (pScreen->width - ((x) + (w)))
+#define SCRY(x,y,w,h)	    (pScreen->height - ((y) + (h)) - 1)
+#define SCRWIDTH(x,y,w,h)   (w)
+#define FIRSTSHA(x,y,w,h)   ((y + h - 1) * shaStride + (x + w - 1))
+#define STEPDOWN(x,y,w,h)   ((h)--)
+#define NEXTY(x,y,w,h)	    ((void)(y))
+#define SHASTEPX(stride)    (-1)
+#define SHASTEPY(stride)    -(stride)
+
+#else
+
+#define SCRLEFT(x,y,w,h)    (x)
+#define SCRY(x,y,w,h)	    (y)
+#define SCRWIDTH(x,y,w,h)   (w)
+#define FIRSTSHA(x,y,w,h)   ((y) * shaStride + (x))
+#define STEPDOWN(x,y,w,h)   ((h)--)
+#define NEXTY(x,y,w,h)	    ((y)++)
+#define SHASTEPX(stride)    (1)
+#define SHASTEPY(stride)    (stride)
+
+#endif
+
+void
+FUNC (ScreenPtr	    pScreen,
+      shadowBufPtr  pBuf)
+{
+    RegionPtr	damage = shadowDamage (pBuf);
+    PixmapPtr	pShadow = pBuf->pPixmap;
+    int		nbox = RegionNumRects (damage);
+    BoxPtr	pbox = RegionRects (damage);
+    FbBits	*shaBits;
+    Data	*shaBase, *shaLine, *sha;
+    FbStride	shaStride;
+    int		scrBase, scrLine, scr;
+    int		shaBpp;
+    _X_UNUSED int	shaXoff, shaYoff;
+    int		x, y, w, h, width;
+    int         i;
+    Data	*winBase = NULL, *win;
+    CARD32	winSize;
+
+    fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff);
+    shaBase = (Data *) shaBits;
+    shaStride = shaStride * sizeof (FbBits) / sizeof (Data);
+#if (DANDEBUG > 1)
+    ErrorF ("-> Entering Shadow Update:\r\n   |- Origins: pShadow=%x, pScreen=%x, damage=%x\r\n   |- Metrics: shaStride=%d, shaBase=%x, shaBpp=%d\r\n   |                                                     \n", pShadow, pScreen, damage, shaStride, shaBase, shaBpp);
+#endif
+    while (nbox--)
+    {
+        x = pbox->x1;
+        y = pbox->y1;
+        w = (pbox->x2 - pbox->x1);
+        h = pbox->y2 - pbox->y1;
+        
+#if (DANDEBUG > 2)
+        ErrorF ("   |-> Redrawing box - Metrics: X=%d, Y=%d, Width=%d, Height=%d\n", x, y, w, h);
+#endif
+        scrLine = SCRLEFT(x,y,w,h);
+        shaLine = shaBase + FIRSTSHA(x,y,w,h);
+        
+        while (STEPDOWN(x,y,w,h))
+        {
+            winSize = 0;
+            scrBase = 0;
+            width = SCRWIDTH(x,y,w,h);
+            scr = scrLine;
+            sha = shaLine;
+#if (DANDEBUG > 3)
+            ErrorF ("   |   |-> StepDown - Metrics: width=%d, scr=%x, sha=%x\n", width, scr, sha);
+#endif
+            while (width)
+            {
+                /*  how much remains in this window */
+                i = scrBase + winSize - scr;
+                if (i <= 0 || scr < scrBase)
+                {
+                    winBase = (Data *) (*pBuf->window) (pScreen,
+							SCRY(x,y,w,h),
+							scr * sizeof (Data),
+							SHADOW_WINDOW_WRITE,
+							&winSize,
+							pBuf->closure);
+                    if(!winBase)
+                        return;
+                    scrBase = scr;
+                    winSize /= sizeof (Data);
+                    i = winSize;
+#if(DANDEBUG > 4)
+                    ErrorF ("   |   |   |-> Starting New Line - Metrics: winBase=%x, scrBase=%x, winSize=%d\r\n   |   |   |   Xstride=%d, Ystride=%d, w=%d h=%d\n", winBase, scrBase, winSize, SHASTEPX(shaStride), SHASTEPY(shaStride), w, h);
+#endif
+                }
+                win = winBase + (scr - scrBase);
+                if (i > width)
+                    i = width;
+                width -= i;
+                scr += i;
+#if(DANDEBUG > 5)
+		ErrorF ("   |   |   |-> Writing Line - Metrics: win=%x, sha=%x\n", win, sha);
+#endif
+                while (i--)
+                {
+#if(DANDEBUG > 6)
+		    ErrorF ("   |   |   |-> Writing Pixel - Metrics: win=%x, sha=%d, remaining=%d\n", win, sha, i);
+#endif
+                    *win++ = *sha;
+                    sha += SHASTEPX(shaStride);
+                } /*  i */
+            } /*  width */
+            shaLine += SHASTEPY(shaStride);
+            NEXTY(x,y,w,h);
+        } /*  STEPDOWN */
+        pbox++;
+    } /*  nbox */
+}
diff --git a/xorg-server/miext/shadow/shrotpackYX.h b/xorg-server/miext/shadow/shrotpackYX.h
index 7005b1457..d7b01ec2a 100644
--- a/xorg-server/miext/shadow/shrotpackYX.h
+++ b/xorg-server/miext/shadow/shrotpackYX.h
@@ -1,160 +1,160 @@
-/*

- * Copyright © 2004 Philip Blundell

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Philip Blundell not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Philip Blundell makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#include    <X11/X.h>

-#include    "scrnintstr.h"

-#include    "windowstr.h"

-#include    "dixfontstr.h"

-#include    "mi.h"

-#include    "regionstr.h"

-#include    "globals.h"

-#include    "gcstruct.h"

-#include    "shadow.h"

-#include    "fb.h"

-

-#if ROTATE == 270

-

-#define WINSTEPX(stride)    (stride)

-#define WINSTART(x,y)       (((pScreen->height - 1) - y) + (x * winStride))

-#define WINSTEPY()	    -1

-

-#elif ROTATE == 90

-

-#define WINSTEPX(stride)    (-stride)

-#define WINSTEPY()	    1

-#define WINSTART(x,y)       (((pScreen->width - 1 - x) * winStride) + y)

-

-#else

-

-#error This rotation is not supported here

-

-#endif

-

-#ifdef __arm__

-#define PREFETCH

-#endif

-

-void

-FUNC (ScreenPtr	    pScreen,

-      shadowBufPtr  pBuf);

-

-void

-FUNC (ScreenPtr	    pScreen,

-      shadowBufPtr  pBuf)

-{

-    RegionPtr	damage = shadowDamage(pBuf);

-    PixmapPtr	pShadow = pBuf->pPixmap;

-    int		nbox = RegionNumRects (damage);

-    BoxPtr	pbox = RegionRects (damage);

-    FbBits	*shaBits;

-    Data	*shaBase, *shaLine, *sha;

-    FbStride	shaStride, winStride;

-    int		shaBpp;

-    int		shaXoff, shaYoff;   /* XXX assumed to be zero */

-    int		x, y, w, h;

-    Data	*winBase, *win, *winLine;

-    CARD32	winSize;

-

-    fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff);

-    shaBase = (Data *) shaBits;

-    shaStride = shaStride * sizeof (FbBits) / sizeof (Data);

-

-    winBase = (Data *) (*pBuf->window) (pScreen, 0, 0,

-					SHADOW_WINDOW_WRITE,

-					&winSize, pBuf->closure);

-    winStride = (Data *) (*pBuf->window) (pScreen, 1, 0,

-					  SHADOW_WINDOW_WRITE,

-					  &winSize, pBuf->closure) - winBase;

-

-    while (nbox--)

-    {

-        x = pbox->x1;

-        y = pbox->y1;

-        w = (pbox->x2 - pbox->x1);

-        h = pbox->y2 - pbox->y1;

-

-	shaLine = shaBase + (y * shaStride) + x;

-#ifdef PREFETCH

-	__builtin_prefetch (shaLine);

-#endif

-	winLine = winBase + WINSTART(x, y);

-

-        while (h--)

-        {

-	    sha = shaLine;

-	    win = winLine;

-

-            while (sha < (shaLine + w - 16))

-            {

-#ifdef PREFETCH

-		__builtin_prefetch (sha + shaStride);

-#endif

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-            }

-

-            while (sha < (shaLine + w))

-            {

-		*win = *sha++;

-		win += WINSTEPX(winStride);

-            }

-

-	    y++;

-	    shaLine += shaStride;

-	    winLine += WINSTEPY();

-        }

-        pbox++;

-    } /*  nbox */

-}

+/*
+ * Copyright © 2004 Philip Blundell
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Philip Blundell not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Philip Blundell makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include    <X11/X.h>
+#include    "scrnintstr.h"
+#include    "windowstr.h"
+#include    "dixfontstr.h"
+#include    "mi.h"
+#include    "regionstr.h"
+#include    "globals.h"
+#include    "gcstruct.h"
+#include    "shadow.h"
+#include    "fb.h"
+
+#if ROTATE == 270
+
+#define WINSTEPX(stride)    (stride)
+#define WINSTART(x,y)       (((pScreen->height - 1) - y) + (x * winStride))
+#define WINSTEPY()	    -1
+
+#elif ROTATE == 90
+
+#define WINSTEPX(stride)    (-stride)
+#define WINSTEPY()	    1
+#define WINSTART(x,y)       (((pScreen->width - 1 - x) * winStride) + y)
+
+#else
+
+#error This rotation is not supported here
+
+#endif
+
+#ifdef __arm__
+#define PREFETCH
+#endif
+
+void
+FUNC (ScreenPtr	    pScreen,
+      shadowBufPtr  pBuf);
+
+void
+FUNC (ScreenPtr	    pScreen,
+      shadowBufPtr  pBuf)
+{
+    RegionPtr	damage = shadowDamage(pBuf);
+    PixmapPtr	pShadow = pBuf->pPixmap;
+    int		nbox = RegionNumRects (damage);
+    BoxPtr	pbox = RegionRects (damage);
+    FbBits	*shaBits;
+    Data	*shaBase, *shaLine, *sha;
+    FbStride	shaStride, winStride;
+    int		shaBpp;
+    _X_UNUSED int	shaXoff, shaYoff;
+    int		x, y, w, h;
+    Data	*winBase, *win, *winLine;
+    CARD32	winSize;
+
+    fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff);
+    shaBase = (Data *) shaBits;
+    shaStride = shaStride * sizeof (FbBits) / sizeof (Data);
+
+    winBase = (Data *) (*pBuf->window) (pScreen, 0, 0,
+					SHADOW_WINDOW_WRITE,
+					&winSize, pBuf->closure);
+    winStride = (Data *) (*pBuf->window) (pScreen, 1, 0,
+					  SHADOW_WINDOW_WRITE,
+					  &winSize, pBuf->closure) - winBase;
+
+    while (nbox--)
+    {
+        x = pbox->x1;
+        y = pbox->y1;
+        w = (pbox->x2 - pbox->x1);
+        h = pbox->y2 - pbox->y1;
+
+	shaLine = shaBase + (y * shaStride) + x;
+#ifdef PREFETCH
+	__builtin_prefetch (shaLine);
+#endif
+	winLine = winBase + WINSTART(x, y);
+
+        while (h--)
+        {
+	    sha = shaLine;
+	    win = winLine;
+
+            while (sha < (shaLine + w - 16))
+            {
+#ifdef PREFETCH
+		__builtin_prefetch (sha + shaStride);
+#endif
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+            }
+
+            while (sha < (shaLine + w))
+            {
+		*win = *sha++;
+		win += WINSTEPX(winStride);
+            }
+
+	    y++;
+	    shaLine += shaStride;
+	    winLine += WINSTEPY();
+        }
+        pbox++;
+    } /*  nbox */
+}