svn merge ^/branches/released .

24 files changed, 7185 insertions, 7202 deletions

diff --git a/xorg-server/fb/Makefile.am b/xorg-server/fb/Makefile.am
index 64e49f345..21ed7b624 100644
--- a/xorg-server/fb/Makefile.am
+++ b/xorg-server/fb/Makefile.am
@@ -1,56 +1,58 @@
-noinst_LTLIBRARIES = libfb.la libwfb.la
-
-INCLUDES = \
-	-I$(top_srcdir)/hw/xfree86/os-support \
-	-I$(top_srcdir)/hw/xfree86/os-support/bus \
-	-I$(top_srcdir)/hw/xfree86/common
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h
-endif
-
-libfb_la_CFLAGS = $(AM_CFLAGS)
-
-libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
-
-libfb_la_SOURCES = 	\
-	fb.h		\
-	fb24_32.c	\
-	fb24_32.h	\
-	fballpriv.c	\
-	fbarc.c		\
-	fbbits.c	\
-	fbbits.h	\
-	fbblt.c		\
-	fbbltone.c	\
-	fbcopy.c	\
-	fbfill.c	\
-	fbfillrect.c	\
-	fbfillsp.c	\
-	fbgc.c		\
-	fbgetsp.c	\
-	fbglyph.c	\
-	fbimage.c	\
-	fbline.c	\
-	fboverlay.c	\
-	fboverlay.h	\
-	fbpict.c	\
-	fbpict.h	\
-	fbpixmap.c	\
-	fbpoint.c	\
-	fbpush.c	\
-	fbrop.h		\
-	fbscreen.c	\
-	fbseg.c		\
-	fbsetsp.c	\
-	fbsolid.c	\
-	fbstipple.c	\
-	fbtile.c	\
-	fbtrap.c	\
-	fbutil.c	\
-	fbwindow.c
-
-libwfb_la_SOURCES = $(libfb_la_SOURCES)
-
-EXTRA_DIST = fbcmap.c fbcmap_mi.c
+noinst_LTLIBRARIES = libfb.la libwfb.la

+

+INCLUDES = \

+	-I$(top_srcdir)/hw/xfree86/os-support \

+	-I$(top_srcdir)/hw/xfree86/os-support/bus \

+	-I$(top_srcdir)/hw/xfree86/common

+AM_CFLAGS = $(DIX_CFLAGS)

+

+if XORG

+sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h

+endif

+

+libfb_la_CFLAGS = $(AM_CFLAGS)

+libfb_la_LIBADD = $(PIXMAN_LIBS)

+

+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER

+libwfb_la_LIBADD = $(PIXMAN_LIBS)

+

+libfb_la_SOURCES = 	\

+	fb.h		\

+	fb24_32.c	\

+	fb24_32.h	\

+	fballpriv.c	\

+	fbarc.c		\

+	fbbits.c	\

+	fbbits.h	\

+	fbblt.c		\

+	fbbltone.c	\

+	fbcopy.c	\

+	fbfill.c	\

+	fbfillrect.c	\

+	fbfillsp.c	\

+	fbgc.c		\

+	fbgetsp.c	\

+	fbglyph.c	\

+	fbimage.c	\

+	fbline.c	\

+	fboverlay.c	\

+	fboverlay.h	\

+	fbpict.c	\

+	fbpict.h	\

+	fbpixmap.c	\

+	fbpoint.c	\

+	fbpush.c	\

+	fbrop.h		\

+	fbscreen.c	\

+	fbseg.c		\

+	fbsetsp.c	\

+	fbsolid.c	\

+	fbstipple.c	\

+	fbtile.c	\

+	fbtrap.c	\

+	fbutil.c	\

+	fbwindow.c

+

+libwfb_la_SOURCES = $(libfb_la_SOURCES)

+

+EXTRA_DIST = fbcmap.c fbcmap_mi.c

diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index 91c91eeb2..b7ac73f95 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -1,2089 +1,2091 @@
-/*
- *
- * Copyright © 1998 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.
- */
-
-
-#ifndef _FB_H_
-#define _FB_H_
-
-#include <X11/X.h>
-#include <pixman.h>
-
-#include "scrnintstr.h"
-#include "pixmap.h"
-#include "pixmapstr.h"
-#include "region.h"
-#include "gcstruct.h"
-#include "colormap.h"
-#include "miscstruct.h"
-#include "servermd.h"
-#include "windowstr.h"
-#include "privates.h"
-#include "mi.h"
-#include "migc.h"
-#include "mibstore.h"
-#include "picturestr.h"
-
-#ifdef FB_ACCESS_WRAPPER
-
-#include "wfbrename.h"
-#define FBPREFIX(x) wfb##x
-#define WRITE(ptr, val) ((*wfbWriteMemory)((ptr), (val), sizeof(*(ptr))))
-#define READ(ptr) ((*wfbReadMemory)((ptr), sizeof(*(ptr))))
-
-#define MEMCPY_WRAPPED(dst, src, size) do {                       \
-    size_t _i;                                                    \
-    CARD8 *_dst = (CARD8*)(dst), *_src = (CARD8*)(src);           \
-    for(_i = 0; _i < size; _i++) {                                \
-        WRITE(_dst +_i, READ(_src + _i));                         \
-    }                                                             \
-} while(0)
-
-#define MEMSET_WRAPPED(dst, val, size) do {                       \
-    size_t _i;                                                    \
-    CARD8 *_dst = (CARD8*)(dst);                                  \
-    for(_i = 0; _i < size; _i++) {                                \
-        WRITE(_dst +_i, (val));                                   \
-    }                                                             \
-} while(0)
-
-#else
-
-#define FBPREFIX(x) fb##x
-#define WRITE(ptr, val) (*(ptr) = (val))
-#define READ(ptr) (*(ptr))
-#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
-#define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
-
-#endif
-
-/*
- * This single define controls the basic size of data manipulated
- * by this software; it must be log2(sizeof (FbBits) * 8)
- */
-
-#ifndef FB_SHIFT
-#define FB_SHIFT    LOG2_BITMAP_PAD
-#endif
-
-#if FB_SHIFT < LOG2_BITMAP_PAD
-    error FB_SHIFT must be >= LOG2_BITMAP_PAD
-#endif
-    
-#define FB_UNIT	    (1 << FB_SHIFT)
-#define FB_HALFUNIT (1 << (FB_SHIFT-1))
-#define FB_MASK	    (FB_UNIT - 1)
-#define FB_ALLONES  ((FbBits) -1)
-    
-#if GLYPHPADBYTES != 4
-#error "GLYPHPADBYTES must be 4"
-#endif
-/* whether to bother to include 24bpp support */
-#ifndef FBNO24BIT
-#define FB_24BIT
-#endif
-
-/*
- * Unless otherwise instructed, fb includes code to advertise 24bpp
- * windows with 32bpp image format for application compatibility
- */
-
-#ifdef FB_24BIT
-#ifndef FBNO24_32
-#define FB_24_32BIT
-#endif
-#endif
-
-#define FB_STIP_SHIFT	LOG2_BITMAP_PAD
-#define FB_STIP_UNIT	(1 << FB_STIP_SHIFT)
-#define FB_STIP_MASK	(FB_STIP_UNIT - 1)
-#define FB_STIP_ALLONES	((FbStip) -1)
-    
-#define FB_STIP_ODDSTRIDE(s)	(((s) & (FB_MASK >> FB_STIP_SHIFT)) != 0)
-#define FB_STIP_ODDPTR(p)	((((long) (p)) & (FB_MASK >> 3)) != 0)
-    
-#define FbStipStrideToBitsStride(s) (((s) >> (FB_SHIFT - FB_STIP_SHIFT)))
-#define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
-    
-#define FbFullMask(n)   ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1))
-    
-#if FB_SHIFT == 6
-# ifdef WIN32
-typedef unsigned __int64    FbBits;
-# else
-#  if defined(__alpha__) || defined(__alpha) || \
-      defined(ia64) || defined(__ia64__) || \
-      defined(__sparc64__) || defined(_LP64) || \
-      defined(__s390x__) || \
-      defined(amd64) || defined (__amd64__) || \
-      defined (__powerpc64__)
-typedef unsigned long	    FbBits;
-#  else
-typedef unsigned long long  FbBits;
-#  endif
-# endif
-#endif
-
-#if FB_SHIFT == 5
-typedef CARD32		    FbBits;
-#endif
-
-#if FB_SHIFT == 4
-typedef CARD16		    FbBits;
-#endif
-
-#if LOG2_BITMAP_PAD == FB_SHIFT
-typedef FbBits		    FbStip;
-#else
-# if LOG2_BITMAP_PAD == 5
-typedef CARD32		    FbStip;
-# endif
-#endif
-
-typedef int		    FbStride;
-
-
-#ifdef FB_DEBUG
-extern _X_EXPORT void fbValidateDrawable(DrawablePtr d);
-extern _X_EXPORT void fbInitializeDrawable(DrawablePtr d);
-extern _X_EXPORT void fbSetBits (FbStip *bits, int stride, FbStip data);
-#define FB_HEAD_BITS   (FbStip) (0xbaadf00d)
-#define FB_TAIL_BITS   (FbStip) (0xbaddf0ad)
-#else
-#define fbValidateDrawable(d)
-#define fdInitializeDrawable(d)
-#endif
-
-#include "fbrop.h"
-
-#if BITMAP_BIT_ORDER == LSBFirst
-#define FbScrLeft(x,n)	((x) >> (n))
-#define FbScrRight(x,n)	((x) << (n))
-/* #define FbLeftBits(x,n)	((x) & ((((FbBits) 1) << (n)) - 1)) */
-#define FbLeftStipBits(x,n) ((x) & ((((FbStip) 1) << (n)) - 1))
-#define FbStipMoveLsb(x,s,n)	(FbStipRight (x,(s)-(n)))
-#define FbPatternOffsetBits	0
-#else
-#define FbScrLeft(x,n)	((x) << (n))
-#define FbScrRight(x,n)	((x) >> (n))
-/* #define FbLeftBits(x,n)	((x) >> (FB_UNIT - (n))) */
-#define FbLeftStipBits(x,n) ((x) >> (FB_STIP_UNIT - (n)))
-#define FbStipMoveLsb(x,s,n)	(x)
-#define FbPatternOffsetBits	(sizeof (FbBits) - 1)
-#endif
-
-#include "micoord.h"
-
-#define FbStipLeft(x,n)	FbScrLeft(x,n)
-#define FbStipRight(x,n) FbScrRight(x,n)
-
-#define FbRotLeft(x,n)	FbScrLeft(x,n) | (n ? FbScrRight(x,FB_UNIT-n) : 0)
-#define FbRotRight(x,n)	FbScrRight(x,n) | (n ? FbScrLeft(x,FB_UNIT-n) : 0)
-
-#define FbRotStipLeft(x,n)  FbStipLeft(x,n) | (n ? FbStipRight(x,FB_STIP_UNIT-n) : 0)
-#define FbRotStipRight(x,n)  FbStipRight(x,n) | (n ? FbStipLeft(x,FB_STIP_UNIT-n) : 0)
-
-#define FbLeftMask(x)	    ( ((x) & FB_MASK) ? \
-			     FbScrRight(FB_ALLONES,(x) & FB_MASK) : 0)
-#define FbRightMask(x)	    ( ((FB_UNIT - (x)) & FB_MASK) ? \
-			     FbScrLeft(FB_ALLONES,(FB_UNIT - (x)) & FB_MASK) : 0)
-
-#define FbLeftStipMask(x)   ( ((x) & FB_STIP_MASK) ? \
-			     FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) : 0)
-#define FbRightStipMask(x)  ( ((FB_STIP_UNIT - (x)) & FB_STIP_MASK) ? \
-			     FbScrLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - (x)) & FB_STIP_MASK) : 0)
-
-#define FbBitsMask(x,w)	(FbScrRight(FB_ALLONES,(x) & FB_MASK) & \
-			 FbScrLeft(FB_ALLONES,(FB_UNIT - ((x) + (w))) & FB_MASK))
-
-#define FbStipMask(x,w)	(FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \
-			 FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))
-
-
-#define FbMaskBits(x,w,l,n,r) { \
-    n = (w); \
-    r = FbRightMask((x)+n); \
-    l = FbLeftMask(x); \
-    if (l) { \
-	n -= FB_UNIT - ((x) & FB_MASK); \
-	if (n < 0) { \
-	    n = 0; \
-	    l &= r; \
-	    r = 0; \
-	} \
-    } \
-    n >>= FB_SHIFT; \
-}
-
-#ifdef FBNOPIXADDR
-#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) FbMaskBits(x,w,l,n,r)
-#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
-    *dst = FbDoMaskRRop(*dst,and,xor,l); \
-}
-#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
-    *dst = FbDoMaskRRop(*dst,and,xor,r); \
-}
-#else
-
-#define FbByteMaskInvalid   0x10
-
-#define FbPatternOffset(o,t)  ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1)))
-
-#define FbPtrOffset(p,o,t)		((t *) ((CARD8 *) (p) + (o)))
-#define FbSelectPatternPart(xor,o,t)	((xor) >> (FbPatternOffset (o,t) << 3))
-#define FbStorePart(dst,off,t,xor)	(WRITE(FbPtrOffset(dst,off,t), \
-					 FbSelectPart(xor,off,t)))
-#ifndef FbSelectPart
-#define FbSelectPart(x,o,t) FbSelectPatternPart(x,o,t)
-#endif
-
-#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) { \
-    n = (w); \
-    lb = 0; \
-    rb = 0; \
-    r = FbRightMask((x)+n); \
-    if (r) { \
-	/* compute right byte length */ \
-	if ((copy) && (((x) + n) & 7) == 0) { \
-	    rb = (((x) + n) & FB_MASK) >> 3; \
-	} else { \
-	    rb = FbByteMaskInvalid; \
-	} \
-    } \
-    l = FbLeftMask(x); \
-    if (l) { \
-	/* compute left byte length */ \
-	if ((copy) && ((x) & 7) == 0) { \
-	    lb = ((x) & FB_MASK) >> 3; \
-	} else { \
-	    lb = FbByteMaskInvalid; \
-	} \
-	/* subtract out the portion painted by leftMask */ \
-	n -= FB_UNIT - ((x) & FB_MASK); \
-	if (n < 0) { \
-	    if (lb != FbByteMaskInvalid) { \
-		if (rb == FbByteMaskInvalid) { \
-		    lb = FbByteMaskInvalid; \
-		} else if (rb) { \
-		    lb |= (rb - lb) << (FB_SHIFT - 3); \
-		    rb = 0; \
-		} \
-	    } \
-	    n = 0; \
-	    l &= r; \
-	    r = 0; \
-	}\
-    } \
-    n >>= FB_SHIFT; \
-}
-
-#if FB_SHIFT == 6
-#define FbDoLeftMaskByteRRop6Cases(dst,xor) \
-    case (sizeof (FbBits) - 7) | (1 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 7) | (2 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 7) | (3 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	break; \
-    case (sizeof (FbBits) - 7) | (4 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 7) | (5 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	break; \
-    case (sizeof (FbBits) - 7) | (6 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 7): \
-	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
-	break; \
-    case (sizeof (FbBits) - 6) | (1 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 6) | (2 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	break; \
-    case (sizeof (FbBits) - 6) | (3 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 6) | (4 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	break; \
-    case (sizeof (FbBits) - 6) | (5 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 6): \
-	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
-	break; \
-    case (sizeof (FbBits) - 5) | (1 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 5) | (2 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 5) | (3 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	break; \
-    case (sizeof (FbBits) - 5) | (4 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 5): \
-	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
-	break; \
-    case (sizeof (FbBits) - 4) | (1 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 4) | (2 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	break; \
-    case (sizeof (FbBits) - 4) | (3 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 4): \
-	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
-	break;
-
-#define FbDoRightMaskByteRRop6Cases(dst,xor) \
-    case 4: \
-	FbStorePart(dst,0,CARD32,xor); \
-	break; \
-    case 5: \
-	FbStorePart(dst,0,CARD32,xor); \
-	FbStorePart(dst,4,CARD8,xor); \
-	break; \
-    case 6: \
-	FbStorePart(dst,0,CARD32,xor); \
-	FbStorePart(dst,4,CARD16,xor); \
-	break; \
-    case 7: \
-	FbStorePart(dst,0,CARD32,xor); \
-	FbStorePart(dst,4,CARD16,xor); \
-	FbStorePart(dst,6,CARD8,xor); \
-	break;
-#else
-#define FbDoLeftMaskByteRRop6Cases(dst,xor)
-#define FbDoRightMaskByteRRop6Cases(dst,xor)
-#endif
-
-#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
-    switch (lb) { \
-    FbDoLeftMaskByteRRop6Cases(dst,xor) \
-    case (sizeof (FbBits) - 3) | (1 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 3) | (2 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
-	break; \
-    case (sizeof (FbBits) - 2) | (1 << (FB_SHIFT - 3)): \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
-	break; \
-    case sizeof (FbBits) - 3: \
-	FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \
-    case sizeof (FbBits) - 2: \
-	FbStorePart(dst,sizeof (FbBits) - 2,CARD16,xor); \
-	break; \
-    case sizeof (FbBits) - 1: \
-	FbStorePart(dst,sizeof (FbBits) - 1,CARD8,xor); \
-	break; \
-    default: \
-	WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, l)); \
-	break; \
-    } \
-}
-
-
-#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
-    switch (rb) { \
-    case 1: \
-	FbStorePart(dst,0,CARD8,xor); \
-	break; \
-    case 2: \
-	FbStorePart(dst,0,CARD16,xor); \
-	break; \
-    case 3: \
-	FbStorePart(dst,0,CARD16,xor); \
-	FbStorePart(dst,2,CARD8,xor); \
-	break; \
-    FbDoRightMaskByteRRop6Cases(dst,xor) \
-    default: \
-	WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, r)); \
-    } \
-}
-#endif
-
-#define FbMaskStip(x,w,l,n,r) { \
-    n = (w); \
-    r = FbRightStipMask((x)+n); \
-    l = FbLeftStipMask(x); \
-    if (l) { \
-	n -= FB_STIP_UNIT - ((x) & FB_STIP_MASK); \
-	if (n < 0) { \
-	    n = 0; \
-	    l &= r; \
-	    r = 0; \
-	} \
-    } \
-    n >>= FB_STIP_SHIFT; \
-}
-
-/*
- * These macros are used to transparently stipple
- * in copy mode; the expected usage is with 'n' constant
- * so all of the conditional parts collapse into a minimal
- * sequence of partial word writes
- *
- * 'n' is the bytemask of which bytes to store, 'a' is the address
- * of the FbBits base unit, 'o' is the offset within that unit
- *
- * The term "lane" comes from the hardware term "byte-lane" which
- */
-
-#define FbLaneCase1(n,a,o)						\
-    if ((n) == 0x01) {							\
-	WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), fgxor);		\
-    }
-
-#define FbLaneCase2(n,a,o)						\
-    if ((n) == 0x03) {							\
-	WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), fgxor);	\
-    } else {								\
-	FbLaneCase1((n)&1,a,o)						\
-	FbLaneCase1((n)>>1,a,(o)+1)					\
-    }
-
-#define FbLaneCase4(n,a,o)						\
-    if ((n) == 0x0f) {							\
-	WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), fgxor);	\
-    } else {								\
-	FbLaneCase2((n)&3,a,o)						\
-	FbLaneCase2((n)>>2,a,(o)+2)					\
-    }
-
-#define FbLaneCase8(n,a,o)						\
-    if ((n) == 0x0ff) {							\
-	*(FbBits *) ((a)+(o)) = fgxor;					\
-    } else {								\
-	FbLaneCase4((n)&15,a,o)						\
-	FbLaneCase4((n)>>4,a,(o)+4)					\
-    }
-
-#if FB_SHIFT == 6
-#define FbLaneCase(n,a)   FbLaneCase8(n,(CARD8 *) (a),0)
-#endif
-
-#if FB_SHIFT == 5
-#define FbLaneCase(n,a)   FbLaneCase4(n,(CARD8 *) (a),0)
-#endif
-
-/* Rotate a filled pixel value to the specified alignement */
-#define FbRot24(p,b)	    (FbScrRight(p,b) | FbScrLeft(p,24-(b)))
-#define FbRot24Stip(p,b)    (FbStipRight(p,b) | FbStipLeft(p,24-(b)))
-
-/* step a filled pixel value to the next/previous FB_UNIT alignment */
-#define FbNext24Pix(p)	(FbRot24(p,(24-FB_UNIT%24)))
-#define FbPrev24Pix(p)	(FbRot24(p,FB_UNIT%24))
-#define FbNext24Stip(p)	(FbRot24(p,(24-FB_STIP_UNIT%24)))
-#define FbPrev24Stip(p)	(FbRot24(p,FB_STIP_UNIT%24))
-
-/* step a rotation value to the next/previous rotation value */
-#if FB_UNIT == 64
-#define FbNext24Rot(r)        ((r) == 16 ? 0 : (r) + 8)
-#define FbPrev24Rot(r)        ((r) == 0 ? 16 : (r) - 8)
-
-#if IMAGE_BYTE_ORDER == MSBFirst
-#define FbFirst24Rot(x)		(((x) + 8) % 24)
-#else
-#define FbFirst24Rot(x)		((x) % 24)
-#endif
-
-#endif
-
-#if FB_UNIT == 32
-#define FbNext24Rot(r)        ((r) == 0 ? 16 : (r) - 8)
-#define FbPrev24Rot(r)        ((r) == 16 ? 0 : (r) + 8)
-
-#if IMAGE_BYTE_ORDER == MSBFirst
-#define FbFirst24Rot(x)		(((x) + 16) % 24)
-#else
-#define FbFirst24Rot(x)		((x) % 24)
-#endif
-#endif
-
-#define FbNext24RotStip(r)        ((r) == 0 ? 16 : (r) - 8)
-#define FbPrev24RotStip(r)        ((r) == 16 ? 0 : (r) + 8)
-
-/* Whether 24-bit specific code is needed for this filled pixel value */
-#define FbCheck24Pix(p)	((p) == FbNext24Pix(p))
-
-/* Macros for dealing with dashing */
-
-#define FbDashDeclare	\
-    unsigned char	*__dash, *__firstDash, *__lastDash
-    
-#define FbDashInit(pGC,pPriv,dashOffset,dashlen,even) {	    \
-    (even) = TRUE;					    \
-    __firstDash = (pGC)->dash;				    \
-    __lastDash = __firstDash + (pGC)->numInDashList;	    \
-    (dashOffset) %= (pPriv)->dashLength;		    \
-							    \
-    __dash = __firstDash;				    \
-    while ((dashOffset) >= ((dashlen) = *__dash))	    \
-    {							    \
-	(dashOffset) -= (dashlen);			    \
-	(even) = 1-(even);				    \
-	if (++__dash == __lastDash)			    \
-	    __dash = __firstDash;			    \
-    }							    \
-    (dashlen) -= (dashOffset);				    \
-}
-
-#define FbDashNext(dashlen) {				    \
-    if (++__dash == __lastDash)				    \
-	__dash = __firstDash;				    \
-    (dashlen) = *__dash;				    \
-}
-
-/* as numInDashList is always even, this case can skip a test */
-
-#define FbDashNextEven(dashlen) {			    \
-    (dashlen) = *++__dash;				    \
-}
-
-#define FbDashNextOdd(dashlen)	FbDashNext(dashlen)
-
-#define FbDashStep(dashlen,even) {			    \
-    if (!--(dashlen)) {					    \
-	FbDashNext(dashlen);				    \
-	(even) = 1-(even);				    \
-    }							    \
-}
-
-extern _X_EXPORT DevPrivateKey fbGetGCPrivateKey(void);
-extern _X_EXPORT DevPrivateKey fbGetWinPrivateKey(void);
-extern _X_EXPORT const GCOps	fbGCOps;
-extern _X_EXPORT const GCFuncs	fbGCFuncs;
-
-#ifdef FB_24_32BIT
-#define FB_SCREEN_PRIVATE
-#endif
-
-/* Framebuffer access wrapper */
-typedef FbBits (*ReadMemoryProcPtr)(const void *src, int size);
-typedef void (*WriteMemoryProcPtr)(void *dst, FbBits value, int size);
-typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,
-                                 WriteMemoryProcPtr *pWrite,
-                                 DrawablePtr         pDraw);
-typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw);
-
-#ifdef FB_ACCESS_WRAPPER
-
-#define fbPrepareAccess(pDraw) \
-	fbGetScreenPrivate((pDraw)->pScreen)->setupWrap( \
-		&wfbReadMemory, \
-		&wfbWriteMemory, \
-		(pDraw))
-#define fbFinishAccess(pDraw) \
-	fbGetScreenPrivate((pDraw)->pScreen)->finishWrap(pDraw)
-
-#else
-
-#define fbPrepareAccess(pPix)
-#define fbFinishAccess(pDraw)
-
-#endif
-
-
-#ifdef FB_SCREEN_PRIVATE
-extern _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void);
-
-/* private field of a screen */
-typedef struct {
-    unsigned char	win32bpp;	/* window bpp for 32-bpp images */
-    unsigned char	pix32bpp;	/* pixmap bpp for 32-bpp images */
-#ifdef FB_ACCESS_WRAPPER
-    SetupWrapProcPtr	setupWrap;	/* driver hook to set pixmap access wrapping */
-    FinishWrapProcPtr	finishWrap;	/* driver hook to clean up pixmap access wrapping */
-#endif
-} FbScreenPrivRec, *FbScreenPrivPtr;
-
-#define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \
-	dixLookupPrivate(&(pScreen)->devPrivates, fbGetScreenPrivateKey()))
-#endif
-
-/* private field of GC */
-typedef struct {
-    FbBits		and, xor;	/* reduced rop values */
-    FbBits		bgand, bgxor;	/* for stipples */
-    FbBits		fg, bg, pm;	/* expanded and filled */
-    unsigned int	dashLength;	/* total of all dash elements */
-    unsigned char    	oneRect;	/* clip list is single rectangle */
-    unsigned char    	evenStipple;	/* stipple is even */
-    unsigned char    	bpp;		/* current drawable bpp */
-} FbGCPrivRec, *FbGCPrivPtr;
-
-#define fbGetGCPrivate(pGC)	((FbGCPrivPtr)\
-	dixLookupPrivate(&(pGC)->devPrivates, fbGetGCPrivateKey()))
-
-#define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
-#define fbGetExpose(pGC)	((pGC)->fExpose)
-#define fbGetFreeCompClip(pGC)	((pGC)->freeCompClip)
-#define fbGetRotatedPixmap(pGC)	((pGC)->pRotatedPixmap)
-
-#define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)
-#define fbGetWindowPixmap(pWin)	((PixmapPtr)\
-    dixLookupPrivate(&((WindowPtr)(pWin))->devPrivates, fbGetWinPrivateKey()))
-
-#ifdef ROOTLESS
-#define __fbPixDrawableX(pPix)	((pPix)->drawable.x)
-#define __fbPixDrawableY(pPix)	((pPix)->drawable.y)
-#else
-#define __fbPixDrawableX(pPix)	0
-#define __fbPixDrawableY(pPix)	0
-#endif
-
-#ifdef COMPOSITE
-#define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix) - (pPix)->screen_x)
-#define __fbPixOffYWin(pPix)	(__fbPixDrawableY(pPix) - (pPix)->screen_y)
-#else
-#define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix))
-#define __fbPixOffYWin(pPix)	(__fbPixDrawableY(pPix))
-#endif
-#define __fbPixOffXPix(pPix)	(__fbPixDrawableX(pPix))
-#define __fbPixOffYPix(pPix)	(__fbPixDrawableY(pPix))
-
-#define fbGetDrawablePixmap(pDrawable, pixmap, xoff, yoff) {			\
-    if ((pDrawable)->type != DRAWABLE_PIXMAP) { 				\
-	(pixmap) = fbGetWindowPixmap(pDrawable);				\
-	(xoff) = __fbPixOffXWin(pixmap); 					\
-	(yoff) = __fbPixOffYWin(pixmap); 					\
-    } else { 									\
-	(pixmap) = (PixmapPtr) (pDrawable);					\
-	(xoff) = __fbPixOffXPix(pixmap); 					\
-	(yoff) = __fbPixOffYPix(pixmap); 					\
-    } 										\
-    fbPrepareAccess(pDrawable); 						\
-}
-
-#define fbGetPixmapBitsData(pixmap, pointer, stride, bpp) {			\
-    (pointer) = (FbBits *) (pixmap)->devPrivate.ptr; 			       	\
-    (stride) = ((int) (pixmap)->devKind) / sizeof (FbBits); (void)(stride);	\
-    (bpp) = (pixmap)->drawable.bitsPerPixel;  (void)(bpp); 			\
-}
-
-#define fbGetPixmapStipData(pixmap, pointer, stride, bpp) {			\
-    (pointer) = (FbStip *) (pixmap)->devPrivate.ptr; 			       	\
-    (stride) = ((int) (pixmap)->devKind) / sizeof (FbStip); (void)(stride);	\
-    (bpp) = (pixmap)->drawable.bitsPerPixel;  (void)(bpp); 			\
-}
-
-#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 		\
-    PixmapPtr   _pPix; 								\
-    fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff); 				\
-    fbGetPixmapBitsData(_pPix, pointer, stride, bpp);				\
-}
-
-#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 	\
-    PixmapPtr   _pPix; 								\
-    fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff);				\
-    fbGetPixmapStipData(_pPix, pointer, stride, bpp);				\
-}
-
-/*
- * XFree86 empties the root BorderClip when the VT is inactive,
- * here's a macro which uses that to disable GetImage and GetSpans
- */
-
-#define fbWindowEnabled(pWin) \
-    REGION_NOTEMPTY((pWin)->drawable.pScreen, \
-		    &WindowTable[(pWin)->drawable.pScreen->myNum]->borderClip)
-
-#define fbDrawableEnabled(pDrawable) \
-    ((pDrawable)->type == DRAWABLE_PIXMAP ? \
-     TRUE : fbWindowEnabled((WindowPtr) pDrawable))
-
-#define FbPowerOfTwo(w)	    (((w) & ((w) - 1)) == 0)
-/*
- * Accelerated tiles are power of 2 width <= FB_UNIT
- */
-#define FbEvenTile(w)	    ((w) <= FB_UNIT && FbPowerOfTwo(w))
-/*
- * Accelerated stipples are power of 2 width and <= FB_UNIT/dstBpp
- * with dstBpp a power of 2 as well
- */
-#define FbEvenStip(w,bpp)   ((w) * (bpp) <= FB_UNIT && FbPowerOfTwo(w) && FbPowerOfTwo(bpp))
-
-/*
- * fb24_32.c
- */
-extern _X_EXPORT void
-fb24_32GetSpans(DrawablePtr	pDrawable, 
-		int		wMax, 
-		DDXPointPtr	ppt, 
-		int		*pwidth, 
-		int		nspans, 
-		char		*pchardstStart);
-
-extern _X_EXPORT void
-fb24_32SetSpans (DrawablePtr	    pDrawable,
-		 GCPtr		    pGC,
-		 char		    *src,
-		 DDXPointPtr	    ppt,
-		 int		    *pwidth,
-		 int		    nspans,
-		 int		    fSorted);
-
-extern _X_EXPORT void
-fb24_32PutZImage (DrawablePtr	pDrawable,
-		  RegionPtr	pClip,
-		  int		alu,
-		  FbBits	pm,
-		  int		x,
-		  int		y,
-		  int		width,
-		  int		height,
-		  CARD8		*src,
-		  FbStride	srcStride);
-    
-extern _X_EXPORT void
-fb24_32GetImage (DrawablePtr     pDrawable,
-		 int             x,
-		 int             y,
-		 int             w,
-		 int             h,
-		 unsigned int    format,
-		 unsigned long   planeMask,
-		 char            *d);
-
-extern _X_EXPORT void
-fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
-		 DrawablePtr pDstDrawable,
-		 GCPtr       pGC,
-		 BoxPtr      pbox,
-		 int         nbox,
-		 int         dx,
-		 int         dy,
-		 Bool        reverse,
-		 Bool        upsidedown,
-		 Pixel       bitplane,
-		 void        *closure);
-
-extern _X_EXPORT PixmapPtr
-fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel);
-    
-extern _X_EXPORT Bool
-fb24_32CreateScreenResources(ScreenPtr pScreen);
-
-extern _X_EXPORT Bool
-fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
-			   int         width,
-			   int         height,
-			   int         depth,
-			   int         bitsPerPixel,
-			   int         devKind,
-			   pointer     pPixData);
-
-/*
- * fballpriv.c
- */
-extern _X_EXPORT DevPrivateKey fbGetWinPrivateKey(void);
-
-extern _X_EXPORT Bool
-fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex);
-    
-/*
- * fbarc.c
- */
-
-extern _X_EXPORT void
-fbPolyArc (DrawablePtr	pDrawable,
-	   GCPtr	pGC,
-	   int		narcs,
-	   xArc		*parcs);
-
-/*
- * fbbits.c
- */
-
-extern _X_EXPORT void
-fbBresSolid8(DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    dashOffset,
-	     int	    signdx,
-	     int	    signdy,
-	     int	    axis,
-	     int	    x,
-	     int	    y,
-	     int	    e,
-	     int	    e1,
-	     int	    e3,
-	     int	    len);
-
-extern _X_EXPORT void
-fbBresDash8 (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    dashOffset,
-	     int	    signdx,
-	     int	    signdy,
-	     int	    axis,
-	     int	    x,
-	     int	    y,
-	     int	    e,
-	     int	    e1,
-	     int	    e3,
-	     int	    len);
-
-extern _X_EXPORT void
-fbDots8 (FbBits	    *dst,
-	 FbStride   dstStride,
-	 int	    dstBpp,
-	 BoxPtr	    pBox,
-	 xPoint	    *pts,
-	 int	    npt,
-	 int	    xorg,
-	 int	    yorg,
-	 int	    xoff,
-	 int	    yoff,
-	 FbBits	    and,
-	 FbBits	    xor);
-
-extern _X_EXPORT void
-fbArc8 (FbBits	    *dst,
-	FbStride    dstStride,
-	int	    dstBpp,
-	xArc	    *arc,
-	int	    dx,
-	int	    dy,
-	FbBits	    and,
-	FbBits	    xor);
-
-extern _X_EXPORT void
-fbGlyph8 (FbBits    *dstLine,
-	  FbStride  dstStride,
-	  int	    dstBpp,
-	  FbStip    *stipple,
-	  FbBits    fg,
-	  int	    height,
-	  int	    shift);
-
-extern _X_EXPORT void
-fbPolyline8 (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    mode,
-	     int	    npt,
-	     DDXPointPtr    ptsOrig);
-
-extern _X_EXPORT void
-fbPolySegment8 (DrawablePtr pDrawable,
-		GCPtr	    pGC,
-		int	    nseg,
-		xSegment    *pseg);
-
-extern _X_EXPORT void
-fbBresSolid16(DrawablePtr   pDrawable,
-	      GCPtr	    pGC,
-	      int	    dashOffset,
-	      int	    signdx,
-	      int	    signdy,
-	      int	    axis,
-	      int	    x,
-	      int	    y,
-	      int	    e,
-	      int	    e1,
-	      int	    e3,
-	      int	    len);
-
-extern _X_EXPORT void
-fbBresDash16(DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    dashOffset,
-	     int	    signdx,
-	     int	    signdy,
-	     int	    axis,
-	     int	    x,
-	     int	    y,
-	     int	    e,
-	     int	    e1,
-	     int	    e3,
-	     int	    len);
-
-extern _X_EXPORT void
-fbDots16(FbBits	    *dst,
-	 FbStride   dstStride,
-	 int	    dstBpp,
-	 BoxPtr	    pBox,
-	 xPoint	    *pts,
-	 int	    npt,
-	 int	    xorg,
-	 int	    yorg,
-	 int	    xoff,
-	 int	    yoff,
-	 FbBits	    and,
-	 FbBits	    xor);
-
-extern _X_EXPORT void
-fbArc16(FbBits	    *dst,
-	FbStride    dstStride,
-	int	    dstBpp,
-	xArc	    *arc,
-	int	    dx,
-	int	    dy,
-	FbBits	    and,
-	FbBits	    xor);
-
-extern _X_EXPORT void
-fbGlyph16(FbBits    *dstLine,
-	  FbStride  dstStride,
-	  int	    dstBpp,
-	  FbStip    *stipple,
-	  FbBits    fg,
-	  int	    height,
-	  int	    shift);
-
-extern _X_EXPORT void
-fbPolyline16 (DrawablePtr   pDrawable,
-	      GCPtr	    pGC,
-	      int	    mode,
-	      int	    npt,
-	      DDXPointPtr   ptsOrig);
-
-extern _X_EXPORT void
-fbPolySegment16 (DrawablePtr	pDrawable,
-		 GCPtr		pGC,
-		 int		nseg,
-		 xSegment	*pseg);
-
-
-extern _X_EXPORT void
-fbBresSolid24(DrawablePtr   pDrawable,
-	      GCPtr	    pGC,
-	      int	    dashOffset,
-	      int	    signdx,
-	      int	    signdy,
-	      int	    axis,
-	      int	    x,
-	      int	    y,
-	      int	    e,
-	      int	    e1,
-	      int	    e3,
-	      int	    len);
-
-extern _X_EXPORT void
-fbBresDash24(DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    dashOffset,
-	     int	    signdx,
-	     int	    signdy,
-	     int	    axis,
-	     int	    x,
-	     int	    y,
-	     int	    e,
-	     int	    e1,
-	     int	    e3,
-	     int	    len);
-
-extern _X_EXPORT void
-fbDots24(FbBits	    *dst,
-	 FbStride   dstStride,
-	 int	    dstBpp,
-	 BoxPtr	    pBox,
-	 xPoint	    *pts,
-	 int	    npt,
-	 int	    xorg,
-	 int	    yorg,
-	 int	    xoff,
-	 int	    yoff,
-	 FbBits	    and,
-	 FbBits	    xor);
-
-extern _X_EXPORT void
-fbArc24(FbBits	    *dst,
-	FbStride    dstStride,
-	int	    dstBpp,
-	xArc	    *arc,
-	int	    dx,
-	int	    dy,
-	FbBits	    and,
-	FbBits	    xor);
-
-extern _X_EXPORT void
-fbGlyph24(FbBits    *dstLine,
-	  FbStride  dstStride,
-	  int	    dstBpp,
-	  FbStip    *stipple,
-	  FbBits    fg,
-	  int	    height,
-	  int	    shift);
-
-extern _X_EXPORT void
-fbPolyline24 (DrawablePtr   pDrawable,
-	      GCPtr	    pGC,
-	      int	    mode,
-	      int	    npt,
-	      DDXPointPtr   ptsOrig);
-
-extern _X_EXPORT void
-fbPolySegment24 (DrawablePtr	pDrawable,
-		 GCPtr		pGC,
-		 int		nseg,
-		 xSegment	*pseg);
-
-
-extern _X_EXPORT void
-fbBresSolid32(DrawablePtr   pDrawable,
-	      GCPtr	    pGC,
-	      int	    dashOffset,
-	      int	    signdx,
-	      int	    signdy,
-	      int	    axis,
-	      int	    x,
-	      int	    y,
-	      int	    e,
-	      int	    e1,
-	      int	    e3,
-	      int	    len);
-
-extern _X_EXPORT void
-fbBresDash32(DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    dashOffset,
-	     int	    signdx,
-	     int	    signdy,
-	     int	    axis,
-	     int	    x,
-	     int	    y,
-	     int	    e,
-	     int	    e1,
-	     int	    e3,
-	     int	    len);
-
-extern _X_EXPORT void
-fbDots32(FbBits	    *dst,
-	 FbStride   dstStride,
-	 int	    dstBpp,
-	 BoxPtr	    pBox,
-	 xPoint	    *pts,
-	 int	    npt,
-	 int	    xorg,
-	 int	    yorg,
-	 int	    xoff,
-	 int	    yoff,
-	 FbBits	    and,
-	 FbBits	    xor);
-
-extern _X_EXPORT void
-fbArc32(FbBits	    *dst,
-	FbStride    dstStride,
-	int	    dstBpp,
-	xArc	    *arc,
-	int	    dx,
-	int	    dy,
-	FbBits	    and,
-	FbBits	    xor);
-
-extern _X_EXPORT void
-fbGlyph32(FbBits    *dstLine,
-	  FbStride  dstStride,
-	  int	    dstBpp,
-	  FbStip    *stipple,
-	  FbBits    fg,
-	  int	    height,
-	  int	    shift);
-extern _X_EXPORT void
-fbPolyline32 (DrawablePtr   pDrawable,
-	      GCPtr	    pGC,
-	      int	    mode,
-	      int	    npt,
-	      DDXPointPtr   ptsOrig);
-
-extern _X_EXPORT void
-fbPolySegment32 (DrawablePtr	pDrawable,
-		 GCPtr		pGC,
-		 int		nseg,
-		 xSegment	*pseg);
-
-/*
- * fbblt.c
- */
-extern _X_EXPORT void
-fbBlt (FbBits   *src, 
-       FbStride	srcStride,
-       int	srcX,
-       
-       FbBits   *dst,
-       FbStride dstStride,
-       int	dstX,
-       
-       int	width, 
-       int	height,
-       
-       int	alu,
-       FbBits	pm,
-       int	bpp,
-       
-       Bool	reverse,
-       Bool	upsidedown);
-
-extern _X_EXPORT void
-fbBlt24 (FbBits	    *srcLine,
-	 FbStride   srcStride,
-	 int	    srcX,
-
-	 FbBits	    *dstLine,
-	 FbStride   dstStride,
-	 int	    dstX,
-
-	 int	    width, 
-	 int	    height,
-
-	 int	    alu,
-	 FbBits	    pm,
-
-	 Bool	    reverse,
-	 Bool	    upsidedown);
-    
-extern _X_EXPORT void
-fbBltStip (FbStip   *src,
-	   FbStride srcStride,	    /* in FbStip units, not FbBits units */
-	   int	    srcX,
-	   
-	   FbStip   *dst,
-	   FbStride dstStride,	    /* in FbStip units, not FbBits units */
-	   int	    dstX,
-
-	   int	    width, 
-	   int	    height,
-
-	   int	    alu,
-	   FbBits   pm,
-	   int	    bpp);
-    
-/*
- * fbbltone.c
- */
-extern _X_EXPORT void
-fbBltOne (FbStip   *src,
-	  FbStride srcStride,
-	  int	   srcX,
-	  FbBits   *dst,
-	  FbStride dstStride,
-	  int	   dstX,
-	  int	   dstBpp,
-
-	  int	   width,
-	  int	   height,
-
-	  FbBits   fgand,
-	  FbBits   fbxor,
-	  FbBits   bgand,
-	  FbBits   bgxor);
- 
-#ifdef FB_24BIT
-extern _X_EXPORT void
-fbBltOne24 (FbStip    *src,
-	  FbStride  srcStride,	    /* FbStip units per scanline */
-	  int	    srcX,	    /* bit position of source */
-	  FbBits    *dst,
-	  FbStride  dstStride,	    /* FbBits units per scanline */
-	  int	    dstX,	    /* bit position of dest */
-	  int	    dstBpp,	    /* bits per destination unit */
-
-	  int	    width,	    /* width in bits of destination */
-	  int	    height,	    /* height in scanlines */
-
-	  FbBits    fgand,	    /* rrop values */
-	  FbBits    fgxor,
-	  FbBits    bgand,
-	  FbBits    bgxor);
-#endif
-
-extern _X_EXPORT void
-fbBltPlane (FbBits	    *src,
-	    FbStride	    srcStride,
-	    int		    srcX,
-	    int		    srcBpp,
-
-	    FbStip	    *dst,
-	    FbStride	    dstStride,
-	    int		    dstX,
-	    
-	    int		    width,
-	    int		    height,
-	    
-	    FbStip	    fgand,
-	    FbStip	    fgxor,
-	    FbStip	    bgand,
-	    FbStip	    bgxor,
-	    Pixel	    planeMask);
-
-/*
- * fbcmap.c
- */
-extern _X_EXPORT int
-fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps);
-
-extern _X_EXPORT void
-fbInstallColormap(ColormapPtr pmap);
-
-extern _X_EXPORT void
-fbUninstallColormap(ColormapPtr pmap);
-
-extern _X_EXPORT void
-fbResolveColor(unsigned short	*pred, 
-	       unsigned short	*pgreen, 
-	       unsigned short	*pblue,
-	       VisualPtr	pVisual);
-
-extern _X_EXPORT Bool
-fbInitializeColormap(ColormapPtr pmap);
-
-extern _X_EXPORT int
-fbExpandDirectColors (ColormapPtr   pmap, 
-		      int	    ndef,
-		      xColorItem    *indefs,
-		      xColorItem    *outdefs);
-
-extern _X_EXPORT Bool
-fbCreateDefColormap(ScreenPtr pScreen);
-
-extern _X_EXPORT void
-fbClearVisualTypes(void);
-
-extern _X_EXPORT Bool
-fbHasVisualTypes (int depth);
-
-extern _X_EXPORT Bool
-fbSetVisualTypes (int depth, int visuals, int bitsPerRGB);
-
-extern _X_EXPORT Bool
-fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
-			  Pixel redMask, Pixel greenMask, Pixel blueMask);
-
-extern _X_EXPORT Bool
-fbInitVisuals (VisualPtr    *visualp, 
-	       DepthPtr	    *depthp,
-	       int	    *nvisualp,
-	       int	    *ndepthp,
-	       int	    *rootDepthp,
-	       VisualID	    *defaultVisp,
-	       unsigned long	sizes,
-	       int	    bitsPerRGB);
-
-/*
- * fbcopy.c
- */
-
-/* Compatibility definition, to be removed at next ABI change. */
-typedef void   (*fbCopyProc) (DrawablePtr  pSrcDrawable,
-                              DrawablePtr  pDstDrawable,
-                              GCPtr        pGC,
-                              BoxPtr       pDstBox,
-                              int          nbox,
-                              int          dx,
-                              int          dy,
-                              Bool         reverse,
-                              Bool         upsidedown,
-                              Pixel        bitplane,
-                              void         *closure);
-
-extern _X_EXPORT void
-fbCopyNtoN (DrawablePtr	pSrcDrawable,
-	    DrawablePtr	pDstDrawable,
-	    GCPtr	pGC,
-	    BoxPtr	pbox,
-	    int		nbox,
-	    int		dx,
-	    int		dy,
-	    Bool	reverse,
-	    Bool	upsidedown,
-	    Pixel	bitplane,
-	    void	*closure);
-
-/* Compatibility wrapper, to be removed at next ABI change. */
-extern _X_EXPORT void
-fbCopyRegion (DrawablePtr   pSrcDrawable,
-             DrawablePtr   pDstDrawable,
-             GCPtr         pGC,
-             RegionPtr     pDstRegion,
-             int           dx,
-             int           dy,
-             fbCopyProc    copyProc,
-             Pixel         bitPlane,
-             void          *closure);
-
-/* Compatibility wrapper, to be removed at next ABI change. */
-extern _X_EXPORT RegionPtr
-fbDoCopy (DrawablePtr  pSrcDrawable,
-         DrawablePtr   pDstDrawable,
-         GCPtr         pGC,
-         int           xIn,
-         int           yIn,
-         int           widthSrc,
-         int           heightSrc,
-         int           xOut,
-         int           yOut,
-         fbCopyProc    copyProc,
-         Pixel         bitplane,
-         void          *closure);
-
-extern _X_EXPORT void
-fbCopy1toN (DrawablePtr	pSrcDrawable,
-	    DrawablePtr	pDstDrawable,
-	    GCPtr	pGC,
-	    BoxPtr	pbox,
-	    int		nbox,
-	    int		dx,
-	    int		dy,
-	    Bool	reverse,
-	    Bool	upsidedown,
-	    Pixel	bitplane,
-	    void	*closure);
-
-extern _X_EXPORT void
-fbCopyNto1 (DrawablePtr	pSrcDrawable,
-	    DrawablePtr	pDstDrawable,
-	    GCPtr	pGC,
-	    BoxPtr	pbox,
-	    int		nbox,
-	    int		dx,
-	    int		dy,
-	    Bool	reverse,
-	    Bool	upsidedown,
-	    Pixel	bitplane,
-	    void	*closure);
-
-extern _X_EXPORT RegionPtr
-fbCopyArea (DrawablePtr	pSrcDrawable,
-	    DrawablePtr	pDstDrawable,
-	    GCPtr	pGC,
-	    int		xIn, 
-	    int		yIn,
-	    int		widthSrc, 
-	    int		heightSrc,
-	    int		xOut, 
-	    int		yOut);
-
-extern _X_EXPORT RegionPtr
-fbCopyPlane (DrawablePtr    pSrcDrawable,
-	     DrawablePtr    pDstDrawable,
-	     GCPtr	    pGC,
-	     int	    xIn, 
-	     int	    yIn,
-	     int	    widthSrc, 
-	     int	    heightSrc,
-	     int	    xOut, 
-	     int	    yOut,
-	     unsigned long  bitplane);
-
-/*
- * fbfill.c
- */
-extern _X_EXPORT void
-fbFill (DrawablePtr pDrawable,
-	GCPtr	    pGC,
-	int	    x,
-	int	    y,
-	int	    width,
-	int	    height);
-
-extern _X_EXPORT void
-fbSolidBoxClipped (DrawablePtr	pDrawable,
-		   RegionPtr	pClip,
-		   int		xa,
-		   int		ya,
-		   int		xb,
-		   int		yb,
-		   FbBits	and,
-		   FbBits	xor);
-
-/*
- * fbfillrect.c
- */
-extern _X_EXPORT void
-fbPolyFillRect(DrawablePtr  pDrawable, 
-	       GCPtr	    pGC, 
-	       int	    nrectInit,
-	       xRectangle   *prectInit);
-
-#define fbPolyFillArc miPolyFillArc
-
-#define fbFillPolygon miFillPolygon
-
-/*
- * fbfillsp.c
- */
-extern _X_EXPORT void
-fbFillSpans (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    nInit,
-	     DDXPointPtr    pptInit,
-	     int	    *pwidthInit,
-	     int	    fSorted);
-
-
-/*
- * fbgc.c
- */
-
-extern _X_EXPORT Bool
-fbCreateGC(GCPtr pGC);
-
-extern _X_EXPORT void
-fbPadPixmap (PixmapPtr pPixmap);
-    
-extern _X_EXPORT void
-fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
-
-/*
- * fbgetsp.c
- */
-extern _X_EXPORT void
-fbGetSpans(DrawablePtr	pDrawable, 
-	   int		wMax, 
-	   DDXPointPtr	ppt, 
-	   int		*pwidth, 
-	   int		nspans, 
-	   char		*pchardstStart);
-
-/*
- * fbglyph.c
- */
-
-extern _X_EXPORT Bool
-fbGlyphIn (RegionPtr	pRegion,
-	   int		x,
-	   int		y,
-	   int		width,
-	   int		height);
-    
-extern _X_EXPORT void
-fbPolyGlyphBlt (DrawablePtr	pDrawable,
-		GCPtr		pGC,
-		int		x, 
-		int		y,
-		unsigned int	nglyph,
-		CharInfoPtr	*ppci,
-		pointer		pglyphBase);
-
-extern _X_EXPORT void
-fbImageGlyphBlt (DrawablePtr	pDrawable,
-		 GCPtr		pGC,
-		 int		x,
-		 int		y,
-		 unsigned int	nglyph,
-		 CharInfoPtr	*ppci,
-		 pointer	pglyphBase);
-
-/*
- * fbimage.c
- */
-
-extern _X_EXPORT void
-fbPutImage (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-	    int		depth,
-	    int		x,
-	    int		y,
-	    int		w,
-	    int		h,
-	    int		leftPad,
-	    int		format,
-	    char	*pImage);
-
-extern _X_EXPORT void
-fbPutZImage (DrawablePtr	pDrawable,
-	     RegionPtr		pClip,
-	     int		alu,
-	     FbBits		pm,
-	     int		x,
-	     int		y,
-	     int		width,
-	     int		height,
-	     FbStip		*src,
-	     FbStride		srcStride);
-
-extern _X_EXPORT void
-fbPutXYImage (DrawablePtr	pDrawable,
-	      RegionPtr		pClip,
-	      FbBits		fg,
-	      FbBits		bg,
-	      FbBits		pm,
-	      int		alu,
-	      Bool		opaque,
-	      
-	      int		x,
-	      int		y,
-	      int		width,
-	      int		height,
-
-	      FbStip		*src,
-	      FbStride		srcStride,
-	      int		srcX);
-
-extern _X_EXPORT void
-fbGetImage (DrawablePtr	    pDrawable,
-	    int		    x,
-	    int		    y,
-	    int		    w,
-	    int		    h,
-	    unsigned int    format,
-	    unsigned long   planeMask,
-	    char	    *d);
-/*
- * fbline.c
- */
-
-extern _X_EXPORT void
-fbZeroLine (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-	    int		mode,
-	    int		npt,
-	    DDXPointPtr	ppt);
-
-extern _X_EXPORT void
-fbZeroSegment (DrawablePtr  pDrawable,
-	       GCPtr	    pGC,
-	       int	    nseg,
-	       xSegment	    *pSegs);
-
-extern _X_EXPORT void
-fbPolyLine (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-	    int		mode,
-	    int		npt,
-	    DDXPointPtr	ppt);
-
-extern _X_EXPORT void
-fbFixCoordModePrevious (int npt,
-			DDXPointPtr ppt);
-
-extern _X_EXPORT void
-fbPolySegment (DrawablePtr  pDrawable,
-	       GCPtr	    pGC,
-	       int	    nseg,
-	       xSegment	    *pseg);
-
-#define fbPolyRectangle	miPolyRectangle
-
-/*
- * fbpict.c
- */
-
-extern _X_EXPORT Bool
-fbPictureInit (ScreenPtr pScreen,
-	       PictFormatPtr formats,
-	       int nformats);
-
-/*
- * fbpixmap.c
- */
-
-extern _X_EXPORT PixmapPtr
-fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
-		   unsigned usage_hint);
-
-extern _X_EXPORT PixmapPtr
-fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
-		unsigned usage_hint);
-
-extern _X_EXPORT Bool
-fbDestroyPixmap (PixmapPtr pPixmap);
-
-extern _X_EXPORT RegionPtr
-fbPixmapToRegion(PixmapPtr pPix);
-
-/*
- * fbpoint.c
- */
-
-extern _X_EXPORT void
-fbDots (FbBits	    *dstOrig,
-	FbStride    dstStride,
-	int	    dstBpp,
-	BoxPtr	    pBox,
-	xPoint	    *pts,
-	int	    npt,
-	int	    xorg,
-	int	    yorg,
-	int	    xoff,
-	int	    yoff,
-	FbBits	    andOrig,
-	FbBits	    xorOrig);
-
-extern _X_EXPORT void
-fbPolyPoint (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    mode,
-	     int	    npt,
-	     xPoint	    *pptInit);
-
-/*
- * fbpush.c
- */
-extern _X_EXPORT void
-fbPushPattern (DrawablePtr  pDrawable,
-	       GCPtr	    pGC,
-	       
-	       FbStip	    *src,
-	       FbStride	    srcStride,
-	       int	    srcX,
-
-	       int	    x,
-	       int	    y,
-
-	       int	    width,
-	       int	    height);
-
-extern _X_EXPORT void
-fbPushFill (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-
-	    FbStip	*src,
-	    FbStride	srcStride,
-	    int		srcX,
-	    
-	    int		x,
-	    int		y,
-	    int		width,
-	    int		height);
-
-extern _X_EXPORT void
-fbPushImage (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     
-	     FbStip	    *src,
-	     FbStride	    srcStride,
-	     int	    srcX,
-
-	     int	    x,
-	     int	    y,
-	     int	    width,
-	     int	    height);
-
-extern _X_EXPORT void
-fbPushPixels (GCPtr	    pGC,
-	      PixmapPtr	    pBitmap,
-	      DrawablePtr   pDrawable,
-	      int	    dx,
-	      int	    dy,
-	      int	    xOrg,
-	      int	    yOrg);
-
-
-/*
- * fbscreen.c
- */
-
-extern _X_EXPORT Bool
-fbCloseScreen (int indx, ScreenPtr pScreen);
-
-extern _X_EXPORT Bool
-fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);
-
-extern _X_EXPORT Bool
-fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);
-
-extern _X_EXPORT void
-fbQueryBestSize (int class, 
-		 unsigned short *width, unsigned short *height,
-		 ScreenPtr pScreen);
-
-extern _X_EXPORT PixmapPtr
-_fbGetWindowPixmap (WindowPtr pWindow);
-
-extern _X_EXPORT void
-_fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap);
-
-extern _X_EXPORT Bool
-fbSetupScreen(ScreenPtr	pScreen, 
-	      pointer	pbits,		/* pointer to screen bitmap */
-	      int	xsize, 		/* in pixels */
-	      int	ysize,
-	      int	dpix,		/* dots per inch */
-	      int	dpiy,
-	      int	width,		/* pixel width of frame buffer */
-	      int	bpp);		/* bits per pixel of frame buffer */
-
-extern _X_EXPORT Bool
-wfbFinishScreenInit(ScreenPtr	pScreen,
-		    pointer	pbits,
-		    int		xsize,
-		    int		ysize,
-		    int		dpix,
-		    int		dpiy,
-		    int		width,
-		    int		bpp,
-		    SetupWrapProcPtr setupWrap,
-		    FinishWrapProcPtr finishWrap);
-
-extern _X_EXPORT Bool
-wfbScreenInit(ScreenPtr	pScreen,
-	      pointer	pbits,
-	      int	xsize,
-	      int	ysize,
-	      int	dpix,
-	      int	dpiy,
-	      int	width,
-	      int	bpp,
-	      SetupWrapProcPtr setupWrap,
-	      FinishWrapProcPtr finishWrap);
-
-extern _X_EXPORT Bool
-fbFinishScreenInit(ScreenPtr	pScreen,
-		   pointer	pbits,
-		   int		xsize,
-		   int		ysize,
-		   int		dpix,
-		   int		dpiy,
-		   int		width,
-		   int		bpp);
-
-extern _X_EXPORT Bool
-fbScreenInit(ScreenPtr	pScreen,
-	     pointer	pbits,
-	     int	xsize,
-	     int	ysize,
-	     int	dpix,
-	     int	dpiy,
-	     int	width,
-	     int	bpp);
-    
-/*
- * fbseg.c
- */
-typedef void	FbBres (DrawablePtr	pDrawable,
-			GCPtr		pGC,
-			int		dashOffset,
-			int		signdx,
-			int		signdy,
-			int		axis,
-			int		x,
-			int		y,
-			int		e,
-			int		e1,
-			int		e3,
-			int		len);
-
-extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash;
-/*
- * fbsetsp.c
- */
-
-extern _X_EXPORT void
-fbSetSpans (DrawablePtr	    pDrawable,
-	    GCPtr	    pGC,
-	    char	    *src,
-	    DDXPointPtr	    ppt,
-	    int		    *pwidth,
-	    int		    nspans,
-	    int		    fSorted);
-
-extern _X_EXPORT FbBres *
-fbSelectBres (DrawablePtr   pDrawable,
-	      GCPtr	    pGC);
-
-extern _X_EXPORT void
-fbBres (DrawablePtr	pDrawable,
-	GCPtr		pGC,
-	int		dashOffset,
-	int		signdx,
-	int		signdy,
-	int		axis,
-	int		x,
-	int		y,
-	int		e,
-	int		e1,
-	int		e3,
-	int		len);
-
-extern _X_EXPORT void
-fbSegment (DrawablePtr	pDrawable,
-	   GCPtr	pGC,
-	   int		xa,
-	   int		ya,
-	   int		xb,
-	   int		yb,
-	   Bool		drawLast,
-	   int		*dashOffset);
-
-
-/*
- * fbsolid.c
- */
-
-extern _X_EXPORT void
-fbSolid (FbBits	    *dst,
-	 FbStride   dstStride,
-	 int	    dstX,
-	 int	    bpp,
-
-	 int	    width,
-	 int	    height,
-
-	 FbBits	    and,
-	 FbBits	    xor);
-
-#ifdef FB_24BIT
-extern _X_EXPORT void
-fbSolid24 (FbBits   *dst,
-	   FbStride dstStride,
-	   int	    dstX,
-
-	   int	    width,
-	   int	    height,
-
-	   FbBits   and,
-	   FbBits   xor);
-#endif
-
-/*
- * fbstipple.c
- */
-
-extern _X_EXPORT void
-fbTransparentSpan (FbBits   *dst,
-		   FbBits   stip,
-		   FbBits   fgxor,
-		   int	    n);
-
-extern _X_EXPORT void
-fbEvenStipple (FbBits   *dst,
-	       FbStride dstStride,
-	       int	dstX,
-	       int	dstBpp,
-
-	       int	width,
-	       int	height,
-
-	       FbStip   *stip,
-	       FbStride	stipStride,
-	       int	stipHeight,
-
-	       FbBits   fgand,
-	       FbBits   fgxor,
-	       FbBits   bgand,
-	       FbBits   bgxor,
-
-	       int	xRot,
-	       int	yRot);
-
-extern _X_EXPORT void
-fbOddStipple (FbBits	*dst,
-	      FbStride	dstStride,
-	      int	dstX,
-	      int	dstBpp,
-
-	      int	width,
-	      int	height,
-
-	      FbStip	*stip,
-	      FbStride	stipStride,
-	      int	stipWidth,
-	      int	stipHeight,
-
-	      FbBits	fgand,
-	      FbBits	fgxor,
-	      FbBits	bgand,
-	      FbBits	bgxor,
-
-	      int	xRot,
-	      int	yRot);
-
-extern _X_EXPORT void
-fbStipple (FbBits   *dst,
-	   FbStride dstStride,
-	   int	    dstX,
-	   int	    dstBpp,
-
-	   int	    width,
-	   int	    height,
-
-	   FbStip   *stip,
-	   FbStride stipStride,
-	   int	    stipWidth,
-	   int	    stipHeight,
-	   Bool	    even,
-
-	   FbBits   fgand,
-	   FbBits   fgxor,
-	   FbBits   bgand,
-	   FbBits   bgxor,
-
-	   int	    xRot,
-	   int	    yRot);
-
-/*
- * fbtile.c
- */
-
-extern _X_EXPORT void
-fbEvenTile (FbBits	*dst,
-	    FbStride	dstStride,
-	    int		dstX,
-
-	    int		width,
-	    int		height,
-
-	    FbBits	*tile,
-	    FbStride	tileStride,
-	    int		tileHeight,
-
-	    int		alu,
-	    FbBits	pm,
-	    int		xRot,
-	    int		yRot);
-
-extern _X_EXPORT void
-fbOddTile (FbBits	*dst,
-	   FbStride	dstStride,
-	   int		dstX,
-
-	   int		width,
-	   int		height,
-
-	   FbBits	*tile,
-	   FbStride	tileStride,
-	   int		tileWidth,
-	   int		tileHeight,
-
-	   int		alu,
-	   FbBits	pm,
-	   int		bpp,
-	   
-	   int		xRot,
-	   int		yRot);
-
-extern _X_EXPORT void
-fbTile (FbBits	    *dst,
-	FbStride    dstStride,
-	int	    dstX,
-
-	int	    width,
-	int	    height,
-
-	FbBits	    *tile,
-	FbStride    tileStride,
-	int	    tileWidth,
-	int	    tileHeight,
-	
-	int	    alu,
-	FbBits	    pm,
-	int	    bpp,
-	
-	int	    xRot,
-	int	    yRot);
-
-/*
- * fbutil.c
- */
-extern _X_EXPORT FbBits
-fbReplicatePixel (Pixel p, int bpp);
-
-extern _X_EXPORT void
-fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp);
-
-#ifdef FB_ACCESS_WRAPPER
-extern _X_EXPORT ReadMemoryProcPtr wfbReadMemory;
-extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory;
-#endif
-
-/*
- * fbwindow.c
- */
-
-extern _X_EXPORT Bool
-fbCreateWindow(WindowPtr pWin);
-
-extern _X_EXPORT Bool
-fbDestroyWindow(WindowPtr pWin);
-
-extern _X_EXPORT Bool
-fbMapWindow(WindowPtr pWindow);
-
-extern _X_EXPORT Bool
-fbPositionWindow(WindowPtr pWin, int x, int y);
-
-extern _X_EXPORT Bool
-fbUnmapWindow(WindowPtr pWindow);
-    
-extern _X_EXPORT void
-fbCopyWindowProc (DrawablePtr	pSrcDrawable,
-		  DrawablePtr	pDstDrawable,
-		  GCPtr		pGC,
-		  BoxPtr	pbox,
-		  int		nbox,
-		  int		dx,
-		  int		dy,
-		  Bool		reverse,
-		  Bool		upsidedown,
-		  Pixel		bitplane,
-		  void		*closure);
-
-extern _X_EXPORT void
-fbCopyWindow(WindowPtr	    pWin, 
-	     DDXPointRec    ptOldOrg, 
-	     RegionPtr	    prgnSrc);
-
-extern _X_EXPORT Bool
-fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
-
-extern _X_EXPORT void
-fbFillRegionSolid (DrawablePtr	pDrawable,
-		   RegionPtr	pRegion,
-		   FbBits	and,
-		   FbBits	xor);
-
-extern _X_EXPORT pixman_image_t *
-image_from_pict (PicturePtr	pict,
-		 Bool		has_clip,
-		 int		*xoff,
-		 int		*yoff);
-
-extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
-
-#endif /* _FB_H_ */
-
+/*

+ *

+ * Copyright © 1998 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.

+ */

+

+

+#ifndef _FB_H_

+#define _FB_H_

+

+#include <X11/X.h>

+#include <pixman.h>

+

+#include "scrnintstr.h"

+#include "pixmap.h"

+#include "pixmapstr.h"

+#include "region.h"

+#include "gcstruct.h"

+#include "colormap.h"

+#include "miscstruct.h"

+#include "servermd.h"

+#include "windowstr.h"

+#include "privates.h"

+#include "mi.h"

+#include "migc.h"

+#include "mibstore.h"

+#include "picturestr.h"

+

+#ifdef FB_ACCESS_WRAPPER

+

+#include "wfbrename.h"

+#define FBPREFIX(x) wfb##x

+#define WRITE(ptr, val) ((*wfbWriteMemory)((ptr), (val), sizeof(*(ptr))))

+#define READ(ptr) ((*wfbReadMemory)((ptr), sizeof(*(ptr))))

+

+#define MEMCPY_WRAPPED(dst, src, size) do {                       \

+    size_t _i;                                                    \

+    CARD8 *_dst = (CARD8*)(dst), *_src = (CARD8*)(src);           \

+    for(_i = 0; _i < size; _i++) {                                \

+        WRITE(_dst +_i, READ(_src + _i));                         \

+    }                                                             \

+} while(0)

+

+#define MEMSET_WRAPPED(dst, val, size) do {                       \

+    size_t _i;                                                    \

+    CARD8 *_dst = (CARD8*)(dst);                                  \

+    for(_i = 0; _i < size; _i++) {                                \

+        WRITE(_dst +_i, (val));                                   \

+    }                                                             \

+} while(0)

+

+#else

+

+#define FBPREFIX(x) fb##x

+#define WRITE(ptr, val) (*(ptr) = (val))

+#define READ(ptr) (*(ptr))

+#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))

+#define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))

+

+#endif

+

+/*

+ * This single define controls the basic size of data manipulated

+ * by this software; it must be log2(sizeof (FbBits) * 8)

+ */

+

+#ifndef FB_SHIFT

+#define FB_SHIFT    LOG2_BITMAP_PAD

+#endif

+

+#if FB_SHIFT < LOG2_BITMAP_PAD

+    error FB_SHIFT must be >= LOG2_BITMAP_PAD

+#endif

+    

+#define FB_UNIT	    (1 << FB_SHIFT)

+#define FB_HALFUNIT (1 << (FB_SHIFT-1))

+#define FB_MASK	    (FB_UNIT - 1)

+#define FB_ALLONES  ((FbBits) -1)

+    

+#if GLYPHPADBYTES != 4

+#error "GLYPHPADBYTES must be 4"

+#endif

+/* whether to bother to include 24bpp support */

+#ifndef FBNO24BIT

+#define FB_24BIT

+#endif

+

+/*

+ * Unless otherwise instructed, fb includes code to advertise 24bpp

+ * windows with 32bpp image format for application compatibility

+ */

+

+#ifdef FB_24BIT

+#ifndef FBNO24_32

+#define FB_24_32BIT

+#endif

+#endif

+

+#define FB_STIP_SHIFT	LOG2_BITMAP_PAD

+#define FB_STIP_UNIT	(1 << FB_STIP_SHIFT)

+#define FB_STIP_MASK	(FB_STIP_UNIT - 1)

+#define FB_STIP_ALLONES	((FbStip) -1)

+    

+#define FB_STIP_ODDSTRIDE(s)	(((s) & (FB_MASK >> FB_STIP_SHIFT)) != 0)

+#define FB_STIP_ODDPTR(p)	((((long) (p)) & (FB_MASK >> 3)) != 0)

+    

+#define FbStipStrideToBitsStride(s) (((s) >> (FB_SHIFT - FB_STIP_SHIFT)))

+#define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))

+    

+#define FbFullMask(n)   ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1))

+    

+#if FB_SHIFT == 6

+# ifdef WIN32

+typedef unsigned __int64    FbBits;

+# else

+#  if defined(__alpha__) || defined(__alpha) || \

+      defined(ia64) || defined(__ia64__) || \

+      defined(__sparc64__) || defined(_LP64) || \

+      defined(__s390x__) || \

+      defined(amd64) || defined (__amd64__) || \

+      defined (__powerpc64__)

+typedef unsigned long	    FbBits;

+#  else

+typedef unsigned long long  FbBits;

+#  endif

+# endif

+#endif

+

+#if FB_SHIFT == 5

+typedef CARD32		    FbBits;

+#endif

+

+#if FB_SHIFT == 4

+typedef CARD16		    FbBits;

+#endif

+

+#if LOG2_BITMAP_PAD == FB_SHIFT

+typedef FbBits		    FbStip;

+#else

+# if LOG2_BITMAP_PAD == 5

+typedef CARD32		    FbStip;

+# endif

+#endif

+

+typedef int		    FbStride;

+

+

+#ifdef FB_DEBUG

+extern _X_EXPORT void fbValidateDrawable(DrawablePtr d);

+extern _X_EXPORT void fbInitializeDrawable(DrawablePtr d);

+extern _X_EXPORT void fbSetBits (FbStip *bits, int stride, FbStip data);

+#define FB_HEAD_BITS   (FbStip) (0xbaadf00d)

+#define FB_TAIL_BITS   (FbStip) (0xbaddf0ad)

+#else

+#define fbValidateDrawable(d)

+#define fdInitializeDrawable(d)

+#endif

+

+#include "fbrop.h"

+

+#if BITMAP_BIT_ORDER == LSBFirst

+#define FbScrLeft(x,n)	((x) >> (n))

+#define FbScrRight(x,n)	((x) << (n))

+/* #define FbLeftBits(x,n)	((x) & ((((FbBits) 1) << (n)) - 1)) */

+#define FbLeftStipBits(x,n) ((x) & ((((FbStip) 1) << (n)) - 1))

+#define FbStipMoveLsb(x,s,n)	(FbStipRight (x,(s)-(n)))

+#define FbPatternOffsetBits	0

+#else

+#define FbScrLeft(x,n)	((x) << (n))

+#define FbScrRight(x,n)	((x) >> (n))

+/* #define FbLeftBits(x,n)	((x) >> (FB_UNIT - (n))) */

+#define FbLeftStipBits(x,n) ((x) >> (FB_STIP_UNIT - (n)))

+#define FbStipMoveLsb(x,s,n)	(x)

+#define FbPatternOffsetBits	(sizeof (FbBits) - 1)

+#endif

+

+#include "micoord.h"

+

+#define FbStipLeft(x,n)	FbScrLeft(x,n)

+#define FbStipRight(x,n) FbScrRight(x,n)

+

+#define FbRotLeft(x,n)	FbScrLeft(x,n) | (n ? FbScrRight(x,FB_UNIT-n) : 0)

+#define FbRotRight(x,n)	FbScrRight(x,n) | (n ? FbScrLeft(x,FB_UNIT-n) : 0)

+

+#define FbRotStipLeft(x,n)  FbStipLeft(x,n) | (n ? FbStipRight(x,FB_STIP_UNIT-n) : 0)

+#define FbRotStipRight(x,n)  FbStipRight(x,n) | (n ? FbStipLeft(x,FB_STIP_UNIT-n) : 0)

+

+#define FbLeftMask(x)	    ( ((x) & FB_MASK) ? \

+			     FbScrRight(FB_ALLONES,(x) & FB_MASK) : 0)

+#define FbRightMask(x)	    ( ((FB_UNIT - (x)) & FB_MASK) ? \

+			     FbScrLeft(FB_ALLONES,(FB_UNIT - (x)) & FB_MASK) : 0)

+

+#define FbLeftStipMask(x)   ( ((x) & FB_STIP_MASK) ? \

+			     FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) : 0)

+#define FbRightStipMask(x)  ( ((FB_STIP_UNIT - (x)) & FB_STIP_MASK) ? \

+			     FbScrLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - (x)) & FB_STIP_MASK) : 0)

+

+#define FbBitsMask(x,w)	(FbScrRight(FB_ALLONES,(x) & FB_MASK) & \

+			 FbScrLeft(FB_ALLONES,(FB_UNIT - ((x) + (w))) & FB_MASK))

+

+#define FbStipMask(x,w)	(FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \

+			 FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))

+

+

+#define FbMaskBits(x,w,l,n,r) { \

+    n = (w); \

+    r = FbRightMask((x)+n); \

+    l = FbLeftMask(x); \

+    if (l) { \

+	n -= FB_UNIT - ((x) & FB_MASK); \

+	if (n < 0) { \

+	    n = 0; \

+	    l &= r; \

+	    r = 0; \

+	} \

+    } \

+    n >>= FB_SHIFT; \

+}

+

+#ifdef FBNOPIXADDR

+#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) FbMaskBits(x,w,l,n,r)

+#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \

+    *dst = FbDoMaskRRop(*dst,and,xor,l); \

+}

+#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \

+    *dst = FbDoMaskRRop(*dst,and,xor,r); \

+}

+#else

+

+#define FbByteMaskInvalid   0x10

+

+#define FbPatternOffset(o,t)  ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1)))

+

+#define FbPtrOffset(p,o,t)		((t *) ((CARD8 *) (p) + (o)))

+#define FbSelectPatternPart(xor,o,t)	((xor) >> (FbPatternOffset (o,t) << 3))

+#define FbStorePart(dst,off,t,xor)	(WRITE(FbPtrOffset(dst,off,t), \

+					 FbSelectPart(xor,off,t)))

+#ifndef FbSelectPart

+#define FbSelectPart(x,o,t) FbSelectPatternPart(x,o,t)

+#endif

+

+#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) { \

+    n = (w); \

+    lb = 0; \

+    rb = 0; \

+    r = FbRightMask((x)+n); \

+    if (r) { \

+	/* compute right byte length */ \

+	if ((copy) && (((x) + n) & 7) == 0) { \

+	    rb = (((x) + n) & FB_MASK) >> 3; \

+	} else { \

+	    rb = FbByteMaskInvalid; \

+	} \

+    } \

+    l = FbLeftMask(x); \

+    if (l) { \

+	/* compute left byte length */ \

+	if ((copy) && ((x) & 7) == 0) { \

+	    lb = ((x) & FB_MASK) >> 3; \

+	} else { \

+	    lb = FbByteMaskInvalid; \

+	} \

+	/* subtract out the portion painted by leftMask */ \

+	n -= FB_UNIT - ((x) & FB_MASK); \

+	if (n < 0) { \

+	    if (lb != FbByteMaskInvalid) { \

+		if (rb == FbByteMaskInvalid) { \

+		    lb = FbByteMaskInvalid; \

+		} else if (rb) { \

+		    lb |= (rb - lb) << (FB_SHIFT - 3); \

+		    rb = 0; \

+		} \

+	    } \

+	    n = 0; \

+	    l &= r; \

+	    r = 0; \

+	}\

+    } \

+    n >>= FB_SHIFT; \

+}

+

+#if FB_SHIFT == 6

+#define FbDoLeftMaskByteRRop6Cases(dst,xor) \

+    case (sizeof (FbBits) - 7) | (1 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 7) | (2 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 7) | (3 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	break; \

+    case (sizeof (FbBits) - 7) | (4 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 7) | (5 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	break; \

+    case (sizeof (FbBits) - 7) | (6 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 7): \

+	FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \

+	break; \

+    case (sizeof (FbBits) - 6) | (1 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 6) | (2 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	break; \

+    case (sizeof (FbBits) - 6) | (3 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 6) | (4 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	break; \

+    case (sizeof (FbBits) - 6) | (5 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 6): \

+	FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \

+	break; \

+    case (sizeof (FbBits) - 5) | (1 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 5) | (2 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 5) | (3 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	break; \

+    case (sizeof (FbBits) - 5) | (4 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 5): \

+	FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \

+	break; \

+    case (sizeof (FbBits) - 4) | (1 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 4) | (2 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	break; \

+    case (sizeof (FbBits) - 4) | (3 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 4): \

+	FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \

+	break;

+

+#define FbDoRightMaskByteRRop6Cases(dst,xor) \

+    case 4: \

+	FbStorePart(dst,0,CARD32,xor); \

+	break; \

+    case 5: \

+	FbStorePart(dst,0,CARD32,xor); \

+	FbStorePart(dst,4,CARD8,xor); \

+	break; \

+    case 6: \

+	FbStorePart(dst,0,CARD32,xor); \

+	FbStorePart(dst,4,CARD16,xor); \

+	break; \

+    case 7: \

+	FbStorePart(dst,0,CARD32,xor); \

+	FbStorePart(dst,4,CARD16,xor); \

+	FbStorePart(dst,6,CARD8,xor); \

+	break;

+#else

+#define FbDoLeftMaskByteRRop6Cases(dst,xor)

+#define FbDoRightMaskByteRRop6Cases(dst,xor)

+#endif

+

+#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \

+    switch (lb) { \

+    FbDoLeftMaskByteRRop6Cases(dst,xor) \

+    case (sizeof (FbBits) - 3) | (1 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 3) | (2 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \

+	break; \

+    case (sizeof (FbBits) - 2) | (1 << (FB_SHIFT - 3)): \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \

+	break; \

+    case sizeof (FbBits) - 3: \

+	FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \

+    case sizeof (FbBits) - 2: \

+	FbStorePart(dst,sizeof (FbBits) - 2,CARD16,xor); \

+	break; \

+    case sizeof (FbBits) - 1: \

+	FbStorePart(dst,sizeof (FbBits) - 1,CARD8,xor); \

+	break; \

+    default: \

+	WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, l)); \

+	break; \

+    } \

+}

+

+

+#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \

+    switch (rb) { \

+    case 1: \

+	FbStorePart(dst,0,CARD8,xor); \

+	break; \

+    case 2: \

+	FbStorePart(dst,0,CARD16,xor); \

+	break; \

+    case 3: \

+	FbStorePart(dst,0,CARD16,xor); \

+	FbStorePart(dst,2,CARD8,xor); \

+	break; \

+    FbDoRightMaskByteRRop6Cases(dst,xor) \

+    default: \

+	WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, r)); \

+    } \

+}

+#endif

+

+#define FbMaskStip(x,w,l,n,r) { \

+    n = (w); \

+    r = FbRightStipMask((x)+n); \

+    l = FbLeftStipMask(x); \

+    if (l) { \

+	n -= FB_STIP_UNIT - ((x) & FB_STIP_MASK); \

+	if (n < 0) { \

+	    n = 0; \

+	    l &= r; \

+	    r = 0; \

+	} \

+    } \

+    n >>= FB_STIP_SHIFT; \

+}

+

+/*

+ * These macros are used to transparently stipple

+ * in copy mode; the expected usage is with 'n' constant

+ * so all of the conditional parts collapse into a minimal

+ * sequence of partial word writes

+ *

+ * 'n' is the bytemask of which bytes to store, 'a' is the address

+ * of the FbBits base unit, 'o' is the offset within that unit

+ *

+ * The term "lane" comes from the hardware term "byte-lane" which

+ */

+

+#define FbLaneCase1(n,a,o)						\

+    if ((n) == 0x01) {							\

+	WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), fgxor);		\

+    }

+

+#define FbLaneCase2(n,a,o)						\

+    if ((n) == 0x03) {							\

+	WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), fgxor);	\

+    } else {								\

+	FbLaneCase1((n)&1,a,o)						\

+	FbLaneCase1((n)>>1,a,(o)+1)					\

+    }

+

+#define FbLaneCase4(n,a,o)						\

+    if ((n) == 0x0f) {							\

+	WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), fgxor);	\

+    } else {								\

+	FbLaneCase2((n)&3,a,o)						\

+	FbLaneCase2((n)>>2,a,(o)+2)					\

+    }

+

+#define FbLaneCase8(n,a,o)						\

+    if ((n) == 0x0ff) {							\

+	*(FbBits *) ((a)+(o)) = fgxor;					\

+    } else {								\

+	FbLaneCase4((n)&15,a,o)						\

+	FbLaneCase4((n)>>4,a,(o)+4)					\

+    }

+

+#if FB_SHIFT == 6

+#define FbLaneCase(n,a)   FbLaneCase8(n,(CARD8 *) (a),0)

+#endif

+

+#if FB_SHIFT == 5

+#define FbLaneCase(n,a)   FbLaneCase4(n,(CARD8 *) (a),0)

+#endif

+

+/* Rotate a filled pixel value to the specified alignement */

+#define FbRot24(p,b)	    (FbScrRight(p,b) | FbScrLeft(p,24-(b)))

+#define FbRot24Stip(p,b)    (FbStipRight(p,b) | FbStipLeft(p,24-(b)))

+

+/* step a filled pixel value to the next/previous FB_UNIT alignment */

+#define FbNext24Pix(p)	(FbRot24(p,(24-FB_UNIT%24)))

+#define FbPrev24Pix(p)	(FbRot24(p,FB_UNIT%24))

+#define FbNext24Stip(p)	(FbRot24(p,(24-FB_STIP_UNIT%24)))

+#define FbPrev24Stip(p)	(FbRot24(p,FB_STIP_UNIT%24))

+

+/* step a rotation value to the next/previous rotation value */

+#if FB_UNIT == 64

+#define FbNext24Rot(r)        ((r) == 16 ? 0 : (r) + 8)

+#define FbPrev24Rot(r)        ((r) == 0 ? 16 : (r) - 8)

+

+#if IMAGE_BYTE_ORDER == MSBFirst

+#define FbFirst24Rot(x)		(((x) + 8) % 24)

+#else

+#define FbFirst24Rot(x)		((x) % 24)

+#endif

+

+#endif

+

+#if FB_UNIT == 32

+#define FbNext24Rot(r)        ((r) == 0 ? 16 : (r) - 8)

+#define FbPrev24Rot(r)        ((r) == 16 ? 0 : (r) + 8)

+

+#if IMAGE_BYTE_ORDER == MSBFirst

+#define FbFirst24Rot(x)		(((x) + 16) % 24)

+#else

+#define FbFirst24Rot(x)		((x) % 24)

+#endif

+#endif

+

+#define FbNext24RotStip(r)        ((r) == 0 ? 16 : (r) - 8)

+#define FbPrev24RotStip(r)        ((r) == 16 ? 0 : (r) + 8)

+

+/* Whether 24-bit specific code is needed for this filled pixel value */

+#define FbCheck24Pix(p)	((p) == FbNext24Pix(p))

+

+/* Macros for dealing with dashing */

+

+#define FbDashDeclare	\

+    unsigned char	*__dash, *__firstDash, *__lastDash

+    

+#define FbDashInit(pGC,pPriv,dashOffset,dashlen,even) {	    \

+    (even) = TRUE;					    \

+    __firstDash = (pGC)->dash;				    \

+    __lastDash = __firstDash + (pGC)->numInDashList;	    \

+    (dashOffset) %= (pPriv)->dashLength;		    \

+							    \

+    __dash = __firstDash;				    \

+    while ((dashOffset) >= ((dashlen) = *__dash))	    \

+    {							    \

+	(dashOffset) -= (dashlen);			    \

+	(even) = 1-(even);				    \

+	if (++__dash == __lastDash)			    \

+	    __dash = __firstDash;			    \

+    }							    \

+    (dashlen) -= (dashOffset);				    \

+}

+

+#define FbDashNext(dashlen) {				    \

+    if (++__dash == __lastDash)				    \

+	__dash = __firstDash;				    \

+    (dashlen) = *__dash;				    \

+}

+

+/* as numInDashList is always even, this case can skip a test */

+

+#define FbDashNextEven(dashlen) {			    \

+    (dashlen) = *++__dash;				    \

+}

+

+#define FbDashNextOdd(dashlen)	FbDashNext(dashlen)

+

+#define FbDashStep(dashlen,even) {			    \

+    if (!--(dashlen)) {					    \

+	FbDashNext(dashlen);				    \

+	(even) = 1-(even);				    \

+    }							    \

+}

+

+extern _X_EXPORT DevPrivateKey

+fbGetGCPrivateKey (void);

+

+extern _X_EXPORT DevPrivateKey

+fbGetWinPrivateKey (void);

+

+extern _X_EXPORT const GCOps	fbGCOps;

+extern _X_EXPORT const GCFuncs	fbGCFuncs;

+

+#ifdef FB_24_32BIT

+#define FB_SCREEN_PRIVATE

+#endif

+

+/* Framebuffer access wrapper */

+typedef FbBits (*ReadMemoryProcPtr)(const void *src, int size);

+typedef void (*WriteMemoryProcPtr)(void *dst, FbBits value, int size);

+typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,

+                                 WriteMemoryProcPtr *pWrite,

+                                 DrawablePtr         pDraw);

+typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw);

+

+#ifdef FB_ACCESS_WRAPPER

+

+#define fbPrepareAccess(pDraw) \

+	fbGetScreenPrivate((pDraw)->pScreen)->setupWrap( \

+		&wfbReadMemory, \

+		&wfbWriteMemory, \

+		(pDraw))

+#define fbFinishAccess(pDraw) \

+	fbGetScreenPrivate((pDraw)->pScreen)->finishWrap(pDraw)

+

+#else

+

+#define fbPrepareAccess(pPix)

+#define fbFinishAccess(pDraw)

+

+#endif

+

+

+#ifdef FB_SCREEN_PRIVATE

+extern _X_EXPORT DevPrivateKey

+fbGetScreenPrivateKey(void);

+

+/* private field of a screen */

+typedef struct {

+    unsigned char	win32bpp;	/* window bpp for 32-bpp images */

+    unsigned char	pix32bpp;	/* pixmap bpp for 32-bpp images */

+#ifdef FB_ACCESS_WRAPPER

+    SetupWrapProcPtr	setupWrap;	/* driver hook to set pixmap access wrapping */

+    FinishWrapProcPtr	finishWrap;	/* driver hook to clean up pixmap access wrapping */

+#endif

+} FbScreenPrivRec, *FbScreenPrivPtr;

+

+#define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \

+				     dixLookupPrivate(&(pScreen)->devPrivates, fbGetScreenPrivateKey()))

+#endif

+

+/* private field of GC */

+typedef struct {

+    FbBits		and, xor;	/* reduced rop values */

+    FbBits		bgand, bgxor;	/* for stipples */

+    FbBits		fg, bg, pm;	/* expanded and filled */

+    unsigned int	dashLength;	/* total of all dash elements */

+    unsigned char    	oneRect;	/* clip list is single rectangle */

+    unsigned char    	evenStipple;	/* stipple is even */

+    unsigned char    	bpp;		/* current drawable bpp */

+} FbGCPrivRec, *FbGCPrivPtr;

+

+#define fbGetGCPrivate(pGC)	((FbGCPrivPtr)\

+				 dixLookupPrivate(&(pGC)->devPrivates, fbGetGCPrivateKey()))

+

+#define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)

+#define fbGetExpose(pGC)	((pGC)->fExpose)

+#define fbGetFreeCompClip(pGC)	((pGC)->freeCompClip)

+#define fbGetRotatedPixmap(pGC)	((pGC)->pRotatedPixmap)

+

+#define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)

+#define fbGetWindowPixmap(pWin)	((PixmapPtr)\

+				 dixLookupPrivate(&((WindowPtr)(pWin))->devPrivates, fbGetWinPrivateKey()))

+

+#ifdef ROOTLESS

+#define __fbPixDrawableX(pPix)	((pPix)->drawable.x)

+#define __fbPixDrawableY(pPix)	((pPix)->drawable.y)

+#else

+#define __fbPixDrawableX(pPix)	0

+#define __fbPixDrawableY(pPix)	0

+#endif

+

+#ifdef COMPOSITE

+#define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix) - (pPix)->screen_x)

+#define __fbPixOffYWin(pPix)	(__fbPixDrawableY(pPix) - (pPix)->screen_y)

+#else

+#define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix))

+#define __fbPixOffYWin(pPix)	(__fbPixDrawableY(pPix))

+#endif

+#define __fbPixOffXPix(pPix)	(__fbPixDrawableX(pPix))

+#define __fbPixOffYPix(pPix)	(__fbPixDrawableY(pPix))

+

+#define fbGetDrawablePixmap(pDrawable, pixmap, xoff, yoff) {			\

+    if ((pDrawable)->type != DRAWABLE_PIXMAP) { 				\

+	(pixmap) = fbGetWindowPixmap(pDrawable);				\

+	(xoff) = __fbPixOffXWin(pixmap); 					\

+	(yoff) = __fbPixOffYWin(pixmap); 					\

+    } else { 									\

+	(pixmap) = (PixmapPtr) (pDrawable);					\

+	(xoff) = __fbPixOffXPix(pixmap); 					\

+	(yoff) = __fbPixOffYPix(pixmap); 					\

+    } 										\

+    fbPrepareAccess(pDrawable); 						\

+}

+

+#define fbGetPixmapBitsData(pixmap, pointer, stride, bpp) {			\

+    (pointer) = (FbBits *) (pixmap)->devPrivate.ptr; 			       	\

+    (stride) = ((int) (pixmap)->devKind) / sizeof (FbBits); (void)(stride);	\

+    (bpp) = (pixmap)->drawable.bitsPerPixel;  (void)(bpp); 			\

+}

+

+#define fbGetPixmapStipData(pixmap, pointer, stride, bpp) {			\

+    (pointer) = (FbStip *) (pixmap)->devPrivate.ptr; 			       	\

+    (stride) = ((int) (pixmap)->devKind) / sizeof (FbStip); (void)(stride);	\

+    (bpp) = (pixmap)->drawable.bitsPerPixel;  (void)(bpp); 			\

+}

+

+#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 		\

+    PixmapPtr   _pPix; 								\

+    fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff); 				\

+    fbGetPixmapBitsData(_pPix, pointer, stride, bpp);				\

+}

+

+#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 	\

+    PixmapPtr   _pPix; 								\

+    fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff);				\

+    fbGetPixmapStipData(_pPix, pointer, stride, bpp);				\

+}

+

+/*

+ * XFree86 empties the root BorderClip when the VT is inactive,

+ * here's a macro which uses that to disable GetImage and GetSpans

+ */

+

+#define fbWindowEnabled(pWin) \

+    RegionNotEmpty(&(pWin)->drawable.pScreen->root->borderClip)

+

+#define fbDrawableEnabled(pDrawable) \

+    ((pDrawable)->type == DRAWABLE_PIXMAP ? \

+     TRUE : fbWindowEnabled((WindowPtr) pDrawable))

+

+#define FbPowerOfTwo(w)	    (((w) & ((w) - 1)) == 0)

+/*

+ * Accelerated tiles are power of 2 width <= FB_UNIT

+ */

+#define FbEvenTile(w)	    ((w) <= FB_UNIT && FbPowerOfTwo(w))

+/*

+ * Accelerated stipples are power of 2 width and <= FB_UNIT/dstBpp

+ * with dstBpp a power of 2 as well

+ */

+#define FbEvenStip(w,bpp)   ((w) * (bpp) <= FB_UNIT && FbPowerOfTwo(w) && FbPowerOfTwo(bpp))

+

+/*

+ * fb24_32.c

+ */

+extern _X_EXPORT void

+fb24_32GetSpans(DrawablePtr	pDrawable, 

+		int		wMax, 

+		DDXPointPtr	ppt, 

+		int		*pwidth, 

+		int		nspans, 

+		char		*pchardstStart);

+

+extern _X_EXPORT void

+fb24_32SetSpans (DrawablePtr	    pDrawable,

+		 GCPtr		    pGC,

+		 char		    *src,

+		 DDXPointPtr	    ppt,

+		 int		    *pwidth,

+		 int		    nspans,

+		 int		    fSorted);

+

+extern _X_EXPORT void

+fb24_32PutZImage (DrawablePtr	pDrawable,

+		  RegionPtr	pClip,

+		  int		alu,

+		  FbBits	pm,

+		  int		x,

+		  int		y,

+		  int		width,

+		  int		height,

+		  CARD8		*src,

+		  FbStride	srcStride);

+    

+extern _X_EXPORT void

+fb24_32GetImage (DrawablePtr     pDrawable,

+		 int             x,

+		 int             y,

+		 int             w,

+		 int             h,

+		 unsigned int    format,

+		 unsigned long   planeMask,

+		 char            *d);

+

+extern _X_EXPORT void

+fb24_32CopyMtoN (DrawablePtr pSrcDrawable,

+		 DrawablePtr pDstDrawable,

+		 GCPtr       pGC,

+		 BoxPtr      pbox,

+		 int         nbox,

+		 int         dx,

+		 int         dy,

+		 Bool        reverse,

+		 Bool        upsidedown,

+		 Pixel       bitplane,

+		 void        *closure);

+

+extern _X_EXPORT PixmapPtr

+fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel);

+    

+extern _X_EXPORT Bool

+fb24_32CreateScreenResources(ScreenPtr pScreen);

+

+extern _X_EXPORT Bool

+fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,

+			   int         width,

+			   int         height,

+			   int         depth,

+			   int         bitsPerPixel,

+			   int         devKind,

+			   pointer     pPixData);

+

+/*

+ * fballpriv.c

+ */

+extern _X_EXPORT Bool

+fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex);

+    

+/*

+ * fbarc.c

+ */

+

+extern _X_EXPORT void

+fbPolyArc (DrawablePtr	pDrawable,

+	   GCPtr	pGC,

+	   int		narcs,

+	   xArc		*parcs);

+

+/*

+ * fbbits.c

+ */

+

+extern _X_EXPORT void

+fbBresSolid8(DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    dashOffset,

+	     int	    signdx,

+	     int	    signdy,

+	     int	    axis,

+	     int	    x,

+	     int	    y,

+	     int	    e,

+	     int	    e1,

+	     int	    e3,

+	     int	    len);

+

+extern _X_EXPORT void

+fbBresDash8 (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    dashOffset,

+	     int	    signdx,

+	     int	    signdy,

+	     int	    axis,

+	     int	    x,

+	     int	    y,

+	     int	    e,

+	     int	    e1,

+	     int	    e3,

+	     int	    len);

+

+extern _X_EXPORT void

+fbDots8 (FbBits	    *dst,

+	 FbStride   dstStride,

+	 int	    dstBpp,

+	 BoxPtr	    pBox,

+	 xPoint	    *pts,

+	 int	    npt,

+	 int	    xorg,

+	 int	    yorg,

+	 int	    xoff,

+	 int	    yoff,

+	 FbBits	    and,

+	 FbBits	    xor);

+

+extern _X_EXPORT void

+fbArc8 (FbBits	    *dst,

+	FbStride    dstStride,

+	int	    dstBpp,

+	xArc	    *arc,

+	int	    dx,

+	int	    dy,

+	FbBits	    and,

+	FbBits	    xor);

+

+extern _X_EXPORT void

+fbGlyph8 (FbBits    *dstLine,

+	  FbStride  dstStride,

+	  int	    dstBpp,

+	  FbStip    *stipple,

+	  FbBits    fg,

+	  int	    height,

+	  int	    shift);

+

+extern _X_EXPORT void

+fbPolyline8 (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    mode,

+	     int	    npt,

+	     DDXPointPtr    ptsOrig);

+

+extern _X_EXPORT void

+fbPolySegment8 (DrawablePtr pDrawable,

+		GCPtr	    pGC,

+		int	    nseg,

+		xSegment    *pseg);

+

+extern _X_EXPORT void

+fbBresSolid16(DrawablePtr   pDrawable,

+	      GCPtr	    pGC,

+	      int	    dashOffset,

+	      int	    signdx,

+	      int	    signdy,

+	      int	    axis,

+	      int	    x,

+	      int	    y,

+	      int	    e,

+	      int	    e1,

+	      int	    e3,

+	      int	    len);

+

+extern _X_EXPORT void

+fbBresDash16(DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    dashOffset,

+	     int	    signdx,

+	     int	    signdy,

+	     int	    axis,

+	     int	    x,

+	     int	    y,

+	     int	    e,

+	     int	    e1,

+	     int	    e3,

+	     int	    len);

+

+extern _X_EXPORT void

+fbDots16(FbBits	    *dst,

+	 FbStride   dstStride,

+	 int	    dstBpp,

+	 BoxPtr	    pBox,

+	 xPoint	    *pts,

+	 int	    npt,

+	 int	    xorg,

+	 int	    yorg,

+	 int	    xoff,

+	 int	    yoff,

+	 FbBits	    and,

+	 FbBits	    xor);

+

+extern _X_EXPORT void

+fbArc16(FbBits	    *dst,

+	FbStride    dstStride,

+	int	    dstBpp,

+	xArc	    *arc,

+	int	    dx,

+	int	    dy,

+	FbBits	    and,

+	FbBits	    xor);

+

+extern _X_EXPORT void

+fbGlyph16(FbBits    *dstLine,

+	  FbStride  dstStride,

+	  int	    dstBpp,

+	  FbStip    *stipple,

+	  FbBits    fg,

+	  int	    height,

+	  int	    shift);

+

+extern _X_EXPORT void

+fbPolyline16 (DrawablePtr   pDrawable,

+	      GCPtr	    pGC,

+	      int	    mode,

+	      int	    npt,

+	      DDXPointPtr   ptsOrig);

+

+extern _X_EXPORT void

+fbPolySegment16 (DrawablePtr	pDrawable,

+		 GCPtr		pGC,

+		 int		nseg,

+		 xSegment	*pseg);

+

+

+extern _X_EXPORT void

+fbBresSolid24(DrawablePtr   pDrawable,

+	      GCPtr	    pGC,

+	      int	    dashOffset,

+	      int	    signdx,

+	      int	    signdy,

+	      int	    axis,

+	      int	    x,

+	      int	    y,

+	      int	    e,

+	      int	    e1,

+	      int	    e3,

+	      int	    len);

+

+extern _X_EXPORT void

+fbBresDash24(DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    dashOffset,

+	     int	    signdx,

+	     int	    signdy,

+	     int	    axis,

+	     int	    x,

+	     int	    y,

+	     int	    e,

+	     int	    e1,

+	     int	    e3,

+	     int	    len);

+

+extern _X_EXPORT void

+fbDots24(FbBits	    *dst,

+	 FbStride   dstStride,

+	 int	    dstBpp,

+	 BoxPtr	    pBox,

+	 xPoint	    *pts,

+	 int	    npt,

+	 int	    xorg,

+	 int	    yorg,

+	 int	    xoff,

+	 int	    yoff,

+	 FbBits	    and,

+	 FbBits	    xor);

+

+extern _X_EXPORT void

+fbArc24(FbBits	    *dst,

+	FbStride    dstStride,

+	int	    dstBpp,

+	xArc	    *arc,

+	int	    dx,

+	int	    dy,

+	FbBits	    and,

+	FbBits	    xor);

+

+extern _X_EXPORT void

+fbGlyph24(FbBits    *dstLine,

+	  FbStride  dstStride,

+	  int	    dstBpp,

+	  FbStip    *stipple,

+	  FbBits    fg,

+	  int	    height,

+	  int	    shift);

+

+extern _X_EXPORT void

+fbPolyline24 (DrawablePtr   pDrawable,

+	      GCPtr	    pGC,

+	      int	    mode,

+	      int	    npt,

+	      DDXPointPtr   ptsOrig);

+

+extern _X_EXPORT void

+fbPolySegment24 (DrawablePtr	pDrawable,

+		 GCPtr		pGC,

+		 int		nseg,

+		 xSegment	*pseg);

+

+

+extern _X_EXPORT void

+fbBresSolid32(DrawablePtr   pDrawable,

+	      GCPtr	    pGC,

+	      int	    dashOffset,

+	      int	    signdx,

+	      int	    signdy,

+	      int	    axis,

+	      int	    x,

+	      int	    y,

+	      int	    e,

+	      int	    e1,

+	      int	    e3,

+	      int	    len);

+

+extern _X_EXPORT void

+fbBresDash32(DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    dashOffset,

+	     int	    signdx,

+	     int	    signdy,

+	     int	    axis,

+	     int	    x,

+	     int	    y,

+	     int	    e,

+	     int	    e1,

+	     int	    e3,

+	     int	    len);

+

+extern _X_EXPORT void

+fbDots32(FbBits	    *dst,

+	 FbStride   dstStride,

+	 int	    dstBpp,

+	 BoxPtr	    pBox,

+	 xPoint	    *pts,

+	 int	    npt,

+	 int	    xorg,

+	 int	    yorg,

+	 int	    xoff,

+	 int	    yoff,

+	 FbBits	    and,

+	 FbBits	    xor);

+

+extern _X_EXPORT void

+fbArc32(FbBits	    *dst,

+	FbStride    dstStride,

+	int	    dstBpp,

+	xArc	    *arc,

+	int	    dx,

+	int	    dy,

+	FbBits	    and,

+	FbBits	    xor);

+

+extern _X_EXPORT void

+fbGlyph32(FbBits    *dstLine,

+	  FbStride  dstStride,

+	  int	    dstBpp,

+	  FbStip    *stipple,

+	  FbBits    fg,

+	  int	    height,

+	  int	    shift);

+extern _X_EXPORT void

+fbPolyline32 (DrawablePtr   pDrawable,

+	      GCPtr	    pGC,

+	      int	    mode,

+	      int	    npt,

+	      DDXPointPtr   ptsOrig);

+

+extern _X_EXPORT void

+fbPolySegment32 (DrawablePtr	pDrawable,

+		 GCPtr		pGC,

+		 int		nseg,

+		 xSegment	*pseg);

+

+/*

+ * fbblt.c

+ */

+extern _X_EXPORT void

+fbBlt (FbBits   *src, 

+       FbStride	srcStride,

+       int	srcX,

+       

+       FbBits   *dst,

+       FbStride dstStride,

+       int	dstX,

+       

+       int	width, 

+       int	height,

+       

+       int	alu,

+       FbBits	pm,

+       int	bpp,

+       

+       Bool	reverse,

+       Bool	upsidedown);

+

+extern _X_EXPORT void

+fbBlt24 (FbBits	    *srcLine,

+	 FbStride   srcStride,

+	 int	    srcX,

+

+	 FbBits	    *dstLine,

+	 FbStride   dstStride,

+	 int	    dstX,

+

+	 int	    width, 

+	 int	    height,

+

+	 int	    alu,

+	 FbBits	    pm,

+

+	 Bool	    reverse,

+	 Bool	    upsidedown);

+    

+extern _X_EXPORT void

+fbBltStip (FbStip   *src,

+	   FbStride srcStride,	    /* in FbStip units, not FbBits units */

+	   int	    srcX,

+	   

+	   FbStip   *dst,

+	   FbStride dstStride,	    /* in FbStip units, not FbBits units */

+	   int	    dstX,

+

+	   int	    width, 

+	   int	    height,

+

+	   int	    alu,

+	   FbBits   pm,

+	   int	    bpp);

+    

+/*

+ * fbbltone.c

+ */

+extern _X_EXPORT void

+fbBltOne (FbStip   *src,

+	  FbStride srcStride,

+	  int	   srcX,

+	  FbBits   *dst,

+	  FbStride dstStride,

+	  int	   dstX,

+	  int	   dstBpp,

+

+	  int	   width,

+	  int	   height,

+

+	  FbBits   fgand,

+	  FbBits   fbxor,

+	  FbBits   bgand,

+	  FbBits   bgxor);

+ 

+#ifdef FB_24BIT

+extern _X_EXPORT void

+fbBltOne24 (FbStip    *src,

+	  FbStride  srcStride,	    /* FbStip units per scanline */

+	  int	    srcX,	    /* bit position of source */

+	  FbBits    *dst,

+	  FbStride  dstStride,	    /* FbBits units per scanline */

+	  int	    dstX,	    /* bit position of dest */

+	  int	    dstBpp,	    /* bits per destination unit */

+

+	  int	    width,	    /* width in bits of destination */

+	  int	    height,	    /* height in scanlines */

+

+	  FbBits    fgand,	    /* rrop values */

+	  FbBits    fgxor,

+	  FbBits    bgand,

+	  FbBits    bgxor);

+#endif

+

+extern _X_EXPORT void

+fbBltPlane (FbBits	    *src,

+	    FbStride	    srcStride,

+	    int		    srcX,

+	    int		    srcBpp,

+

+	    FbStip	    *dst,

+	    FbStride	    dstStride,

+	    int		    dstX,

+	    

+	    int		    width,

+	    int		    height,

+	    

+	    FbStip	    fgand,

+	    FbStip	    fgxor,

+	    FbStip	    bgand,

+	    FbStip	    bgxor,

+	    Pixel	    planeMask);

+

+/*

+ * fbcmap.c

+ */

+extern _X_EXPORT int

+fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps);

+

+extern _X_EXPORT void

+fbInstallColormap(ColormapPtr pmap);

+

+extern _X_EXPORT void

+fbUninstallColormap(ColormapPtr pmap);

+

+extern _X_EXPORT void

+fbResolveColor(unsigned short	*pred, 

+	       unsigned short	*pgreen, 

+	       unsigned short	*pblue,

+	       VisualPtr	pVisual);

+

+extern _X_EXPORT Bool

+fbInitializeColormap(ColormapPtr pmap);

+

+extern _X_EXPORT int

+fbExpandDirectColors (ColormapPtr   pmap, 

+		      int	    ndef,

+		      xColorItem    *indefs,

+		      xColorItem    *outdefs);

+

+extern _X_EXPORT Bool

+fbCreateDefColormap(ScreenPtr pScreen);

+

+extern _X_EXPORT void

+fbClearVisualTypes(void);

+

+extern _X_EXPORT Bool

+fbHasVisualTypes (int depth);

+

+extern _X_EXPORT Bool

+fbSetVisualTypes (int depth, int visuals, int bitsPerRGB);

+

+extern _X_EXPORT Bool

+fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,

+			  Pixel redMask, Pixel greenMask, Pixel blueMask);

+

+extern _X_EXPORT Bool

+fbInitVisuals (VisualPtr    *visualp, 

+	       DepthPtr	    *depthp,

+	       int	    *nvisualp,

+	       int	    *ndepthp,

+	       int	    *rootDepthp,

+	       VisualID	    *defaultVisp,

+	       unsigned long	sizes,

+	       int	    bitsPerRGB);

+

+/*

+ * fbcopy.c

+ */

+

+/* Compatibility definition, to be removed at next ABI change. */

+typedef void   (*fbCopyProc) (DrawablePtr  pSrcDrawable,

+                              DrawablePtr  pDstDrawable,

+                              GCPtr        pGC,

+                              BoxPtr       pDstBox,

+                              int          nbox,

+                              int          dx,

+                              int          dy,

+                              Bool         reverse,

+                              Bool         upsidedown,

+                              Pixel        bitplane,

+                              void         *closure);

+

+extern _X_EXPORT void

+fbCopyNtoN (DrawablePtr	pSrcDrawable,

+	    DrawablePtr	pDstDrawable,

+	    GCPtr	pGC,

+	    BoxPtr	pbox,

+	    int		nbox,

+	    int		dx,

+	    int		dy,

+	    Bool	reverse,

+	    Bool	upsidedown,

+	    Pixel	bitplane,

+	    void	*closure);

+

+/* Compatibility wrapper, to be removed at next ABI change. */

+extern _X_EXPORT void

+fbCopyRegion (DrawablePtr   pSrcDrawable,

+             DrawablePtr   pDstDrawable,

+             GCPtr         pGC,

+             RegionPtr     pDstRegion,

+             int           dx,

+             int           dy,

+             fbCopyProc    copyProc,

+             Pixel         bitPlane,

+             void          *closure);

+

+/* Compatibility wrapper, to be removed at next ABI change. */

+extern _X_EXPORT RegionPtr

+fbDoCopy (DrawablePtr  pSrcDrawable,

+         DrawablePtr   pDstDrawable,

+         GCPtr         pGC,

+         int           xIn,

+         int           yIn,

+         int           widthSrc,

+         int           heightSrc,

+         int           xOut,

+         int           yOut,

+         fbCopyProc    copyProc,

+         Pixel         bitplane,

+         void          *closure);

+

+extern _X_EXPORT void

+fbCopy1toN (DrawablePtr	pSrcDrawable,

+	    DrawablePtr	pDstDrawable,

+	    GCPtr	pGC,

+	    BoxPtr	pbox,

+	    int		nbox,

+	    int		dx,

+	    int		dy,

+	    Bool	reverse,

+	    Bool	upsidedown,

+	    Pixel	bitplane,

+	    void	*closure);

+

+extern _X_EXPORT void

+fbCopyNto1 (DrawablePtr	pSrcDrawable,

+	    DrawablePtr	pDstDrawable,

+	    GCPtr	pGC,

+	    BoxPtr	pbox,

+	    int		nbox,

+	    int		dx,

+	    int		dy,

+	    Bool	reverse,

+	    Bool	upsidedown,

+	    Pixel	bitplane,

+	    void	*closure);

+

+extern _X_EXPORT RegionPtr

+fbCopyArea (DrawablePtr	pSrcDrawable,

+	    DrawablePtr	pDstDrawable,

+	    GCPtr	pGC,

+	    int		xIn, 

+	    int		yIn,

+	    int		widthSrc, 

+	    int		heightSrc,

+	    int		xOut, 

+	    int		yOut);

+

+extern _X_EXPORT RegionPtr

+fbCopyPlane (DrawablePtr    pSrcDrawable,

+	     DrawablePtr    pDstDrawable,

+	     GCPtr	    pGC,

+	     int	    xIn, 

+	     int	    yIn,

+	     int	    widthSrc, 

+	     int	    heightSrc,

+	     int	    xOut, 

+	     int	    yOut,

+	     unsigned long  bitplane);

+

+/*

+ * fbfill.c

+ */

+extern _X_EXPORT void

+fbFill (DrawablePtr pDrawable,

+	GCPtr	    pGC,

+	int	    x,

+	int	    y,

+	int	    width,

+	int	    height);

+

+extern _X_EXPORT void

+fbSolidBoxClipped (DrawablePtr	pDrawable,

+		   RegionPtr	pClip,

+		   int		xa,

+		   int		ya,

+		   int		xb,

+		   int		yb,

+		   FbBits	and,

+		   FbBits	xor);

+

+/*

+ * fbfillrect.c

+ */

+extern _X_EXPORT void

+fbPolyFillRect(DrawablePtr  pDrawable, 

+	       GCPtr	    pGC, 

+	       int	    nrectInit,

+	       xRectangle   *prectInit);

+

+#define fbPolyFillArc miPolyFillArc

+

+#define fbFillPolygon miFillPolygon

+

+/*

+ * fbfillsp.c

+ */

+extern _X_EXPORT void

+fbFillSpans (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    nInit,

+	     DDXPointPtr    pptInit,

+	     int	    *pwidthInit,

+	     int	    fSorted);

+

+

+/*

+ * fbgc.c

+ */

+

+extern _X_EXPORT Bool

+fbCreateGC(GCPtr pGC);

+

+extern _X_EXPORT void

+fbPadPixmap (PixmapPtr pPixmap);

+    

+extern _X_EXPORT void

+fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);

+

+/*

+ * fbgetsp.c

+ */

+extern _X_EXPORT void

+fbGetSpans(DrawablePtr	pDrawable, 

+	   int		wMax, 

+	   DDXPointPtr	ppt, 

+	   int		*pwidth, 

+	   int		nspans, 

+	   char		*pchardstStart);

+

+/*

+ * fbglyph.c

+ */

+

+extern _X_EXPORT Bool

+fbGlyphIn (RegionPtr	pRegion,

+	   int		x,

+	   int		y,

+	   int		width,

+	   int		height);

+    

+extern _X_EXPORT void

+fbPolyGlyphBlt (DrawablePtr	pDrawable,

+		GCPtr		pGC,

+		int		x, 

+		int		y,

+		unsigned int	nglyph,

+		CharInfoPtr	*ppci,

+		pointer		pglyphBase);

+

+extern _X_EXPORT void

+fbImageGlyphBlt (DrawablePtr	pDrawable,

+		 GCPtr		pGC,

+		 int		x,

+		 int		y,

+		 unsigned int	nglyph,

+		 CharInfoPtr	*ppci,

+		 pointer	pglyphBase);

+

+/*

+ * fbimage.c

+ */

+

+extern _X_EXPORT void

+fbPutImage (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+	    int		depth,

+	    int		x,

+	    int		y,

+	    int		w,

+	    int		h,

+	    int		leftPad,

+	    int		format,

+	    char	*pImage);

+

+extern _X_EXPORT void

+fbPutZImage (DrawablePtr	pDrawable,

+	     RegionPtr		pClip,

+	     int		alu,

+	     FbBits		pm,

+	     int		x,

+	     int		y,

+	     int		width,

+	     int		height,

+	     FbStip		*src,

+	     FbStride		srcStride);

+

+extern _X_EXPORT void

+fbPutXYImage (DrawablePtr	pDrawable,

+	      RegionPtr		pClip,

+	      FbBits		fg,

+	      FbBits		bg,

+	      FbBits		pm,

+	      int		alu,

+	      Bool		opaque,

+	      

+	      int		x,

+	      int		y,

+	      int		width,

+	      int		height,

+

+	      FbStip		*src,

+	      FbStride		srcStride,

+	      int		srcX);

+

+extern _X_EXPORT void

+fbGetImage (DrawablePtr	    pDrawable,

+	    int		    x,

+	    int		    y,

+	    int		    w,

+	    int		    h,

+	    unsigned int    format,

+	    unsigned long   planeMask,

+	    char	    *d);

+/*

+ * fbline.c

+ */

+

+extern _X_EXPORT void

+fbZeroLine (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+	    int		mode,

+	    int		npt,

+	    DDXPointPtr	ppt);

+

+extern _X_EXPORT void

+fbZeroSegment (DrawablePtr  pDrawable,

+	       GCPtr	    pGC,

+	       int	    nseg,

+	       xSegment	    *pSegs);

+

+extern _X_EXPORT void

+fbPolyLine (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+	    int		mode,

+	    int		npt,

+	    DDXPointPtr	ppt);

+

+extern _X_EXPORT void

+fbFixCoordModePrevious (int npt,

+			DDXPointPtr ppt);

+

+extern _X_EXPORT void

+fbPolySegment (DrawablePtr  pDrawable,

+	       GCPtr	    pGC,

+	       int	    nseg,

+	       xSegment	    *pseg);

+

+#define fbPolyRectangle	miPolyRectangle

+

+/*

+ * fbpict.c

+ */

+

+extern _X_EXPORT Bool

+fbPictureInit (ScreenPtr pScreen,

+	       PictFormatPtr formats,

+	       int nformats);

+

+/*

+ * fbpixmap.c

+ */

+

+extern _X_EXPORT PixmapPtr

+fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,

+		   unsigned usage_hint);

+

+extern _X_EXPORT PixmapPtr

+fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,

+		unsigned usage_hint);

+

+extern _X_EXPORT Bool

+fbDestroyPixmap (PixmapPtr pPixmap);

+

+extern _X_EXPORT RegionPtr

+fbPixmapToRegion(PixmapPtr pPix);

+

+/*

+ * fbpoint.c

+ */

+

+extern _X_EXPORT void

+fbDots (FbBits	    *dstOrig,

+	FbStride    dstStride,

+	int	    dstBpp,

+	BoxPtr	    pBox,

+	xPoint	    *pts,

+	int	    npt,

+	int	    xorg,

+	int	    yorg,

+	int	    xoff,

+	int	    yoff,

+	FbBits	    andOrig,

+	FbBits	    xorOrig);

+

+extern _X_EXPORT void

+fbPolyPoint (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    mode,

+	     int	    npt,

+	     xPoint	    *pptInit);

+

+/*

+ * fbpush.c

+ */

+extern _X_EXPORT void

+fbPushPattern (DrawablePtr  pDrawable,

+	       GCPtr	    pGC,

+	       

+	       FbStip	    *src,

+	       FbStride	    srcStride,

+	       int	    srcX,

+

+	       int	    x,

+	       int	    y,

+

+	       int	    width,

+	       int	    height);

+

+extern _X_EXPORT void

+fbPushFill (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+

+	    FbStip	*src,

+	    FbStride	srcStride,

+	    int		srcX,

+	    

+	    int		x,

+	    int		y,

+	    int		width,

+	    int		height);

+

+extern _X_EXPORT void

+fbPushImage (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     

+	     FbStip	    *src,

+	     FbStride	    srcStride,

+	     int	    srcX,

+

+	     int	    x,

+	     int	    y,

+	     int	    width,

+	     int	    height);

+

+extern _X_EXPORT void

+fbPushPixels (GCPtr	    pGC,

+	      PixmapPtr	    pBitmap,

+	      DrawablePtr   pDrawable,

+	      int	    dx,

+	      int	    dy,

+	      int	    xOrg,

+	      int	    yOrg);

+

+

+/*

+ * fbscreen.c

+ */

+

+extern _X_EXPORT Bool

+fbCloseScreen (int indx, ScreenPtr pScreen);

+

+extern _X_EXPORT Bool

+fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);

+

+extern _X_EXPORT Bool

+fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);

+

+extern _X_EXPORT void

+fbQueryBestSize (int class, 

+		 unsigned short *width, unsigned short *height,

+		 ScreenPtr pScreen);

+

+extern _X_EXPORT PixmapPtr

+_fbGetWindowPixmap (WindowPtr pWindow);

+

+extern _X_EXPORT void

+_fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap);

+

+extern _X_EXPORT Bool

+fbSetupScreen(ScreenPtr	pScreen, 

+	      pointer	pbits,		/* pointer to screen bitmap */

+	      int	xsize, 		/* in pixels */

+	      int	ysize,

+	      int	dpix,		/* dots per inch */

+	      int	dpiy,

+	      int	width,		/* pixel width of frame buffer */

+	      int	bpp);		/* bits per pixel of frame buffer */

+

+extern _X_EXPORT Bool

+wfbFinishScreenInit(ScreenPtr	pScreen,

+		    pointer	pbits,

+		    int		xsize,

+		    int		ysize,

+		    int		dpix,

+		    int		dpiy,

+		    int		width,

+		    int		bpp,

+		    SetupWrapProcPtr setupWrap,

+		    FinishWrapProcPtr finishWrap);

+

+extern _X_EXPORT Bool

+wfbScreenInit(ScreenPtr	pScreen,

+	      pointer	pbits,

+	      int	xsize,

+	      int	ysize,

+	      int	dpix,

+	      int	dpiy,

+	      int	width,

+	      int	bpp,

+	      SetupWrapProcPtr setupWrap,

+	      FinishWrapProcPtr finishWrap);

+

+extern _X_EXPORT Bool

+fbFinishScreenInit(ScreenPtr	pScreen,

+		   pointer	pbits,

+		   int		xsize,

+		   int		ysize,

+		   int		dpix,

+		   int		dpiy,

+		   int		width,

+		   int		bpp);

+

+extern _X_EXPORT Bool

+fbScreenInit(ScreenPtr	pScreen,

+	     pointer	pbits,

+	     int	xsize,

+	     int	ysize,

+	     int	dpix,

+	     int	dpiy,

+	     int	width,

+	     int	bpp);

+    

+/*

+ * fbseg.c

+ */

+typedef void	FbBres (DrawablePtr	pDrawable,

+			GCPtr		pGC,

+			int		dashOffset,

+			int		signdx,

+			int		signdy,

+			int		axis,

+			int		x,

+			int		y,

+			int		e,

+			int		e1,

+			int		e3,

+			int		len);

+

+extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash;

+/*

+ * fbsetsp.c

+ */

+

+extern _X_EXPORT void

+fbSetSpans (DrawablePtr	    pDrawable,

+	    GCPtr	    pGC,

+	    char	    *src,

+	    DDXPointPtr	    ppt,

+	    int		    *pwidth,

+	    int		    nspans,

+	    int		    fSorted);

+

+extern _X_EXPORT FbBres *

+fbSelectBres (DrawablePtr   pDrawable,

+	      GCPtr	    pGC);

+

+extern _X_EXPORT void

+fbBres (DrawablePtr	pDrawable,

+	GCPtr		pGC,

+	int		dashOffset,

+	int		signdx,

+	int		signdy,

+	int		axis,

+	int		x,

+	int		y,

+	int		e,

+	int		e1,

+	int		e3,

+	int		len);

+

+extern _X_EXPORT void

+fbSegment (DrawablePtr	pDrawable,

+	   GCPtr	pGC,

+	   int		xa,

+	   int		ya,

+	   int		xb,

+	   int		yb,

+	   Bool		drawLast,

+	   int		*dashOffset);

+

+

+/*

+ * fbsolid.c

+ */

+

+extern _X_EXPORT void

+fbSolid (FbBits	    *dst,

+	 FbStride   dstStride,

+	 int	    dstX,

+	 int	    bpp,

+

+	 int	    width,

+	 int	    height,

+

+	 FbBits	    and,

+	 FbBits	    xor);

+

+#ifdef FB_24BIT

+extern _X_EXPORT void

+fbSolid24 (FbBits   *dst,

+	   FbStride dstStride,

+	   int	    dstX,

+

+	   int	    width,

+	   int	    height,

+

+	   FbBits   and,

+	   FbBits   xor);

+#endif

+

+/*

+ * fbstipple.c

+ */

+

+extern _X_EXPORT void

+fbTransparentSpan (FbBits   *dst,

+		   FbBits   stip,

+		   FbBits   fgxor,

+		   int	    n);

+

+extern _X_EXPORT void

+fbEvenStipple (FbBits   *dst,

+	       FbStride dstStride,

+	       int	dstX,

+	       int	dstBpp,

+

+	       int	width,

+	       int	height,

+

+	       FbStip   *stip,

+	       FbStride	stipStride,

+	       int	stipHeight,

+

+	       FbBits   fgand,

+	       FbBits   fgxor,

+	       FbBits   bgand,

+	       FbBits   bgxor,

+

+	       int	xRot,

+	       int	yRot);

+

+extern _X_EXPORT void

+fbOddStipple (FbBits	*dst,

+	      FbStride	dstStride,

+	      int	dstX,

+	      int	dstBpp,

+

+	      int	width,

+	      int	height,

+

+	      FbStip	*stip,

+	      FbStride	stipStride,

+	      int	stipWidth,

+	      int	stipHeight,

+

+	      FbBits	fgand,

+	      FbBits	fgxor,

+	      FbBits	bgand,

+	      FbBits	bgxor,

+

+	      int	xRot,

+	      int	yRot);

+

+extern _X_EXPORT void

+fbStipple (FbBits   *dst,

+	   FbStride dstStride,

+	   int	    dstX,

+	   int	    dstBpp,

+

+	   int	    width,

+	   int	    height,

+

+	   FbStip   *stip,

+	   FbStride stipStride,

+	   int	    stipWidth,

+	   int	    stipHeight,

+	   Bool	    even,

+

+	   FbBits   fgand,

+	   FbBits   fgxor,

+	   FbBits   bgand,

+	   FbBits   bgxor,

+

+	   int	    xRot,

+	   int	    yRot);

+

+/*

+ * fbtile.c

+ */

+

+extern _X_EXPORT void

+fbEvenTile (FbBits	*dst,

+	    FbStride	dstStride,

+	    int		dstX,

+

+	    int		width,

+	    int		height,

+

+	    FbBits	*tile,

+	    FbStride	tileStride,

+	    int		tileHeight,

+

+	    int		alu,

+	    FbBits	pm,

+	    int		xRot,

+	    int		yRot);

+

+extern _X_EXPORT void

+fbOddTile (FbBits	*dst,

+	   FbStride	dstStride,

+	   int		dstX,

+

+	   int		width,

+	   int		height,

+

+	   FbBits	*tile,

+	   FbStride	tileStride,

+	   int		tileWidth,

+	   int		tileHeight,

+

+	   int		alu,

+	   FbBits	pm,

+	   int		bpp,

+	   

+	   int		xRot,

+	   int		yRot);

+

+extern _X_EXPORT void

+fbTile (FbBits	    *dst,

+	FbStride    dstStride,

+	int	    dstX,

+

+	int	    width,

+	int	    height,

+

+	FbBits	    *tile,

+	FbStride    tileStride,

+	int	    tileWidth,

+	int	    tileHeight,

+	

+	int	    alu,

+	FbBits	    pm,

+	int	    bpp,

+	

+	int	    xRot,

+	int	    yRot);

+

+/*

+ * fbutil.c

+ */

+extern _X_EXPORT FbBits

+fbReplicatePixel (Pixel p, int bpp);

+

+extern _X_EXPORT void

+fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp);

+

+#ifdef FB_ACCESS_WRAPPER

+extern _X_EXPORT ReadMemoryProcPtr wfbReadMemory;

+extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory;

+#endif

+

+/*

+ * fbwindow.c

+ */

+

+extern _X_EXPORT Bool

+fbCreateWindow(WindowPtr pWin);

+

+extern _X_EXPORT Bool

+fbDestroyWindow(WindowPtr pWin);

+

+extern _X_EXPORT Bool

+fbMapWindow(WindowPtr pWindow);

+

+extern _X_EXPORT Bool

+fbPositionWindow(WindowPtr pWin, int x, int y);

+

+extern _X_EXPORT Bool

+fbUnmapWindow(WindowPtr pWindow);

+    

+extern _X_EXPORT void

+fbCopyWindowProc (DrawablePtr	pSrcDrawable,

+		  DrawablePtr	pDstDrawable,

+		  GCPtr		pGC,

+		  BoxPtr	pbox,

+		  int		nbox,

+		  int		dx,

+		  int		dy,

+		  Bool		reverse,

+		  Bool		upsidedown,

+		  Pixel		bitplane,

+		  void		*closure);

+

+extern _X_EXPORT void

+fbCopyWindow(WindowPtr	    pWin, 

+	     DDXPointRec    ptOldOrg, 

+	     RegionPtr	    prgnSrc);

+

+extern _X_EXPORT Bool

+fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask);

+

+extern _X_EXPORT void

+fbFillRegionSolid (DrawablePtr	pDrawable,

+		   RegionPtr	pRegion,

+		   FbBits	and,

+		   FbBits	xor);

+

+extern _X_EXPORT pixman_image_t *

+image_from_pict (PicturePtr	pict,

+		 Bool		has_clip,

+		 int		*xoff,

+		 int		*yoff);

+

+extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);

+

+#endif /* _FB_H_ */

+

diff --git a/xorg-server/fb/fb24_32.c b/xorg-server/fb/fb24_32.c
index 1ebd598a8..748a0ec04 100644
--- a/xorg-server/fb/fb24_32.c
+++ b/xorg-server/fb/fb24_32.c
@@ -1,635 +1,635 @@
-/*
- * Copyright © 2000 SuSE, 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 SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- * 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.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <string.h>
-
-#include "fb.h"
-
-/* X apps don't like 24bpp images, this code exposes 32bpp images */
-
-/*
- * These two functions do a full CopyArea while reformatting
- * the data between 24 and 32bpp.  They try to go a bit faster
- * by reading/writing aligned CARD32s where it's easy
- */
-
-#define Get8(a)	((CARD32) READ(a))
-
-#if BITMAP_BIT_ORDER == MSBFirst
-#define Get24(a)    ((Get8(a) << 16) | (Get8((a)+1) << 8) | Get8((a)+2))
-#define Put24(a,p)  ((WRITE((a+0), (CARD8) ((p) >> 16))), \
-		     (WRITE((a+1), (CARD8) ((p) >> 8))), \
-		     (WRITE((a+2), (CARD8) (p))))
-#else
-#define Get24(a)    (Get8(a) | (Get8((a)+1) << 8) | (Get8((a)+2)<<16))
-#define Put24(a,p)  ((WRITE((a+0), (CARD8) (p))), \
-		     (WRITE((a+1), (CARD8) ((p) >> 8))), \
-		     (WRITE((a+2), (CARD8) ((p) >> 16))))
-#endif
-
-typedef void (*fb24_32BltFunc) (CARD8	    *srcLine,
-				FbStride    srcStride,
-				int	    srcX,
-
-				CARD8	    *dstLine,
-				FbStride    dstStride,
-				int	    dstX,
-
-				int	    width, 
-				int	    height,
-
-				int	    alu,
-				FbBits	    pm);
-
-static void
-fb24_32BltDown (CARD8	    *srcLine,
-		FbStride    srcStride,
-		int	    srcX,
-
-		CARD8	    *dstLine,
-		FbStride    dstStride,
-		int	    dstX,
-
-		int	    width, 
-		int	    height,
-
-		int	    alu,
-		FbBits	    pm)
-{
-    CARD32  *src;
-    CARD8   *dst;
-    int	    w;
-    Bool    destInvarient;
-    CARD32  pixel, dpixel;
-    FbDeclareMergeRop ();
-    
-    srcLine += srcX * 4;
-    dstLine += dstX * 3;
-
-    FbInitializeMergeRop(alu, (pm | ~(FbBits) 0xffffff));
-    destInvarient = FbDestInvarientMergeRop();
-
-    while (height--)
-    {
-	src = (CARD32 *) srcLine;
-	dst = dstLine;
-	srcLine += srcStride;
-	dstLine += dstStride;
-	w = width;
-	if (destInvarient)
-	{
-	    while (((long) dst & 3) && w)
-	    {
-		w--;
-		pixel = READ(src++);
-		pixel = FbDoDestInvarientMergeRop(pixel);
-		Put24 (dst, pixel);
-		dst += 3;
-	    }
-	    /* Do four aligned pixels at a time */
-	    while (w >= 4)
-	    {
-		CARD32  s0, s1;
-		s0 = READ(src++);
-		s0 = FbDoDestInvarientMergeRop(s0);
-		s1 = READ(src++);
-		s1 = FbDoDestInvarientMergeRop(s1);
-#if BITMAP_BIT_ORDER == LSBFirst
-		WRITE((CARD32 *)dst, (s0 & 0xffffff) | (s1 << 24));
-#else
-		WRITE((CARD32 *)dst, (s0 << 8) | ((s1 & 0xffffff) >> 16));
-#endif
-		s0 = READ(src++);
-		s0 = FbDoDestInvarientMergeRop(s0);
-#if BITMAP_BIT_ORDER == LSBFirst
-		WRITE((CARD32 *)(dst+4), ((s1 & 0xffffff) >> 8) | (s0 << 16));
-#else
-		WRITE((CARD32 *)(dst+4), (s1 << 16) | ((s0 & 0xffffff) >> 8));
-#endif
-		s1 = READ(src++);
-		s1 = FbDoDestInvarientMergeRop(s1);
-#if BITMAP_BIT_ORDER == LSBFirst
-		WRITE((CARD32 *)(dst+8), ((s0 & 0xffffff) >> 16) | (s1 << 8));
-#else
-		WRITE((CARD32 *)(dst+8), (s0 << 24) | (s1 & 0xffffff));
-#endif
-		dst += 12;
-		w -= 4;
-	    }
-	    while (w--)
-	    {
-		pixel = READ(src++);
-		pixel = FbDoDestInvarientMergeRop(pixel);
-		Put24 (dst, pixel);
-		dst += 3;
-	    }
-	}
-	else
-	{
-	    while (w--)
-	    {
-		pixel = READ(src++);
-		dpixel = Get24 (dst);
-		pixel = FbDoMergeRop(pixel, dpixel);
-		Put24 (dst, pixel);
-		dst += 3;
-	    }
-	}
-    }
-}
-
-static void
-fb24_32BltUp (CARD8	    *srcLine,
-	      FbStride	    srcStride,
-	      int	    srcX,
-
-	      CARD8	    *dstLine,
-	      FbStride	    dstStride,
-	      int	    dstX,
-
-	      int	    width, 
-	      int	    height,
-
-	      int	    alu,
-	      FbBits	    pm)
-{
-    CARD8   *src;
-    CARD32  *dst;
-    int	    w;
-    Bool    destInvarient;
-    CARD32  pixel;
-    FbDeclareMergeRop ();
-    
-    FbInitializeMergeRop(alu, (pm | (~(FbBits) 0xffffff)));
-    destInvarient = FbDestInvarientMergeRop();
-
-    srcLine += srcX * 3;
-    dstLine += dstX * 4;
-
-    while (height--)
-    {
-	w = width;
-	src = srcLine;
-	dst = (CARD32 *) dstLine;
-	srcLine += srcStride;
-	dstLine += dstStride;
-	if (destInvarient)
-	{
-	    while (((long) src & 3) && w)
-	    {
-		w--;
-		pixel = Get24(src);
-		src += 3;
-		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
-	    }
-	    /* Do four aligned pixels at a time */
-	    while (w >= 4)
-	    {
-		CARD32  s0, s1;
-
-		s0 = READ((CARD32 *)src);
-#if BITMAP_BIT_ORDER == LSBFirst
-		pixel = s0 & 0xffffff;
-#else
-		pixel = s0 >> 8;
-#endif
-		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
-		s1 = READ((CARD32 *)(src+4));
-#if BITMAP_BIT_ORDER == LSBFirst
-		pixel = (s0 >> 24) | ((s1 << 8) & 0xffffff);
-#else
-		pixel = ((s0 << 16) & 0xffffff) | (s1 >> 16);
-#endif
-		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
-		s0 = READ((CARD32 *)(src+8));
-#if BITMAP_BIT_ORDER == LSBFirst
-		pixel = (s1 >> 16) | ((s0 << 16) & 0xffffff);
-#else
-		pixel = ((s1 << 8) & 0xffffff) | (s0 >> 24);
-#endif
-		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
-#if BITMAP_BIT_ORDER == LSBFirst
-		pixel = s0 >> 8;
-#else
-		pixel = s0 & 0xffffff;
-#endif
-		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
-		src += 12;
-		w -= 4;
-	    }
-	    while (w)
-	    {
-		w--;
-		pixel = Get24(src);
-		src += 3;
-		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));
-	    }
-	}
-	else
-	{
-	    while (w--)
-	    {
-		pixel = Get24(src);
-		src += 3;
-		WRITE(dst, FbDoMergeRop(pixel, READ(dst)));
-		dst++;
-	    }
-	}
-    }
-}
-
-/*
- * Spans functions; probably unused.
- */
-void
-fb24_32GetSpans(DrawablePtr	pDrawable, 
-		int		wMax, 
-		DDXPointPtr	ppt, 
-		int		*pwidth, 
-		int		nspans, 
-		char		*pchardstStart)
-{
-    FbBits	    *srcBits;
-    CARD8	    *src;
-    FbStride	    srcStride;
-    int		    srcBpp;
-    int		    srcXoff, srcYoff;
-    CARD8	    *dst;
-    
-    fbGetDrawable (pDrawable, srcBits, srcStride, srcBpp, srcXoff, srcYoff);
-    src = (CARD8 *) srcBits;
-    srcStride *= sizeof (FbBits);
-    
-    while (nspans--)
-    {
-	dst = (CARD8 *) pchardstStart;
-	fb24_32BltUp (src + (ppt->y + srcYoff) * srcStride, srcStride,
-		      ppt->x + srcXoff,
-	       
-		      dst,
-		      1,
-		      0,
-
-		      *pwidth,
-		      1,
-
-		      GXcopy,
-		      FB_ALLONES);
-	
-	pchardstStart += PixmapBytePad(*pwidth, pDrawable->depth);
-	ppt++;
-	pwidth++;
-    }
-
-    fbFinishAccess (pDrawable);
-}
-
-void
-fb24_32SetSpans (DrawablePtr	    pDrawable,
-		 GCPtr		    pGC,
-		 char		    *src,
-		 DDXPointPtr	    ppt,
-		 int		    *pwidth,
-		 int		    nspans,
-		 int		    fSorted)
-{
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    FbBits	    *dstBits;
-    CARD8	    *dst, *d, *s;
-    FbStride	    dstStride;
-    int		    dstBpp;
-    int		    dstXoff, dstYoff;
-    BoxPtr	    pbox;
-    int		    n;
-    int		    x1, x2;
-
-    fbGetDrawable (pDrawable, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
-    dst = (CARD8 *) dstBits;
-    dstStride *= sizeof (FbBits);
-    while (nspans--)
-    {
-	d = dst + (ppt->y + dstYoff) * dstStride;
-	s = (CARD8 *) src;
-	n = REGION_NUM_RECTS(pClip);
-	pbox = REGION_RECTS (pClip);
-	while (n--)
-	{
-	    if (pbox->y1 > ppt->y)
-		break;
-	    if (pbox->y2 > ppt->y)
-	    {
-		x1 = ppt->x;
-		x2 = x1 + *pwidth;
-		if (pbox->x1 > x1)
-		    x1 = pbox->x1;
-		if (pbox->x2 < x2)
-		    x2 = pbox->x2;
-		if (x1 < x2)
-		    fb24_32BltDown (s,
-				    0,
-				    (x1 - ppt->x),
-				    d,
-				    dstStride,
-				    x1 + dstXoff,
-
-				    (x2 - x1),
-				    1,
-				    pGC->alu,
-				    pPriv->pm);
-	    }
-	}
-	src += PixmapBytePad (*pwidth, pDrawable->depth);
-	ppt++;
-	pwidth++;
-    }
-
-    fbFinishAccess (pDrawable);
-}
-
-/*
- * Clip and put 32bpp Z-format images to a 24bpp drawable
- */
-void
-fb24_32PutZImage (DrawablePtr	pDrawable,
-		  RegionPtr	pClip,
-		  int		alu,
-		  FbBits	pm,
-		  int		x,
-		  int		y,
-		  int		width,
-		  int		height,
-		  CARD8		*src,
-		  FbStride	srcStride)
-{
-    FbBits	*dstBits;
-    CARD8	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    int		nbox;
-    BoxPtr	pbox;
-    int		x1, y1, x2, y2;
-
-    fbGetDrawable (pDrawable, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
-    dstStride *= sizeof(FbBits);
-    dst = (CARD8 *) dstBits;
-
-    for (nbox = REGION_NUM_RECTS (pClip),
-	 pbox = REGION_RECTS(pClip);
-	 nbox--;
-	 pbox++)
-    {
-	x1 = x;
-	y1 = y;
-	x2 = x + width;
-	y2 = y + height;
-	if (x1 < pbox->x1)
-	    x1 = pbox->x1;
-	if (y1 < pbox->y1)
-	    y1 = pbox->y1;
-	if (x2 > pbox->x2)
-	    x2 = pbox->x2;
-	if (y2 > pbox->y2)
-	    y2 = pbox->y2;
-	if (x1 >= x2 || y1 >= y2)
-	    continue;
-	fb24_32BltDown (src + (y1 - y) * srcStride,
-			srcStride,
-			(x1 - x),
-
-			dst + (y1 + dstYoff) * dstStride,
-			dstStride,
-			x1 + dstXoff,
-
-			(x2 - x1),
-			(y2 - y1),
-
-			alu,
-			pm);
-    }
-
-    fbFinishAccess (pDrawable);
-}
-
-void
-fb24_32GetImage (DrawablePtr     pDrawable,
-		 int             x,
-		 int             y,
-		 int             w,
-		 int             h,
-		 unsigned int    format,
-		 unsigned long   planeMask,
-		 char            *d)
-{
-    FbBits	    *srcBits;
-    CARD8	    *src;
-    FbStride	    srcStride;
-    int		    srcBpp;
-    int		    srcXoff, srcYoff;
-    FbStride	    dstStride;
-    FbBits	    pm;
-
-    fbGetDrawable (pDrawable, srcBits, srcStride, srcBpp, srcXoff, srcYoff);
-    src = (CARD8 *) srcBits;
-    srcStride *= sizeof (FbBits);
-
-    x += pDrawable->x;
-    y += pDrawable->y;
-    
-    pm = fbReplicatePixel (planeMask, 32);
-    dstStride = PixmapBytePad(w, pDrawable->depth);
-    if (pm != FB_ALLONES)
-	memset (d, 0, dstStride * h);
-    fb24_32BltUp (src + (y + srcYoff) * srcStride, srcStride, x + srcXoff,
-		  (CARD8 *) d, dstStride, 0,
-		  w, h, GXcopy, pm);
-
-    fbFinishAccess (pDrawable);
-}
-
-void
-fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
-		 DrawablePtr pDstDrawable,
-		 GCPtr       pGC,
-		 BoxPtr      pbox,
-		 int         nbox,
-		 int         dx,
-		 int         dy,
-		 Bool        reverse,
-		 Bool        upsidedown,
-		 Pixel       bitplane,
-		 void        *closure)
-{
-    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
-    FbBits	*srcBits;
-    CARD8	*src;
-    FbStride	srcStride;
-    int		srcBpp;
-    FbBits	*dstBits;
-    CARD8	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    fb24_32BltFunc  blt;
-    int		srcXoff, srcYoff;
-    int		dstXoff, dstYoff;
-    
-    fbGetDrawable (pSrcDrawable, srcBits, srcStride, srcBpp, srcXoff, srcYoff);
-    src = (CARD8 *) srcBits;
-    srcStride *= sizeof (FbBits);
-    fbGetDrawable (pDstDrawable, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
-    dst = (CARD8 *) dstBits;
-    dstStride *= sizeof (FbBits);
-    if (srcBpp == 24)
-	blt = fb24_32BltUp;
-    else
-	blt = fb24_32BltDown;
-    
-    while (nbox--)
-    {
-	(*blt) (src + (pbox->y1 + dy + srcYoff) * srcStride,
-		srcStride,
-		(pbox->x1 + dx + srcXoff),
-
-		dst + (pbox->y1 + dstYoff) * dstStride,
-		dstStride,
-		(pbox->x1 + dstXoff),
-
-		(pbox->x2 - pbox->x1),
-		(pbox->y2 - pbox->y1),
-
-		pGC->alu,
-		pPriv->pm);
-	pbox++;
-    }
-
-    fbFinishAccess (pSrcDrawable);
-    fbFinishAccess (pDstDrawable);
-}
-
-PixmapPtr
-fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
-{
-    ScreenPtr	pScreen = pOldTile->drawable.pScreen;
-    PixmapPtr	pNewTile;
-    FbBits	*old, *new;
-    FbStride	oldStride, newStride;
-    int		oldBpp, newBpp;
-    fb24_32BltFunc  blt;
-    int		oldXoff, oldYoff;
-    int		newXoff, newYoff;
-
-    pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,
-				     pOldTile->drawable.height,
-				     pOldTile->drawable.depth,
-				     pOldTile->usage_hint);
-    if (!pNewTile)
-	return 0;
-    fbGetDrawable (&pOldTile->drawable, 
-		   old, oldStride, oldBpp, oldXoff, oldYoff);
-    fbGetDrawable (&pNewTile->drawable, 
-		   new, newStride, newBpp, newXoff, newYoff);
-    if (oldBpp == 24)
-	blt = fb24_32BltUp;
-    else
-	blt = fb24_32BltDown;
-
-    (*blt) ((CARD8 *) old,
-	    oldStride * sizeof (FbBits),
-	    0,
-
-	    (CARD8 *) new,
-	    newStride * sizeof (FbBits),
-	    0,
-
-	    pOldTile->drawable.width,
-	    pOldTile->drawable.height,
-
-	    GXcopy,
-	    FB_ALLONES);
-
-    fbFinishAccess (&pOldTile->drawable);
-    fbFinishAccess (&pNewTile->drawable);
-
-    return pNewTile;
-}
-
-typedef struct {
-    pointer pbits; 
-    int width;   
-} miScreenInitParmsRec, *miScreenInitParmsPtr;
-
-Bool
-fb24_32CreateScreenResources(ScreenPtr pScreen)
-{
-    miScreenInitParmsPtr pScrInitParms;
-    int pitch;
-    Bool retval;
-
-    /* get the pitch before mi destroys it */
-    pScrInitParms = (miScreenInitParmsPtr)pScreen->devPrivate;
-    pitch = BitmapBytePad(pScrInitParms->width * 24);
-
-    if((retval = miCreateScreenResources(pScreen))) {
-	/* fix the screen pixmap */
-	PixmapPtr pPix = (PixmapPtr)pScreen->devPrivate;
-	pPix->drawable.bitsPerPixel = 24;
-	pPix->devKind = pitch;
-    }
-
-    return retval;
-}
-
-Bool
-fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
-			   int         width,
-			   int         height,
-			   int         depth,
-			   int         bitsPerPixel,
-			   int         devKind,
-			   pointer     pPixData)
-{
-    int	    bpp, w;
-
-    if (!pPixmap)
-	return FALSE;
-    bpp = bitsPerPixel;
-    if (bpp <= 0)
-	bpp = pPixmap->drawable.bitsPerPixel;
-    if (bpp == 24)
-    {
-	if (devKind < 0)
-	{
-	    w = width;
-	    if (w <= 0)
-		w = pPixmap->drawable.width;
-	    devKind = BitmapBytePad(w * 24);
-	}
-    }
-    return miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel,
-				devKind, pPixData);	
-}		
+/*

+ * Copyright © 2000 SuSE, 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 SuSE not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  SuSE makes no representations about the

+ * suitability of this software for any purpose.  It is provided "as is"

+ * without express or implied warranty.

+ *

+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

+ * 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.

+ *

+ * Author:  Keith Packard, SuSE, Inc.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <string.h>

+

+#include "fb.h"

+

+/* X apps don't like 24bpp images, this code exposes 32bpp images */

+

+/*

+ * These two functions do a full CopyArea while reformatting

+ * the data between 24 and 32bpp.  They try to go a bit faster

+ * by reading/writing aligned CARD32s where it's easy

+ */

+

+#define Get8(a)	((CARD32) READ(a))

+

+#if BITMAP_BIT_ORDER == MSBFirst

+#define Get24(a)    ((Get8(a) << 16) | (Get8((a)+1) << 8) | Get8((a)+2))

+#define Put24(a,p)  ((WRITE((a+0), (CARD8) ((p) >> 16))), \

+		     (WRITE((a+1), (CARD8) ((p) >> 8))), \

+		     (WRITE((a+2), (CARD8) (p))))

+#else

+#define Get24(a)    (Get8(a) | (Get8((a)+1) << 8) | (Get8((a)+2)<<16))

+#define Put24(a,p)  ((WRITE((a+0), (CARD8) (p))), \

+		     (WRITE((a+1), (CARD8) ((p) >> 8))), \

+		     (WRITE((a+2), (CARD8) ((p) >> 16))))

+#endif

+

+typedef void (*fb24_32BltFunc) (CARD8	    *srcLine,

+				FbStride    srcStride,

+				int	    srcX,

+

+				CARD8	    *dstLine,

+				FbStride    dstStride,

+				int	    dstX,

+

+				int	    width, 

+				int	    height,

+

+				int	    alu,

+				FbBits	    pm);

+

+static void

+fb24_32BltDown (CARD8	    *srcLine,

+		FbStride    srcStride,

+		int	    srcX,

+

+		CARD8	    *dstLine,

+		FbStride    dstStride,

+		int	    dstX,

+

+		int	    width, 

+		int	    height,

+

+		int	    alu,

+		FbBits	    pm)

+{

+    CARD32  *src;

+    CARD8   *dst;

+    int	    w;

+    Bool    destInvarient;

+    CARD32  pixel, dpixel;

+    FbDeclareMergeRop ();

+    

+    srcLine += srcX * 4;

+    dstLine += dstX * 3;

+

+    FbInitializeMergeRop(alu, (pm | ~(FbBits) 0xffffff));

+    destInvarient = FbDestInvarientMergeRop();

+

+    while (height--)

+    {

+	src = (CARD32 *) srcLine;

+	dst = dstLine;

+	srcLine += srcStride;

+	dstLine += dstStride;

+	w = width;

+	if (destInvarient)

+	{

+	    while (((long) dst & 3) && w)

+	    {

+		w--;

+		pixel = READ(src++);

+		pixel = FbDoDestInvarientMergeRop(pixel);

+		Put24 (dst, pixel);

+		dst += 3;

+	    }

+	    /* Do four aligned pixels at a time */

+	    while (w >= 4)

+	    {

+		CARD32  s0, s1;

+		s0 = READ(src++);

+		s0 = FbDoDestInvarientMergeRop(s0);

+		s1 = READ(src++);

+		s1 = FbDoDestInvarientMergeRop(s1);

+#if BITMAP_BIT_ORDER == LSBFirst

+		WRITE((CARD32 *)dst, (s0 & 0xffffff) | (s1 << 24));

+#else

+		WRITE((CARD32 *)dst, (s0 << 8) | ((s1 & 0xffffff) >> 16));

+#endif

+		s0 = READ(src++);

+		s0 = FbDoDestInvarientMergeRop(s0);

+#if BITMAP_BIT_ORDER == LSBFirst

+		WRITE((CARD32 *)(dst+4), ((s1 & 0xffffff) >> 8) | (s0 << 16));

+#else

+		WRITE((CARD32 *)(dst+4), (s1 << 16) | ((s0 & 0xffffff) >> 8));

+#endif

+		s1 = READ(src++);

+		s1 = FbDoDestInvarientMergeRop(s1);

+#if BITMAP_BIT_ORDER == LSBFirst

+		WRITE((CARD32 *)(dst+8), ((s0 & 0xffffff) >> 16) | (s1 << 8));

+#else

+		WRITE((CARD32 *)(dst+8), (s0 << 24) | (s1 & 0xffffff));

+#endif

+		dst += 12;

+		w -= 4;

+	    }

+	    while (w--)

+	    {

+		pixel = READ(src++);

+		pixel = FbDoDestInvarientMergeRop(pixel);

+		Put24 (dst, pixel);

+		dst += 3;

+	    }

+	}

+	else

+	{

+	    while (w--)

+	    {

+		pixel = READ(src++);

+		dpixel = Get24 (dst);

+		pixel = FbDoMergeRop(pixel, dpixel);

+		Put24 (dst, pixel);

+		dst += 3;

+	    }

+	}

+    }

+}

+

+static void

+fb24_32BltUp (CARD8	    *srcLine,

+	      FbStride	    srcStride,

+	      int	    srcX,

+

+	      CARD8	    *dstLine,

+	      FbStride	    dstStride,

+	      int	    dstX,

+

+	      int	    width, 

+	      int	    height,

+

+	      int	    alu,

+	      FbBits	    pm)

+{

+    CARD8   *src;

+    CARD32  *dst;

+    int	    w;

+    Bool    destInvarient;

+    CARD32  pixel;

+    FbDeclareMergeRop ();

+    

+    FbInitializeMergeRop(alu, (pm | (~(FbBits) 0xffffff)));

+    destInvarient = FbDestInvarientMergeRop();

+

+    srcLine += srcX * 3;

+    dstLine += dstX * 4;

+

+    while (height--)

+    {

+	w = width;

+	src = srcLine;

+	dst = (CARD32 *) dstLine;

+	srcLine += srcStride;

+	dstLine += dstStride;

+	if (destInvarient)

+	{

+	    while (((long) src & 3) && w)

+	    {

+		w--;

+		pixel = Get24(src);

+		src += 3;

+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));

+	    }

+	    /* Do four aligned pixels at a time */

+	    while (w >= 4)

+	    {

+		CARD32  s0, s1;

+

+		s0 = READ((CARD32 *)src);

+#if BITMAP_BIT_ORDER == LSBFirst

+		pixel = s0 & 0xffffff;

+#else

+		pixel = s0 >> 8;

+#endif

+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));

+		s1 = READ((CARD32 *)(src+4));

+#if BITMAP_BIT_ORDER == LSBFirst

+		pixel = (s0 >> 24) | ((s1 << 8) & 0xffffff);

+#else

+		pixel = ((s0 << 16) & 0xffffff) | (s1 >> 16);

+#endif

+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));

+		s0 = READ((CARD32 *)(src+8));

+#if BITMAP_BIT_ORDER == LSBFirst

+		pixel = (s1 >> 16) | ((s0 << 16) & 0xffffff);

+#else

+		pixel = ((s1 << 8) & 0xffffff) | (s0 >> 24);

+#endif

+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));

+#if BITMAP_BIT_ORDER == LSBFirst

+		pixel = s0 >> 8;

+#else

+		pixel = s0 & 0xffffff;

+#endif

+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));

+		src += 12;

+		w -= 4;

+	    }

+	    while (w)

+	    {

+		w--;

+		pixel = Get24(src);

+		src += 3;

+		WRITE(dst++, FbDoDestInvarientMergeRop(pixel));

+	    }

+	}

+	else

+	{

+	    while (w--)

+	    {

+		pixel = Get24(src);

+		src += 3;

+		WRITE(dst, FbDoMergeRop(pixel, READ(dst)));

+		dst++;

+	    }

+	}

+    }

+}

+

+/*

+ * Spans functions; probably unused.

+ */

+void

+fb24_32GetSpans(DrawablePtr	pDrawable, 

+		int		wMax, 

+		DDXPointPtr	ppt, 

+		int		*pwidth, 

+		int		nspans, 

+		char		*pchardstStart)

+{

+    FbBits	    *srcBits;

+    CARD8	    *src;

+    FbStride	    srcStride;

+    int		    srcBpp;

+    int		    srcXoff, srcYoff;

+    CARD8	    *dst;

+    

+    fbGetDrawable (pDrawable, srcBits, srcStride, srcBpp, srcXoff, srcYoff);

+    src = (CARD8 *) srcBits;

+    srcStride *= sizeof (FbBits);

+    

+    while (nspans--)

+    {

+	dst = (CARD8 *) pchardstStart;

+	fb24_32BltUp (src + (ppt->y + srcYoff) * srcStride, srcStride,

+		      ppt->x + srcXoff,

+	       

+		      dst,

+		      1,

+		      0,

+

+		      *pwidth,

+		      1,

+

+		      GXcopy,

+		      FB_ALLONES);

+	

+	pchardstStart += PixmapBytePad(*pwidth, pDrawable->depth);

+	ppt++;

+	pwidth++;

+    }

+

+    fbFinishAccess (pDrawable);

+}

+

+void

+fb24_32SetSpans (DrawablePtr	    pDrawable,

+		 GCPtr		    pGC,

+		 char		    *src,

+		 DDXPointPtr	    ppt,

+		 int		    *pwidth,

+		 int		    nspans,

+		 int		    fSorted)

+{

+    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);

+    RegionPtr	    pClip = fbGetCompositeClip(pGC);

+    FbBits	    *dstBits;

+    CARD8	    *dst, *d, *s;

+    FbStride	    dstStride;

+    int		    dstBpp;

+    int		    dstXoff, dstYoff;

+    BoxPtr	    pbox;

+    int		    n;

+    int		    x1, x2;

+

+    fbGetDrawable (pDrawable, dstBits, dstStride, dstBpp, dstXoff, dstYoff);

+    dst = (CARD8 *) dstBits;

+    dstStride *= sizeof (FbBits);

+    while (nspans--)

+    {

+	d = dst + (ppt->y + dstYoff) * dstStride;

+	s = (CARD8 *) src;

+	n = RegionNumRects(pClip);

+	pbox = RegionRects (pClip);

+	while (n--)

+	{

+	    if (pbox->y1 > ppt->y)

+		break;

+	    if (pbox->y2 > ppt->y)

+	    {

+		x1 = ppt->x;

+		x2 = x1 + *pwidth;

+		if (pbox->x1 > x1)

+		    x1 = pbox->x1;

+		if (pbox->x2 < x2)

+		    x2 = pbox->x2;

+		if (x1 < x2)

+		    fb24_32BltDown (s,

+				    0,

+				    (x1 - ppt->x),

+				    d,

+				    dstStride,

+				    x1 + dstXoff,

+

+				    (x2 - x1),

+				    1,

+				    pGC->alu,

+				    pPriv->pm);

+	    }

+	}

+	src += PixmapBytePad (*pwidth, pDrawable->depth);

+	ppt++;

+	pwidth++;

+    }

+

+    fbFinishAccess (pDrawable);

+}

+

+/*

+ * Clip and put 32bpp Z-format images to a 24bpp drawable

+ */

+void

+fb24_32PutZImage (DrawablePtr	pDrawable,

+		  RegionPtr	pClip,

+		  int		alu,

+		  FbBits	pm,

+		  int		x,

+		  int		y,

+		  int		width,

+		  int		height,

+		  CARD8		*src,

+		  FbStride	srcStride)

+{

+    FbBits	*dstBits;

+    CARD8	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    int		nbox;

+    BoxPtr	pbox;

+    int		x1, y1, x2, y2;

+

+    fbGetDrawable (pDrawable, dstBits, dstStride, dstBpp, dstXoff, dstYoff);

+    dstStride *= sizeof(FbBits);

+    dst = (CARD8 *) dstBits;

+

+    for (nbox = RegionNumRects (pClip),

+	 pbox = RegionRects(pClip);

+	 nbox--;

+	 pbox++)

+    {

+	x1 = x;

+	y1 = y;

+	x2 = x + width;

+	y2 = y + height;

+	if (x1 < pbox->x1)

+	    x1 = pbox->x1;

+	if (y1 < pbox->y1)

+	    y1 = pbox->y1;

+	if (x2 > pbox->x2)

+	    x2 = pbox->x2;

+	if (y2 > pbox->y2)

+	    y2 = pbox->y2;

+	if (x1 >= x2 || y1 >= y2)

+	    continue;

+	fb24_32BltDown (src + (y1 - y) * srcStride,

+			srcStride,

+			(x1 - x),

+

+			dst + (y1 + dstYoff) * dstStride,

+			dstStride,

+			x1 + dstXoff,

+

+			(x2 - x1),

+			(y2 - y1),

+

+			alu,

+			pm);

+    }

+

+    fbFinishAccess (pDrawable);

+}

+

+void

+fb24_32GetImage (DrawablePtr     pDrawable,

+		 int             x,

+		 int             y,

+		 int             w,

+		 int             h,

+		 unsigned int    format,

+		 unsigned long   planeMask,

+		 char            *d)

+{

+    FbBits	    *srcBits;

+    CARD8	    *src;

+    FbStride	    srcStride;

+    int		    srcBpp;

+    int		    srcXoff, srcYoff;

+    FbStride	    dstStride;

+    FbBits	    pm;

+

+    fbGetDrawable (pDrawable, srcBits, srcStride, srcBpp, srcXoff, srcYoff);

+    src = (CARD8 *) srcBits;

+    srcStride *= sizeof (FbBits);

+

+    x += pDrawable->x;

+    y += pDrawable->y;

+    

+    pm = fbReplicatePixel (planeMask, 32);

+    dstStride = PixmapBytePad(w, pDrawable->depth);

+    if (pm != FB_ALLONES)

+	memset (d, 0, dstStride * h);

+    fb24_32BltUp (src + (y + srcYoff) * srcStride, srcStride, x + srcXoff,

+		  (CARD8 *) d, dstStride, 0,

+		  w, h, GXcopy, pm);

+

+    fbFinishAccess (pDrawable);

+}

+

+void

+fb24_32CopyMtoN (DrawablePtr pSrcDrawable,

+		 DrawablePtr pDstDrawable,

+		 GCPtr       pGC,

+		 BoxPtr      pbox,

+		 int         nbox,

+		 int         dx,

+		 int         dy,

+		 Bool        reverse,

+		 Bool        upsidedown,

+		 Pixel       bitplane,

+		 void        *closure)

+{

+    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);

+    FbBits	*srcBits;

+    CARD8	*src;

+    FbStride	srcStride;

+    int		srcBpp;

+    FbBits	*dstBits;

+    CARD8	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    fb24_32BltFunc  blt;

+    int		srcXoff, srcYoff;

+    int		dstXoff, dstYoff;

+    

+    fbGetDrawable (pSrcDrawable, srcBits, srcStride, srcBpp, srcXoff, srcYoff);

+    src = (CARD8 *) srcBits;

+    srcStride *= sizeof (FbBits);

+    fbGetDrawable (pDstDrawable, dstBits, dstStride, dstBpp, dstXoff, dstYoff);

+    dst = (CARD8 *) dstBits;

+    dstStride *= sizeof (FbBits);

+    if (srcBpp == 24)

+	blt = fb24_32BltUp;

+    else

+	blt = fb24_32BltDown;

+    

+    while (nbox--)

+    {

+	(*blt) (src + (pbox->y1 + dy + srcYoff) * srcStride,

+		srcStride,

+		(pbox->x1 + dx + srcXoff),

+

+		dst + (pbox->y1 + dstYoff) * dstStride,

+		dstStride,

+		(pbox->x1 + dstXoff),

+

+		(pbox->x2 - pbox->x1),

+		(pbox->y2 - pbox->y1),

+

+		pGC->alu,

+		pPriv->pm);

+	pbox++;

+    }

+

+    fbFinishAccess (pSrcDrawable);

+    fbFinishAccess (pDstDrawable);

+}

+

+PixmapPtr

+fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)

+{

+    ScreenPtr	pScreen = pOldTile->drawable.pScreen;

+    PixmapPtr	pNewTile;

+    FbBits	*old, *new;

+    FbStride	oldStride, newStride;

+    int		oldBpp, newBpp;

+    fb24_32BltFunc  blt;

+    int		oldXoff, oldYoff;

+    int		newXoff, newYoff;

+

+    pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,

+				     pOldTile->drawable.height,

+				     pOldTile->drawable.depth,

+				     pOldTile->usage_hint);

+    if (!pNewTile)

+	return 0;

+    fbGetDrawable (&pOldTile->drawable, 

+		   old, oldStride, oldBpp, oldXoff, oldYoff);

+    fbGetDrawable (&pNewTile->drawable, 

+		   new, newStride, newBpp, newXoff, newYoff);

+    if (oldBpp == 24)

+	blt = fb24_32BltUp;

+    else

+	blt = fb24_32BltDown;

+

+    (*blt) ((CARD8 *) old,

+	    oldStride * sizeof (FbBits),

+	    0,

+

+	    (CARD8 *) new,

+	    newStride * sizeof (FbBits),

+	    0,

+

+	    pOldTile->drawable.width,

+	    pOldTile->drawable.height,

+

+	    GXcopy,

+	    FB_ALLONES);

+

+    fbFinishAccess (&pOldTile->drawable);

+    fbFinishAccess (&pNewTile->drawable);

+

+    return pNewTile;

+}

+

+typedef struct {

+    pointer pbits; 

+    int width;   

+} miScreenInitParmsRec, *miScreenInitParmsPtr;

+

+Bool

+fb24_32CreateScreenResources(ScreenPtr pScreen)

+{

+    miScreenInitParmsPtr pScrInitParms;

+    int pitch;

+    Bool retval;

+

+    /* get the pitch before mi destroys it */

+    pScrInitParms = (miScreenInitParmsPtr)pScreen->devPrivate;

+    pitch = BitmapBytePad(pScrInitParms->width * 24);

+

+    if((retval = miCreateScreenResources(pScreen))) {

+	/* fix the screen pixmap */

+	PixmapPtr pPix = (PixmapPtr)pScreen->devPrivate;

+	pPix->drawable.bitsPerPixel = 24;

+	pPix->devKind = pitch;

+    }

+

+    return retval;

+}

+

+Bool

+fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,

+			   int         width,

+			   int         height,

+			   int         depth,

+			   int         bitsPerPixel,

+			   int         devKind,

+			   pointer     pPixData)

+{

+    int	    bpp, w;

+

+    if (!pPixmap)

+	return FALSE;

+    bpp = bitsPerPixel;

+    if (bpp <= 0)

+	bpp = pPixmap->drawable.bitsPerPixel;

+    if (bpp == 24)

+    {

+	if (devKind < 0)

+	{

+	    w = width;

+	    if (w <= 0)

+		w = pPixmap->drawable.width;

+	    devKind = BitmapBytePad(w * 24);

+	}

+    }

+    return miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel,

+				devKind, pPixData);	

+}		

diff --git a/xorg-server/fb/fballpriv.c b/xorg-server/fb/fballpriv.c
index 6aee50bce..b4fcb1f4a 100644
--- a/xorg-server/fb/fballpriv.c
+++ b/xorg-server/fb/fballpriv.c
@@ -27,46 +27,34 @@
 #include "fb.h"

 

 #ifdef FB_SCREEN_PRIVATE

-static int fbScreenPrivateKeyIndex;

-static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex;

-DevPrivateKey fbGetScreenPrivateKey(void)

-{

-    return fbScreenPrivateKey;

-}

+static DevPrivateKeyRec fbScreenPrivateKeyRec;

+DevPrivateKey

+fbGetScreenPrivateKey(void) { return &fbScreenPrivateKeyRec; }

 #endif

 

-static int fbGCPrivateKeyIndex;

-static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex;

-DevPrivateKey fbGetGCPrivateKey(void)

-{

-    return fbGCPrivateKey;

-}

+static DevPrivateKeyRec fbGCPrivateKeyRec;

+DevPrivateKey

+fbGetGCPrivateKey (void) { return &fbGCPrivateKeyRec; }

 

-static int fbWinPrivateKeyIndex;

-static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex;

-DevPrivateKey fbGetWinPrivateKey(void)

-{

-    return fbWinPrivateKey;

-}

+static DevPrivateKeyRec fbWinPrivateKeyRec;

+DevPrivateKey

+fbGetWinPrivateKey (void) { return &fbWinPrivateKeyRec; }

 

 Bool

 fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)

 {

     if (pGCKey)

-	*pGCKey = fbGCPrivateKey;

+	*pGCKey = &fbGCPrivateKeyRec;

     

-    if (!dixRequestPrivate(fbGCPrivateKey, sizeof(FbGCPrivRec)))

+    if (!dixRegisterPrivateKey(&fbGCPrivateKeyRec, PRIVATE_GC, sizeof(FbGCPrivRec)))

 	return FALSE;

 #ifdef FB_SCREEN_PRIVATE

-    {

-	FbScreenPrivPtr	pScreenPriv;

-

-	pScreenPriv = (FbScreenPrivPtr) malloc(sizeof (FbScreenPrivRec));

-	if (!pScreenPriv)

-	    return FALSE;

-	dixSetPrivate(&pScreen->devPrivates, fbScreenPrivateKey, pScreenPriv);

-    }

+    if (!dixRegisterPrivateKey(&fbScreenPrivateKeyRec, PRIVATE_SCREEN, sizeof (FbScreenPrivRec)))

+	return FALSE;

 #endif

+    if (!dixRegisterPrivateKey(&fbWinPrivateKeyRec, PRIVATE_WINDOW, 0))

+	return FALSE;

+

     return TRUE;

 }

 

diff --git a/xorg-server/fb/fbarc.c b/xorg-server/fb/fbarc.c
index 3a8a2c56a..1da980255 100644
--- a/xorg-server/fb/fbarc.c
+++ b/xorg-server/fb/fbarc.c
@@ -1,149 +1,149 @@
-/*
- * Copyright © 1998 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 "fb.h"
-#include "mizerarc.h"
-#include <limits.h>
-
-typedef void	(*FbArc) (FbBits    *dst, 
-			  FbStride  dstStride, 
-			  int	    dstBpp, 
-			  xArc	    *arc, 
-			  int	    dx,
-			  int	    dy,
-			  FbBits    and, 
-			  FbBits    xor);
-
-void
-fbPolyArc (DrawablePtr	pDrawable,
-	   GCPtr	pGC,
-	   int		narcs,
-	   xArc		*parcs)
-{
-    FbArc	arc;
-    
-    if (pGC->lineWidth == 0)
-    {
-#ifndef FBNOPIXADDR
-	arc = 0;
-	if (pGC->lineStyle == LineSolid && pGC->fillStyle == FillSolid)
-	{
-	    switch (pDrawable->bitsPerPixel)
-	    {
-	    case 8:	arc = fbArc8; break;
-	    case 16:    arc = fbArc16; break;
-#ifdef FB_24BIT
-	    case 24:	arc = fbArc24; break;
-#endif
-	    case 32:    arc = fbArc32; break;
-	    }
-	}
-	if (arc)
-	{
-	    FbGCPrivPtr	pPriv = fbGetGCPrivate (pGC);
-	    FbBits	*dst;
-	    FbStride	dstStride;
-	    int		dstBpp;
-	    int		dstXoff, dstYoff;
-	    BoxRec	box;
-	    int		x2, y2;
-	    RegionPtr	cclip;
-	    int		wrapped = 0;
-	    
-	    cclip = fbGetCompositeClip (pGC);
-	    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-#ifdef FB_ACCESS_WRAPPER
-	    wrapped = 1;
-#else
-	    wrapped = 0;
-#endif
-	    while (narcs--)
-	    {
-		if (miCanZeroArc (parcs))
-		{
-		    box.x1 = parcs->x + pDrawable->x;
-		    box.y1 = parcs->y + pDrawable->y;
-		    /*
-		     * Because box.x2 and box.y2 get truncated to 16 bits, and the
-		     * RECT_IN_REGION test treats the resulting number as a signed
-		     * integer, the RECT_IN_REGION test alone can go the wrong way.
-		     * This can result in a server crash because the rendering
-		     * routines in this file deal directly with cpu addresses
-		     * of pixels to be stored, and do not clip or otherwise check
-		     * that all such addresses are within their respective pixmaps.
-		     * So we only allow the RECT_IN_REGION test to be used for
-		     * values that can be expressed correctly in a signed short.
-		     */
-		    x2 = box.x1 + (int)parcs->width + 1;
-		    box.x2 = x2;
-		    y2 = box.y1 + (int)parcs->height + 1;
-		    box.y2 = y2;
-		    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
-			(RECT_IN_REGION(pDrawable->pScreen, cclip, &box) == rgnIN) ) {
-#ifdef FB_ACCESS_WRAPPER
-			if (!wrapped) {
-			    fbPrepareAccess (pDrawable);
-			    wrapped = 1;
-			}
-#endif
-			(*arc) (dst, dstStride, dstBpp, 
-				parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff, 
-				pPriv->and, pPriv->xor);
-		    } else {
-#ifdef FB_ACCESS_WRAPPER
-		    	if (wrapped) {
-	    			fbFinishAccess (pDrawable);
-				wrapped = 0;
-			}
-#endif
-			miZeroPolyArc(pDrawable, pGC, 1, parcs);
-		    }
-		}
-		else {
-#ifdef FB_ACCESS_WRAPPER
-		    if (wrapped) {
-	    		fbFinishAccess (pDrawable);
-			wrapped = 0;
-		    }
-#endif
-		    miPolyArc(pDrawable, pGC, 1, parcs);
-		}
-		parcs++;
-	    }
-#ifdef FB_ACCESS_WRAPPER
-	    if (wrapped) {
-		fbFinishAccess (pDrawable);
-		wrapped = 0;
-	    }
-#endif
-	}
-	else
-#endif
-	    miZeroPolyArc (pDrawable, pGC, narcs, parcs);
-    }
-    else
-	miPolyArc (pDrawable, pGC, narcs, parcs);
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+#include "mizerarc.h"

+#include <limits.h>

+

+typedef void	(*FbArc) (FbBits    *dst, 

+			  FbStride  dstStride, 

+			  int	    dstBpp, 

+			  xArc	    *arc, 

+			  int	    dx,

+			  int	    dy,

+			  FbBits    and, 

+			  FbBits    xor);

+

+void

+fbPolyArc (DrawablePtr	pDrawable,

+	   GCPtr	pGC,

+	   int		narcs,

+	   xArc		*parcs)

+{

+    FbArc	arc;

+    

+    if (pGC->lineWidth == 0)

+    {

+#ifndef FBNOPIXADDR

+	arc = 0;

+	if (pGC->lineStyle == LineSolid && pGC->fillStyle == FillSolid)

+	{

+	    switch (pDrawable->bitsPerPixel)

+	    {

+	    case 8:	arc = fbArc8; break;

+	    case 16:    arc = fbArc16; break;

+#ifdef FB_24BIT

+	    case 24:	arc = fbArc24; break;

+#endif

+	    case 32:    arc = fbArc32; break;

+	    }

+	}

+	if (arc)

+	{

+	    FbGCPrivPtr	pPriv = fbGetGCPrivate (pGC);

+	    FbBits	*dst;

+	    FbStride	dstStride;

+	    int		dstBpp;

+	    int		dstXoff, dstYoff;

+	    BoxRec	box;

+	    int		x2, y2;

+	    RegionPtr	cclip;

+	    int		wrapped = 0;

+	    

+	    cclip = fbGetCompositeClip (pGC);

+	    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+#ifdef FB_ACCESS_WRAPPER

+	    wrapped = 1;

+#else

+	    wrapped = 0;

+#endif

+	    while (narcs--)

+	    {

+		if (miCanZeroArc (parcs))

+		{

+		    box.x1 = parcs->x + pDrawable->x;

+		    box.y1 = parcs->y + pDrawable->y;

+		    /*

+		     * Because box.x2 and box.y2 get truncated to 16 bits, and the

+		     * RECT_IN_REGION test treats the resulting number as a signed

+		     * integer, the RECT_IN_REGION test alone can go the wrong way.

+		     * This can result in a server crash because the rendering

+		     * routines in this file deal directly with cpu addresses

+		     * of pixels to be stored, and do not clip or otherwise check

+		     * that all such addresses are within their respective pixmaps.

+		     * So we only allow the RECT_IN_REGION test to be used for

+		     * values that can be expressed correctly in a signed short.

+		     */

+		    x2 = box.x1 + (int)parcs->width + 1;

+		    box.x2 = x2;

+		    y2 = box.y1 + (int)parcs->height + 1;

+		    box.y2 = y2;

+		    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&

+			(RegionContainsRect(cclip, &box) == rgnIN) ) {

+#ifdef FB_ACCESS_WRAPPER

+			if (!wrapped) {

+			    fbPrepareAccess (pDrawable);

+			    wrapped = 1;

+			}

+#endif

+			(*arc) (dst, dstStride, dstBpp, 

+				parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff, 

+				pPriv->and, pPriv->xor);

+		    } else {

+#ifdef FB_ACCESS_WRAPPER

+		    	if (wrapped) {

+	    			fbFinishAccess (pDrawable);

+				wrapped = 0;

+			}

+#endif

+			miZeroPolyArc(pDrawable, pGC, 1, parcs);

+		    }

+		}

+		else {

+#ifdef FB_ACCESS_WRAPPER

+		    if (wrapped) {

+	    		fbFinishAccess (pDrawable);

+			wrapped = 0;

+		    }

+#endif

+		    miPolyArc(pDrawable, pGC, 1, parcs);

+		}

+		parcs++;

+	    }

+#ifdef FB_ACCESS_WRAPPER

+	    if (wrapped) {

+		fbFinishAccess (pDrawable);

+		wrapped = 0;

+	    }

+#endif

+	}

+	else

+#endif

+	    miZeroPolyArc (pDrawable, pGC, narcs, parcs);

+    }

+    else

+	miPolyArc (pDrawable, pGC, narcs, parcs);

+}

diff --git a/xorg-server/fb/fbbits.h b/xorg-server/fb/fbbits.h
index 44991f106..77e792fd7 100644
--- a/xorg-server/fb/fbbits.h
+++ b/xorg-server/fb/fbbits.h
@@ -1,971 +1,971 @@
-/*
- * Copyright © 1998 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.
- */
-
-/*
- * This file defines functions for drawing some primitives using
- * underlying datatypes instead of masks
- */
-
-#define isClipped(c,ul,lr)  ((((c) - (ul)) | ((lr) - (c))) & 0x80008000)
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifdef BITSMUL
-#define MUL BITSMUL
-#else
-#define MUL 1
-#endif
-
-#ifdef BITSSTORE
-#define STORE(b,x)  BITSSTORE(b,x)
-#else
-#define STORE(b,x)  WRITE((b), (x))
-#endif
-
-#ifdef BITSRROP
-#define RROP(b,a,x)	BITSRROP(b,a,x)
-#else
-#define RROP(b,a,x)	WRITE((b), FbDoRRop (READ(b), (a), (x)))
-#endif
-
-#ifdef BITSUNIT
-#define UNIT BITSUNIT
-#define USE_SOLID
-#else
-#define UNIT BITS
-#endif
-
-/*
- * Define the following before including this file:
- *
- *  BRESSOLID	name of function for drawing a solid segment
- *  BRESDASH	name of function for drawing a dashed segment
- *  DOTS	name of function for drawing dots
- *  ARC		name of function for drawing a solid arc
- *  BITS	type of underlying unit
- */
-
-#ifdef BRESSOLID
-void
-BRESSOLID (DrawablePtr	pDrawable,
-	   GCPtr	pGC,
-	   int		dashOffset,
-	   int		signdx,
-	   int		signdy,
-	   int		axis,
-	   int		x1,
-	   int		y1,
-	   int		e,
-	   int		e1,
-	   int		e3,
-	   int		len)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    FbGCPrivPtr	pPriv = fbGetGCPrivate (pGC);
-    UNIT	*bits;
-    FbStride	bitsStride;
-    FbStride	majorStep, minorStep;
-    BITS	xor = (BITS) pPriv->xor;
-    
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    bits = ((UNIT *) (dst + ((y1 + dstYoff) * dstStride))) + (x1 + dstXoff) * MUL;
-    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));
-    if (signdy < 0)
-	bitsStride = -bitsStride;
-    if (axis == X_AXIS)
-    {
-	majorStep = signdx * MUL;
-	minorStep = bitsStride;
-    }
-    else
-    {
-	majorStep = bitsStride;
-	minorStep = signdx * MUL;
-    }
-    while (len--)
-    {
-	STORE(bits,xor);
-	bits += majorStep;
-	e += e1;
-	if (e >= 0)
-	{
-	    bits += minorStep;
-	    e += e3;
-	}
-    }
-
-    fbFinishAccess (pDrawable);
-}
-#endif
-
-#ifdef BRESDASH
-void
-BRESDASH (DrawablePtr	pDrawable,
-	  GCPtr		pGC,
-	  int		dashOffset,
-	  int		signdx,
-	  int		signdy,
-	  int		axis,
-	  int		x1,
-	  int		y1,
-	  int		e,
-	  int		e1,
-	  int		e3,
-	  int		len)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    FbGCPrivPtr	pPriv = fbGetGCPrivate (pGC);
-    UNIT	*bits;
-    FbStride	bitsStride;
-    FbStride	majorStep, minorStep;
-    BITS	xorfg, xorbg;
-    FbDashDeclare;
-    int		dashlen;
-    Bool	even;
-    Bool	doOdd;
-    
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    doOdd = pGC->lineStyle == LineDoubleDash;
-    xorfg = (BITS) pPriv->xor;
-    xorbg = (BITS) pPriv->bgxor;
-    
-    FbDashInit (pGC, pPriv, dashOffset, dashlen, even);
-    
-    bits = ((UNIT *) (dst + ((y1 + dstYoff) * dstStride))) + (x1 + dstXoff) * MUL;
-    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));
-    if (signdy < 0)
-	bitsStride = -bitsStride;
-    if (axis == X_AXIS)
-    {
-	majorStep = signdx * MUL;
-	minorStep = bitsStride;
-    }
-    else
-    {
-	majorStep = bitsStride;
-	minorStep = signdx * MUL;
-    }
-    if (dashlen >= len)
-	dashlen = len;
-    if (doOdd)
-    {
-	if (!even)
-	    goto doubleOdd;
-	for (;;)
-	{
-	    len -= dashlen;
-	    while (dashlen--)
-	    {
-		STORE(bits,xorfg);
-		bits += majorStep;
-		if ((e += e1) >= 0)
-		{
-		    e += e3;
-		    bits += minorStep;
-		}
-	    }
-	    if (!len)
-		break;
-	    
-	    FbDashNextEven(dashlen);
-	    
-	    if (dashlen >= len)
-		dashlen = len;
-doubleOdd:
-	    len -= dashlen;
-	    while (dashlen--)
-	    {
-		STORE(bits,xorbg);
-		bits += majorStep;
-		if ((e += e1) >= 0)
-		{
-		    e += e3;
-		    bits += minorStep;
-		}
-	    }
-	    if (!len)
-		break;
-	    
-	    FbDashNextOdd(dashlen);
-	    
-	    if (dashlen >= len)
-		dashlen = len;
-	}
-    }
-    else
-    {
-	if (!even)
-	    goto onOffOdd;
-	for (;;)
-	{
-	    len -= dashlen;
-	    while (dashlen--)
-	    {
-		STORE(bits,xorfg);
-		bits += majorStep;
-		if ((e += e1) >= 0)
-		{
-		    e += e3;
-		    bits += minorStep;
-		}
-	    }
-	    if (!len)
-		break;
-
-	    FbDashNextEven (dashlen);
-	    
-	    if (dashlen >= len)
-		dashlen = len;
-onOffOdd:
-	    len -= dashlen;
-	    while (dashlen--)
-	    {
-		bits += majorStep;
-		if ((e += e1) >= 0)
-		{
-		    e += e3;
-		    bits += minorStep;
-		}
-	    }
-	    if (!len)
-		break;
-	    
-	    FbDashNextOdd (dashlen);
-	    
-	    if (dashlen >= len)
-		dashlen = len;
-	}
-    }
-
-    fbFinishAccess (pDrawable);
-}
-#endif
-
-#ifdef DOTS
-void
-DOTS (FbBits	    *dst,
-      FbStride	    dstStride,
-      int	    dstBpp,
-      BoxPtr	    pBox,
-      xPoint	    *ptsOrig,
-      int	    npt,
-      int	    xorg,
-      int	    yorg,
-      int	    xoff,
-      int	    yoff,
-      FbBits	    and,
-      FbBits	    xor)
-{
-    INT32    	*pts = (INT32 *) ptsOrig;
-    UNIT	*bits = (UNIT *) dst;
-    UNIT	*point;
-    BITS	bxor = (BITS) xor;
-    BITS	band = (BITS) and;
-    FbStride	bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));
-    INT32    	ul, lr;
-    INT32    	pt;
-
-    ul = coordToInt(pBox->x1 - xorg,     pBox->y1 - yorg);
-    lr = coordToInt(pBox->x2 - xorg - 1, pBox->y2 - yorg - 1);
-
-    bits += bitsStride * (yorg + yoff) + (xorg + xoff) * MUL;
-    
-    if (and == 0)
-    {
-	while (npt--)
-	{
-	    pt = *pts++;
-	    if (!isClipped(pt,ul,lr))
-	    {
-		point = bits + intToY(pt) * bitsStride + intToX(pt) * MUL;
-		STORE(point,bxor);
-	    }
-	}
-    }
-    else
-    {
-	while (npt--)
-	{
-	    pt = *pts++;
-	    if (!isClipped(pt,ul,lr))
-	    {
-		point = bits + intToY(pt) * bitsStride + intToX(pt) * MUL;
-		RROP(point,band,bxor);
-	    }
-	}
-    }
-}
-#endif
-
-#ifdef ARC
-
-#define ARCCOPY(d)  STORE(d,xorBits)
-#define ARCRROP(d)  RROP(d,andBits,xorBits)
-
-void
-ARC (FbBits	*dst,
-     FbStride	dstStride,
-     int	dstBpp,
-     xArc	*arc,
-     int	drawX,
-     int	drawY,
-     FbBits	and,
-     FbBits	xor)
-{
-    UNIT	    *bits;
-    FbStride	    bitsStride;
-    miZeroArcRec    info;
-    Bool	    do360;
-    int		    x;
-    UNIT	    *yorgp, *yorgop;
-    BITS	    andBits, xorBits;
-    int		    yoffset, dyoffset;
-    int		    y, a, b, d, mask;
-    int		    k1, k3, dx, dy;
-    
-    bits = (UNIT *) dst;
-    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));
-    andBits = (BITS) and;
-    xorBits = (BITS) xor;
-    do360 = miZeroArcSetup(arc, &info, TRUE);
-    yorgp = bits + ((info.yorg + drawY) * bitsStride);
-    yorgop = bits + ((info.yorgo + drawY) * bitsStride);
-    info.xorg = (info.xorg + drawX) * MUL;
-    info.xorgo = (info.xorgo + drawX) * MUL;
-    MIARCSETUP();
-    yoffset = y ? bitsStride : 0;
-    dyoffset = 0;
-    mask = info.initialMask;
-    
-    if (!(arc->width & 1))
-    {
-	if (andBits == 0)
-	{
-	    if (mask & 2)
-		ARCCOPY(yorgp + info.xorgo);
-	    if (mask & 8)
-		ARCCOPY(yorgop + info.xorgo);
-	}
-	else
-	{
-	    if (mask & 2)
-		ARCRROP(yorgp + info.xorgo);
-	    if (mask & 8)
-		ARCRROP(yorgop + info.xorgo);
-	}
-    }
-    if (!info.end.x || !info.end.y)
-    {
-	mask = info.end.mask;
-	info.end = info.altend;
-    }
-    if (do360 && (arc->width == arc->height) && !(arc->width & 1))
-    {
-	int xoffset = bitsStride;
-	UNIT *yorghb = yorgp + (info.h * bitsStride) + info.xorg;
-	UNIT *yorgohb = yorghb - info.h * MUL;
-
-	yorgp += info.xorg;
-	yorgop += info.xorg;
-	yorghb += info.h * MUL;
-	while (1)
-	{
-	    if (andBits == 0)
-	    {
-		ARCCOPY(yorgp + yoffset + x * MUL);
-		ARCCOPY(yorgp + yoffset - x * MUL);
-		ARCCOPY(yorgop - yoffset - x * MUL);
-		ARCCOPY(yorgop - yoffset + x * MUL);
-	    }
-	    else
-	    {
-		ARCRROP(yorgp + yoffset + x * MUL);
-		ARCRROP(yorgp + yoffset - x * MUL);
-		ARCRROP(yorgop - yoffset - x * MUL);
-		ARCRROP(yorgop - yoffset + x * MUL);
-	    }
-	    if (a < 0)
-		break;
-	    if (andBits == 0)
-	    {
-		ARCCOPY(yorghb - xoffset - y * MUL);
-		ARCCOPY(yorgohb - xoffset + y * MUL);
-		ARCCOPY(yorgohb + xoffset + y * MUL);
-		ARCCOPY(yorghb + xoffset - y * MUL);
-	    }
-	    else
-	    {
-		ARCRROP(yorghb - xoffset - y * MUL);
-		ARCRROP(yorgohb - xoffset + y * MUL);
-		ARCRROP(yorgohb + xoffset + y * MUL);
-		ARCRROP(yorghb + xoffset - y * MUL);
-	    }
-	    xoffset += bitsStride;
-	    MIARCCIRCLESTEP(yoffset += bitsStride;);
-	}
-	yorgp -= info.xorg;
-	yorgop -= info.xorg;
-	x = info.w;
-	yoffset = info.h * bitsStride;
-    }
-    else if (do360)
-    {
-	while (y < info.h || x < info.w)
-	{
-	    MIARCOCTANTSHIFT(dyoffset = bitsStride;);
-	    if (andBits == 0)
-	    {
-		ARCCOPY(yorgp + yoffset + info.xorg + x * MUL);
-		ARCCOPY(yorgp + yoffset + info.xorgo - x * MUL);
-		ARCCOPY(yorgop - yoffset + info.xorgo - x * MUL);
-		ARCCOPY(yorgop - yoffset + info.xorg + x * MUL);
-	    }
-	    else
-	    {
-		ARCRROP(yorgp + yoffset + info.xorg + x * MUL);
-		ARCRROP(yorgp + yoffset + info.xorgo - x * MUL);
-		ARCRROP(yorgop - yoffset + info.xorgo - x * MUL);
-		ARCRROP(yorgop - yoffset + info.xorg + x * MUL);
-	    }
-	    MIARCSTEP(yoffset += dyoffset;, yoffset += bitsStride;);
-	}
-    }
-    else
-    {
-	while (y < info.h || x < info.w)
-	{
-	    MIARCOCTANTSHIFT(dyoffset = bitsStride;);
-	    if ((x == info.start.x) || (y == info.start.y))
-	    {
-		mask = info.start.mask;
-		info.start = info.altstart;
-	    }
-	    if (andBits == 0)
-	    {
-		if (mask & 1)
-		    ARCCOPY(yorgp + yoffset + info.xorg + x * MUL);
-		if (mask & 2)
-		    ARCCOPY(yorgp + yoffset + info.xorgo - x * MUL);
-		if (mask & 4)
-		    ARCCOPY(yorgop - yoffset + info.xorgo - x * MUL);
-		if (mask & 8)
-		    ARCCOPY(yorgop - yoffset + info.xorg + x * MUL);
-	    }
-	    else
-	    {
-		if (mask & 1)
-		    ARCRROP(yorgp + yoffset + info.xorg + x * MUL);
-		if (mask & 2)
-		    ARCRROP(yorgp + yoffset + info.xorgo - x * MUL);
-		if (mask & 4)
-		    ARCRROP(yorgop - yoffset + info.xorgo - x * MUL);
-		if (mask & 8)
-		    ARCRROP(yorgop - yoffset + info.xorg + x * MUL);
-	    }
-	    if ((x == info.end.x) || (y == info.end.y))
-	    {
-		mask = info.end.mask;
-		info.end = info.altend;
-	    }
-	    MIARCSTEP(yoffset += dyoffset;, yoffset += bitsStride;);
-	}
-    }
-    if ((x == info.start.x) || (y == info.start.y))
-	mask = info.start.mask;
-    if (andBits == 0)
-    {
-	if (mask & 1)
-	    ARCCOPY(yorgp + yoffset + info.xorg + x * MUL);
-	if (mask & 4)
-	    ARCCOPY(yorgop - yoffset + info.xorgo - x * MUL);
-	if (arc->height & 1)
-	{
-	    if (mask & 2)
-		ARCCOPY(yorgp + yoffset + info.xorgo - x * MUL);
-	    if (mask & 8)
-		ARCCOPY(yorgop - yoffset + info.xorg + x * MUL);
-	}
-    }
-    else
-    {
-	if (mask & 1)
-	    ARCRROP(yorgp + yoffset + info.xorg + x * MUL);
-	if (mask & 4)
-	    ARCRROP(yorgop - yoffset + info.xorgo - x * MUL);
-	if (arc->height & 1)
-	{
-	    if (mask & 2)
-		ARCRROP(yorgp + yoffset + info.xorgo - x * MUL);
-	    if (mask & 8)
-		ARCRROP(yorgop - yoffset + info.xorg + x * MUL);
-	}
-    }
-}
-#undef ARCCOPY
-#undef ARCRROP
-#endif
-
-#ifdef GLYPH
-#if BITMAP_BIT_ORDER == LSBFirst
-# define WRITE_ADDR1(n)	    (n)
-# define WRITE_ADDR2(n)	    (n)
-# define WRITE_ADDR4(n)	    (n)
-#else
-# define WRITE_ADDR1(n)	    ((n) ^ 3)
-# define WRITE_ADDR2(n)	    ((n) ^ 2)
-# define WRITE_ADDR4(n)	    ((n))
-#endif
-
-#define WRITE1(d,n,fg)	    WRITE(d + WRITE_ADDR1(n), (BITS) (fg))
-
-#ifdef BITS2
-# define WRITE2(d,n,fg)	    WRITE((BITS2 *) &((d)[WRITE_ADDR2(n)]), (BITS2) (fg))
-#else
-# define WRITE2(d,n,fg)	    (WRITE1(d,n,fg), WRITE1(d,(n)+1,fg))
-#endif
-
-#ifdef BITS4
-# define WRITE4(d,n,fg)	    WRITE((BITS4 *) &((d)[WRITE_ADDR4(n)]), (BITS4) (fg))
-#else
-# define WRITE4(d,n,fg)	    (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg))
-#endif
-
-void
-GLYPH (FbBits	*dstBits,
-   FbStride	dstStride,
-   int	dstBpp,
-   FbStip	*stipple,
-   FbBits	fg,
-   int	x,
-   int	height)
-{
-    int	    lshift;
-    FbStip  bits;
-    BITS    *dstLine;
-    BITS    *dst;
-    int	    n;
-    int	    shift;
-
-    dstLine = (BITS *) dstBits;
-    dstLine += x & ~3;
-    dstStride *= (sizeof (FbBits) / sizeof (BITS));
-    shift = x & 3;
-    lshift = 4 - shift;
-    while (height--)
-    {
-	bits = *stipple++;
-	dst = (BITS *) dstLine;
-	n = lshift;
-	while (bits)
-	{
-	    switch (FbStipMoveLsb (FbLeftStipBits (bits, n), 4, n)) {
-	    case 0:
-		break;
-	    case 1:
-		WRITE1(dst,0,fg);
-		break;
-	    case 2:
-		WRITE1(dst,1,fg);
-		break;
-	    case 3:
-		WRITE2(dst,0,fg);
-		break;
-	    case 4:
-		WRITE1(dst,2,fg);
-		break;
-	    case 5:
-		WRITE1(dst,0,fg);
-		WRITE1(dst,2,fg);
-		break;
-	    case 6:
-		WRITE1(dst,1,fg);
-		WRITE1(dst,2,fg);
-		break;
-	    case 7:
-		WRITE2(dst,0,fg);
-		WRITE1(dst,2,fg);
-		break;
-	    case 8:
-		WRITE1(dst,3,fg);
-		break;
-	    case 9:
-		WRITE1(dst,0,fg);
-		WRITE1(dst,3,fg);
-		break;
-	    case 10:
-		WRITE1(dst,1,fg);
-		WRITE1(dst,3,fg);
-		break;
-	    case 11:
-		WRITE2(dst,0,fg);
-		WRITE1(dst,3,fg);
-		break;
-	    case 12:
-		WRITE2(dst,2,fg);
-		break;
-	    case 13:
-		WRITE1(dst,0,fg);
-		WRITE2(dst,2,fg);
-		break;
-	    case 14:
-		WRITE1(dst,1,fg);
-		WRITE2(dst,2,fg);
-		break;
-	    case 15:
-		WRITE4(dst,0,fg);
-		break;
-	    }
-	    bits = FbStipLeft (bits, n);
-	    n = 4;
-	    dst += 4;
-	}
-	dstLine += dstStride;
-    }
-}
-#undef WRITE_ADDR1
-#undef WRITE_ADDR2
-#undef WRITE_ADDR4
-#undef WRITE1
-#undef WRITE2
-#undef WRITE4
-
-#endif
-
-#ifdef POLYLINE
-void
-POLYLINE (DrawablePtr	pDrawable,
-	  GCPtr		pGC,
-	  int		mode,
-	  int		npt,
-	  DDXPointPtr	ptsOrig)
-{
-    INT32	    *pts = (INT32 *) ptsOrig;
-    int		    xoff = pDrawable->x;
-    int		    yoff = pDrawable->y;
-    unsigned int    bias = miGetZeroLineBias(pDrawable->pScreen);
-    BoxPtr	    pBox = REGION_EXTENTS (pDrawable->pScreen, fbGetCompositeClip (pGC));
-    
-    FbBits	    *dst;
-    int		    dstStride;
-    int		    dstBpp;
-    int		    dstXoff, dstYoff;
-    
-    UNIT	    *bits, *bitsBase;
-    FbStride	    bitsStride;
-    BITS	    xor = fbGetGCPrivate(pGC)->xor;
-    BITS	    and = fbGetGCPrivate(pGC)->and;
-    int		    dashoffset = 0;
-    
-    INT32	    ul, lr;
-    INT32	    pt1, pt2;
-
-    int		    e, e1, e3, len;
-    int		    stepmajor, stepminor;
-    int		    octant;
-
-    if (mode == CoordModePrevious)
-	fbFixCoordModePrevious (npt, ptsOrig);
-    
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));
-    bitsBase = ((UNIT *) dst) + (yoff + dstYoff) * bitsStride + (xoff + dstXoff) * MUL;
-    ul = coordToInt(pBox->x1 - xoff,     pBox->y1 - yoff);
-    lr = coordToInt(pBox->x2 - xoff - 1, pBox->y2 - yoff - 1);
-
-    pt1 = *pts++;
-    npt--;
-    pt2 = *pts++;
-    npt--;
-    for (;;)
-    {
-	if (isClipped (pt1, ul, lr) | isClipped (pt2, ul, lr))
-	{
-	    fbSegment (pDrawable, pGC, 
-		       intToX(pt1) + xoff, intToY(pt1) + yoff,
-		       intToX(pt2) + xoff, intToY(pt2) + yoff,
-		       npt == 0 && pGC->capStyle != CapNotLast,
-		       &dashoffset);
-	    if (!npt) {
-		fbFinishAccess (pDrawable);
-		return;
-	    }
-	    pt1 = pt2;
-	    pt2 = *pts++;
-	    npt--;
-	}
-	else
-	{
-	    bits = bitsBase + intToY(pt1) * bitsStride + intToX(pt1) * MUL;
-	    for (;;)
-	    {
-		CalcLineDeltas (intToX(pt1), intToY(pt1),
-				intToX(pt2), intToY(pt2),
-				len, e1, stepmajor, stepminor, 1, bitsStride,
-				octant);
-		stepmajor *= MUL;
-		if (len < e1)
-		{
-		    e3 = len;
-		    len = e1;
-		    e1 = e3;
-
-		    e3 = stepminor;
-		    stepminor = stepmajor;
-		    stepmajor = e3;
-		    SetYMajorOctant(octant);
-		}
-		e = -len;
-		e1 <<= 1;
-		e3 = e << 1;
-		FIXUP_ERROR (e, octant, bias);
-		if (and == 0)
-		{
-		    while (len--)
-		    {
-			STORE(bits,xor);
-			bits += stepmajor;
-			e += e1;
-			if (e >= 0)
-			{
-			    bits += stepminor;
-			    e += e3;
-			}
-		    }
-		}
-		else
-		{
-		    while (len--)
-		    {
-			RROP(bits,and,xor);
-			bits += stepmajor;
-			e += e1;
-			if (e >= 0)
-			{
-			    bits += stepminor;
-			    e += e3;
-			}
-		    }
-		}
-		if (!npt)
-		{
-		    if (pGC->capStyle != CapNotLast && 
-			pt2 != *((INT32 *) ptsOrig))
-		    {
-			RROP(bits,and,xor);
-		    }
-		    fbFinishAccess (pDrawable);
-		    return;
-		}
-		pt1 = pt2;
-		pt2 = *pts++;
-		--npt;
-		if (isClipped (pt2, ul, lr))
-		    break;
-    	    }
-	}
-    }
-
-    fbFinishAccess (pDrawable);
-}
-#endif
-
-#ifdef POLYSEGMENT
-void
-POLYSEGMENT (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    nseg,
-	     xSegment	    *pseg)
-{
-    INT32	    *pts = (INT32 *) pseg;
-    int		    xoff = pDrawable->x;
-    int		    yoff = pDrawable->y;
-    unsigned int    bias = miGetZeroLineBias(pDrawable->pScreen);
-    BoxPtr	    pBox = REGION_EXTENTS (pDrawable->pScreen, fbGetCompositeClip (pGC));
-    
-    FbBits	    *dst;
-    int		    dstStride;
-    int		    dstBpp;
-    int		    dstXoff, dstYoff;
-    
-    UNIT	    *bits, *bitsBase;
-    FbStride	    bitsStride;
-    FbBits	    xorBits = fbGetGCPrivate(pGC)->xor;
-    FbBits	    andBits = fbGetGCPrivate(pGC)->and;
-    BITS	    xor = xorBits;
-    BITS	    and = andBits;
-    int		    dashoffset = 0;
-    
-    INT32	    ul, lr;
-    INT32	    pt1, pt2;
-
-    int		    e, e1, e3, len;
-    int		    stepmajor, stepminor;
-    int		    octant;
-    Bool	    capNotLast;
-
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));
-    bitsBase = ((UNIT *) dst) + (yoff + dstYoff) * bitsStride + (xoff + dstXoff) * MUL;
-    ul = coordToInt(pBox->x1 - xoff,     pBox->y1 - yoff);
-    lr = coordToInt(pBox->x2 - xoff - 1, pBox->y2 - yoff - 1);
-
-    capNotLast = pGC->capStyle == CapNotLast;
-    
-    while (nseg--)
-    {
-	pt1 = *pts++;
-	pt2 = *pts++;
-	if (isClipped (pt1, ul, lr) | isClipped (pt2, ul, lr))
-	{
-	    fbSegment (pDrawable, pGC, 
-		       intToX(pt1) + xoff, intToY(pt1) + yoff,
-		       intToX(pt2) + xoff, intToY(pt2) + yoff,
-		       !capNotLast, &dashoffset);
-	}
-	else
-	{
-	    CalcLineDeltas (intToX(pt1), intToY(pt1),
-			    intToX(pt2), intToY(pt2),
-			    len, e1, stepmajor, stepminor, 1, bitsStride,
-			    octant);
-	    if (e1 == 0 && len > 3
-#if MUL != 1
-		&& FbCheck24Pix(and) && FbCheck24Pix(xor)
-#endif
-		)
-	    {
-		int	x1, x2;
-		FbBits	*dstLine;
-		int	dstX, width;
-		FbBits	startmask, endmask;
-		int	nmiddle;
-		
-		if (stepmajor < 0)
-		{
-		    x1 = intToX(pt2);
-		    x2 = intToX(pt1) + 1;
-		    if (capNotLast)
-			x1++;
-		}
-		else
-		{
-		    x1 = intToX(pt1);
-		    x2 = intToX(pt2);
-		    if (!capNotLast)
-			x2++;
-		}
-		dstX = (x1 + xoff + dstXoff) * (sizeof (UNIT) * 8 * MUL);
-		width = (x2 - x1) * (sizeof (UNIT) * 8 * MUL);
-		
-		dstLine = dst + (intToY(pt1) + yoff + dstYoff) * dstStride;
-		dstLine += dstX >> FB_SHIFT;
-		dstX &= FB_MASK;
-		FbMaskBits (dstX, width, startmask, nmiddle, endmask);
-		if (startmask)
-		{
-		    WRITE(dstLine, FbDoMaskRRop (READ(dstLine), andBits, xorBits, startmask));
-		    dstLine++;
-		}
-		if (!andBits)
-		    while (nmiddle--)
-			WRITE(dstLine++, xorBits);
-		else
-		    while (nmiddle--)
-		    {
-			WRITE(dstLine, FbDoRRop (READ(dstLine), andBits, xorBits));
-			dstLine++;
-		    }
-		if (endmask)
-		    WRITE(dstLine, FbDoMaskRRop (READ(dstLine), andBits, xorBits, endmask));
-	    }
-	    else
-	    {
-		stepmajor *= MUL;
-		bits = bitsBase + intToY(pt1) * bitsStride + intToX(pt1) * MUL;
-		if (len < e1)
-		{
-		    e3 = len;
-		    len = e1;
-		    e1 = e3;
-    
-		    e3 = stepminor;
-		    stepminor = stepmajor;
-		    stepmajor = e3;
-		    SetYMajorOctant(octant);
-		}
-		e = -len;
-		e1 <<= 1;
-		e3 = e << 1;
-		FIXUP_ERROR (e, octant, bias);
-		if (!capNotLast)
-		    len++;
-		if (and == 0)
-		{
-		    while (len--)
-		    {
-			STORE(bits,xor);
-			bits += stepmajor;
-			e += e1;
-			if (e >= 0)
-			{
-			    bits += stepminor;
-			    e += e3;
-			}
-		    }
-		}
-		else
-		{
-		    while (len--)
-		    {
-			RROP(bits,and,xor);
-			bits += stepmajor;
-			e += e1;
-			if (e >= 0)
-			{
-			    bits += stepminor;
-			    e += e3;
-			}
-		    }
-		}
-	    }
-	}
-    }
-
-    fbFinishAccess (pDrawable);
-}
-#endif
-
-#undef MUL
-#undef STORE
-#undef RROP
-#undef UNIT
-#undef USE_SOLID
-
-#undef isClipped
+/*

+ * Copyright © 1998 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.

+ */

+

+/*

+ * This file defines functions for drawing some primitives using

+ * underlying datatypes instead of masks

+ */

+

+#define isClipped(c,ul,lr)  ((((c) - (ul)) | ((lr) - (c))) & 0x80008000)

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifdef BITSMUL

+#define MUL BITSMUL

+#else

+#define MUL 1

+#endif

+

+#ifdef BITSSTORE

+#define STORE(b,x)  BITSSTORE(b,x)

+#else

+#define STORE(b,x)  WRITE((b), (x))

+#endif

+

+#ifdef BITSRROP

+#define RROP(b,a,x)	BITSRROP(b,a,x)

+#else

+#define RROP(b,a,x)	WRITE((b), FbDoRRop (READ(b), (a), (x)))

+#endif

+

+#ifdef BITSUNIT

+#define UNIT BITSUNIT

+#define USE_SOLID

+#else

+#define UNIT BITS

+#endif

+

+/*

+ * Define the following before including this file:

+ *

+ *  BRESSOLID	name of function for drawing a solid segment

+ *  BRESDASH	name of function for drawing a dashed segment

+ *  DOTS	name of function for drawing dots

+ *  ARC		name of function for drawing a solid arc

+ *  BITS	type of underlying unit

+ */

+

+#ifdef BRESSOLID

+void

+BRESSOLID (DrawablePtr	pDrawable,

+	   GCPtr	pGC,

+	   int		dashOffset,

+	   int		signdx,

+	   int		signdy,

+	   int		axis,

+	   int		x1,

+	   int		y1,

+	   int		e,

+	   int		e1,

+	   int		e3,

+	   int		len)

+{

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    FbGCPrivPtr	pPriv = fbGetGCPrivate (pGC);

+    UNIT	*bits;

+    FbStride	bitsStride;

+    FbStride	majorStep, minorStep;

+    BITS	xor = (BITS) pPriv->xor;

+    

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    bits = ((UNIT *) (dst + ((y1 + dstYoff) * dstStride))) + (x1 + dstXoff) * MUL;

+    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));

+    if (signdy < 0)

+	bitsStride = -bitsStride;

+    if (axis == X_AXIS)

+    {

+	majorStep = signdx * MUL;

+	minorStep = bitsStride;

+    }

+    else

+    {

+	majorStep = bitsStride;

+	minorStep = signdx * MUL;

+    }

+    while (len--)

+    {

+	STORE(bits,xor);

+	bits += majorStep;

+	e += e1;

+	if (e >= 0)

+	{

+	    bits += minorStep;

+	    e += e3;

+	}

+    }

+

+    fbFinishAccess (pDrawable);

+}

+#endif

+

+#ifdef BRESDASH

+void

+BRESDASH (DrawablePtr	pDrawable,

+	  GCPtr		pGC,

+	  int		dashOffset,

+	  int		signdx,

+	  int		signdy,

+	  int		axis,

+	  int		x1,

+	  int		y1,

+	  int		e,

+	  int		e1,

+	  int		e3,

+	  int		len)

+{

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    FbGCPrivPtr	pPriv = fbGetGCPrivate (pGC);

+    UNIT	*bits;

+    FbStride	bitsStride;

+    FbStride	majorStep, minorStep;

+    BITS	xorfg, xorbg;

+    FbDashDeclare;

+    int		dashlen;

+    Bool	even;

+    Bool	doOdd;

+    

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    doOdd = pGC->lineStyle == LineDoubleDash;

+    xorfg = (BITS) pPriv->xor;

+    xorbg = (BITS) pPriv->bgxor;

+    

+    FbDashInit (pGC, pPriv, dashOffset, dashlen, even);

+    

+    bits = ((UNIT *) (dst + ((y1 + dstYoff) * dstStride))) + (x1 + dstXoff) * MUL;

+    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));

+    if (signdy < 0)

+	bitsStride = -bitsStride;

+    if (axis == X_AXIS)

+    {

+	majorStep = signdx * MUL;

+	minorStep = bitsStride;

+    }

+    else

+    {

+	majorStep = bitsStride;

+	minorStep = signdx * MUL;

+    }

+    if (dashlen >= len)

+	dashlen = len;

+    if (doOdd)

+    {

+	if (!even)

+	    goto doubleOdd;

+	for (;;)

+	{

+	    len -= dashlen;

+	    while (dashlen--)

+	    {

+		STORE(bits,xorfg);

+		bits += majorStep;

+		if ((e += e1) >= 0)

+		{

+		    e += e3;

+		    bits += minorStep;

+		}

+	    }

+	    if (!len)

+		break;

+	    

+	    FbDashNextEven(dashlen);

+	    

+	    if (dashlen >= len)

+		dashlen = len;

+doubleOdd:

+	    len -= dashlen;

+	    while (dashlen--)

+	    {

+		STORE(bits,xorbg);

+		bits += majorStep;

+		if ((e += e1) >= 0)

+		{

+		    e += e3;

+		    bits += minorStep;

+		}

+	    }

+	    if (!len)

+		break;

+	    

+	    FbDashNextOdd(dashlen);

+	    

+	    if (dashlen >= len)

+		dashlen = len;

+	}

+    }

+    else

+    {

+	if (!even)

+	    goto onOffOdd;

+	for (;;)

+	{

+	    len -= dashlen;

+	    while (dashlen--)

+	    {

+		STORE(bits,xorfg);

+		bits += majorStep;

+		if ((e += e1) >= 0)

+		{

+		    e += e3;

+		    bits += minorStep;

+		}

+	    }

+	    if (!len)

+		break;

+

+	    FbDashNextEven (dashlen);

+	    

+	    if (dashlen >= len)

+		dashlen = len;

+onOffOdd:

+	    len -= dashlen;

+	    while (dashlen--)

+	    {

+		bits += majorStep;

+		if ((e += e1) >= 0)

+		{

+		    e += e3;

+		    bits += minorStep;

+		}

+	    }

+	    if (!len)

+		break;

+	    

+	    FbDashNextOdd (dashlen);

+	    

+	    if (dashlen >= len)

+		dashlen = len;

+	}

+    }

+

+    fbFinishAccess (pDrawable);

+}

+#endif

+

+#ifdef DOTS

+void

+DOTS (FbBits	    *dst,

+      FbStride	    dstStride,

+      int	    dstBpp,

+      BoxPtr	    pBox,

+      xPoint	    *ptsOrig,

+      int	    npt,

+      int	    xorg,

+      int	    yorg,

+      int	    xoff,

+      int	    yoff,

+      FbBits	    and,

+      FbBits	    xor)

+{

+    INT32    	*pts = (INT32 *) ptsOrig;

+    UNIT	*bits = (UNIT *) dst;

+    UNIT	*point;

+    BITS	bxor = (BITS) xor;

+    BITS	band = (BITS) and;

+    FbStride	bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));

+    INT32    	ul, lr;

+    INT32    	pt;

+

+    ul = coordToInt(pBox->x1 - xorg,     pBox->y1 - yorg);

+    lr = coordToInt(pBox->x2 - xorg - 1, pBox->y2 - yorg - 1);

+

+    bits += bitsStride * (yorg + yoff) + (xorg + xoff) * MUL;

+    

+    if (and == 0)

+    {

+	while (npt--)

+	{

+	    pt = *pts++;

+	    if (!isClipped(pt,ul,lr))

+	    {

+		point = bits + intToY(pt) * bitsStride + intToX(pt) * MUL;

+		STORE(point,bxor);

+	    }

+	}

+    }

+    else

+    {

+	while (npt--)

+	{

+	    pt = *pts++;

+	    if (!isClipped(pt,ul,lr))

+	    {

+		point = bits + intToY(pt) * bitsStride + intToX(pt) * MUL;

+		RROP(point,band,bxor);

+	    }

+	}

+    }

+}

+#endif

+

+#ifdef ARC

+

+#define ARCCOPY(d)  STORE(d,xorBits)

+#define ARCRROP(d)  RROP(d,andBits,xorBits)

+

+void

+ARC (FbBits	*dst,

+     FbStride	dstStride,

+     int	dstBpp,

+     xArc	*arc,

+     int	drawX,

+     int	drawY,

+     FbBits	and,

+     FbBits	xor)

+{

+    UNIT	    *bits;

+    FbStride	    bitsStride;

+    miZeroArcRec    info;

+    Bool	    do360;

+    int		    x;

+    UNIT	    *yorgp, *yorgop;

+    BITS	    andBits, xorBits;

+    int		    yoffset, dyoffset;

+    int		    y, a, b, d, mask;

+    int		    k1, k3, dx, dy;

+    

+    bits = (UNIT *) dst;

+    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));

+    andBits = (BITS) and;

+    xorBits = (BITS) xor;

+    do360 = miZeroArcSetup(arc, &info, TRUE);

+    yorgp = bits + ((info.yorg + drawY) * bitsStride);

+    yorgop = bits + ((info.yorgo + drawY) * bitsStride);

+    info.xorg = (info.xorg + drawX) * MUL;

+    info.xorgo = (info.xorgo + drawX) * MUL;

+    MIARCSETUP();

+    yoffset = y ? bitsStride : 0;

+    dyoffset = 0;

+    mask = info.initialMask;

+    

+    if (!(arc->width & 1))

+    {

+	if (andBits == 0)

+	{

+	    if (mask & 2)

+		ARCCOPY(yorgp + info.xorgo);

+	    if (mask & 8)

+		ARCCOPY(yorgop + info.xorgo);

+	}

+	else

+	{

+	    if (mask & 2)

+		ARCRROP(yorgp + info.xorgo);

+	    if (mask & 8)

+		ARCRROP(yorgop + info.xorgo);

+	}

+    }

+    if (!info.end.x || !info.end.y)

+    {

+	mask = info.end.mask;

+	info.end = info.altend;

+    }

+    if (do360 && (arc->width == arc->height) && !(arc->width & 1))

+    {

+	int xoffset = bitsStride;

+	UNIT *yorghb = yorgp + (info.h * bitsStride) + info.xorg;

+	UNIT *yorgohb = yorghb - info.h * MUL;

+

+	yorgp += info.xorg;

+	yorgop += info.xorg;

+	yorghb += info.h * MUL;

+	while (1)

+	{

+	    if (andBits == 0)

+	    {

+		ARCCOPY(yorgp + yoffset + x * MUL);

+		ARCCOPY(yorgp + yoffset - x * MUL);

+		ARCCOPY(yorgop - yoffset - x * MUL);

+		ARCCOPY(yorgop - yoffset + x * MUL);

+	    }

+	    else

+	    {

+		ARCRROP(yorgp + yoffset + x * MUL);

+		ARCRROP(yorgp + yoffset - x * MUL);

+		ARCRROP(yorgop - yoffset - x * MUL);

+		ARCRROP(yorgop - yoffset + x * MUL);

+	    }

+	    if (a < 0)

+		break;

+	    if (andBits == 0)

+	    {

+		ARCCOPY(yorghb - xoffset - y * MUL);

+		ARCCOPY(yorgohb - xoffset + y * MUL);

+		ARCCOPY(yorgohb + xoffset + y * MUL);

+		ARCCOPY(yorghb + xoffset - y * MUL);

+	    }

+	    else

+	    {

+		ARCRROP(yorghb - xoffset - y * MUL);

+		ARCRROP(yorgohb - xoffset + y * MUL);

+		ARCRROP(yorgohb + xoffset + y * MUL);

+		ARCRROP(yorghb + xoffset - y * MUL);

+	    }

+	    xoffset += bitsStride;

+	    MIARCCIRCLESTEP(yoffset += bitsStride;);

+	}

+	yorgp -= info.xorg;

+	yorgop -= info.xorg;

+	x = info.w;

+	yoffset = info.h * bitsStride;

+    }

+    else if (do360)

+    {

+	while (y < info.h || x < info.w)

+	{

+	    MIARCOCTANTSHIFT(dyoffset = bitsStride;);

+	    if (andBits == 0)

+	    {

+		ARCCOPY(yorgp + yoffset + info.xorg + x * MUL);

+		ARCCOPY(yorgp + yoffset + info.xorgo - x * MUL);

+		ARCCOPY(yorgop - yoffset + info.xorgo - x * MUL);

+		ARCCOPY(yorgop - yoffset + info.xorg + x * MUL);

+	    }

+	    else

+	    {

+		ARCRROP(yorgp + yoffset + info.xorg + x * MUL);

+		ARCRROP(yorgp + yoffset + info.xorgo - x * MUL);

+		ARCRROP(yorgop - yoffset + info.xorgo - x * MUL);

+		ARCRROP(yorgop - yoffset + info.xorg + x * MUL);

+	    }

+	    MIARCSTEP(yoffset += dyoffset;, yoffset += bitsStride;);

+	}

+    }

+    else

+    {

+	while (y < info.h || x < info.w)

+	{

+	    MIARCOCTANTSHIFT(dyoffset = bitsStride;);

+	    if ((x == info.start.x) || (y == info.start.y))

+	    {

+		mask = info.start.mask;

+		info.start = info.altstart;

+	    }

+	    if (andBits == 0)

+	    {

+		if (mask & 1)

+		    ARCCOPY(yorgp + yoffset + info.xorg + x * MUL);

+		if (mask & 2)

+		    ARCCOPY(yorgp + yoffset + info.xorgo - x * MUL);

+		if (mask & 4)

+		    ARCCOPY(yorgop - yoffset + info.xorgo - x * MUL);

+		if (mask & 8)

+		    ARCCOPY(yorgop - yoffset + info.xorg + x * MUL);

+	    }

+	    else

+	    {

+		if (mask & 1)

+		    ARCRROP(yorgp + yoffset + info.xorg + x * MUL);

+		if (mask & 2)

+		    ARCRROP(yorgp + yoffset + info.xorgo - x * MUL);

+		if (mask & 4)

+		    ARCRROP(yorgop - yoffset + info.xorgo - x * MUL);

+		if (mask & 8)

+		    ARCRROP(yorgop - yoffset + info.xorg + x * MUL);

+	    }

+	    if ((x == info.end.x) || (y == info.end.y))

+	    {

+		mask = info.end.mask;

+		info.end = info.altend;

+	    }

+	    MIARCSTEP(yoffset += dyoffset;, yoffset += bitsStride;);

+	}

+    }

+    if ((x == info.start.x) || (y == info.start.y))

+	mask = info.start.mask;

+    if (andBits == 0)

+    {

+	if (mask & 1)

+	    ARCCOPY(yorgp + yoffset + info.xorg + x * MUL);

+	if (mask & 4)

+	    ARCCOPY(yorgop - yoffset + info.xorgo - x * MUL);

+	if (arc->height & 1)

+	{

+	    if (mask & 2)

+		ARCCOPY(yorgp + yoffset + info.xorgo - x * MUL);

+	    if (mask & 8)

+		ARCCOPY(yorgop - yoffset + info.xorg + x * MUL);

+	}

+    }

+    else

+    {

+	if (mask & 1)

+	    ARCRROP(yorgp + yoffset + info.xorg + x * MUL);

+	if (mask & 4)

+	    ARCRROP(yorgop - yoffset + info.xorgo - x * MUL);

+	if (arc->height & 1)

+	{

+	    if (mask & 2)

+		ARCRROP(yorgp + yoffset + info.xorgo - x * MUL);

+	    if (mask & 8)

+		ARCRROP(yorgop - yoffset + info.xorg + x * MUL);

+	}

+    }

+}

+#undef ARCCOPY

+#undef ARCRROP

+#endif

+

+#ifdef GLYPH

+#if BITMAP_BIT_ORDER == LSBFirst

+# define WRITE_ADDR1(n)	    (n)

+# define WRITE_ADDR2(n)	    (n)

+# define WRITE_ADDR4(n)	    (n)

+#else

+# define WRITE_ADDR1(n)	    ((n) ^ 3)

+# define WRITE_ADDR2(n)	    ((n) ^ 2)

+# define WRITE_ADDR4(n)	    ((n))

+#endif

+

+#define WRITE1(d,n,fg)	    WRITE(d + WRITE_ADDR1(n), (BITS) (fg))

+

+#ifdef BITS2

+# define WRITE2(d,n,fg)	    WRITE((BITS2 *) &((d)[WRITE_ADDR2(n)]), (BITS2) (fg))

+#else

+# define WRITE2(d,n,fg)	    (WRITE1(d,n,fg), WRITE1(d,(n)+1,fg))

+#endif

+

+#ifdef BITS4

+# define WRITE4(d,n,fg)	    WRITE((BITS4 *) &((d)[WRITE_ADDR4(n)]), (BITS4) (fg))

+#else

+# define WRITE4(d,n,fg)	    (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg))

+#endif

+

+void

+GLYPH (FbBits	*dstBits,

+   FbStride	dstStride,

+   int	dstBpp,

+   FbStip	*stipple,

+   FbBits	fg,

+   int	x,

+   int	height)

+{

+    int	    lshift;

+    FbStip  bits;

+    BITS    *dstLine;

+    BITS    *dst;

+    int	    n;

+    int	    shift;

+

+    dstLine = (BITS *) dstBits;

+    dstLine += x & ~3;

+    dstStride *= (sizeof (FbBits) / sizeof (BITS));

+    shift = x & 3;

+    lshift = 4 - shift;

+    while (height--)

+    {

+	bits = *stipple++;

+	dst = (BITS *) dstLine;

+	n = lshift;

+	while (bits)

+	{

+	    switch (FbStipMoveLsb (FbLeftStipBits (bits, n), 4, n)) {

+	    case 0:

+		break;

+	    case 1:

+		WRITE1(dst,0,fg);

+		break;

+	    case 2:

+		WRITE1(dst,1,fg);

+		break;

+	    case 3:

+		WRITE2(dst,0,fg);

+		break;

+	    case 4:

+		WRITE1(dst,2,fg);

+		break;

+	    case 5:

+		WRITE1(dst,0,fg);

+		WRITE1(dst,2,fg);

+		break;

+	    case 6:

+		WRITE1(dst,1,fg);

+		WRITE1(dst,2,fg);

+		break;

+	    case 7:

+		WRITE2(dst,0,fg);

+		WRITE1(dst,2,fg);

+		break;

+	    case 8:

+		WRITE1(dst,3,fg);

+		break;

+	    case 9:

+		WRITE1(dst,0,fg);

+		WRITE1(dst,3,fg);

+		break;

+	    case 10:

+		WRITE1(dst,1,fg);

+		WRITE1(dst,3,fg);

+		break;

+	    case 11:

+		WRITE2(dst,0,fg);

+		WRITE1(dst,3,fg);

+		break;

+	    case 12:

+		WRITE2(dst,2,fg);

+		break;

+	    case 13:

+		WRITE1(dst,0,fg);

+		WRITE2(dst,2,fg);

+		break;

+	    case 14:

+		WRITE1(dst,1,fg);

+		WRITE2(dst,2,fg);

+		break;

+	    case 15:

+		WRITE4(dst,0,fg);

+		break;

+	    }

+	    bits = FbStipLeft (bits, n);

+	    n = 4;

+	    dst += 4;

+	}

+	dstLine += dstStride;

+    }

+}

+#undef WRITE_ADDR1

+#undef WRITE_ADDR2

+#undef WRITE_ADDR4

+#undef WRITE1

+#undef WRITE2

+#undef WRITE4

+

+#endif

+

+#ifdef POLYLINE

+void

+POLYLINE (DrawablePtr	pDrawable,

+	  GCPtr		pGC,

+	  int		mode,

+	  int		npt,

+	  DDXPointPtr	ptsOrig)

+{

+    INT32	    *pts = (INT32 *) ptsOrig;

+    int		    xoff = pDrawable->x;

+    int		    yoff = pDrawable->y;

+    unsigned int    bias = miGetZeroLineBias(pDrawable->pScreen);

+    BoxPtr	    pBox = RegionExtents(fbGetCompositeClip (pGC));

+    

+    FbBits	    *dst;

+    int		    dstStride;

+    int		    dstBpp;

+    int		    dstXoff, dstYoff;

+    

+    UNIT	    *bits, *bitsBase;

+    FbStride	    bitsStride;

+    BITS	    xor = fbGetGCPrivate(pGC)->xor;

+    BITS	    and = fbGetGCPrivate(pGC)->and;

+    int		    dashoffset = 0;

+    

+    INT32	    ul, lr;

+    INT32	    pt1, pt2;

+

+    int		    e, e1, e3, len;

+    int		    stepmajor, stepminor;

+    int		    octant;

+

+    if (mode == CoordModePrevious)

+	fbFixCoordModePrevious (npt, ptsOrig);

+    

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));

+    bitsBase = ((UNIT *) dst) + (yoff + dstYoff) * bitsStride + (xoff + dstXoff) * MUL;

+    ul = coordToInt(pBox->x1 - xoff,     pBox->y1 - yoff);

+    lr = coordToInt(pBox->x2 - xoff - 1, pBox->y2 - yoff - 1);

+

+    pt1 = *pts++;

+    npt--;

+    pt2 = *pts++;

+    npt--;

+    for (;;)

+    {

+	if (isClipped (pt1, ul, lr) | isClipped (pt2, ul, lr))

+	{

+	    fbSegment (pDrawable, pGC, 

+		       intToX(pt1) + xoff, intToY(pt1) + yoff,

+		       intToX(pt2) + xoff, intToY(pt2) + yoff,

+		       npt == 0 && pGC->capStyle != CapNotLast,

+		       &dashoffset);

+	    if (!npt) {

+		fbFinishAccess (pDrawable);

+		return;

+	    }

+	    pt1 = pt2;

+	    pt2 = *pts++;

+	    npt--;

+	}

+	else

+	{

+	    bits = bitsBase + intToY(pt1) * bitsStride + intToX(pt1) * MUL;

+	    for (;;)

+	    {

+		CalcLineDeltas (intToX(pt1), intToY(pt1),

+				intToX(pt2), intToY(pt2),

+				len, e1, stepmajor, stepminor, 1, bitsStride,

+				octant);

+		stepmajor *= MUL;

+		if (len < e1)

+		{

+		    e3 = len;

+		    len = e1;

+		    e1 = e3;

+

+		    e3 = stepminor;

+		    stepminor = stepmajor;

+		    stepmajor = e3;

+		    SetYMajorOctant(octant);

+		}

+		e = -len;

+		e1 <<= 1;

+		e3 = e << 1;

+		FIXUP_ERROR (e, octant, bias);

+		if (and == 0)

+		{

+		    while (len--)

+		    {

+			STORE(bits,xor);

+			bits += stepmajor;

+			e += e1;

+			if (e >= 0)

+			{

+			    bits += stepminor;

+			    e += e3;

+			}

+		    }

+		}

+		else

+		{

+		    while (len--)

+		    {

+			RROP(bits,and,xor);

+			bits += stepmajor;

+			e += e1;

+			if (e >= 0)

+			{

+			    bits += stepminor;

+			    e += e3;

+			}

+		    }

+		}

+		if (!npt)

+		{

+		    if (pGC->capStyle != CapNotLast && 

+			pt2 != *((INT32 *) ptsOrig))

+		    {

+			RROP(bits,and,xor);

+		    }

+		    fbFinishAccess (pDrawable);

+		    return;

+		}

+		pt1 = pt2;

+		pt2 = *pts++;

+		--npt;

+		if (isClipped (pt2, ul, lr))

+		    break;

+    	    }

+	}

+    }

+

+    fbFinishAccess (pDrawable);

+}

+#endif

+

+#ifdef POLYSEGMENT

+void

+POLYSEGMENT (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    nseg,

+	     xSegment	    *pseg)

+{

+    INT32	    *pts = (INT32 *) pseg;

+    int		    xoff = pDrawable->x;

+    int		    yoff = pDrawable->y;

+    unsigned int    bias = miGetZeroLineBias(pDrawable->pScreen);

+    BoxPtr	    pBox = RegionExtents(fbGetCompositeClip (pGC));

+    

+    FbBits	    *dst;

+    int		    dstStride;

+    int		    dstBpp;

+    int		    dstXoff, dstYoff;

+    

+    UNIT	    *bits, *bitsBase;

+    FbStride	    bitsStride;

+    FbBits	    xorBits = fbGetGCPrivate(pGC)->xor;

+    FbBits	    andBits = fbGetGCPrivate(pGC)->and;

+    BITS	    xor = xorBits;

+    BITS	    and = andBits;

+    int		    dashoffset = 0;

+    

+    INT32	    ul, lr;

+    INT32	    pt1, pt2;

+

+    int		    e, e1, e3, len;

+    int		    stepmajor, stepminor;

+    int		    octant;

+    Bool	    capNotLast;

+

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    bitsStride = dstStride * (sizeof (FbBits) / sizeof (UNIT));

+    bitsBase = ((UNIT *) dst) + (yoff + dstYoff) * bitsStride + (xoff + dstXoff) * MUL;

+    ul = coordToInt(pBox->x1 - xoff,     pBox->y1 - yoff);

+    lr = coordToInt(pBox->x2 - xoff - 1, pBox->y2 - yoff - 1);

+

+    capNotLast = pGC->capStyle == CapNotLast;

+    

+    while (nseg--)

+    {

+	pt1 = *pts++;

+	pt2 = *pts++;

+	if (isClipped (pt1, ul, lr) | isClipped (pt2, ul, lr))

+	{

+	    fbSegment (pDrawable, pGC, 

+		       intToX(pt1) + xoff, intToY(pt1) + yoff,

+		       intToX(pt2) + xoff, intToY(pt2) + yoff,

+		       !capNotLast, &dashoffset);

+	}

+	else

+	{

+	    CalcLineDeltas (intToX(pt1), intToY(pt1),

+			    intToX(pt2), intToY(pt2),

+			    len, e1, stepmajor, stepminor, 1, bitsStride,

+			    octant);

+	    if (e1 == 0 && len > 3

+#if MUL != 1

+		&& FbCheck24Pix(and) && FbCheck24Pix(xor)

+#endif

+		)

+	    {

+		int	x1, x2;

+		FbBits	*dstLine;

+		int	dstX, width;

+		FbBits	startmask, endmask;

+		int	nmiddle;

+		

+		if (stepmajor < 0)

+		{

+		    x1 = intToX(pt2);

+		    x2 = intToX(pt1) + 1;

+		    if (capNotLast)

+			x1++;

+		}

+		else

+		{

+		    x1 = intToX(pt1);

+		    x2 = intToX(pt2);

+		    if (!capNotLast)

+			x2++;

+		}

+		dstX = (x1 + xoff + dstXoff) * (sizeof (UNIT) * 8 * MUL);

+		width = (x2 - x1) * (sizeof (UNIT) * 8 * MUL);

+		

+		dstLine = dst + (intToY(pt1) + yoff + dstYoff) * dstStride;

+		dstLine += dstX >> FB_SHIFT;

+		dstX &= FB_MASK;

+		FbMaskBits (dstX, width, startmask, nmiddle, endmask);

+		if (startmask)

+		{

+		    WRITE(dstLine, FbDoMaskRRop (READ(dstLine), andBits, xorBits, startmask));

+		    dstLine++;

+		}

+		if (!andBits)

+		    while (nmiddle--)

+			WRITE(dstLine++, xorBits);

+		else

+		    while (nmiddle--)

+		    {

+			WRITE(dstLine, FbDoRRop (READ(dstLine), andBits, xorBits));

+			dstLine++;

+		    }

+		if (endmask)

+		    WRITE(dstLine, FbDoMaskRRop (READ(dstLine), andBits, xorBits, endmask));

+	    }

+	    else

+	    {

+		stepmajor *= MUL;

+		bits = bitsBase + intToY(pt1) * bitsStride + intToX(pt1) * MUL;

+		if (len < e1)

+		{

+		    e3 = len;

+		    len = e1;

+		    e1 = e3;

+    

+		    e3 = stepminor;

+		    stepminor = stepmajor;

+		    stepmajor = e3;

+		    SetYMajorOctant(octant);

+		}

+		e = -len;

+		e1 <<= 1;

+		e3 = e << 1;

+		FIXUP_ERROR (e, octant, bias);

+		if (!capNotLast)

+		    len++;

+		if (and == 0)

+		{

+		    while (len--)

+		    {

+			STORE(bits,xor);

+			bits += stepmajor;

+			e += e1;

+			if (e >= 0)

+			{

+			    bits += stepminor;

+			    e += e3;

+			}

+		    }

+		}

+		else

+		{

+		    while (len--)

+		    {

+			RROP(bits,and,xor);

+			bits += stepmajor;

+			e += e1;

+			if (e >= 0)

+			{

+			    bits += stepminor;

+			    e += e3;

+			}

+		    }

+		}

+	    }

+	}

+    }

+

+    fbFinishAccess (pDrawable);

+}

+#endif

+

+#undef MUL

+#undef STORE

+#undef RROP

+#undef UNIT

+#undef USE_SOLID

+

+#undef isClipped

diff --git a/xorg-server/fb/fbcmap.c b/xorg-server/fb/fbcmap.c
index e656c2399..123b7f41d 100644
--- a/xorg-server/fb/fbcmap.c
+++ b/xorg-server/fb/fbcmap.c
@@ -36,8 +36,8 @@
 #error "You should be compiling fbcmap_mi.c instead of fbcmap.c!"

 #endif

 

-static int cmapScrPrivateKeyIndex;

-static DevPrivateKey cmapScrPrivateKey = &cmapScrPrivateKeyIndex;

+static DevPrivateKeyRec cmapScrPrivateKeyRec;

+#define cmapScrPrivateKey (&cmapScrPrivateKeyRec)

 

 #define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey))

 #define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c))

@@ -48,7 +48,7 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
     /* By the time we are processing requests, we can guarantee that there

      * is always a colormap installed */

     *pmaps = GetInstalledColormap(pScreen)->mid;

-    return (1);

+    return 1;

 }

 

 

diff --git a/xorg-server/fb/fbfill.c b/xorg-server/fb/fbfill.c
index 831b1ce76..664d6a82e 100644
--- a/xorg-server/fb/fbfill.c
+++ b/xorg-server/fb/fbfill.c
@@ -1,230 +1,230 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-void
-fbFill (DrawablePtr pDrawable,
-	GCPtr	    pGC,
-	int	    x,
-	int	    y,
-	int	    width,
-	int	    height)
-{
-    FbBits	    *dst;
-    FbStride	    dstStride;
-    int		    dstBpp;
-    int		    dstXoff, dstYoff;
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);
-    
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-
-    switch (pGC->fillStyle) {
-    case FillSolid:
-#ifndef FB_ACCESS_WRAPPER
-	if (pPriv->and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,
-					x + dstXoff, y + dstYoff,
-					width, height,
-					pPriv->xor))
-#endif	    
-	    fbSolid (dst + (y + dstYoff) * dstStride, 
-		     dstStride, 
-		     (x + dstXoff) * dstBpp,
-		     dstBpp,
-		     width * dstBpp, height,
-		     pPriv->and, pPriv->xor);
-	break;
-    case FillStippled:
-    case FillOpaqueStippled: {
-	PixmapPtr   pStip = pGC->stipple;
-	int	    stipWidth = pStip->drawable.width;
-	int	    stipHeight = pStip->drawable.height;
-	
-	if (dstBpp == 1)
-	{
-	    int		alu;
-	    FbBits	*stip;
-	    FbStride    stipStride;
-	    int		stipBpp;
-	    int		stipXoff, stipYoff; /* XXX assumed to be zero */
-
-	    if (pGC->fillStyle == FillStippled)
-		alu = FbStipple1Rop(pGC->alu,pGC->fgPixel);
-	    else
-		alu = FbOpaqueStipple1Rop(pGC->alu,pGC->fgPixel,pGC->bgPixel);
-	    fbGetDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
-	    fbTile (dst + (y + dstYoff) * dstStride,
-		    dstStride,
-		    x + dstXoff,
-		    width, height,
-		    stip,
-		    stipStride,
-		    stipWidth,
-		    stipHeight,
-		    alu,
-		    pPriv->pm,
-		    dstBpp,
-		    
-		    (pGC->patOrg.x + pDrawable->x + dstXoff),
-		    pGC->patOrg.y + pDrawable->y - y);
-	    fbFinishAccess (&pStip->drawable);
-	}
-	else
-	{
-	    FbStip	*stip;
-	    FbStride    stipStride;
-	    int		stipBpp;
-	    int		stipXoff, stipYoff; /* XXX assumed to be zero */
-	    FbBits	fgand, fgxor, bgand, bgxor;
-
-	    fgand = pPriv->and;
-	    fgxor = pPriv->xor;
-	    if (pGC->fillStyle == FillStippled)
-	    {
-		bgand = fbAnd(GXnoop,(FbBits) 0,FB_ALLONES);
-		bgxor = fbXor(GXnoop,(FbBits) 0,FB_ALLONES);
-	    }
-	    else
-	    {
-		bgand = pPriv->bgand;
-		bgxor = pPriv->bgxor;
-	    }
-
-	    fbGetStipDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
-	    fbStipple (dst + (y + dstYoff) * dstStride, 
-		       dstStride, 
-		       (x + dstXoff) * dstBpp,
-		       dstBpp,
-		       width * dstBpp, height,
-		       stip,
-		       stipStride,
-		       stipWidth,
-		       stipHeight,
-		       pPriv->evenStipple,
-		       fgand, fgxor,
-		       bgand, bgxor,
-		       pGC->patOrg.x + pDrawable->x + dstXoff,
-		       pGC->patOrg.y + pDrawable->y - y);
-	    fbFinishAccess (&pStip->drawable);
-	}
-	break;
-    }
-    case FillTiled: {
-	PixmapPtr   pTile = pGC->tile.pixmap;
-	FbBits	    *tile;
-	FbStride    tileStride;
-	int	    tileBpp;
-	int	    tileWidth;
-	int	    tileHeight;
-	int	    tileXoff, tileYoff; /* XXX assumed to be zero */
-	
-	fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
-	tileWidth = pTile->drawable.width;
-	tileHeight = pTile->drawable.height;
-	fbTile (dst + (y + dstYoff) * dstStride, 
-		dstStride, 
-		(x + dstXoff) * dstBpp, 
-		width * dstBpp, height,
-		tile,
-		tileStride,
-		tileWidth * tileBpp,
-		tileHeight,
-		pGC->alu,
-		pPriv->pm,
-		dstBpp,
-		(pGC->patOrg.x + pDrawable->x + dstXoff) * dstBpp,
-		pGC->patOrg.y + pDrawable->y - y);
-	fbFinishAccess (&pTile->drawable);
-	break;
-    }
-    }
-    fbValidateDrawable (pDrawable);
-    fbFinishAccess (pDrawable);
-}
-
-void
-fbSolidBoxClipped (DrawablePtr	pDrawable,
-		   RegionPtr	pClip,
-		   int		x1,
-		   int		y1,
-		   int		x2,
-		   int		y2,
-		   FbBits	and,
-		   FbBits	xor)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    BoxPtr	pbox;
-    int		nbox;
-    int		partX1, partX2, partY1, partY2;
-
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    
-    for (nbox = REGION_NUM_RECTS(pClip), pbox = REGION_RECTS(pClip); 
-	 nbox--; 
-	 pbox++)
-    {
-	partX1 = pbox->x1;
-	if (partX1 < x1)
-	    partX1 = x1;
-	
-	partX2 = pbox->x2;
-	if (partX2 > x2)
-	    partX2 = x2;
-	
-	if (partX2 <= partX1)
-	    continue;
-	
-	partY1 = pbox->y1;
-	if (partY1 < y1)
-	    partY1 = y1;
-	
-	partY2 = pbox->y2;
-	if (partY2 > y2)
-	    partY2 = y2;
-	
-	if (partY2 <= partY1)
-	    continue;
-
-#ifndef FB_ACCESS_WRAPPER
-	if (and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,
-				 partX1 + dstXoff, partY1 + dstYoff,
-				 (partX2 - partX1), (partY2 - partY1),
-				 xor))
-#endif
-	    fbSolid (dst + (partY1 + dstYoff) * dstStride,
-		     dstStride,
-		     (partX1 + dstXoff) * dstBpp,
-		     dstBpp,
-		     
-		     (partX2 - partX1) * dstBpp,
-		     (partY2 - partY1),
-		     and, xor);
-    }
-    fbFinishAccess (pDrawable);
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+void

+fbFill (DrawablePtr pDrawable,

+	GCPtr	    pGC,

+	int	    x,

+	int	    y,

+	int	    width,

+	int	    height)

+{

+    FbBits	    *dst;

+    FbStride	    dstStride;

+    int		    dstBpp;

+    int		    dstXoff, dstYoff;

+    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);

+    

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+

+    switch (pGC->fillStyle) {

+    case FillSolid:

+#ifndef FB_ACCESS_WRAPPER

+	if (pPriv->and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,

+					x + dstXoff, y + dstYoff,

+					width, height,

+					pPriv->xor))

+#endif	    

+	    fbSolid (dst + (y + dstYoff) * dstStride, 

+		     dstStride, 

+		     (x + dstXoff) * dstBpp,

+		     dstBpp,

+		     width * dstBpp, height,

+		     pPriv->and, pPriv->xor);

+	break;

+    case FillStippled:

+    case FillOpaqueStippled: {

+	PixmapPtr   pStip = pGC->stipple;

+	int	    stipWidth = pStip->drawable.width;

+	int	    stipHeight = pStip->drawable.height;

+	

+	if (dstBpp == 1)

+	{

+	    int		alu;

+	    FbBits	*stip;

+	    FbStride    stipStride;

+	    int		stipBpp;

+	    int		stipXoff, stipYoff; /* XXX assumed to be zero */

+

+	    if (pGC->fillStyle == FillStippled)

+		alu = FbStipple1Rop(pGC->alu,pGC->fgPixel);

+	    else

+		alu = FbOpaqueStipple1Rop(pGC->alu,pGC->fgPixel,pGC->bgPixel);

+	    fbGetDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);

+	    fbTile (dst + (y + dstYoff) * dstStride,

+		    dstStride,

+		    x + dstXoff,

+		    width, height,

+		    stip,

+		    stipStride,

+		    stipWidth,

+		    stipHeight,

+		    alu,

+		    pPriv->pm,

+		    dstBpp,

+		    

+		    (pGC->patOrg.x + pDrawable->x + dstXoff),

+		    pGC->patOrg.y + pDrawable->y - y);

+	    fbFinishAccess (&pStip->drawable);

+	}

+	else

+	{

+	    FbStip	*stip;

+	    FbStride    stipStride;

+	    int		stipBpp;

+	    int		stipXoff, stipYoff; /* XXX assumed to be zero */

+	    FbBits	fgand, fgxor, bgand, bgxor;

+

+	    fgand = pPriv->and;

+	    fgxor = pPriv->xor;

+	    if (pGC->fillStyle == FillStippled)

+	    {

+		bgand = fbAnd(GXnoop,(FbBits) 0,FB_ALLONES);

+		bgxor = fbXor(GXnoop,(FbBits) 0,FB_ALLONES);

+	    }

+	    else

+	    {

+		bgand = pPriv->bgand;

+		bgxor = pPriv->bgxor;

+	    }

+

+	    fbGetStipDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);

+	    fbStipple (dst + (y + dstYoff) * dstStride, 

+		       dstStride, 

+		       (x + dstXoff) * dstBpp,

+		       dstBpp,

+		       width * dstBpp, height,

+		       stip,

+		       stipStride,

+		       stipWidth,

+		       stipHeight,

+		       pPriv->evenStipple,

+		       fgand, fgxor,

+		       bgand, bgxor,

+		       pGC->patOrg.x + pDrawable->x + dstXoff,

+		       pGC->patOrg.y + pDrawable->y - y);

+	    fbFinishAccess (&pStip->drawable);

+	}

+	break;

+    }

+    case FillTiled: {

+	PixmapPtr   pTile = pGC->tile.pixmap;

+	FbBits	    *tile;

+	FbStride    tileStride;

+	int	    tileBpp;

+	int	    tileWidth;

+	int	    tileHeight;

+	int	    tileXoff, tileYoff; /* XXX assumed to be zero */

+	

+	fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);

+	tileWidth = pTile->drawable.width;

+	tileHeight = pTile->drawable.height;

+	fbTile (dst + (y + dstYoff) * dstStride, 

+		dstStride, 

+		(x + dstXoff) * dstBpp, 

+		width * dstBpp, height,

+		tile,

+		tileStride,

+		tileWidth * tileBpp,

+		tileHeight,

+		pGC->alu,

+		pPriv->pm,

+		dstBpp,

+		(pGC->patOrg.x + pDrawable->x + dstXoff) * dstBpp,

+		pGC->patOrg.y + pDrawable->y - y);

+	fbFinishAccess (&pTile->drawable);

+	break;

+    }

+    }

+    fbValidateDrawable (pDrawable);

+    fbFinishAccess (pDrawable);

+}

+

+void

+fbSolidBoxClipped (DrawablePtr	pDrawable,

+		   RegionPtr	pClip,

+		   int		x1,

+		   int		y1,

+		   int		x2,

+		   int		y2,

+		   FbBits	and,

+		   FbBits	xor)

+{

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    BoxPtr	pbox;

+    int		nbox;

+    int		partX1, partX2, partY1, partY2;

+

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    

+    for (nbox = RegionNumRects(pClip), pbox = RegionRects(pClip);

+	 nbox--; 

+	 pbox++)

+    {

+	partX1 = pbox->x1;

+	if (partX1 < x1)

+	    partX1 = x1;

+	

+	partX2 = pbox->x2;

+	if (partX2 > x2)

+	    partX2 = x2;

+	

+	if (partX2 <= partX1)

+	    continue;

+	

+	partY1 = pbox->y1;

+	if (partY1 < y1)

+	    partY1 = y1;

+	

+	partY2 = pbox->y2;

+	if (partY2 > y2)

+	    partY2 = y2;

+	

+	if (partY2 <= partY1)

+	    continue;

+

+#ifndef FB_ACCESS_WRAPPER

+	if (and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,

+				 partX1 + dstXoff, partY1 + dstYoff,

+				 (partX2 - partX1), (partY2 - partY1),

+				 xor))

+#endif

+	    fbSolid (dst + (partY1 + dstYoff) * dstStride,

+		     dstStride,

+		     (partX1 + dstXoff) * dstBpp,

+		     dstBpp,

+		     

+		     (partX2 - partX1) * dstBpp,

+		     (partY2 - partY1),

+		     and, xor);

+    }

+    fbFinishAccess (pDrawable);

+}

diff --git a/xorg-server/fb/fbfillrect.c b/xorg-server/fb/fbfillrect.c
index 4e4edb3fd..66ed77fa5 100644
--- a/xorg-server/fb/fbfillrect.c
+++ b/xorg-server/fb/fbfillrect.c
@@ -1,112 +1,112 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-void
-fbPolyFillRect(DrawablePtr  pDrawable, 
-	       GCPtr	    pGC, 
-	       int	    nrect,
-	       xRectangle   *prect)
-{
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    register BoxPtr pbox;
-    BoxPtr	    pextent;
-    int		    extentX1, extentX2, extentY1, extentY2;
-    int		    fullX1, fullX2, fullY1, fullY2;
-    int		    partX1, partX2, partY1, partY2;
-    int		    xorg, yorg;
-    int		    n;
-
-    xorg = pDrawable->x;
-    yorg = pDrawable->y;
-    
-    pextent = REGION_EXTENTS(pGC->pScreen, pClip);
-    extentX1 = pextent->x1;
-    extentY1 = pextent->y1;
-    extentX2 = pextent->x2;
-    extentY2 = pextent->y2;
-    while (nrect--)
-    {
-	fullX1 = prect->x + xorg;
-	fullY1 = prect->y + yorg;
-	fullX2 = fullX1 + (int) prect->width;
-	fullY2 = fullY1 + (int) prect->height;
-	prect++;
-	
-	if (fullX1 < extentX1)
-	    fullX1 = extentX1;
-
-	if (fullY1 < extentY1)
-	    fullY1 = extentY1;
-
-	if (fullX2 > extentX2)
-	    fullX2 = extentX2;
-	
-	if (fullY2 > extentY2)
-	    fullY2 = extentY2;
-
-	if ((fullX1 >= fullX2) || (fullY1 >= fullY2))
-	    continue;
-	n = REGION_NUM_RECTS (pClip);
-	if (n == 1)
-	{
-	    fbFill (pDrawable,
-		    pGC,
-		    fullX1, fullY1, fullX2-fullX1, fullY2-fullY1);
-	}
-	else
-	{
-	    pbox = REGION_RECTS(pClip);
-	    /* 
-	     * clip the rectangle to each box in the clip region
-	     * this is logically equivalent to calling Intersect()
-	     */
-	    while(n--)
-	    {
-		partX1 = pbox->x1;
-		if (partX1 < fullX1)
-		    partX1 = fullX1;
-		partY1 = pbox->y1;
-		if (partY1 < fullY1)
-		    partY1 = fullY1;
-		partX2 = pbox->x2;
-		if (partX2 > fullX2)
-		    partX2 = fullX2;
-		partY2 = pbox->y2;
-		if (partY2 > fullY2)
-		    partY2 = fullY2;
-    
-		pbox++;
-		
-		if (partX1 < partX2 && partY1 < partY2)
-		    fbFill (pDrawable, pGC,
-			    partX1, partY1,
-			    partX2 - partX1, partY2 - partY1);
-	    }
-	}
-    }
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+void

+fbPolyFillRect(DrawablePtr  pDrawable, 

+	       GCPtr	    pGC, 

+	       int	    nrect,

+	       xRectangle   *prect)

+{

+    RegionPtr	    pClip = fbGetCompositeClip(pGC);

+    register BoxPtr pbox;

+    BoxPtr	    pextent;

+    int		    extentX1, extentX2, extentY1, extentY2;

+    int		    fullX1, fullX2, fullY1, fullY2;

+    int		    partX1, partX2, partY1, partY2;

+    int		    xorg, yorg;

+    int		    n;

+

+    xorg = pDrawable->x;

+    yorg = pDrawable->y;

+    

+    pextent = RegionExtents(pClip);

+    extentX1 = pextent->x1;

+    extentY1 = pextent->y1;

+    extentX2 = pextent->x2;

+    extentY2 = pextent->y2;

+    while (nrect--)

+    {

+	fullX1 = prect->x + xorg;

+	fullY1 = prect->y + yorg;

+	fullX2 = fullX1 + (int) prect->width;

+	fullY2 = fullY1 + (int) prect->height;

+	prect++;

+	

+	if (fullX1 < extentX1)

+	    fullX1 = extentX1;

+

+	if (fullY1 < extentY1)

+	    fullY1 = extentY1;

+

+	if (fullX2 > extentX2)

+	    fullX2 = extentX2;

+	

+	if (fullY2 > extentY2)

+	    fullY2 = extentY2;

+

+	if ((fullX1 >= fullX2) || (fullY1 >= fullY2))

+	    continue;

+	n = RegionNumRects (pClip);

+	if (n == 1)

+	{

+	    fbFill (pDrawable,

+		    pGC,

+		    fullX1, fullY1, fullX2-fullX1, fullY2-fullY1);

+	}

+	else

+	{

+	    pbox = RegionRects(pClip);

+	    /* 

+	     * clip the rectangle to each box in the clip region

+	     * this is logically equivalent to calling Intersect()

+	     */

+	    while(n--)

+	    {

+		partX1 = pbox->x1;

+		if (partX1 < fullX1)

+		    partX1 = fullX1;

+		partY1 = pbox->y1;

+		if (partY1 < fullY1)

+		    partY1 = fullY1;

+		partX2 = pbox->x2;

+		if (partX2 > fullX2)

+		    partX2 = fullX2;

+		partY2 = pbox->y2;

+		if (partY2 > fullY2)

+		    partY2 = fullY2;

+    

+		pbox++;

+		

+		if (partX1 < partX2 && partY1 < partY2)

+		    fbFill (pDrawable, pGC,

+			    partX1, partY1,

+			    partX2 - partX1, partY2 - partY1);

+	    }

+	}

+    }

+}

diff --git a/xorg-server/fb/fbfillsp.c b/xorg-server/fb/fbfillsp.c
index 5d2147213..16c33943f 100644
--- a/xorg-server/fb/fbfillsp.c
+++ b/xorg-server/fb/fbfillsp.c
@@ -1,100 +1,100 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-void
-fbFillSpans (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    n,
-	     DDXPointPtr    ppt,
-	     int	    *pwidth,
-	     int	    fSorted)
-{
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    BoxPtr	    pextent, pbox;
-    int		    nbox;
-    int		    extentX1, extentX2, extentY1, extentY2;
-    int		    fullX1, fullX2, fullY1;
-    int		    partX1, partX2;
-    
-    pextent = REGION_EXTENTS(pGC->pScreen, pClip);
-    extentX1 = pextent->x1;
-    extentY1 = pextent->y1;
-    extentX2 = pextent->x2;
-    extentY2 = pextent->y2;
-    while (n--)
-    {
-	fullX1 = ppt->x;
-	fullY1 = ppt->y;
-	fullX2 = fullX1 + (int) *pwidth;
-	ppt++;
-	pwidth++;
-	
-	if (fullY1 < extentY1 || extentY2 <= fullY1)
-	    continue;
-	
-	if (fullX1 < extentX1)
-	    fullX1 = extentX1;
-
-	if (fullX2 > extentX2)
-	    fullX2 = extentX2;
-	
-	if (fullX1 >= fullX2)
-	    continue;
-	
-	nbox = REGION_NUM_RECTS (pClip);
-	if (nbox == 1)
-	{
-	    fbFill (pDrawable,
-		    pGC,
-		    fullX1, fullY1, fullX2-fullX1, 1);
-	}
-	else
-	{
-	    pbox = REGION_RECTS(pClip);
-	    while(nbox--)
-	    {
-		if (pbox->y1 <= fullY1 && fullY1 < pbox->y2)
-		{
-		    partX1 = pbox->x1;
-		    if (partX1 < fullX1)
-			partX1 = fullX1;
-		    partX2 = pbox->x2;
-		    if (partX2 > fullX2)
-			partX2 = fullX2;
-		    if (partX2 > partX1)
-		    {
-			fbFill (pDrawable, pGC,
-				partX1, fullY1,
-				partX2 - partX1, 1);
-		    }
-		}
-		pbox++;
-	    }
-	}
-    }
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+void

+fbFillSpans (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    n,

+	     DDXPointPtr    ppt,

+	     int	    *pwidth,

+	     int	    fSorted)

+{

+    RegionPtr	    pClip = fbGetCompositeClip(pGC);

+    BoxPtr	    pextent, pbox;

+    int		    nbox;

+    int		    extentX1, extentX2, extentY1, extentY2;

+    int		    fullX1, fullX2, fullY1;

+    int		    partX1, partX2;

+    

+    pextent = RegionExtents(pClip);

+    extentX1 = pextent->x1;

+    extentY1 = pextent->y1;

+    extentX2 = pextent->x2;

+    extentY2 = pextent->y2;

+    while (n--)

+    {

+	fullX1 = ppt->x;

+	fullY1 = ppt->y;

+	fullX2 = fullX1 + (int) *pwidth;

+	ppt++;

+	pwidth++;

+	

+	if (fullY1 < extentY1 || extentY2 <= fullY1)

+	    continue;

+	

+	if (fullX1 < extentX1)

+	    fullX1 = extentX1;

+

+	if (fullX2 > extentX2)

+	    fullX2 = extentX2;

+	

+	if (fullX1 >= fullX2)

+	    continue;

+	

+	nbox = RegionNumRects (pClip);

+	if (nbox == 1)

+	{

+	    fbFill (pDrawable,

+		    pGC,

+		    fullX1, fullY1, fullX2-fullX1, 1);

+	}

+	else

+	{

+	    pbox = RegionRects(pClip);

+	    while(nbox--)

+	    {

+		if (pbox->y1 <= fullY1 && fullY1 < pbox->y2)

+		{

+		    partX1 = pbox->x1;

+		    if (partX1 < fullX1)

+			partX1 = fullX1;

+		    partX2 = pbox->x2;

+		    if (partX2 > fullX2)

+			partX2 = fullX2;

+		    if (partX2 > partX1)

+		    {

+			fbFill (pDrawable, pGC,

+				partX1, fullY1,

+				partX2 - partX1, 1);

+		    }

+		}

+		pbox++;

+	    }

+	}

+    }

+}

diff --git a/xorg-server/fb/fbgc.c b/xorg-server/fb/fbgc.c
index fda391b14..7b63b889e 100644
--- a/xorg-server/fb/fbgc.c
+++ b/xorg-server/fb/fbgc.c
@@ -1,319 +1,319 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-const GCFuncs fbGCFuncs = {
-    fbValidateGC,
-    miChangeGC,
-    miCopyGC,
-    miDestroyGC,
-    miChangeClip,
-    miDestroyClip,
-    miCopyClip,
-};
-
-const GCOps	fbGCOps = {
-    fbFillSpans,
-    fbSetSpans,
-    fbPutImage,
-    fbCopyArea,
-    fbCopyPlane,
-    fbPolyPoint,
-    fbPolyLine,
-    fbPolySegment,
-    fbPolyRectangle,
-    fbPolyArc,
-    miFillPolygon,
-    fbPolyFillRect,
-    fbPolyFillArc,
-    miPolyText8,
-    miPolyText16,
-    miImageText8,
-    miImageText16,
-    fbImageGlyphBlt,
-    fbPolyGlyphBlt,
-    fbPushPixels
-};
-
-Bool
-fbCreateGC(GCPtr pGC)
-{
-    pGC->clientClip = NULL;
-    pGC->clientClipType = CT_NONE;
-
-    pGC->ops = (GCOps *) &fbGCOps;
-    pGC->funcs = (GCFuncs *) &fbGCFuncs;
-
-    /* fb wants to translate before scan conversion */
-    pGC->miTranslate = 1;
-
-    fbGetRotatedPixmap(pGC) = 0;
-    fbGetExpose(pGC) = 1;
-    fbGetFreeCompClip(pGC) = 0;
-    fbGetCompositeClip(pGC) = 0;
-    fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);
-    return TRUE;
-}
-
-/*
- * Pad pixmap to FB_UNIT bits wide
- */
-void
-fbPadPixmap (PixmapPtr pPixmap)
-{
-    int	    width;
-    FbBits  *bits;
-    FbBits  b;
-    FbBits  mask;
-    int	    height;
-    int	    w;
-    int     stride;
-    int     bpp;
-    int     xOff, yOff;
-
-    fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff);
-
-    width = pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel;
-    height = pPixmap->drawable.height;
-    mask = FbBitsMask (0, width);
-    while (height--)
-    {
-	b = READ(bits) & mask;
-	w = width;
-	while (w < FB_UNIT)
-	{
-	    b = b | FbScrRight(b, w);
-	    w <<= 1;
-	}
-	WRITE(bits, b);
-	bits += stride;
-    }
-
-    fbFinishAccess (&pPixmap->drawable);
-}
-
-/*
- * Verify that 'bits' repeats every 'len' bits
- */
-static Bool
-fbBitsRepeat (FbBits bits, int len, int width)
-{
-    FbBits  mask = FbBitsMask(0, len);
-    FbBits  orig = bits & mask;
-    int	    i;
-    
-    if (width > FB_UNIT)
-	width = FB_UNIT;
-    for (i = 0; i < width / len; i++)
-    {
-	if ((bits & mask) != orig)
-	    return FALSE;
-	bits = FbScrLeft(bits,len);
-    }
-    return TRUE;
-}
-
-/*
- * Check whether an entire bitmap line is a repetition of
- * the first 'len' bits
- */
-static Bool
-fbLineRepeat (FbBits *bits, int len, int width)
-{
-    FbBits  first = bits[0];
-    
-    if (!fbBitsRepeat (first, len, width))
-	return FALSE;
-    width = (width + FB_UNIT-1) >> FB_SHIFT;
-    bits++;
-    while (--width)
-	if (READ(bits) != first)
-	    return FALSE;
-    return TRUE;
-}
-
-/*
- * The even stipple code wants the first FB_UNIT/bpp bits on
- * each scanline to represent the entire stipple
- */
-static Bool
-fbCanEvenStipple (PixmapPtr pStipple, int bpp)
-{
-    int	    len = FB_UNIT / bpp;
-    FbBits  *bits;
-    int	    stride;
-    int	    stip_bpp;
-    int	    stipXoff, stipYoff;
-    int	    h;
-
-    /* can't even stipple 24bpp drawables */
-    if ((bpp & (bpp-1)) != 0)
-	return FALSE;
-    /* make sure the stipple width is a multiple of the even stipple width */
-    if (pStipple->drawable.width % len != 0)
-	return FALSE;
-    fbGetDrawable (&pStipple->drawable, bits, stride, stip_bpp, stipXoff, stipYoff);
-    h = pStipple->drawable.height;
-    /* check to see that the stipple repeats horizontally */
-    while (h--)
-    {
-	if (!fbLineRepeat (bits, len, pStipple->drawable.width)) {
-	    fbFinishAccess (&pStipple->drawable);
-	    return FALSE;
-	}
-	bits += stride;
-    }
-    fbFinishAccess (&pStipple->drawable);
-    return TRUE;
-}
-
-void
-fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
-{
-    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
-    FbBits	mask;
-
-    pGC->lastWinOrg.x = pDrawable->x;
-    pGC->lastWinOrg.y = pDrawable->y;
-
-    /*
-     * if the client clip is different or moved OR the subwindowMode has
-     * changed OR the window's clip has changed since the last validation
-     * we need to recompute the composite clip 
-     */
-
-    if ((changes & (GCClipXOrigin|GCClipYOrigin|GCClipMask|GCSubwindowMode)) ||
-	(pDrawable->serialNumber != (pGC->serialNumber & DRAWABLE_SERIAL_BITS))
-	)
-    {
-	miComputeCompositeClip (pGC, pDrawable);
-	pPriv->oneRect = REGION_NUM_RECTS(fbGetCompositeClip(pGC)) == 1;
-    }
-    
-#ifdef FB_24_32BIT    
-    if (pPriv->bpp != pDrawable->bitsPerPixel)
-    {
-	changes |= GCStipple|GCForeground|GCBackground|GCPlaneMask;
-	pPriv->bpp = pDrawable->bitsPerPixel;
-    }
-    if ((changes & GCTile) && fbGetRotatedPixmap(pGC))
-    {
-	(*pGC->pScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC));
-	fbGetRotatedPixmap(pGC) = 0;
-    }
-	
-    if (pGC->fillStyle == FillTiled)
-    {
-	PixmapPtr	pOldTile, pNewTile;
-
-	pOldTile = pGC->tile.pixmap;
-	if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
-	{
-	    pNewTile = fbGetRotatedPixmap(pGC);
-	    if (!pNewTile || pNewTile ->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
-	    {
-		if (pNewTile)
-		    (*pGC->pScreen->DestroyPixmap) (pNewTile);
-		pNewTile = fb24_32ReformatTile (pOldTile, pDrawable->bitsPerPixel);
-	    }
-	    if (pNewTile)
-	    {
-		fbGetRotatedPixmap(pGC) = pOldTile;
-		pGC->tile.pixmap = pNewTile;
-		changes |= GCTile;
-	    }
-	}
-    }
-#endif
-    if (changes & GCTile)
-    {
-	if (!pGC->tileIsPixel && 
-	    FbEvenTile (pGC->tile.pixmap->drawable.width *
-			pDrawable->bitsPerPixel))
-	    fbPadPixmap (pGC->tile.pixmap);
-    }
-    if (changes & GCStipple)
-    {
-	pPriv->evenStipple = FALSE;
-
-	if (pGC->stipple) {
-
-	    /* can we do an even stipple ?? */
-	    if (FbEvenStip (pGC->stipple->drawable.width,
-						pDrawable->bitsPerPixel) &&
-	       (fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel)))
-	   	pPriv->evenStipple = TRUE;
-
-	    if (pGC->stipple->drawable.width * pDrawable->bitsPerPixel < FB_UNIT)
-		fbPadPixmap (pGC->stipple);
-	}
-    }
-    /*
-     * Recompute reduced rop values
-     */
-    if (changes & (GCForeground|GCBackground|GCPlaneMask|GCFunction))
-    {
-	int	s;
-	FbBits	depthMask;
-	
-	mask = FbFullMask(pDrawable->bitsPerPixel);
-	depthMask = FbFullMask(pDrawable->depth);
-	
-	pPriv->fg = pGC->fgPixel & mask;
-	pPriv->bg = pGC->bgPixel & mask;
-	
-	if ((pGC->planemask & depthMask) == depthMask)
-	    pPriv->pm = mask;
-	else
-	    pPriv->pm = pGC->planemask & mask;    
-	
-	s = pDrawable->bitsPerPixel;
-	while (s < FB_UNIT)
-	{
-	    pPriv->fg |= pPriv->fg << s;
-	    pPriv->bg |= pPriv->bg << s;
-	    pPriv->pm |= pPriv->pm << s;
-	    s <<= 1;
-	}
-	pPriv->and = fbAnd(pGC->alu, pPriv->fg, pPriv->pm);
-	pPriv->xor = fbXor(pGC->alu, pPriv->fg, pPriv->pm);
-	pPriv->bgand = fbAnd(pGC->alu, pPriv->bg, pPriv->pm);
-	pPriv->bgxor = fbXor(pGC->alu, pPriv->bg, pPriv->pm);
-    }
-    if (changes & GCDashList)
-    {
-	unsigned short	n = pGC->numInDashList;
-	unsigned char	*dash = pGC->dash;
-	unsigned int	dashLength = 0;
-
-	while (n--)
-	    dashLength += (unsigned int ) *dash++;
-	pPriv->dashLength = dashLength;
-    }
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+const GCFuncs fbGCFuncs = {

+    fbValidateGC,

+    miChangeGC,

+    miCopyGC,

+    miDestroyGC,

+    miChangeClip,

+    miDestroyClip,

+    miCopyClip,

+};

+

+const GCOps	fbGCOps = {

+    fbFillSpans,

+    fbSetSpans,

+    fbPutImage,

+    fbCopyArea,

+    fbCopyPlane,

+    fbPolyPoint,

+    fbPolyLine,

+    fbPolySegment,

+    fbPolyRectangle,

+    fbPolyArc,

+    miFillPolygon,

+    fbPolyFillRect,

+    fbPolyFillArc,

+    miPolyText8,

+    miPolyText16,

+    miImageText8,

+    miImageText16,

+    fbImageGlyphBlt,

+    fbPolyGlyphBlt,

+    fbPushPixels

+};

+

+Bool

+fbCreateGC(GCPtr pGC)

+{

+    pGC->clientClip = NULL;

+    pGC->clientClipType = CT_NONE;

+

+    pGC->ops = (GCOps *) &fbGCOps;

+    pGC->funcs = (GCFuncs *) &fbGCFuncs;

+

+    /* fb wants to translate before scan conversion */

+    pGC->miTranslate = 1;

+

+    fbGetRotatedPixmap(pGC) = 0;

+    fbGetExpose(pGC) = 1;

+    fbGetFreeCompClip(pGC) = 0;

+    fbGetCompositeClip(pGC) = 0;

+    fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);

+    return TRUE;

+}

+

+/*

+ * Pad pixmap to FB_UNIT bits wide

+ */

+void

+fbPadPixmap (PixmapPtr pPixmap)

+{

+    int	    width;

+    FbBits  *bits;

+    FbBits  b;

+    FbBits  mask;

+    int	    height;

+    int	    w;

+    int     stride;

+    int     bpp;

+    int     xOff, yOff;

+

+    fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff);

+

+    width = pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel;

+    height = pPixmap->drawable.height;

+    mask = FbBitsMask (0, width);

+    while (height--)

+    {

+	b = READ(bits) & mask;

+	w = width;

+	while (w < FB_UNIT)

+	{

+	    b = b | FbScrRight(b, w);

+	    w <<= 1;

+	}

+	WRITE(bits, b);

+	bits += stride;

+    }

+

+    fbFinishAccess (&pPixmap->drawable);

+}

+

+/*

+ * Verify that 'bits' repeats every 'len' bits

+ */

+static Bool

+fbBitsRepeat (FbBits bits, int len, int width)

+{

+    FbBits  mask = FbBitsMask(0, len);

+    FbBits  orig = bits & mask;

+    int	    i;

+    

+    if (width > FB_UNIT)

+	width = FB_UNIT;

+    for (i = 0; i < width / len; i++)

+    {

+	if ((bits & mask) != orig)

+	    return FALSE;

+	bits = FbScrLeft(bits,len);

+    }

+    return TRUE;

+}

+

+/*

+ * Check whether an entire bitmap line is a repetition of

+ * the first 'len' bits

+ */

+static Bool

+fbLineRepeat (FbBits *bits, int len, int width)

+{

+    FbBits  first = bits[0];

+    

+    if (!fbBitsRepeat (first, len, width))

+	return FALSE;

+    width = (width + FB_UNIT-1) >> FB_SHIFT;

+    bits++;

+    while (--width)

+	if (READ(bits) != first)

+	    return FALSE;

+    return TRUE;

+}

+

+/*

+ * The even stipple code wants the first FB_UNIT/bpp bits on

+ * each scanline to represent the entire stipple

+ */

+static Bool

+fbCanEvenStipple (PixmapPtr pStipple, int bpp)

+{

+    int	    len = FB_UNIT / bpp;

+    FbBits  *bits;

+    int	    stride;

+    int	    stip_bpp;

+    int	    stipXoff, stipYoff;

+    int	    h;

+

+    /* can't even stipple 24bpp drawables */

+    if ((bpp & (bpp-1)) != 0)

+	return FALSE;

+    /* make sure the stipple width is a multiple of the even stipple width */

+    if (pStipple->drawable.width % len != 0)

+	return FALSE;

+    fbGetDrawable (&pStipple->drawable, bits, stride, stip_bpp, stipXoff, stipYoff);

+    h = pStipple->drawable.height;

+    /* check to see that the stipple repeats horizontally */

+    while (h--)

+    {

+	if (!fbLineRepeat (bits, len, pStipple->drawable.width)) {

+	    fbFinishAccess (&pStipple->drawable);

+	    return FALSE;

+	}

+	bits += stride;

+    }

+    fbFinishAccess (&pStipple->drawable);

+    return TRUE;

+}

+

+void

+fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)

+{

+    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);

+    FbBits	mask;

+

+    pGC->lastWinOrg.x = pDrawable->x;

+    pGC->lastWinOrg.y = pDrawable->y;

+

+    /*

+     * if the client clip is different or moved OR the subwindowMode has

+     * changed OR the window's clip has changed since the last validation

+     * we need to recompute the composite clip 

+     */

+

+    if ((changes & (GCClipXOrigin|GCClipYOrigin|GCClipMask|GCSubwindowMode)) ||

+	(pDrawable->serialNumber != (pGC->serialNumber & DRAWABLE_SERIAL_BITS))

+	)

+    {

+	miComputeCompositeClip (pGC, pDrawable);

+	pPriv->oneRect = RegionNumRects(fbGetCompositeClip(pGC)) == 1;

+    }

+    

+#ifdef FB_24_32BIT    

+    if (pPriv->bpp != pDrawable->bitsPerPixel)

+    {

+	changes |= GCStipple|GCForeground|GCBackground|GCPlaneMask;

+	pPriv->bpp = pDrawable->bitsPerPixel;

+    }

+    if ((changes & GCTile) && fbGetRotatedPixmap(pGC))

+    {

+	(*pGC->pScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC));

+	fbGetRotatedPixmap(pGC) = 0;

+    }

+	

+    if (pGC->fillStyle == FillTiled)

+    {

+	PixmapPtr	pOldTile, pNewTile;

+

+	pOldTile = pGC->tile.pixmap;

+	if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel)

+	{

+	    pNewTile = fbGetRotatedPixmap(pGC);

+	    if (!pNewTile || pNewTile ->drawable.bitsPerPixel != pDrawable->bitsPerPixel)

+	    {

+		if (pNewTile)

+		    (*pGC->pScreen->DestroyPixmap) (pNewTile);

+		pNewTile = fb24_32ReformatTile (pOldTile, pDrawable->bitsPerPixel);

+	    }

+	    if (pNewTile)

+	    {

+		fbGetRotatedPixmap(pGC) = pOldTile;

+		pGC->tile.pixmap = pNewTile;

+		changes |= GCTile;

+	    }

+	}

+    }

+#endif

+    if (changes & GCTile)

+    {

+	if (!pGC->tileIsPixel && 

+	    FbEvenTile (pGC->tile.pixmap->drawable.width *

+			pDrawable->bitsPerPixel))

+	    fbPadPixmap (pGC->tile.pixmap);

+    }

+    if (changes & GCStipple)

+    {

+	pPriv->evenStipple = FALSE;

+

+	if (pGC->stipple) {

+

+	    /* can we do an even stipple ?? */

+	    if (FbEvenStip (pGC->stipple->drawable.width,

+						pDrawable->bitsPerPixel) &&

+	       (fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel)))

+	   	pPriv->evenStipple = TRUE;

+

+	    if (pGC->stipple->drawable.width * pDrawable->bitsPerPixel < FB_UNIT)

+		fbPadPixmap (pGC->stipple);

+	}

+    }

+    /*

+     * Recompute reduced rop values

+     */

+    if (changes & (GCForeground|GCBackground|GCPlaneMask|GCFunction))

+    {

+	int	s;

+	FbBits	depthMask;

+	

+	mask = FbFullMask(pDrawable->bitsPerPixel);

+	depthMask = FbFullMask(pDrawable->depth);

+	

+	pPriv->fg = pGC->fgPixel & mask;

+	pPriv->bg = pGC->bgPixel & mask;

+	

+	if ((pGC->planemask & depthMask) == depthMask)

+	    pPriv->pm = mask;

+	else

+	    pPriv->pm = pGC->planemask & mask;    

+	

+	s = pDrawable->bitsPerPixel;

+	while (s < FB_UNIT)

+	{

+	    pPriv->fg |= pPriv->fg << s;

+	    pPriv->bg |= pPriv->bg << s;

+	    pPriv->pm |= pPriv->pm << s;

+	    s <<= 1;

+	}

+	pPriv->and = fbAnd(pGC->alu, pPriv->fg, pPriv->pm);

+	pPriv->xor = fbXor(pGC->alu, pPriv->fg, pPriv->pm);

+	pPriv->bgand = fbAnd(pGC->alu, pPriv->bg, pPriv->pm);

+	pPriv->bgxor = fbXor(pGC->alu, pPriv->bg, pPriv->pm);

+    }

+    if (changes & GCDashList)

+    {

+	unsigned short	n = pGC->numInDashList;

+	unsigned char	*dash = pGC->dash;

+	unsigned int	dashLength = 0;

+

+	while (n--)

+	    dashLength += (unsigned int ) *dash++;

+	pPriv->dashLength = dashLength;

+    }

+}

diff --git a/xorg-server/fb/fbglyph.c b/xorg-server/fb/fbglyph.c
index 2c19b742f..51a5ea0a4 100644
--- a/xorg-server/fb/fbglyph.c
+++ b/xorg-server/fb/fbglyph.c
@@ -1,481 +1,479 @@
-/*
- *
- * Copyright © 1998 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 "fb.h"
-#include	<X11/fonts/fontstruct.h>
-#include	"dixfontstr.h"
-
-#define dummyScreen screenInfo.screens[0]
-      
-Bool
-fbGlyphIn (RegionPtr	pRegion,
-	   int		x,
-	   int		y,
-	   int		width,
-	   int		height)
-{
-    BoxRec  box;
-    BoxPtr  pExtents = REGION_EXTENTS (dummyScreen, pRegion);
-
-    /*
-     * Check extents by hand to avoid 16 bit overflows
-     */
-    if (x < (int) pExtents->x1) 
-	return FALSE;
-    if ((int) pExtents->x2 < x + width) 
-	return FALSE;
-    if (y < (int) pExtents->y1)
-	return FALSE;
-    if ((int) pExtents->y2 < y + height)
-	return FALSE;
-    box.x1 = x;
-    box.x2 = x + width;
-    box.y1 = y;
-    box.y2 = y + height;
-    return RECT_IN_REGION (dummyScreen, pRegion, &box) == rgnIN;
-}
-
-#ifdef FB_24BIT
-#ifndef FBNOPIXADDR
-
-#define WRITE1(d,n,fg)	WRITE((d) + (n), (CARD8) fg)
-#define WRITE2(d,n,fg)	WRITE((CARD16 *) &(d[n]), (CARD16) fg)
-#define WRITE4(d,n,fg)	WRITE((CARD32 *) &(d[n]), (CARD32) fg)
-#if FB_UNIT == 6 && IMAGE_BYTE_ORDER == LSBFirst
-#define WRITE8(d)	WRITE((FbBits *) &(d[0]), fg)
-#else
-#define WRITE8(d)	WRITE4(d,0,_ABCA), WRITE4(d,4,_BCAB)
-#endif
-			 
-/*
- * This is a bit tricky, but it's brief.  Write 12 bytes worth
- * of dest, which is four pixels, at a time.  This gives constant
- * code for each pattern as they're always aligned the same
- *
- *  a b c d  a b c d  a b c d	bytes
- *  A B C A  B C A B  C A B C	pixels
- * 
- *    f0        f1       f2
- *  A B C A  B C A B  C A B C	pixels LSB
- *  C A B C  A B C A  B C A B	pixels MSB
- *
- *		LSB	MSB
- *  A		f0	f1
- *  B		f1	f2
- *  C		f2	f0
- *  A B		f0	f2
- *  B C		f1	f0
- *  C A		f2	f1
- *  A B C A	f0	f1
- *  B C A B	f1    	f2
- *  C A B C	f2	f0
- */
-
-#undef _A
-#undef _B
-#undef _C
-#undef _AB
-#undef _BC
-#undef _CA
-#undef _ABCA
-#undef _BCAB
-#undef _CABC
-
-#if IMAGE_BYTE_ORDER == MSBFirst
-#define _A	f1
-#define _B	f2
-#define _C	f0
-#define _AB	f2
-#define _BC	f0
-#define _CA	f1
-#define _ABCA	f1
-#define _BCAB	f2
-#define _CABC	f0
-#define CASE(a,b,c,d)	((a << 3) | (b << 2) | (c << 1) | d)
-#else
-#define _A	f0
-#define _B	f1
-#define _C	f2
-#define _AB	f0
-#define _BC	f1
-#define _CA	f2
-#define _ABCA	f0
-#define _BCAB	f1
-#define _CABC	f2
-#define CASE(a,b,c,d)	(a | (b << 1) | (c << 2) | (d << 3))
-#endif
-
-void
-fbGlyph24 (FbBits   *dstBits,
-	   FbStride dstStride,
-	   int	    dstBpp,
-	   FbStip   *stipple,
-	   FbBits   fg,
-	   int	    x,
-	   int	    height)
-{
-    int	    lshift;
-    FbStip  bits;
-    CARD8   *dstLine;
-    CARD8   *dst;
-    FbStip  f0, f1, f2;
-    int	    n;
-    int	    shift;
-
-    f0 = fg;
-    f1 = FbRot24(f0,16);
-    f2 = FbRot24(f0,8);
-    
-    dstLine = (CARD8 *) dstBits;
-    dstLine += (x & ~3) * 3;
-    dstStride *= (sizeof (FbBits) / sizeof (CARD8));
-    shift = x & 3;
-    lshift = 4 - shift;
-    while (height--)
-    {
-	bits = READ(stipple++);
-	n = lshift;
-	dst = dstLine;
-	while (bits)
-	{
-	    switch (FbStipMoveLsb (FbLeftStipBits (bits, n), 4, n)) {
-	    case CASE(0,0,0,0):
-		break;
-	    case CASE(1,0,0,0):
-		WRITE2(dst,0,_AB);
-		WRITE1(dst,2,_C);
-		break;
-	    case CASE(0,1,0,0):
-		WRITE1(dst,3,_A);
-		WRITE2(dst,4,_BC);
-		break;
-	    case CASE(1,1,0,0):
-		WRITE4(dst,0,_ABCA);
-		WRITE2(dst,4,_BC);
-		break;
-	    case CASE(0,0,1,0):
-		WRITE2(dst,6,_AB);
-		WRITE1(dst,8,_C);
-		break;
-	    case CASE(1,0,1,0):
-		WRITE2(dst,0,_AB);
-		WRITE1(dst,2,_C);
-		
-		WRITE2(dst,6,_AB);
-		WRITE1(dst,8,_C);
-		break;
-	    case CASE(0,1,1,0):
-		WRITE1(dst,3,_A);
-		WRITE4(dst,4,_BCAB);
-		WRITE1(dst,8,_C);
-		break;
-	    case CASE(1,1,1,0):
-		WRITE8(dst);
-		WRITE1(dst,8,_C);
-		break;
-	    case CASE(0,0,0,1):
-		WRITE1(dst,9,_A);
-		WRITE2(dst,10,_BC);
-		break;
-	    case CASE(1,0,0,1):
-		WRITE2(dst,0,_AB);
-		WRITE1(dst,2,_C);
-		
-		WRITE1(dst,9,_A);
-		WRITE2(dst,10,_BC);
-		break;
-	    case CASE(0,1,0,1):
-		WRITE1(dst,3,_A);
-		WRITE2(dst,4,_BC);
-		
-		WRITE1(dst,9,_A);
-		WRITE2(dst,10,_BC);
-		break;
-	    case CASE(1,1,0,1):
-		WRITE4(dst,0,_ABCA);
-		WRITE2(dst,4,_BC);
-		
-		WRITE1(dst,9,_A);
-		WRITE2(dst,10,_BC);
-		break;
-	    case CASE(0,0,1,1):
-		WRITE2(dst,6,_AB);
-		WRITE4(dst,8,_CABC);
-		break;
-	    case CASE(1,0,1,1):
-		WRITE2(dst,0,_AB);
-		WRITE1(dst,2,_C);
-		
-		WRITE2(dst,6,_AB);
-		WRITE4(dst,8,_CABC);
-		break;
-	    case CASE(0,1,1,1):
-		WRITE1(dst,3,_A);
-		WRITE4(dst,4,_BCAB);
-		WRITE4(dst,8,_CABC);
-		break;
-	    case CASE(1,1,1,1):
-		WRITE8(dst);
-		WRITE4(dst,8,_CABC);
-		break;
-	    }
-	    bits = FbStipLeft (bits, n);
-	    n = 4;
-	    dst += 12;
-	}
-	dstLine += dstStride;
-    }
-}
-#endif
-#endif
-
-void
-fbPolyGlyphBlt (DrawablePtr	pDrawable,
-		GCPtr		pGC,
-		int		x, 
-		int		y,
-		unsigned int	nglyph,
-		CharInfoPtr	*ppci,
-		pointer		pglyphBase)
-{
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);
-    CharInfoPtr	    pci;
-    unsigned char   *pglyph;		/* pointer bits in glyph */
-    int		    gx, gy;
-    int		    gWidth, gHeight;	/* width and height of glyph */
-    FbStride	    gStride;		/* stride of glyph */
-#ifndef FBNOPIXADDR
-    void	    (*glyph) (FbBits *,
-			      FbStride,
-			      int,
-			      FbStip *,
-			      FbBits,
-			      int,
-			      int);
-    FbBits	    *dst = 0;
-    FbStride	    dstStride = 0;
-    int		    dstBpp = 0;
-    int		    dstXoff = 0, dstYoff = 0;
-    
-    glyph = 0;
-    if (pGC->fillStyle == FillSolid && pPriv->and == 0)
-    {
-	dstBpp = pDrawable->bitsPerPixel;
-	switch (dstBpp) {
-	case 8:	    glyph = fbGlyph8; break;
-	case 16:    glyph = fbGlyph16; break;
-#ifdef FB_24BIT
-	case 24:    glyph = fbGlyph24; break;
-#endif
-	case 32:    glyph = fbGlyph32; break;
-	}
-    }
-#endif
-    x += pDrawable->x;
-    y += pDrawable->y;
-
-    while (nglyph--)
-    {
-	pci = *ppci++;
-	pglyph = FONTGLYPHBITS(pglyphBase, pci);
-	gWidth = GLYPHWIDTHPIXELS(pci);
-	gHeight = GLYPHHEIGHTPIXELS(pci);
-	if (gWidth && gHeight)
-	{
-	    gx = x + pci->metrics.leftSideBearing;
-	    gy = y - pci->metrics.ascent; 
-#ifndef FBNOPIXADDR
-	    if (glyph && gWidth <= sizeof (FbStip) * 8 &&
-		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))
-	    {
-		fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-		(*glyph) (dst + (gy + dstYoff) * dstStride,
-			  dstStride,
-			  dstBpp,
-			  (FbStip *) pglyph,
-			  pPriv->xor,
-			  gx + dstXoff,
-			  gHeight);
-		fbFinishAccess (pDrawable);
-	    }
-	    else
-#endif
-	    {
-		gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip);
-		fbPushImage (pDrawable,
-			     pGC,
-    
-			     (FbStip *) pglyph,
-			     gStride,
-			     0,
-    
-			     gx,
-			     gy,
-			     gWidth, gHeight);
-	    }
-	}
-	x += pci->metrics.characterWidth;
-    }
-}
-
-
-void
-fbImageGlyphBlt (DrawablePtr	pDrawable,
-		 GCPtr		pGC,
-		 int		x, 
-		 int		y,
-		 unsigned int	nglyph,
-		 CharInfoPtr	*ppciInit,
-		 pointer	pglyphBase)
-{
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);
-    CharInfoPtr	    *ppci;
-    CharInfoPtr	    pci;
-    unsigned char   *pglyph;		/* pointer bits in glyph */
-    int		    gWidth, gHeight;	/* width and height of glyph */
-    FbStride	    gStride;		/* stride of glyph */
-    Bool	    opaque;
-    int		    n;
-    int		    gx, gy;
-#ifndef FBNOPIXADDR
-    void	    (*glyph) (FbBits *,
-			      FbStride,
-			      int,
-			      FbStip *,
-			      FbBits,
-			      int,
-			      int);
-    FbBits	    *dst = 0;
-    FbStride	    dstStride = 0;
-    int		    dstBpp = 0;
-    int		    dstXoff = 0, dstYoff = 0;
-    
-    glyph = 0;
-    if (pPriv->and == 0)
-    {
-	dstBpp = pDrawable->bitsPerPixel;
-	switch (dstBpp) {
-	case 8:	    glyph = fbGlyph8; break;
-	case 16:    glyph = fbGlyph16; break;
-#ifdef FB_24BIT
-	case 24:    glyph = fbGlyph24; break;
-#endif
-	case 32:    glyph = fbGlyph32; break;
-	}
-    }
-#endif
-    
-    x += pDrawable->x;
-    y += pDrawable->y;
-
-    if (TERMINALFONT (pGC->font)
-#ifndef FBNOPIXADDR
-	&& !glyph
-#endif
-	)
-    {
-	opaque = TRUE;
-    }
-    else
-    {
-	int		xBack, widthBack;
-	int		yBack, heightBack;
-	
-	ppci = ppciInit;
-	n = nglyph;
-	widthBack = 0;
-	while (n--)
-	    widthBack += (*ppci++)->metrics.characterWidth;
-	
-        xBack = x;
-	if (widthBack < 0)
-	{
-	    xBack += widthBack;
-	    widthBack = -widthBack;
-	}
-	yBack = y - FONTASCENT(pGC->font);
-	heightBack = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);
-	fbSolidBoxClipped (pDrawable,
-			   fbGetCompositeClip(pGC),
-			   xBack,
-			   yBack,
-			   xBack + widthBack,
-			   yBack + heightBack,
-			   fbAnd(GXcopy,pPriv->bg,pPriv->pm),
-			   fbXor(GXcopy,pPriv->bg,pPriv->pm));
-	opaque = FALSE;
-    }
-
-    ppci = ppciInit;
-    while (nglyph--)
-    {
-	pci = *ppci++;
-	pglyph = FONTGLYPHBITS(pglyphBase, pci);
-	gWidth = GLYPHWIDTHPIXELS(pci);
-	gHeight = GLYPHHEIGHTPIXELS(pci);
-	if (gWidth && gHeight)
-	{
-	    gx = x + pci->metrics.leftSideBearing;
-	    gy = y - pci->metrics.ascent; 
-#ifndef FBNOPIXADDR
-	    if (glyph && gWidth <= sizeof (FbStip) * 8 &&
-		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))
-	    {
-		fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-		(*glyph) (dst + (gy + dstYoff) * dstStride,
-			  dstStride,
-			  dstBpp,
-			  (FbStip *) pglyph,
-			  pPriv->fg,
-			  gx + dstXoff,
-			  gHeight);
-		fbFinishAccess (pDrawable);
-	    }
-	    else
-#endif
-	    {
-		gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip);
-		fbPutXYImage (pDrawable,
-			      fbGetCompositeClip(pGC),
-			      pPriv->fg,
-			      pPriv->bg,
-			      pPriv->pm,
-			      GXcopy,
-			      opaque,
-    
-			      gx,
-			      gy,
-			      gWidth, gHeight,
-    
-			      (FbStip *) pglyph,
-			      gStride,
-			      0);
-	    }
-	}
-	x += pci->metrics.characterWidth;
-    }
-}
+/*

+ *

+ * Copyright © 1998 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 "fb.h"

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

+#include	"dixfontstr.h"

+

+Bool

+fbGlyphIn (RegionPtr	pRegion,

+	   int		x,

+	   int		y,

+	   int		width,

+	   int		height)

+{

+    BoxRec  box;

+    BoxPtr  pExtents = RegionExtents(pRegion);

+

+    /*

+     * Check extents by hand to avoid 16 bit overflows

+     */

+    if (x < (int) pExtents->x1) 

+	return FALSE;

+    if ((int) pExtents->x2 < x + width) 

+	return FALSE;

+    if (y < (int) pExtents->y1)

+	return FALSE;

+    if ((int) pExtents->y2 < y + height)

+	return FALSE;

+    box.x1 = x;

+    box.x2 = x + width;

+    box.y1 = y;

+    box.y2 = y + height;

+    return RegionContainsRect(pRegion, &box) == rgnIN;

+}

+

+#ifdef FB_24BIT

+#ifndef FBNOPIXADDR

+

+#define WRITE1(d,n,fg)	WRITE((d) + (n), (CARD8) fg)

+#define WRITE2(d,n,fg)	WRITE((CARD16 *) &(d[n]), (CARD16) fg)

+#define WRITE4(d,n,fg)	WRITE((CARD32 *) &(d[n]), (CARD32) fg)

+#if FB_UNIT == 6 && IMAGE_BYTE_ORDER == LSBFirst

+#define WRITE8(d)	WRITE((FbBits *) &(d[0]), fg)

+#else

+#define WRITE8(d)	WRITE4(d,0,_ABCA), WRITE4(d,4,_BCAB)

+#endif

+			 

+/*

+ * This is a bit tricky, but it's brief.  Write 12 bytes worth

+ * of dest, which is four pixels, at a time.  This gives constant

+ * code for each pattern as they're always aligned the same

+ *

+ *  a b c d  a b c d  a b c d	bytes

+ *  A B C A  B C A B  C A B C	pixels

+ * 

+ *    f0        f1       f2

+ *  A B C A  B C A B  C A B C	pixels LSB

+ *  C A B C  A B C A  B C A B	pixels MSB

+ *

+ *		LSB	MSB

+ *  A		f0	f1

+ *  B		f1	f2

+ *  C		f2	f0

+ *  A B		f0	f2

+ *  B C		f1	f0

+ *  C A		f2	f1

+ *  A B C A	f0	f1

+ *  B C A B	f1    	f2

+ *  C A B C	f2	f0

+ */

+

+#undef _A

+#undef _B

+#undef _C

+#undef _AB

+#undef _BC

+#undef _CA

+#undef _ABCA

+#undef _BCAB

+#undef _CABC

+

+#if IMAGE_BYTE_ORDER == MSBFirst

+#define _A	f1

+#define _B	f2

+#define _C	f0

+#define _AB	f2

+#define _BC	f0

+#define _CA	f1

+#define _ABCA	f1

+#define _BCAB	f2

+#define _CABC	f0

+#define CASE(a,b,c,d)	((a << 3) | (b << 2) | (c << 1) | d)

+#else

+#define _A	f0

+#define _B	f1

+#define _C	f2

+#define _AB	f0

+#define _BC	f1

+#define _CA	f2

+#define _ABCA	f0

+#define _BCAB	f1

+#define _CABC	f2

+#define CASE(a,b,c,d)	(a | (b << 1) | (c << 2) | (d << 3))

+#endif

+

+void

+fbGlyph24 (FbBits   *dstBits,

+	   FbStride dstStride,

+	   int	    dstBpp,

+	   FbStip   *stipple,

+	   FbBits   fg,

+	   int	    x,

+	   int	    height)

+{

+    int	    lshift;

+    FbStip  bits;

+    CARD8   *dstLine;

+    CARD8   *dst;

+    FbStip  f0, f1, f2;

+    int	    n;

+    int	    shift;

+

+    f0 = fg;

+    f1 = FbRot24(f0,16);

+    f2 = FbRot24(f0,8);

+    

+    dstLine = (CARD8 *) dstBits;

+    dstLine += (x & ~3) * 3;

+    dstStride *= (sizeof (FbBits) / sizeof (CARD8));

+    shift = x & 3;

+    lshift = 4 - shift;

+    while (height--)

+    {

+	bits = READ(stipple++);

+	n = lshift;

+	dst = dstLine;

+	while (bits)

+	{

+	    switch (FbStipMoveLsb (FbLeftStipBits (bits, n), 4, n)) {

+	    case CASE(0,0,0,0):

+		break;

+	    case CASE(1,0,0,0):

+		WRITE2(dst,0,_AB);

+		WRITE1(dst,2,_C);

+		break;

+	    case CASE(0,1,0,0):

+		WRITE1(dst,3,_A);

+		WRITE2(dst,4,_BC);

+		break;

+	    case CASE(1,1,0,0):

+		WRITE4(dst,0,_ABCA);

+		WRITE2(dst,4,_BC);

+		break;

+	    case CASE(0,0,1,0):

+		WRITE2(dst,6,_AB);

+		WRITE1(dst,8,_C);

+		break;

+	    case CASE(1,0,1,0):

+		WRITE2(dst,0,_AB);

+		WRITE1(dst,2,_C);

+		

+		WRITE2(dst,6,_AB);

+		WRITE1(dst,8,_C);

+		break;

+	    case CASE(0,1,1,0):

+		WRITE1(dst,3,_A);

+		WRITE4(dst,4,_BCAB);

+		WRITE1(dst,8,_C);

+		break;

+	    case CASE(1,1,1,0):

+		WRITE8(dst);

+		WRITE1(dst,8,_C);

+		break;

+	    case CASE(0,0,0,1):

+		WRITE1(dst,9,_A);

+		WRITE2(dst,10,_BC);

+		break;

+	    case CASE(1,0,0,1):

+		WRITE2(dst,0,_AB);

+		WRITE1(dst,2,_C);

+		

+		WRITE1(dst,9,_A);

+		WRITE2(dst,10,_BC);

+		break;

+	    case CASE(0,1,0,1):

+		WRITE1(dst,3,_A);

+		WRITE2(dst,4,_BC);

+		

+		WRITE1(dst,9,_A);

+		WRITE2(dst,10,_BC);

+		break;

+	    case CASE(1,1,0,1):

+		WRITE4(dst,0,_ABCA);

+		WRITE2(dst,4,_BC);

+		

+		WRITE1(dst,9,_A);

+		WRITE2(dst,10,_BC);

+		break;

+	    case CASE(0,0,1,1):

+		WRITE2(dst,6,_AB);

+		WRITE4(dst,8,_CABC);

+		break;

+	    case CASE(1,0,1,1):

+		WRITE2(dst,0,_AB);

+		WRITE1(dst,2,_C);

+		

+		WRITE2(dst,6,_AB);

+		WRITE4(dst,8,_CABC);

+		break;

+	    case CASE(0,1,1,1):

+		WRITE1(dst,3,_A);

+		WRITE4(dst,4,_BCAB);

+		WRITE4(dst,8,_CABC);

+		break;

+	    case CASE(1,1,1,1):

+		WRITE8(dst);

+		WRITE4(dst,8,_CABC);

+		break;

+	    }

+	    bits = FbStipLeft (bits, n);

+	    n = 4;

+	    dst += 12;

+	}

+	dstLine += dstStride;

+    }

+}

+#endif

+#endif

+

+void

+fbPolyGlyphBlt (DrawablePtr	pDrawable,

+		GCPtr		pGC,

+		int		x, 

+		int		y,

+		unsigned int	nglyph,

+		CharInfoPtr	*ppci,

+		pointer		pglyphBase)

+{

+    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);

+    CharInfoPtr	    pci;

+    unsigned char   *pglyph;		/* pointer bits in glyph */

+    int		    gx, gy;

+    int		    gWidth, gHeight;	/* width and height of glyph */

+    FbStride	    gStride;		/* stride of glyph */

+#ifndef FBNOPIXADDR

+    void	    (*glyph) (FbBits *,

+			      FbStride,

+			      int,

+			      FbStip *,

+			      FbBits,

+			      int,

+			      int);

+    FbBits	    *dst = 0;

+    FbStride	    dstStride = 0;

+    int		    dstBpp = 0;

+    int		    dstXoff = 0, dstYoff = 0;

+    

+    glyph = 0;

+    if (pGC->fillStyle == FillSolid && pPriv->and == 0)

+    {

+	dstBpp = pDrawable->bitsPerPixel;

+	switch (dstBpp) {

+	case 8:	    glyph = fbGlyph8; break;

+	case 16:    glyph = fbGlyph16; break;

+#ifdef FB_24BIT

+	case 24:    glyph = fbGlyph24; break;

+#endif

+	case 32:    glyph = fbGlyph32; break;

+	}

+    }

+#endif

+    x += pDrawable->x;

+    y += pDrawable->y;

+

+    while (nglyph--)

+    {

+	pci = *ppci++;

+	pglyph = FONTGLYPHBITS(pglyphBase, pci);

+	gWidth = GLYPHWIDTHPIXELS(pci);

+	gHeight = GLYPHHEIGHTPIXELS(pci);

+	if (gWidth && gHeight)

+	{

+	    gx = x + pci->metrics.leftSideBearing;

+	    gy = y - pci->metrics.ascent; 

+#ifndef FBNOPIXADDR

+	    if (glyph && gWidth <= sizeof (FbStip) * 8 &&

+		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))

+	    {

+		fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+		(*glyph) (dst + (gy + dstYoff) * dstStride,

+			  dstStride,

+			  dstBpp,

+			  (FbStip *) pglyph,

+			  pPriv->xor,

+			  gx + dstXoff,

+			  gHeight);

+		fbFinishAccess (pDrawable);

+	    }

+	    else

+#endif

+	    {

+		gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip);

+		fbPushImage (pDrawable,

+			     pGC,

+    

+			     (FbStip *) pglyph,

+			     gStride,

+			     0,

+    

+			     gx,

+			     gy,

+			     gWidth, gHeight);

+	    }

+	}

+	x += pci->metrics.characterWidth;

+    }

+}

+

+

+void

+fbImageGlyphBlt (DrawablePtr	pDrawable,

+		 GCPtr		pGC,

+		 int		x, 

+		 int		y,

+		 unsigned int	nglyph,

+		 CharInfoPtr	*ppciInit,

+		 pointer	pglyphBase)

+{

+    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);

+    CharInfoPtr	    *ppci;

+    CharInfoPtr	    pci;

+    unsigned char   *pglyph;		/* pointer bits in glyph */

+    int		    gWidth, gHeight;	/* width and height of glyph */

+    FbStride	    gStride;		/* stride of glyph */

+    Bool	    opaque;

+    int		    n;

+    int		    gx, gy;

+#ifndef FBNOPIXADDR

+    void	    (*glyph) (FbBits *,

+			      FbStride,

+			      int,

+			      FbStip *,

+			      FbBits,

+			      int,

+			      int);

+    FbBits	    *dst = 0;

+    FbStride	    dstStride = 0;

+    int		    dstBpp = 0;

+    int		    dstXoff = 0, dstYoff = 0;

+    

+    glyph = 0;

+    if (pPriv->and == 0)

+    {

+	dstBpp = pDrawable->bitsPerPixel;

+	switch (dstBpp) {

+	case 8:	    glyph = fbGlyph8; break;

+	case 16:    glyph = fbGlyph16; break;

+#ifdef FB_24BIT

+	case 24:    glyph = fbGlyph24; break;

+#endif

+	case 32:    glyph = fbGlyph32; break;

+	}

+    }

+#endif

+    

+    x += pDrawable->x;

+    y += pDrawable->y;

+

+    if (TERMINALFONT (pGC->font)

+#ifndef FBNOPIXADDR

+	&& !glyph

+#endif

+	)

+    {

+	opaque = TRUE;

+    }

+    else

+    {

+	int		xBack, widthBack;

+	int		yBack, heightBack;

+	

+	ppci = ppciInit;

+	n = nglyph;

+	widthBack = 0;

+	while (n--)

+	    widthBack += (*ppci++)->metrics.characterWidth;

+	

+        xBack = x;

+	if (widthBack < 0)

+	{

+	    xBack += widthBack;

+	    widthBack = -widthBack;

+	}

+	yBack = y - FONTASCENT(pGC->font);

+	heightBack = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);

+	fbSolidBoxClipped (pDrawable,

+			   fbGetCompositeClip(pGC),

+			   xBack,

+			   yBack,

+			   xBack + widthBack,

+			   yBack + heightBack,

+			   fbAnd(GXcopy,pPriv->bg,pPriv->pm),

+			   fbXor(GXcopy,pPriv->bg,pPriv->pm));

+	opaque = FALSE;

+    }

+

+    ppci = ppciInit;

+    while (nglyph--)

+    {

+	pci = *ppci++;

+	pglyph = FONTGLYPHBITS(pglyphBase, pci);

+	gWidth = GLYPHWIDTHPIXELS(pci);

+	gHeight = GLYPHHEIGHTPIXELS(pci);

+	if (gWidth && gHeight)

+	{

+	    gx = x + pci->metrics.leftSideBearing;

+	    gy = y - pci->metrics.ascent; 

+#ifndef FBNOPIXADDR

+	    if (glyph && gWidth <= sizeof (FbStip) * 8 &&

+		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))

+	    {

+		fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+		(*glyph) (dst + (gy + dstYoff) * dstStride,

+			  dstStride,

+			  dstBpp,

+			  (FbStip *) pglyph,

+			  pPriv->fg,

+			  gx + dstXoff,

+			  gHeight);

+		fbFinishAccess (pDrawable);

+	    }

+	    else

+#endif

+	    {

+		gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip);

+		fbPutXYImage (pDrawable,

+			      fbGetCompositeClip(pGC),

+			      pPriv->fg,

+			      pPriv->bg,

+			      pPriv->pm,

+			      GXcopy,

+			      opaque,

+    

+			      gx,

+			      gy,

+			      gWidth, gHeight,

+    

+			      (FbStip *) pglyph,

+			      gStride,

+			      0);

+	    }

+	}

+	x += pci->metrics.characterWidth;

+    }

+}

diff --git a/xorg-server/fb/fbimage.c b/xorg-server/fb/fbimage.c
index 2b9ac27c0..0fcb05f7c 100644
--- a/xorg-server/fb/fbimage.c
+++ b/xorg-server/fb/fbimage.c
@@ -1,368 +1,368 @@
-/*
- * Copyright © 1998 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 <string.h>
-
-#include "fb.h"
-
-void
-fbPutImage (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-	    int		depth,
-	    int		x,
-	    int		y,
-	    int		w,
-	    int		h,
-	    int		leftPad,
-	    int		format,
-	    char	*pImage)
-{
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);
-    unsigned long   i;
-    FbStride	    srcStride;
-    FbStip	    *src = (FbStip *) pImage;
-    
-    x += pDrawable->x;
-    y += pDrawable->y;
-    
-    switch (format)
-    {
-    case XYBitmap:
-	srcStride = BitmapBytePad(w + leftPad) / sizeof (FbStip);
-	fbPutXYImage (pDrawable,
-		      fbGetCompositeClip(pGC),
-		      pPriv->fg,
-		      pPriv->bg,
-		      pPriv->pm,
-		      pGC->alu,
-		      TRUE,
-		      x, y, w, h,
-		      src,
-		      srcStride,
-		      leftPad);
-	break;
-    case XYPixmap:
-	srcStride = BitmapBytePad(w + leftPad) / sizeof (FbStip);
-	for (i = (unsigned long)1 << (pDrawable->depth - 1); i; i >>= 1)
-	{
-	    if (i & pGC->planemask)
-	    {
-		fbPutXYImage (pDrawable,
-			      fbGetCompositeClip(pGC),
-			      FB_ALLONES,
-			      0,
-			      fbReplicatePixel (i, pDrawable->bitsPerPixel),
-			      pGC->alu,
-			      TRUE,
-			      x, y, w, h,
-			      src,
-			      srcStride,
-			      leftPad);
-		src += srcStride * h;
-	    }
-	}
-	break;
-    case ZPixmap:
-#ifdef FB_24_32BIT
-	if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))
-	{
-	    srcStride = PixmapBytePad(w, pDrawable->depth);
-	    fb24_32PutZImage (pDrawable,
-			      fbGetCompositeClip(pGC),
-			      pGC->alu,
-			      (FbBits) pGC->planemask,
-			      x, y, w, h,
-			      (CARD8 *) pImage,
-			      srcStride);
-	}
-	else
-#endif
-	{
-	    srcStride = PixmapBytePad(w, pDrawable->depth) / sizeof (FbStip);
-	    fbPutZImage (pDrawable,
-			 fbGetCompositeClip(pGC),
-			 pGC->alu,
-			 pPriv->pm,
-			 x, y, w, h, 
-			 src, srcStride);
-	}
-    }
-}
-
-void
-fbPutZImage (DrawablePtr	pDrawable,
-	     RegionPtr		pClip,
-	     int		alu,
-	     FbBits		pm,
-	     int		x,
-	     int		y,
-	     int		width,
-	     int		height,
-	     FbStip		*src,
-	     FbStride		srcStride)
-{
-    FbStip	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    int		nbox;
-    BoxPtr	pbox;
-    int		x1, y1, x2, y2;
-
-    fbGetStipDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-
-    for (nbox = REGION_NUM_RECTS (pClip),
-	 pbox = REGION_RECTS(pClip);
-	 nbox--;
-	 pbox++)
-    {
-	x1 = x;
-	y1 = y;
-	x2 = x + width;
-	y2 = y + height;
-	if (x1 < pbox->x1)
-	    x1 = pbox->x1;
-	if (y1 < pbox->y1)
-	    y1 = pbox->y1;
-	if (x2 > pbox->x2)
-	    x2 = pbox->x2;
-	if (y2 > pbox->y2)
-	    y2 = pbox->y2;
-	if (x1 >= x2 || y1 >= y2)
-	    continue;
-	fbBltStip (src + (y1 - y) * srcStride,
-		   srcStride,
-		   (x1 - x) * dstBpp,
-
-		   dst + (y1 + dstYoff) * dstStride,
-		   dstStride,
-		   (x1 + dstXoff) * dstBpp,
-
-		   (x2 - x1) * dstBpp,
-		   (y2 - y1),
-
-		   alu,
-		   pm,
-		   dstBpp);
-    }
-
-    fbFinishAccess (pDrawable);
-}
-	     
-void
-fbPutXYImage (DrawablePtr	pDrawable,
-	      RegionPtr		pClip,
-	      FbBits		fg,
-	      FbBits		bg,
-	      FbBits		pm,
-	      int		alu,
-	      Bool		opaque,
-	      
-	      int		x,
-	      int		y,
-	      int		width,
-	      int		height,
-
-	      FbStip		*src,
-	      FbStride		srcStride,
-	      int		srcX)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    int		nbox;
-    BoxPtr	pbox;
-    int		x1, y1, x2, y2;
-    FbBits	fgand = 0, fgxor = 0, bgand = 0, bgxor = 0;
-
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-
-    if (dstBpp == 1)
-    {
-	if (opaque)
-	    alu = FbOpaqueStipple1Rop(alu,fg,bg);
-	else
-	    alu = FbStipple1Rop(alu,fg);
-    }
-    else
-    {
-	fgand = fbAnd(alu,fg,pm);
-	fgxor = fbXor(alu,fg,pm);
-	if (opaque)
-	{
-	    bgand = fbAnd(alu,bg,pm);
-	    bgxor = fbXor(alu,bg,pm);
-	}
-	else
-	{
-	    bgand = fbAnd(GXnoop,(FbBits)0,FB_ALLONES);
-	    bgxor = fbXor(GXnoop,(FbBits)0,FB_ALLONES);
-	}
-    }
-
-    for (nbox = REGION_NUM_RECTS (pClip),
-	 pbox = REGION_RECTS(pClip);
-	 nbox--;
-	 pbox++)
-    {
-	x1 = x;
-	y1 = y;
-	x2 = x + width;
-	y2 = y + height;
-	if (x1 < pbox->x1)
-	    x1 = pbox->x1;
-	if (y1 < pbox->y1)
-	    y1 = pbox->y1;
-	if (x2 > pbox->x2)
-	    x2 = pbox->x2;
-	if (y2 > pbox->y2)
-	    y2 = pbox->y2;
-	if (x1 >= x2 || y1 >= y2)
-	    continue;
-	if (dstBpp == 1)
-	{
-	    fbBltStip (src + (y1 - y) * srcStride,
-		       srcStride,
-		       (x1 - x) + srcX,
-
-		       (FbStip *) (dst + (y1 + dstYoff) * dstStride),
-		       FbBitsStrideToStipStride(dstStride),
-		       (x1 + dstXoff) * dstBpp,
-
-		       (x2 - x1) * dstBpp,
-		       (y2 - y1),
-
-		       alu,
-		       pm,
-		       dstBpp);
-	}
-	else
-	{
-	    fbBltOne (src + (y1 - y) * srcStride,
-		      srcStride,
-		      (x1 - x) + srcX,
-
-		      dst + (y1 + dstYoff) * dstStride,
-		      dstStride,
-		      (x1 + dstXoff) * dstBpp,
-		      dstBpp,
-
-		      (x2 - x1) * dstBpp,
-		      (y2 - y1),
-
-		      fgand, fgxor, bgand, bgxor);
-	}
-    }
-
-    fbFinishAccess (pDrawable);
-}
-
-void
-fbGetImage (DrawablePtr	    pDrawable,
-	    int		    x,
-	    int		    y,
-	    int		    w,
-	    int		    h,
-	    unsigned int    format,
-	    unsigned long   planeMask,
-	    char	    *d)
-{
-    FbBits	    *src;
-    FbStride	    srcStride;
-    int		    srcBpp;
-    int		    srcXoff, srcYoff;
-    FbStip	    *dst;
-    FbStride	    dstStride;
-    
-    /*
-     * XFree86 DDX empties the root borderClip when the VT is
-     * switched away; this checks for that case
-     */
-    if (!fbDrawableEnabled(pDrawable))
-	return;
-    
-#ifdef FB_24_32BIT
-    if (format == ZPixmap &&
-	pDrawable->bitsPerPixel != BitsPerPixel (pDrawable->depth))
-    {
-	fb24_32GetImage (pDrawable, x, y, w, h, format, planeMask, d);
-	return;
-    }
-#endif
-    
-    fbGetDrawable (pDrawable, src, srcStride, srcBpp, srcXoff, srcYoff);
-    
-    x += pDrawable->x;
-    y += pDrawable->y;
-    
-    dst = (FbStip *) d;
-    if (format == ZPixmap || srcBpp == 1)
-    {
-	FbBits	pm;
-
-	pm = fbReplicatePixel (planeMask, srcBpp);
-	dstStride = PixmapBytePad(w, pDrawable->depth);
-	if (pm != FB_ALLONES)
-	    memset (d, 0, dstStride * h);
-	dstStride /= sizeof (FbStip);
-	fbBltStip ((FbStip *) (src + (y + srcYoff) * srcStride), 
-		   FbBitsStrideToStipStride(srcStride),
-		   (x + srcXoff) * srcBpp,
-		   
-		   dst,
-		   dstStride,
-		   0,
-		   
-		   w * srcBpp, h,
-
-		   GXcopy,
-		   pm,
-		   srcBpp);
-    }
-    else
-    {
-	dstStride = BitmapBytePad(w) / sizeof (FbStip);
-	fbBltPlane (src + (y + srcYoff) * srcStride,
-		    srcStride, 
-		    (x + srcXoff) * srcBpp,
-		    srcBpp,
-
-		    dst,
-		    dstStride,
-		    0,
-		    
-		    w * srcBpp, h,
-
-		    fbAndStip(GXcopy,FB_STIP_ALLONES,FB_STIP_ALLONES),
-		    fbXorStip(GXcopy,FB_STIP_ALLONES,FB_STIP_ALLONES),
-		    fbAndStip(GXcopy,0,FB_STIP_ALLONES),
-		    fbXorStip(GXcopy,0,FB_STIP_ALLONES),
-		    planeMask);
-    }
-
-    fbFinishAccess (pDrawable);
-}
+/*

+ * Copyright © 1998 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 <string.h>

+

+#include "fb.h"

+

+void

+fbPutImage (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+	    int		depth,

+	    int		x,

+	    int		y,

+	    int		w,

+	    int		h,

+	    int		leftPad,

+	    int		format,

+	    char	*pImage)

+{

+    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);

+    unsigned long   i;

+    FbStride	    srcStride;

+    FbStip	    *src = (FbStip *) pImage;

+    

+    x += pDrawable->x;

+    y += pDrawable->y;

+    

+    switch (format)

+    {

+    case XYBitmap:

+	srcStride = BitmapBytePad(w + leftPad) / sizeof (FbStip);

+	fbPutXYImage (pDrawable,

+		      fbGetCompositeClip(pGC),

+		      pPriv->fg,

+		      pPriv->bg,

+		      pPriv->pm,

+		      pGC->alu,

+		      TRUE,

+		      x, y, w, h,

+		      src,

+		      srcStride,

+		      leftPad);

+	break;

+    case XYPixmap:

+	srcStride = BitmapBytePad(w + leftPad) / sizeof (FbStip);

+	for (i = (unsigned long)1 << (pDrawable->depth - 1); i; i >>= 1)

+	{

+	    if (i & pGC->planemask)

+	    {

+		fbPutXYImage (pDrawable,

+			      fbGetCompositeClip(pGC),

+			      FB_ALLONES,

+			      0,

+			      fbReplicatePixel (i, pDrawable->bitsPerPixel),

+			      pGC->alu,

+			      TRUE,

+			      x, y, w, h,

+			      src,

+			      srcStride,

+			      leftPad);

+		src += srcStride * h;

+	    }

+	}

+	break;

+    case ZPixmap:

+#ifdef FB_24_32BIT

+	if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))

+	{

+	    srcStride = PixmapBytePad(w, pDrawable->depth);

+	    fb24_32PutZImage (pDrawable,

+			      fbGetCompositeClip(pGC),

+			      pGC->alu,

+			      (FbBits) pGC->planemask,

+			      x, y, w, h,

+			      (CARD8 *) pImage,

+			      srcStride);

+	}

+	else

+#endif

+	{

+	    srcStride = PixmapBytePad(w, pDrawable->depth) / sizeof (FbStip);

+	    fbPutZImage (pDrawable,

+			 fbGetCompositeClip(pGC),

+			 pGC->alu,

+			 pPriv->pm,

+			 x, y, w, h, 

+			 src, srcStride);

+	}

+    }

+}

+

+void

+fbPutZImage (DrawablePtr	pDrawable,

+	     RegionPtr		pClip,

+	     int		alu,

+	     FbBits		pm,

+	     int		x,

+	     int		y,

+	     int		width,

+	     int		height,

+	     FbStip		*src,

+	     FbStride		srcStride)

+{

+    FbStip	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    int		nbox;

+    BoxPtr	pbox;

+    int		x1, y1, x2, y2;

+

+    fbGetStipDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+

+    for (nbox = RegionNumRects (pClip),

+	 pbox = RegionRects(pClip);

+	 nbox--;

+	 pbox++)

+    {

+	x1 = x;

+	y1 = y;

+	x2 = x + width;

+	y2 = y + height;

+	if (x1 < pbox->x1)

+	    x1 = pbox->x1;

+	if (y1 < pbox->y1)

+	    y1 = pbox->y1;

+	if (x2 > pbox->x2)

+	    x2 = pbox->x2;

+	if (y2 > pbox->y2)

+	    y2 = pbox->y2;

+	if (x1 >= x2 || y1 >= y2)

+	    continue;

+	fbBltStip (src + (y1 - y) * srcStride,

+		   srcStride,

+		   (x1 - x) * dstBpp,

+

+		   dst + (y1 + dstYoff) * dstStride,

+		   dstStride,

+		   (x1 + dstXoff) * dstBpp,

+

+		   (x2 - x1) * dstBpp,

+		   (y2 - y1),

+

+		   alu,

+		   pm,

+		   dstBpp);

+    }

+

+    fbFinishAccess (pDrawable);

+}

+	     

+void

+fbPutXYImage (DrawablePtr	pDrawable,

+	      RegionPtr		pClip,

+	      FbBits		fg,

+	      FbBits		bg,

+	      FbBits		pm,

+	      int		alu,

+	      Bool		opaque,

+	      

+	      int		x,

+	      int		y,

+	      int		width,

+	      int		height,

+

+	      FbStip		*src,

+	      FbStride		srcStride,

+	      int		srcX)

+{

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    int		nbox;

+    BoxPtr	pbox;

+    int		x1, y1, x2, y2;

+    FbBits	fgand = 0, fgxor = 0, bgand = 0, bgxor = 0;

+

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+

+    if (dstBpp == 1)

+    {

+	if (opaque)

+	    alu = FbOpaqueStipple1Rop(alu,fg,bg);

+	else

+	    alu = FbStipple1Rop(alu,fg);

+    }

+    else

+    {

+	fgand = fbAnd(alu,fg,pm);

+	fgxor = fbXor(alu,fg,pm);

+	if (opaque)

+	{

+	    bgand = fbAnd(alu,bg,pm);

+	    bgxor = fbXor(alu,bg,pm);

+	}

+	else

+	{

+	    bgand = fbAnd(GXnoop,(FbBits)0,FB_ALLONES);

+	    bgxor = fbXor(GXnoop,(FbBits)0,FB_ALLONES);

+	}

+    }

+

+    for (nbox = RegionNumRects (pClip),

+	 pbox = RegionRects(pClip);

+	 nbox--;

+	 pbox++)

+    {

+	x1 = x;

+	y1 = y;

+	x2 = x + width;

+	y2 = y + height;

+	if (x1 < pbox->x1)

+	    x1 = pbox->x1;

+	if (y1 < pbox->y1)

+	    y1 = pbox->y1;

+	if (x2 > pbox->x2)

+	    x2 = pbox->x2;

+	if (y2 > pbox->y2)

+	    y2 = pbox->y2;

+	if (x1 >= x2 || y1 >= y2)

+	    continue;

+	if (dstBpp == 1)

+	{

+	    fbBltStip (src + (y1 - y) * srcStride,

+		       srcStride,

+		       (x1 - x) + srcX,

+

+		       (FbStip *) (dst + (y1 + dstYoff) * dstStride),

+		       FbBitsStrideToStipStride(dstStride),

+		       (x1 + dstXoff) * dstBpp,

+

+		       (x2 - x1) * dstBpp,

+		       (y2 - y1),

+

+		       alu,

+		       pm,

+		       dstBpp);

+	}

+	else

+	{

+	    fbBltOne (src + (y1 - y) * srcStride,

+		      srcStride,

+		      (x1 - x) + srcX,

+

+		      dst + (y1 + dstYoff) * dstStride,

+		      dstStride,

+		      (x1 + dstXoff) * dstBpp,

+		      dstBpp,

+

+		      (x2 - x1) * dstBpp,

+		      (y2 - y1),

+

+		      fgand, fgxor, bgand, bgxor);

+	}

+    }

+

+    fbFinishAccess (pDrawable);

+}

+

+void

+fbGetImage (DrawablePtr	    pDrawable,

+	    int		    x,

+	    int		    y,

+	    int		    w,

+	    int		    h,

+	    unsigned int    format,

+	    unsigned long   planeMask,

+	    char	    *d)

+{

+    FbBits	    *src;

+    FbStride	    srcStride;

+    int		    srcBpp;

+    int		    srcXoff, srcYoff;

+    FbStip	    *dst;

+    FbStride	    dstStride;

+    

+    /*

+     * XFree86 DDX empties the root borderClip when the VT is

+     * switched away; this checks for that case

+     */

+    if (!fbDrawableEnabled(pDrawable))

+	return;

+    

+#ifdef FB_24_32BIT

+    if (format == ZPixmap &&

+	pDrawable->bitsPerPixel != BitsPerPixel (pDrawable->depth))

+    {

+	fb24_32GetImage (pDrawable, x, y, w, h, format, planeMask, d);

+	return;

+    }

+#endif

+    

+    fbGetDrawable (pDrawable, src, srcStride, srcBpp, srcXoff, srcYoff);

+    

+    x += pDrawable->x;

+    y += pDrawable->y;

+    

+    dst = (FbStip *) d;

+    if (format == ZPixmap || srcBpp == 1)

+    {

+	FbBits	pm;

+

+	pm = fbReplicatePixel (planeMask, srcBpp);

+	dstStride = PixmapBytePad(w, pDrawable->depth);

+	if (pm != FB_ALLONES)

+	    memset (d, 0, dstStride * h);

+	dstStride /= sizeof (FbStip);

+	fbBltStip ((FbStip *) (src + (y + srcYoff) * srcStride), 

+		   FbBitsStrideToStipStride(srcStride),

+		   (x + srcXoff) * srcBpp,

+		   

+		   dst,

+		   dstStride,

+		   0,

+		   

+		   w * srcBpp, h,

+

+		   GXcopy,

+		   pm,

+		   srcBpp);

+    }

+    else

+    {

+	dstStride = BitmapBytePad(w) / sizeof (FbStip);

+	fbBltPlane (src + (y + srcYoff) * srcStride,

+		    srcStride, 

+		    (x + srcXoff) * srcBpp,

+		    srcBpp,

+

+		    dst,

+		    dstStride,

+		    0,

+		    

+		    w * srcBpp, h,

+

+		    fbAndStip(GXcopy,FB_STIP_ALLONES,FB_STIP_ALLONES),

+		    fbXorStip(GXcopy,FB_STIP_ALLONES,FB_STIP_ALLONES),

+		    fbAndStip(GXcopy,0,FB_STIP_ALLONES),

+		    fbXorStip(GXcopy,0,FB_STIP_ALLONES),

+		    planeMask);

+    }

+

+    fbFinishAccess (pDrawable);

+}

diff --git a/xorg-server/fb/fbline.c b/xorg-server/fb/fbline.c
index 2cee123ae..66e6d3690 100644
--- a/xorg-server/fb/fbline.c
+++ b/xorg-server/fb/fbline.c
@@ -1,175 +1,175 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-void
-fbZeroLine (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-	    int		mode,
-	    int		npt,
-	    DDXPointPtr	ppt)
-{
-    int		    x1, y1, x2, y2;
-    int		    x, y;
-    int		    dashOffset;
-
-    x = pDrawable->x;
-    y = pDrawable->y;
-    x1 = ppt->x;
-    y1 = ppt->y;
-    dashOffset = pGC->dashOffset;
-    while (--npt)
-    {
-	++ppt;
-	x2 = ppt->x;
-	y2 = ppt->y;
-	if (mode == CoordModePrevious)
-	{
-	    x2 += x1;
-	    y2 += y1;
-	}
-	fbSegment (pDrawable, pGC, x1 + x, y1 + y, 
-		   x2 + x, y2 + y, 
-		   npt == 1 && pGC->capStyle != CapNotLast,
-		   &dashOffset);
-	x1 = x2;
-	y1 = y2;
-    }
-}
-
-void
-fbZeroSegment (DrawablePtr  pDrawable,
-	       GCPtr	    pGC,
-	       int	    nseg,
-	       xSegment	    *pSegs)
-{
-    int	    dashOffset;
-    int	    x, y;
-    Bool    drawLast = pGC->capStyle != CapNotLast;
-    
-    x = pDrawable->x;
-    y = pDrawable->y;
-    while (nseg--)
-    {
-	dashOffset = pGC->dashOffset;
-	fbSegment (pDrawable, pGC, 
-		   pSegs->x1 + x, pSegs->y1 + y,
-		   pSegs->x2 + x, pSegs->y2 + y,
-		   drawLast,
-		   &dashOffset);
-	pSegs++;
-    }
-}
-
-void
-fbFixCoordModePrevious (int	    npt,
-			DDXPointPtr ppt)
-{
-    int	    x, y;
-
-    x = ppt->x;
-    y = ppt->y;
-    npt--;
-    while (npt--)
-    {
-	ppt++;
-	x = (ppt->x += x);
-	y = (ppt->y += y);
-    }
-}
-
-void
-fbPolyLine (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-	    int		mode,
-	    int		npt,
-	    DDXPointPtr	ppt)
-{
-    void	(*line) (DrawablePtr, GCPtr, int mode, int npt, DDXPointPtr ppt);
-    
-    if (pGC->lineWidth == 0)
-    {
-	line = fbZeroLine;
-#ifndef FBNOPIXADDR
-	if (pGC->fillStyle == FillSolid &&
-	    pGC->lineStyle == LineSolid &&
-	    REGION_NUM_RECTS (fbGetCompositeClip(pGC)) == 1)
-	{
-	    switch (pDrawable->bitsPerPixel) {
-	    case 8:  line = fbPolyline8; break;
-	    case 16: line = fbPolyline16; break;
-#ifdef FB_24BIT
-	    case 24: line = fbPolyline24; break;
-#endif
-	    case 32: line = fbPolyline32; break;
-	    }
-	}
-#endif
-    }
-    else
-    {
-	if (pGC->lineStyle != LineSolid)
-	    line = miWideDash;
-	else
-	    line = miWideLine;
-    }
-    (*line) (pDrawable, pGC, mode, npt, ppt);
-}
-
-void
-fbPolySegment (DrawablePtr  pDrawable,
-	       GCPtr	    pGC,
-	       int	    nseg,
-	       xSegment	    *pseg)
-{
-    void    (*seg) (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pseg);
-
-    if (pGC->lineWidth == 0)
-    {
-	seg = fbZeroSegment;
-#ifndef FBNOPIXADDR
-	if (pGC->fillStyle == FillSolid &&
-	    pGC->lineStyle == LineSolid &&
-	    REGION_NUM_RECTS (fbGetCompositeClip(pGC)) == 1)
-	{
-	    switch (pDrawable->bitsPerPixel) {
-	    case 8:  seg = fbPolySegment8; break;
-	    case 16: seg = fbPolySegment16; break;
-#ifdef FB_24BIT
-	    case 24: seg = fbPolySegment24; break;
-#endif
-	    case 32: seg = fbPolySegment32; break;
-	    }
-	}
-#endif
-    }
-    else
-    {
-	seg = miPolySegment;
-    }
-    (*seg) (pDrawable, pGC, nseg, pseg);
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+void

+fbZeroLine (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+	    int		mode,

+	    int		npt,

+	    DDXPointPtr	ppt)

+{

+    int		    x1, y1, x2, y2;

+    int		    x, y;

+    int		    dashOffset;

+

+    x = pDrawable->x;

+    y = pDrawable->y;

+    x1 = ppt->x;

+    y1 = ppt->y;

+    dashOffset = pGC->dashOffset;

+    while (--npt)

+    {

+	++ppt;

+	x2 = ppt->x;

+	y2 = ppt->y;

+	if (mode == CoordModePrevious)

+	{

+	    x2 += x1;

+	    y2 += y1;

+	}

+	fbSegment (pDrawable, pGC, x1 + x, y1 + y, 

+		   x2 + x, y2 + y, 

+		   npt == 1 && pGC->capStyle != CapNotLast,

+		   &dashOffset);

+	x1 = x2;

+	y1 = y2;

+    }

+}

+

+void

+fbZeroSegment (DrawablePtr  pDrawable,

+	       GCPtr	    pGC,

+	       int	    nseg,

+	       xSegment	    *pSegs)

+{

+    int	    dashOffset;

+    int	    x, y;

+    Bool    drawLast = pGC->capStyle != CapNotLast;

+    

+    x = pDrawable->x;

+    y = pDrawable->y;

+    while (nseg--)

+    {

+	dashOffset = pGC->dashOffset;

+	fbSegment (pDrawable, pGC, 

+		   pSegs->x1 + x, pSegs->y1 + y,

+		   pSegs->x2 + x, pSegs->y2 + y,

+		   drawLast,

+		   &dashOffset);

+	pSegs++;

+    }

+}

+

+void

+fbFixCoordModePrevious (int	    npt,

+			DDXPointPtr ppt)

+{

+    int	    x, y;

+

+    x = ppt->x;

+    y = ppt->y;

+    npt--;

+    while (npt--)

+    {

+	ppt++;

+	x = (ppt->x += x);

+	y = (ppt->y += y);

+    }

+}

+

+void

+fbPolyLine (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+	    int		mode,

+	    int		npt,

+	    DDXPointPtr	ppt)

+{

+    void	(*line) (DrawablePtr, GCPtr, int mode, int npt, DDXPointPtr ppt);

+    

+    if (pGC->lineWidth == 0)

+    {

+	line = fbZeroLine;

+#ifndef FBNOPIXADDR

+	if (pGC->fillStyle == FillSolid &&

+	    pGC->lineStyle == LineSolid &&

+	    RegionNumRects (fbGetCompositeClip(pGC)) == 1)

+	{

+	    switch (pDrawable->bitsPerPixel) {

+	    case 8:  line = fbPolyline8; break;

+	    case 16: line = fbPolyline16; break;

+#ifdef FB_24BIT

+	    case 24: line = fbPolyline24; break;

+#endif

+	    case 32: line = fbPolyline32; break;

+	    }

+	}

+#endif

+    }

+    else

+    {

+	if (pGC->lineStyle != LineSolid)

+	    line = miWideDash;

+	else

+	    line = miWideLine;

+    }

+    (*line) (pDrawable, pGC, mode, npt, ppt);

+}

+

+void

+fbPolySegment (DrawablePtr  pDrawable,

+	       GCPtr	    pGC,

+	       int	    nseg,

+	       xSegment	    *pseg)

+{

+    void    (*seg) (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pseg);

+

+    if (pGC->lineWidth == 0)

+    {

+	seg = fbZeroSegment;

+#ifndef FBNOPIXADDR

+	if (pGC->fillStyle == FillSolid &&

+	    pGC->lineStyle == LineSolid &&

+	    RegionNumRects (fbGetCompositeClip(pGC)) == 1)

+	{

+	    switch (pDrawable->bitsPerPixel) {

+	    case 8:  seg = fbPolySegment8; break;

+	    case 16: seg = fbPolySegment16; break;

+#ifdef FB_24BIT

+	    case 24: seg = fbPolySegment24; break;

+#endif

+	    case 32: seg = fbPolySegment32; break;

+	    }

+	}

+#endif

+    }

+    else

+    {

+	seg = miPolySegment;

+    }

+    (*seg) (pDrawable, pGC, nseg, pseg);

+}

diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c
index f14187cba..d6986e2a8 100644
--- a/xorg-server/fb/fboverlay.c
+++ b/xorg-server/fb/fboverlay.c
@@ -33,8 +33,8 @@
 #include "fboverlay.h"

 #include "shmint.h"

 

-static int fbOverlayScreenPrivateKeyIndex;

-static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex;

+static DevPrivateKeyRec fbOverlayScreenPrivateKeyRec;

+#define fbOverlayScreenPrivateKey (&fbOverlayScreenPrivateKeyRec)

 

 DevPrivateKey fbOverlayGetScreenPrivateKey(void)

 {

@@ -75,8 +75,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
 	     */

 	    if (!pWin->parent)

 	    {

-		REGION_EMPTY (pWin->drawable.pScreen,

-			      &pScrPriv->layer[i].u.run.region);

+		RegionEmpty(&pScrPriv->layer[i].u.run.region);

 	    }

 	    return TRUE;

 	}

@@ -93,7 +92,7 @@ fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
     for (i = 0; i < pScrPriv->nlayers; i++)

     {

 	(*pScreen->DestroyPixmap)(pScrPriv->layer[i].u.run.pixmap);

-	REGION_UNINIT (pScreen, &pScrPriv->layer[i].u.run.region);

+	RegionUninit(&pScrPriv->layer[i].u.run.region);

     }

     return TRUE;

 }

@@ -147,7 +146,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
 					    pbits))

 	    return FALSE;

 	pScrPriv->layer[i].u.run.pixmap = pPixmap;

-	REGION_INIT(pScreen, &pScrPriv->layer[i].u.run.region, &box, 0);

+	RegionInit(&pScrPriv->layer[i].u.run.region, &box, 0);

     }

     pScreen->devPrivate = pScrPriv->layer[0].u.run.pixmap;

     return TRUE;

@@ -175,37 +174,32 @@ fbOverlayUpdateLayerRegion (ScreenPtr	pScreen,
     int			i;

     RegionRec		rgnNew;

     

-    if (!prgn || !REGION_NOTEMPTY(pScreen, prgn))

+    if (!prgn || !RegionNotEmpty(prgn))

 	return;

     for (i = 0; i < pScrPriv->nlayers; i++)

     {

 	if (i == layer)

 	{

 	    /* add new piece to this fb */

-	    REGION_UNION (pScreen,

-			  &pScrPriv->layer[i].u.run.region,

-			  &pScrPriv->layer[i].u.run.region,

-			  prgn);

+	    RegionUnion(&pScrPriv->layer[i].u.run.region,

+			&pScrPriv->layer[i].u.run.region,

+			prgn);

 	}

-	else if (REGION_NOTEMPTY (pScreen, 

-				  &pScrPriv->layer[i].u.run.region))

+	else if (RegionNotEmpty(&pScrPriv->layer[i].u.run.region))

 	{

 	    /* paint new piece with chroma key */

-	    REGION_NULL (pScreen, &rgnNew);

-	    REGION_INTERSECT (pScreen,

-			      &rgnNew, 

-			      prgn, 

-			      &pScrPriv->layer[i].u.run.region);

+	    RegionNull(&rgnNew);

+	    RegionIntersect(&rgnNew, prgn,

+			    &pScrPriv->layer[i].u.run.region);

 	    (*pScrPriv->PaintKey) (&pScrPriv->layer[i].u.run.pixmap->drawable,

 				   &rgnNew,

 				   pScrPriv->layer[i].key,

 				   i);

-	    REGION_UNINIT(pScreen, &rgnNew);

+	    RegionUninit(&rgnNew);

 	    /* remove piece from other fbs */

-	    REGION_SUBTRACT (pScreen,

-			     &pScrPriv->layer[i].u.run.region,

-			     &pScrPriv->layer[i].u.run.region,

-			     prgn);

+	    RegionSubtract(&pScrPriv->layer[i].u.run.region,

+			   &pScrPriv->layer[i].u.run.region,

+			   prgn);

 	}

     }

 }

@@ -219,7 +213,7 @@ fbOverlayCopyWindow(WindowPtr	pWin,
 		    RegionPtr	prgnSrc)

 {

     ScreenPtr		pScreen = pWin->drawable.pScreen;

-    FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);

+    FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pScreen);

     RegionRec		rgnDst;

     int			dx, dy;

     int			i;

@@ -232,21 +226,21 @@ fbOverlayCopyWindow(WindowPtr	pWin,
     /*

      * Clip to existing bits

      */

-    REGION_TRANSLATE(pScreen, prgnSrc, -dx, -dy);

-    REGION_NULL (pScreen, &rgnDst);

-    REGION_INTERSECT(pScreen, &rgnDst, &pWin->borderClip, prgnSrc);

-    REGION_TRANSLATE(pScreen, &rgnDst, dx, dy);

+    RegionTranslate(prgnSrc, -dx, -dy);

+    RegionNull(&rgnDst);

+    RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);

+    RegionTranslate(&rgnDst, dx, dy);

     /*

      * Compute the portion of each fb affected by this copy

      */

     for (i = 0; i < pScrPriv->nlayers; i++)

     {

-	REGION_NULL (pScreen, &layerRgn[i]);

-	REGION_INTERSECT(pScreen, &layerRgn[i], &rgnDst,

+	RegionNull(&layerRgn[i]);

+	RegionIntersect(&layerRgn[i], &rgnDst,

 			 &pScrPriv->layer[i].u.run.region);

-	if (REGION_NOTEMPTY (pScreen, &layerRgn[i]))

+	if (RegionNotEmpty(&layerRgn[i]))

 	{

-	    REGION_TRANSLATE(pScreen, &layerRgn[i], -dx, -dy);

+	    RegionTranslate(&layerRgn[i], -dx, -dy);

 	    pPixmap = pScrPriv->layer[i].u.run.pixmap;

 	    miCopyRegion (&pPixmap->drawable, &pPixmap->drawable,

 			  0,

@@ -259,12 +253,12 @@ fbOverlayCopyWindow(WindowPtr	pWin,
      */

     for (i = 0; i < pScrPriv->nlayers; i++)

     {

-	if (REGION_NOTEMPTY (pScreen, &layerRgn[i]))

+	if (RegionNotEmpty(&layerRgn[i]))

 	    fbOverlayUpdateLayerRegion (pScreen, i, &layerRgn[i]);

 

-	REGION_UNINIT(pScreen, &layerRgn[i]);

+	RegionUninit(&layerRgn[i]);

     }

-    REGION_UNINIT(pScreen, &rgnDst);

+    RegionUninit(&rgnDst);

 }   

 

 void

@@ -348,6 +342,9 @@ fbOverlayFinishScreenInit(ScreenPtr	pScreen,
     VisualID	defaultVisual;

     FbOverlayScrPrivPtr	pScrPriv;

 

+    if (!dixRegisterPrivateKey(&fbOverlayScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

+

     pScrPriv = malloc(sizeof (FbOverlayScrPrivRec));

     if (!pScrPriv)

 	return FALSE;

@@ -416,7 +413,6 @@ fbOverlayFinishScreenInit(ScreenPtr	pScreen,
     pScrPriv->layer[1].u.init.pbits = pbits2;

     pScrPriv->layer[1].u.init.width = width2;

     pScrPriv->layer[1].u.init.depth = depth2;

-    

     dixSetPrivate(&pScreen->devPrivates, fbOverlayScreenPrivateKey, pScrPriv);

     

     /* overwrite miCloseScreen with our own */

diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c
index 896d33ebb..d6dc30d2c 100644
--- a/xorg-server/fb/fbpict.c
+++ b/xorg-server/fb/fbpict.c
@@ -1,484 +1,484 @@
-/*
- *
- * Copyright © 2000 SuSE, Inc.
- * Copyright © 2007 Red Hat, 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 SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- * 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.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <string.h>
-
-#include "fb.h"
-
-#include "picturestr.h"
-#include "mipict.h"
-#include "fbpict.h"
-
-#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
-
-void
-fbWalkCompositeRegion (CARD8 op,
-		       PicturePtr pSrc,
-		       PicturePtr pMask,
-		       PicturePtr pDst,
-		       INT16 xSrc,
-		       INT16 ySrc,
-		       INT16 xMask,
-		       INT16 yMask,
-		       INT16 xDst,
-		       INT16 yDst,
-		       CARD16 width,
-		       CARD16 height,
-		       Bool srcRepeat,
-		       Bool maskRepeat,
-		       CompositeFunc compositeRect)
-{
-    RegionRec	    region;
-    int		    n;
-    BoxPtr	    pbox;
-    int		    w, h, w_this, h_this;
-    int		    x_msk, y_msk, x_src, y_src, x_dst, y_dst;
-    
-    xDst += pDst->pDrawable->x;
-    yDst += pDst->pDrawable->y;
-    if (pSrc->pDrawable)
-    {
-        xSrc += pSrc->pDrawable->x;
-        ySrc += pSrc->pDrawable->y;
-    }
-    if (pMask && pMask->pDrawable)
-    {
-	xMask += pMask->pDrawable->x;
-	yMask += pMask->pDrawable->y;
-    }
-
-    if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, xSrc, ySrc,
-				   xMask, yMask, xDst, yDst, width, height))
-        return;
-    
-    n = REGION_NUM_RECTS (&region);
-    pbox = REGION_RECTS (&region);
-    while (n--)
-    {
-	h = pbox->y2 - pbox->y1;
-	y_src = pbox->y1 - yDst + ySrc;
-	y_msk = pbox->y1 - yDst + yMask;
-	y_dst = pbox->y1;
-	while (h)
-	{
-	    h_this = h;
-	    w = pbox->x2 - pbox->x1;
-	    x_src = pbox->x1 - xDst + xSrc;
-	    x_msk = pbox->x1 - xDst + xMask;
-	    x_dst = pbox->x1;
-	    if (maskRepeat)
-	    {
-		y_msk = mod (y_msk - pMask->pDrawable->y, pMask->pDrawable->height);
-		if (h_this > pMask->pDrawable->height - y_msk)
-		    h_this = pMask->pDrawable->height - y_msk;
-		y_msk += pMask->pDrawable->y;
-	    }
-	    if (srcRepeat)
-	    {
-		y_src = mod (y_src - pSrc->pDrawable->y, pSrc->pDrawable->height);
-		if (h_this > pSrc->pDrawable->height - y_src)
-		    h_this = pSrc->pDrawable->height - y_src;
-		y_src += pSrc->pDrawable->y;
-	    }
-	    while (w)
-	    {
-		w_this = w;
-		if (maskRepeat)
-		{
-		    x_msk = mod (x_msk - pMask->pDrawable->x, pMask->pDrawable->width);
-		    if (w_this > pMask->pDrawable->width - x_msk)
-			w_this = pMask->pDrawable->width - x_msk;
-		    x_msk += pMask->pDrawable->x;
-		}
-		if (srcRepeat)
-		{
-		    x_src = mod (x_src - pSrc->pDrawable->x, pSrc->pDrawable->width);
-		    if (w_this > pSrc->pDrawable->width - x_src)
-			w_this = pSrc->pDrawable->width - x_src;
-		    x_src += pSrc->pDrawable->x;
-		}
-		(*compositeRect) (op, pSrc, pMask, pDst,
-				  x_src, y_src, x_msk, y_msk, x_dst, y_dst,
-				  w_this, h_this);
-		w -= w_this;
-		x_src += w_this;
-		x_msk += w_this;
-		x_dst += w_this;
-	    }
-	    h -= h_this;
-	    y_src += h_this;
-	    y_msk += h_this;
-	    y_dst += h_this;
-	}
-	pbox++;
-    }
-    REGION_UNINIT (pDst->pDrawable->pScreen, &region);
-}
-
-void
-fbComposite (CARD8      op,
-	     PicturePtr pSrc,
-	     PicturePtr pMask,
-	     PicturePtr pDst,
-	     INT16      xSrc,
-	     INT16      ySrc,
-	     INT16      xMask,
-	     INT16      yMask,
-	     INT16      xDst,
-	     INT16      yDst,
-	     CARD16     width,
-	     CARD16     height)
-{
-    pixman_image_t *src, *mask, *dest;
-    int src_xoff, src_yoff;
-    int msk_xoff, msk_yoff;
-    int dst_xoff, dst_yoff;
-    
-    miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
-    if (pMask)
-	miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
-    
-    src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
-    mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);
-    dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
-
-    if (src && dest && !(pMask && !mask))
-    {
-	pixman_image_composite (op, src, mask, dest,
-				xSrc + src_xoff, ySrc + src_yoff,
-				xMask + msk_xoff, yMask + msk_yoff,
-				xDst + dst_xoff, yDst + dst_yoff,
-				width, height);
-    }
-
-    free_pixman_pict (pSrc, src);
-    free_pixman_pict (pMask, mask);
-    free_pixman_pict (pDst, dest);
-}
-
-void
-fbCompositeGeneral (CARD8	op,
-		    PicturePtr	pSrc,
-		    PicturePtr	pMask,
-		    PicturePtr	pDst,
-		    INT16	xSrc,
-		    INT16	ySrc,
-		    INT16	xMask,
-		    INT16	yMask,
-		    INT16	xDst,
-		    INT16	yDst,
-		    CARD16	width,
-		    CARD16	height)
-{
-    fbComposite (op, pSrc, pMask, pDst,
-			xSrc, ySrc, xMask, yMask, xDst, yDst,
-			width, height);
-}
-
-static pixman_image_t *
-create_solid_fill_image (PicturePtr pict)
-{
-    PictSolidFill *solid = &pict->pSourcePict->solidFill;
-    pixman_color_t color;
-    CARD32 a, r, g, b;
-    
-    a = (solid->color & 0xff000000) >> 24;
-    r = (solid->color & 0x00ff0000) >> 16;
-    g = (solid->color & 0x0000ff00) >>  8;
-    b = (solid->color & 0x000000ff) >>  0;
-    
-    color.alpha = (a << 8) | a;
-    color.red =   (r << 8) | r;
-    color.green = (g << 8) | g;
-    color.blue =  (b << 8) | b;
-    
-    return pixman_image_create_solid_fill (&color);
-}
-
-static pixman_image_t *
-create_linear_gradient_image (PictGradient *gradient)
-{
-    PictLinearGradient *linear = (PictLinearGradient *)gradient;
-    pixman_point_fixed_t p1;
-    pixman_point_fixed_t p2;
-    
-    p1.x = linear->p1.x;
-    p1.y = linear->p1.y;
-    p2.x = linear->p2.x;
-    p2.y = linear->p2.y;
-    
-    return pixman_image_create_linear_gradient (
-	&p1, &p2, (pixman_gradient_stop_t *)gradient->stops, gradient->nstops);
-}
-
-static pixman_image_t *
-create_radial_gradient_image (PictGradient *gradient)
-{
-    PictRadialGradient *radial = (PictRadialGradient *)gradient;
-    pixman_point_fixed_t c1;
-    pixman_point_fixed_t c2;
-    
-    c1.x = radial->c1.x;
-    c1.y = radial->c1.y;
-    c2.x = radial->c2.x;
-    c2.y = radial->c2.y;
-    
-    return pixman_image_create_radial_gradient (
-	&c1, &c2, radial->c1.radius,
-	radial->c2.radius,
-	(pixman_gradient_stop_t *)gradient->stops, gradient->nstops);
-}
-
-static pixman_image_t *
-create_conical_gradient_image (PictGradient *gradient)
-{
-    PictConicalGradient *conical = (PictConicalGradient *)gradient;
-    pixman_point_fixed_t center;
-    
-    center.x = conical->center.x;
-    center.y = conical->center.y;
-    
-    return pixman_image_create_conical_gradient (
-	&center, conical->angle, (pixman_gradient_stop_t *)gradient->stops,
-	gradient->nstops);
-}
-
-static pixman_image_t *
-create_bits_picture (PicturePtr pict,
-		     Bool       has_clip,
-		     int	*xoff,
-		     int	*yoff)
-{
-    PixmapPtr pixmap;
-    FbBits *bits;
-    FbStride stride;
-    int bpp;
-    pixman_image_t *image;
-    
-    fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
-    fbGetPixmapBitsData(pixmap, bits, stride, bpp);
-
-    image = pixman_image_create_bits (
-	pict->format,
-	pixmap->drawable.width, pixmap->drawable.height,
-	(uint32_t *)bits, stride * sizeof (FbStride));
-    
-    
-#ifdef FB_ACCESS_WRAPPER
-#if FB_SHIFT==5
-    
-    pixman_image_set_accessors (image,
-				(pixman_read_memory_func_t)wfbReadMemory,
-				(pixman_write_memory_func_t)wfbWriteMemory);
-    
-#else
-    
-#error The pixman library only works when FbBits is 32 bits wide
-    
-#endif
-#endif
-    
-    /* pCompositeClip is undefined for source pictures, so
-     * only set the clip region for pictures with drawables
-     */
-    if (has_clip)
-    {
-	if (pict->clientClipType != CT_NONE)
-	    pixman_image_set_has_client_clip (image, TRUE);
-
-	if (*xoff || *yoff)
-	    pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
-
-	pixman_image_set_clip_region (image, pict->pCompositeClip);
-
-	if (*xoff || *yoff)
-	    pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
-    }
-    
-    /* Indexed table */
-    if (pict->pFormat->index.devPrivate)
-	pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
-
-    /* Add in drawable origin to position within the image */
-    *xoff += pict->pDrawable->x;
-    *yoff += pict->pDrawable->y;
-
-    return image;
-}
-
-static void
-set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-{
-    pixman_repeat_t repeat;
-    pixman_filter_t filter;
-    
-    if (pict->transform)
-    {
-	/* For source images, adjust the transform to account
-	 * for the drawable offset within the pixman image,
-	 * then set the offset to 0 as it will be used
-	 * to compute positions within the transformed image.
-	 */
-	if (!has_clip) {
-	    struct pixman_transform	adjusted;
-
-	    adjusted = *pict->transform;
-	    pixman_transform_translate(&adjusted,
-				       NULL,
-				       pixman_int_to_fixed(*xoff),
-				       pixman_int_to_fixed(*yoff));
-	    pixman_image_set_transform (image, &adjusted);
-	    *xoff = 0;
-	    *yoff = 0;
-	} else
-	    pixman_image_set_transform (image, pict->transform);
-    }
-    
-    switch (pict->repeatType)
-    {
-    default:
-    case RepeatNone:
-	repeat = PIXMAN_REPEAT_NONE;
-	break;
-	
-    case RepeatPad:
-	repeat = PIXMAN_REPEAT_PAD;
-	break;
-	
-    case RepeatNormal:
-	repeat = PIXMAN_REPEAT_NORMAL;
-	break;
-	
-    case RepeatReflect:
-	repeat = PIXMAN_REPEAT_REFLECT;
-	break;
-    }
-    
-    pixman_image_set_repeat (image, repeat);
-    
-    if (pict->alphaMap)
-    {
-	int alpha_xoff, alpha_yoff;
-	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
-	
-	pixman_image_set_alpha_map (
-	    image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
-	
-	free_pixman_pict (pict->alphaMap, alpha_map);
-    }
-    
-    pixman_image_set_component_alpha (image, pict->componentAlpha);
-
-    switch (pict->filter)
-    {
-    default:
-    case PictFilterNearest:
-    case PictFilterFast:
-	filter = PIXMAN_FILTER_NEAREST;
-	break;
-	
-    case PictFilterBilinear:
-    case PictFilterGood:
-	filter = PIXMAN_FILTER_BILINEAR;
-	break;
-	
-    case PictFilterConvolution:
-	filter = PIXMAN_FILTER_CONVOLUTION;
-	break;
-    }
-    
-    pixman_image_set_filter (image, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams);
-    pixman_image_set_source_clipping (image, TRUE);
-}
-
-pixman_image_t *
-image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-{
-    pixman_image_t *image = NULL;
-
-    if (!pict)
-	return NULL;
-
-    if (pict->pDrawable)
-    {
-	image = create_bits_picture (pict, has_clip, xoff, yoff);
-    }
-    else if (pict->pSourcePict)
-    {
-	SourcePict *sp = pict->pSourcePict;
-	
-	if (sp->type == SourcePictTypeSolidFill)
-	{
-	    image = create_solid_fill_image (pict);
-	}
-	else
-	{
-	    PictGradient *gradient = &pict->pSourcePict->gradient;
-	    
-	    if (sp->type == SourcePictTypeLinear)
-		image = create_linear_gradient_image (gradient);
-	    else if (sp->type == SourcePictTypeRadial)
-		image = create_radial_gradient_image (gradient);
-	    else if (sp->type == SourcePictTypeConical)
-		image = create_conical_gradient_image (gradient);
-	}
-	*xoff = *yoff = 0;
-    }
-    
-    if (image)
-	set_image_properties (image, pict, has_clip, xoff, yoff);
-    
-    return image;
-}
-
-void
-free_pixman_pict (PicturePtr pict, pixman_image_t *image)
-{
-    if (image && pixman_image_unref (image) && pict->pDrawable)
-	fbFinishAccess (pict->pDrawable);
-}
-
-Bool
-fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-{
-
-    PictureScreenPtr    ps;
-
-    if (!miPictureInit (pScreen, formats, nformats))
-	return FALSE;
-    ps = GetPictureScreen(pScreen);
-    ps->Composite = fbComposite;
-    ps->Glyphs = miGlyphs;
-    ps->CompositeRects = miCompositeRects;
-    ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-    ps->AddTraps = fbAddTraps;
-    ps->AddTriangles = fbAddTriangles;
-
-    return TRUE;
-}
+/*

+ *

+ * Copyright © 2000 SuSE, Inc.

+ * Copyright © 2007 Red Hat, 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 SuSE not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  SuSE makes no representations about the

+ * suitability of this software for any purpose.  It is provided "as is"

+ * without express or implied warranty.

+ *

+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

+ * 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.

+ *

+ * Author:  Keith Packard, SuSE, Inc.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <string.h>

+

+#include "fb.h"

+

+#include "picturestr.h"

+#include "mipict.h"

+#include "fbpict.h"

+

+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))

+

+void

+fbWalkCompositeRegion (CARD8 op,

+		       PicturePtr pSrc,

+		       PicturePtr pMask,

+		       PicturePtr pDst,

+		       INT16 xSrc,

+		       INT16 ySrc,

+		       INT16 xMask,

+		       INT16 yMask,

+		       INT16 xDst,

+		       INT16 yDst,

+		       CARD16 width,

+		       CARD16 height,

+		       Bool srcRepeat,

+		       Bool maskRepeat,

+		       CompositeFunc compositeRect)

+{

+    RegionRec	    region;

+    int		    n;

+    BoxPtr	    pbox;

+    int		    w, h, w_this, h_this;

+    int		    x_msk, y_msk, x_src, y_src, x_dst, y_dst;

+    

+    xDst += pDst->pDrawable->x;

+    yDst += pDst->pDrawable->y;

+    if (pSrc->pDrawable)

+    {

+        xSrc += pSrc->pDrawable->x;

+        ySrc += pSrc->pDrawable->y;

+    }

+    if (pMask && pMask->pDrawable)

+    {

+	xMask += pMask->pDrawable->x;

+	yMask += pMask->pDrawable->y;

+    }

+

+    if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, xSrc, ySrc,

+				   xMask, yMask, xDst, yDst, width, height))

+        return;

+    

+    n = RegionNumRects (&region);

+    pbox = RegionRects (&region);

+    while (n--)

+    {

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

+	y_src = pbox->y1 - yDst + ySrc;

+	y_msk = pbox->y1 - yDst + yMask;

+	y_dst = pbox->y1;

+	while (h)

+	{

+	    h_this = h;

+	    w = pbox->x2 - pbox->x1;

+	    x_src = pbox->x1 - xDst + xSrc;

+	    x_msk = pbox->x1 - xDst + xMask;

+	    x_dst = pbox->x1;

+	    if (maskRepeat)

+	    {

+		y_msk = mod (y_msk - pMask->pDrawable->y, pMask->pDrawable->height);

+		if (h_this > pMask->pDrawable->height - y_msk)

+		    h_this = pMask->pDrawable->height - y_msk;

+		y_msk += pMask->pDrawable->y;

+	    }

+	    if (srcRepeat)

+	    {

+		y_src = mod (y_src - pSrc->pDrawable->y, pSrc->pDrawable->height);

+		if (h_this > pSrc->pDrawable->height - y_src)

+		    h_this = pSrc->pDrawable->height - y_src;

+		y_src += pSrc->pDrawable->y;

+	    }

+	    while (w)

+	    {

+		w_this = w;

+		if (maskRepeat)

+		{

+		    x_msk = mod (x_msk - pMask->pDrawable->x, pMask->pDrawable->width);

+		    if (w_this > pMask->pDrawable->width - x_msk)

+			w_this = pMask->pDrawable->width - x_msk;

+		    x_msk += pMask->pDrawable->x;

+		}

+		if (srcRepeat)

+		{

+		    x_src = mod (x_src - pSrc->pDrawable->x, pSrc->pDrawable->width);

+		    if (w_this > pSrc->pDrawable->width - x_src)

+			w_this = pSrc->pDrawable->width - x_src;

+		    x_src += pSrc->pDrawable->x;

+		}

+		(*compositeRect) (op, pSrc, pMask, pDst,

+				  x_src, y_src, x_msk, y_msk, x_dst, y_dst,

+				  w_this, h_this);

+		w -= w_this;

+		x_src += w_this;

+		x_msk += w_this;

+		x_dst += w_this;

+	    }

+	    h -= h_this;

+	    y_src += h_this;

+	    y_msk += h_this;

+	    y_dst += h_this;

+	}

+	pbox++;

+    }

+    RegionUninit(&region);

+}

+

+void

+fbComposite (CARD8      op,

+	     PicturePtr pSrc,

+	     PicturePtr pMask,

+	     PicturePtr pDst,

+	     INT16      xSrc,

+	     INT16      ySrc,

+	     INT16      xMask,

+	     INT16      yMask,

+	     INT16      xDst,

+	     INT16      yDst,

+	     CARD16     width,

+	     CARD16     height)

+{

+    pixman_image_t *src, *mask, *dest;

+    int src_xoff, src_yoff;

+    int msk_xoff, msk_yoff;

+    int dst_xoff, dst_yoff;

+    

+    miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);

+    if (pMask)

+	miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);

+    

+    src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);

+    mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);

+    dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);

+

+    if (src && dest && !(pMask && !mask))

+    {

+	pixman_image_composite (op, src, mask, dest,

+				xSrc + src_xoff, ySrc + src_yoff,

+				xMask + msk_xoff, yMask + msk_yoff,

+				xDst + dst_xoff, yDst + dst_yoff,

+				width, height);

+    }

+

+    free_pixman_pict (pSrc, src);

+    free_pixman_pict (pMask, mask);

+    free_pixman_pict (pDst, dest);

+}

+

+void

+fbCompositeGeneral (CARD8	op,

+		    PicturePtr	pSrc,

+		    PicturePtr	pMask,

+		    PicturePtr	pDst,

+		    INT16	xSrc,

+		    INT16	ySrc,

+		    INT16	xMask,

+		    INT16	yMask,

+		    INT16	xDst,

+		    INT16	yDst,

+		    CARD16	width,

+		    CARD16	height)

+{

+    fbComposite (op, pSrc, pMask, pDst,

+			xSrc, ySrc, xMask, yMask, xDst, yDst,

+			width, height);

+}

+

+static pixman_image_t *

+create_solid_fill_image (PicturePtr pict)

+{

+    PictSolidFill *solid = &pict->pSourcePict->solidFill;

+    pixman_color_t color;

+    CARD32 a, r, g, b;

+    

+    a = (solid->color & 0xff000000) >> 24;

+    r = (solid->color & 0x00ff0000) >> 16;

+    g = (solid->color & 0x0000ff00) >>  8;

+    b = (solid->color & 0x000000ff) >>  0;

+    

+    color.alpha = (a << 8) | a;

+    color.red =   (r << 8) | r;

+    color.green = (g << 8) | g;

+    color.blue =  (b << 8) | b;

+    

+    return pixman_image_create_solid_fill (&color);

+}

+

+static pixman_image_t *

+create_linear_gradient_image (PictGradient *gradient)

+{

+    PictLinearGradient *linear = (PictLinearGradient *)gradient;

+    pixman_point_fixed_t p1;

+    pixman_point_fixed_t p2;

+    

+    p1.x = linear->p1.x;

+    p1.y = linear->p1.y;

+    p2.x = linear->p2.x;

+    p2.y = linear->p2.y;

+    

+    return pixman_image_create_linear_gradient (

+	&p1, &p2, (pixman_gradient_stop_t *)gradient->stops, gradient->nstops);

+}

+

+static pixman_image_t *

+create_radial_gradient_image (PictGradient *gradient)

+{

+    PictRadialGradient *radial = (PictRadialGradient *)gradient;

+    pixman_point_fixed_t c1;

+    pixman_point_fixed_t c2;

+    

+    c1.x = radial->c1.x;

+    c1.y = radial->c1.y;

+    c2.x = radial->c2.x;

+    c2.y = radial->c2.y;

+    

+    return pixman_image_create_radial_gradient (

+	&c1, &c2, radial->c1.radius,

+	radial->c2.radius,

+	(pixman_gradient_stop_t *)gradient->stops, gradient->nstops);

+}

+

+static pixman_image_t *

+create_conical_gradient_image (PictGradient *gradient)

+{

+    PictConicalGradient *conical = (PictConicalGradient *)gradient;

+    pixman_point_fixed_t center;

+    

+    center.x = conical->center.x;

+    center.y = conical->center.y;

+    

+    return pixman_image_create_conical_gradient (

+	&center, conical->angle, (pixman_gradient_stop_t *)gradient->stops,

+	gradient->nstops);

+}

+

+static pixman_image_t *

+create_bits_picture (PicturePtr pict,

+		     Bool       has_clip,

+		     int	*xoff,

+		     int	*yoff)

+{

+    PixmapPtr pixmap;

+    FbBits *bits;

+    FbStride stride;

+    int bpp;

+    pixman_image_t *image;

+    

+    fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);

+    fbGetPixmapBitsData(pixmap, bits, stride, bpp);

+

+    image = pixman_image_create_bits (

+	pict->format,

+	pixmap->drawable.width, pixmap->drawable.height,

+	(uint32_t *)bits, stride * sizeof (FbStride));

+    

+    

+#ifdef FB_ACCESS_WRAPPER

+#if FB_SHIFT==5

+    

+    pixman_image_set_accessors (image,

+				(pixman_read_memory_func_t)wfbReadMemory,

+				(pixman_write_memory_func_t)wfbWriteMemory);

+    

+#else

+    

+#error The pixman library only works when FbBits is 32 bits wide

+    

+#endif

+#endif

+    

+    /* pCompositeClip is undefined for source pictures, so

+     * only set the clip region for pictures with drawables

+     */

+    if (has_clip)

+    {

+	if (pict->clientClipType != CT_NONE)

+	    pixman_image_set_has_client_clip (image, TRUE);

+

+	if (*xoff || *yoff)

+	    pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);

+

+	pixman_image_set_clip_region (image, pict->pCompositeClip);

+

+	if (*xoff || *yoff)

+	    pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);

+    }

+    

+    /* Indexed table */

+    if (pict->pFormat->index.devPrivate)

+	pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);

+

+    /* Add in drawable origin to position within the image */

+    *xoff += pict->pDrawable->x;

+    *yoff += pict->pDrawable->y;

+

+    return image;

+}

+

+static void

+set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)

+{

+    pixman_repeat_t repeat;

+    pixman_filter_t filter;

+    

+    if (pict->transform)

+    {

+	/* For source images, adjust the transform to account

+	 * for the drawable offset within the pixman image,

+	 * then set the offset to 0 as it will be used

+	 * to compute positions within the transformed image.

+	 */

+	if (!has_clip) {

+	    struct pixman_transform	adjusted;

+

+	    adjusted = *pict->transform;

+	    pixman_transform_translate(&adjusted,

+				       NULL,

+				       pixman_int_to_fixed(*xoff),

+				       pixman_int_to_fixed(*yoff));

+	    pixman_image_set_transform (image, &adjusted);

+	    *xoff = 0;

+	    *yoff = 0;

+	} else

+	    pixman_image_set_transform (image, pict->transform);

+    }

+    

+    switch (pict->repeatType)

+    {

+    default:

+    case RepeatNone:

+	repeat = PIXMAN_REPEAT_NONE;

+	break;

+	

+    case RepeatPad:

+	repeat = PIXMAN_REPEAT_PAD;

+	break;

+	

+    case RepeatNormal:

+	repeat = PIXMAN_REPEAT_NORMAL;

+	break;

+	

+    case RepeatReflect:

+	repeat = PIXMAN_REPEAT_REFLECT;

+	break;

+    }

+    

+    pixman_image_set_repeat (image, repeat);

+    

+    if (pict->alphaMap)

+    {

+	int alpha_xoff, alpha_yoff;

+	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);

+	

+	pixman_image_set_alpha_map (

+	    image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);

+	

+	free_pixman_pict (pict->alphaMap, alpha_map);

+    }

+    

+    pixman_image_set_component_alpha (image, pict->componentAlpha);

+

+    switch (pict->filter)

+    {

+    default:

+    case PictFilterNearest:

+    case PictFilterFast:

+	filter = PIXMAN_FILTER_NEAREST;

+	break;

+	

+    case PictFilterBilinear:

+    case PictFilterGood:

+	filter = PIXMAN_FILTER_BILINEAR;

+	break;

+	

+    case PictFilterConvolution:

+	filter = PIXMAN_FILTER_CONVOLUTION;

+	break;

+    }

+    

+    pixman_image_set_filter (image, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams);

+    pixman_image_set_source_clipping (image, TRUE);

+}

+

+pixman_image_t *

+image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)

+{

+    pixman_image_t *image = NULL;

+

+    if (!pict)

+	return NULL;

+

+    if (pict->pDrawable)

+    {

+	image = create_bits_picture (pict, has_clip, xoff, yoff);

+    }

+    else if (pict->pSourcePict)

+    {

+	SourcePict *sp = pict->pSourcePict;

+	

+	if (sp->type == SourcePictTypeSolidFill)

+	{

+	    image = create_solid_fill_image (pict);

+	}

+	else

+	{

+	    PictGradient *gradient = &pict->pSourcePict->gradient;

+	    

+	    if (sp->type == SourcePictTypeLinear)

+		image = create_linear_gradient_image (gradient);

+	    else if (sp->type == SourcePictTypeRadial)

+		image = create_radial_gradient_image (gradient);

+	    else if (sp->type == SourcePictTypeConical)

+		image = create_conical_gradient_image (gradient);

+	}

+	*xoff = *yoff = 0;

+    }

+    

+    if (image)

+	set_image_properties (image, pict, has_clip, xoff, yoff);

+    

+    return image;

+}

+

+void

+free_pixman_pict (PicturePtr pict, pixman_image_t *image)

+{

+    if (image && pixman_image_unref (image) && pict->pDrawable)

+	fbFinishAccess (pict->pDrawable);

+}

+

+Bool

+fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)

+{

+

+    PictureScreenPtr    ps;

+

+    if (!miPictureInit (pScreen, formats, nformats))

+	return FALSE;

+    ps = GetPictureScreen(pScreen);

+    ps->Composite = fbComposite;

+    ps->Glyphs = miGlyphs;

+    ps->CompositeRects = miCompositeRects;

+    ps->RasterizeTrapezoid = fbRasterizeTrapezoid;

+    ps->AddTraps = fbAddTraps;

+    ps->AddTriangles = fbAddTriangles;

+

+    return TRUE;

+}

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index 4714ef22e..80d3252d2 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -67,6 +67,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     pPixmap->devKind = paddedWidth;

     pPixmap->refcnt = 1;

     pPixmap->devPrivate.ptr = (pointer) ((char *)pPixmap + base + adjust);

+

 #ifdef FB_DEBUG

     pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth);

     fbInitializeDrawable (&pPixmap->drawable);

@@ -100,8 +101,7 @@ fbDestroyPixmap (PixmapPtr pPixmap)
 {

     if(--pPixmap->refcnt)

 	return TRUE;

-    dixFreePrivates(pPixmap->devPrivates);

-    free(pPixmap);

+    FreePixmap(pPixmap);

     return TRUE;

 }

 

@@ -115,8 +115,8 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
 {								\

     if ((reg)->data->numRects == (reg)->data->size)		\

     {								\

-	miRectAlloc(reg, 1);					\

-	fr = REGION_BOXPTR(reg);				\

+	RegionRectAlloc(reg, 1);					\

+	fr = RegionBoxptr(reg);				\

 	r = fr + (reg)->data->numRects;				\

     }								\

     r->x1 = (rx1);						\

@@ -153,10 +153,10 @@ fbPixmapToRegion(PixmapPtr pPix)
     FbBits		*pwLine;

     int			nWidth;

     

-    pReg = REGION_CREATE(pPix->drawable.pScreen, NULL, 1);

+    pReg = RegionCreate(NULL, 1);

     if(!pReg)

 	return NullRegion;

-    FirstRect = REGION_BOXPTR(pReg);

+    FirstRect = RegionBoxptr(pReg);

     rects = FirstRect;

 

     fbPrepareAccess(&pPix->drawable);

@@ -304,8 +304,8 @@ fbPixmapToRegion(PixmapPtr pPix)
 	pReg->extents.x1 = pReg->extents.x2 = 0;

     else

     {

-	pReg->extents.y1 = REGION_BOXPTR(pReg)->y1;

-	pReg->extents.y2 = REGION_END(pReg)->y2;

+	pReg->extents.y1 = RegionBoxptr(pReg)->y1;

+	pReg->extents.y2 = RegionEnd(pReg)->y2;

 	if (pReg->data->numRects == 1)

 	{

 	    free(pReg->data);

@@ -315,10 +315,10 @@ fbPixmapToRegion(PixmapPtr pPix)
 

     fbFinishAccess(&pPix->drawable);

 #ifdef DEBUG

-    if (!miValidRegion(pReg))

+    if (!RegionIsValid(pReg))

 	FatalError("Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__);

 #endif

-    return(pReg);

+    return pReg;

 }

 

 #ifdef FB_DEBUG

diff --git a/xorg-server/fb/fbpoint.c b/xorg-server/fb/fbpoint.c
index c0ea8ba5b..d675dbaff 100644
--- a/xorg-server/fb/fbpoint.c
+++ b/xorg-server/fb/fbpoint.c
@@ -1,162 +1,162 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-typedef void	(*FbDots)  (FbBits	*dst,
-			    FbStride    dstStride,
-			    int		dstBpp,
-			    BoxPtr	pBox,
-			    xPoint	*pts,
-			    int		npt,
-			    int		xorg,
-			    int		yorg,
-			    int		xoff,
-			    int		yoff,
-			    FbBits	and,
-			    FbBits	xor);
-
-void
-fbDots (FbBits	    *dstOrig,
-	FbStride    dstStride,
-	int	    dstBpp,
-	BoxPtr	    pBox,
-	xPoint	    *pts,
-	int	    npt,
-	int	    xorg,
-	int	    yorg,
-	int	    xoff,
-	int	    yoff,
-	FbBits	    andOrig,
-	FbBits	    xorOrig)
-{
-    FbStip	*dst = (FbStip *) dstOrig;
-    int		x1, y1, x2, y2;
-    int		x, y;
-    FbStip	*d;
-    FbStip	and = andOrig;
-    FbStip	xor = xorOrig;
-
-    dstStride = FbBitsStrideToStipStride (dstStride);
-    x1 = pBox->x1;
-    y1 = pBox->y1;
-    x2 = pBox->x2;
-    y2 = pBox->y2;
-    while (npt--)
-    {
-	x = pts->x + xorg;
-	y = pts->y + yorg;
-	pts++;
-	if (x1 <= x && x < x2 && y1 <= y && y < y2)
-	{
-	    x = (x + xoff) * dstBpp;
-	    d = dst + ((y + yoff) * dstStride) + (x >> FB_STIP_SHIFT);
-	    x &= FB_STIP_MASK;
-#ifdef FB_24BIT
-	    if (dstBpp == 24)
-	    {
-		FbStip	leftMask, rightMask;
-		int	n, rot;
-		FbStip	andT, xorT;
-		
-		rot = FbFirst24Rot (x);
-		andT = FbRot24Stip(and,rot);
-		xorT = FbRot24Stip(xor,rot);
-		FbMaskStip (x, 24, leftMask, n, rightMask);
-		if (leftMask)
-		{
-		    WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, leftMask));
-		    andT = FbNext24Stip(andT);
-		    xorT = FbNext24Stip(xorT);
-		    d++;
-		}
-		if (rightMask)
-		    WRITE(d, FbDoMaskRRop(READ(d), andT, xorT, rightMask));
-	    }
-	    else
-#endif
-	    {
-		FbStip	mask;
-		mask = FbStipMask(x, dstBpp);
-		WRITE(d, FbDoMaskRRop (READ(d), and, xor, mask));
-	    }
-	}
-    }
-}
-
-void
-fbPolyPoint (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     int	    mode,
-	     int	    nptInit,
-	     xPoint	    *pptInit)
-{
-    FbGCPrivPtr pPriv = fbGetGCPrivate (pGC);
-    RegionPtr	pClip = fbGetCompositeClip(pGC);
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    FbDots	dots;
-    FbBits	and, xor;
-    xPoint	*ppt;
-    int		npt;
-    BoxPtr	pBox;
-    int		nBox;
-    
-    /* make pointlist origin relative */
-    ppt = pptInit;
-    npt = nptInit;
-    if (mode == CoordModePrevious)
-    {
-	npt--;
-	while(npt--)
-	{
-	    ppt++;
-	    ppt->x += (ppt-1)->x;
-	    ppt->y += (ppt-1)->y;
-	}
-    }
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    and = pPriv->and;
-    xor = pPriv->xor;
-    dots = fbDots;
-#ifndef FBNOPIXADDR
-    switch (dstBpp) {
-    case 8:	dots = fbDots8; break;
-    case 16:    dots = fbDots16; break;
-#ifdef FB_24BIT
-    case 24:    dots = fbDots24; break;
-#endif
-    case 32:    dots = fbDots32; break;
-    }
-#endif
-    for (nBox = REGION_NUM_RECTS (pClip), pBox = REGION_RECTS (pClip);
-	 nBox--; pBox++)
-	(*dots) (dst, dstStride, dstBpp, pBox, pptInit, nptInit, 
-		 pDrawable->x, pDrawable->y, dstXoff, dstYoff, and, xor);
-    fbFinishAccess (pDrawable);
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+typedef void	(*FbDots)  (FbBits	*dst,

+			    FbStride    dstStride,

+			    int		dstBpp,

+			    BoxPtr	pBox,

+			    xPoint	*pts,

+			    int		npt,

+			    int		xorg,

+			    int		yorg,

+			    int		xoff,

+			    int		yoff,

+			    FbBits	and,

+			    FbBits	xor);

+

+void

+fbDots (FbBits	    *dstOrig,

+	FbStride    dstStride,

+	int	    dstBpp,

+	BoxPtr	    pBox,

+	xPoint	    *pts,

+	int	    npt,

+	int	    xorg,

+	int	    yorg,

+	int	    xoff,

+	int	    yoff,

+	FbBits	    andOrig,

+	FbBits	    xorOrig)

+{

+    FbStip	*dst = (FbStip *) dstOrig;

+    int		x1, y1, x2, y2;

+    int		x, y;

+    FbStip	*d;

+    FbStip	and = andOrig;

+    FbStip	xor = xorOrig;

+

+    dstStride = FbBitsStrideToStipStride (dstStride);

+    x1 = pBox->x1;

+    y1 = pBox->y1;

+    x2 = pBox->x2;

+    y2 = pBox->y2;

+    while (npt--)

+    {

+	x = pts->x + xorg;

+	y = pts->y + yorg;

+	pts++;

+	if (x1 <= x && x < x2 && y1 <= y && y < y2)

+	{

+	    x = (x + xoff) * dstBpp;

+	    d = dst + ((y + yoff) * dstStride) + (x >> FB_STIP_SHIFT);

+	    x &= FB_STIP_MASK;

+#ifdef FB_24BIT

+	    if (dstBpp == 24)

+	    {

+		FbStip	leftMask, rightMask;

+		int	n, rot;

+		FbStip	andT, xorT;

+		

+		rot = FbFirst24Rot (x);

+		andT = FbRot24Stip(and,rot);

+		xorT = FbRot24Stip(xor,rot);

+		FbMaskStip (x, 24, leftMask, n, rightMask);

+		if (leftMask)

+		{

+		    WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, leftMask));

+		    andT = FbNext24Stip(andT);

+		    xorT = FbNext24Stip(xorT);

+		    d++;

+		}

+		if (rightMask)

+		    WRITE(d, FbDoMaskRRop(READ(d), andT, xorT, rightMask));

+	    }

+	    else

+#endif

+	    {

+		FbStip	mask;

+		mask = FbStipMask(x, dstBpp);

+		WRITE(d, FbDoMaskRRop (READ(d), and, xor, mask));

+	    }

+	}

+    }

+}

+

+void

+fbPolyPoint (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     int	    mode,

+	     int	    nptInit,

+	     xPoint	    *pptInit)

+{

+    FbGCPrivPtr pPriv = fbGetGCPrivate (pGC);

+    RegionPtr	pClip = fbGetCompositeClip(pGC);

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    FbDots	dots;

+    FbBits	and, xor;

+    xPoint	*ppt;

+    int		npt;

+    BoxPtr	pBox;

+    int		nBox;

+    

+    /* make pointlist origin relative */

+    ppt = pptInit;

+    npt = nptInit;

+    if (mode == CoordModePrevious)

+    {

+	npt--;

+	while(npt--)

+	{

+	    ppt++;

+	    ppt->x += (ppt-1)->x;

+	    ppt->y += (ppt-1)->y;

+	}

+    }

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    and = pPriv->and;

+    xor = pPriv->xor;

+    dots = fbDots;

+#ifndef FBNOPIXADDR

+    switch (dstBpp) {

+    case 8:	dots = fbDots8; break;

+    case 16:    dots = fbDots16; break;

+#ifdef FB_24BIT

+    case 24:    dots = fbDots24; break;

+#endif

+    case 32:    dots = fbDots32; break;

+    }

+#endif

+    for (nBox = RegionNumRects (pClip), pBox = RegionRects (pClip);

+	 nBox--; pBox++)

+	(*dots) (dst, dstStride, dstBpp, pBox, pptInit, nptInit, 

+		 pDrawable->x, pDrawable->y, dstXoff, dstYoff, and, xor);

+    fbFinishAccess (pDrawable);

+}

diff --git a/xorg-server/fb/fbpush.c b/xorg-server/fb/fbpush.c
index 891572f0d..cfb702483 100644
--- a/xorg-server/fb/fbpush.c
+++ b/xorg-server/fb/fbpush.c
@@ -1,245 +1,245 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-void
-fbPushPattern (DrawablePtr  pDrawable,
-	       GCPtr	    pGC,
-	       
-	       FbStip	    *src,
-	       FbStride	    srcStride,
-	       int	    srcX,
-
-	       int	    x,
-	       int	    y,
-
-	       int	    width,
-	       int	    height)
-{
-    FbStip	    *s, bitsMask, bitsMask0, bits;
-    int		    xspan;
-    int		    w;
-    int		    lenspan;
-    
-    src += srcX >> FB_STIP_SHIFT;
-    srcX &= FB_STIP_MASK;
-    
-    bitsMask0 = FbStipMask (srcX, 1);
-    
-    while (height--)
-    {
-	bitsMask = bitsMask0;
-	w = width;
-	s = src;
-	src += srcStride;
-	bits = READ(s++);
-	xspan = x;
-	while (w)
-	{
-	    if (bits & bitsMask)
-	    {
-		lenspan = 0;
-		do
-		{
-		    lenspan++;
-		    if (lenspan == w)
-			break;
-		    bitsMask = FbStipRight (bitsMask, 1);
-		    if (!bitsMask)
-		    {
-			bits = READ(s++);
-			bitsMask = FbBitsMask(0,1);
-		    }
-		} while (bits & bitsMask);
-		fbFill (pDrawable, pGC, xspan, y, lenspan, 1);
-		xspan += lenspan;
-		w -= lenspan;
-	    }
-	    else
-	    {
-		do
-		{
-		    w--;
-		    xspan++;
-		    if (!w)
-			break;
-		    bitsMask = FbStipRight (bitsMask, 1);
-		    if (!bitsMask)
-		    {
-			bits = READ(s++);
-			bitsMask = FbBitsMask(0,1);
-		    }
-		} while (!(bits & bitsMask));
-	    }
-	}
-	y++;
-    }
-}
-
-void
-fbPushFill (DrawablePtr	pDrawable,
-	    GCPtr	pGC,
-
-	    FbStip	*src,
-	    FbStride	srcStride,
-	    int		srcX,
-	    
-	    int		x,
-	    int		y,
-	    int		width,
-	    int		height)
-{
-    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
-    
-    if (pGC->fillStyle == FillSolid)
-    {
-	FbBits	    *dst;
-	FbStride    dstStride;
-	int	    dstBpp;
-	int	    dstXoff, dstYoff;
-	int	    dstX;
-	int	    dstWidth;
-
-	fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-	dst = dst + (y + dstYoff) * dstStride;
-	dstX = (x + dstXoff) * dstBpp;
-	dstWidth = width * dstBpp;
-	if (dstBpp == 1)
-	{
-	    fbBltStip (src,
-		       srcStride,
-		       srcX,
-    
-		       (FbStip *) dst,
-		       FbBitsStrideToStipStride (dstStride),
-		       dstX,
-    
-		       dstWidth,
-		       height,
-    
-		       FbStipple1Rop(pGC->alu,pGC->fgPixel),
-		       pPriv->pm,
-		       dstBpp);
-	}
-	else
-	{
-	    fbBltOne (src,
-		      srcStride,
-		      srcX,
-    
-		      dst,
-		      dstStride,
-		      dstX,
-		      dstBpp,
-    
-		      dstWidth,
-		      height,
-    
-		      pPriv->and, pPriv->xor,
-		      fbAnd(GXnoop,(FbBits) 0,FB_ALLONES),
-		      fbXor(GXnoop,(FbBits) 0,FB_ALLONES));
-	}
-	fbFinishAccess (pDrawable);
-    }
-    else
-    {
-	fbPushPattern (pDrawable, pGC, src, srcStride, srcX,
-		       x, y, width, height);
-    }
-}
-	    
-void
-fbPushImage (DrawablePtr    pDrawable,
-	     GCPtr	    pGC,
-	     
-	     FbStip	    *src,
-	     FbStride	    srcStride,
-	     int	    srcX,
-
-	     int	    x,
-	     int	    y,
-	     int	    width,
-	     int	    height)
-{
-    RegionPtr	pClip = fbGetCompositeClip (pGC);
-    int		nbox;
-    BoxPtr	pbox;
-    int		x1, y1, x2, y2;
-    
-    for (nbox = REGION_NUM_RECTS (pClip),
-	 pbox = REGION_RECTS(pClip);
-	 nbox--;
-	 pbox++)
-    {
-	x1 = x;
-	y1 = y;
-	x2 = x + width;
-	y2 = y + height;
-	if (x1 < pbox->x1)
-	    x1 = pbox->x1;
-	if (y1 < pbox->y1)
-	    y1 = pbox->y1;
-	if (x2 > pbox->x2)
-	    x2 = pbox->x2;
-	if (y2 > pbox->y2)
-	    y2 = pbox->y2;
-	if (x1 >= x2 || y1 >= y2)
-	    continue;
-	fbPushFill (pDrawable,
-		    pGC,
-
-		    src + (y1 - y) * srcStride,
-		    srcStride,
-		    srcX + (x1 - x),
-
-		    x1,
-		    y1,
-		    x2 - x1,
-		    y2 - y1);
-    }
-}
-	     
-void
-fbPushPixels (GCPtr	    pGC,
-	      PixmapPtr	    pBitmap,
-	      DrawablePtr   pDrawable,
-	      int	    dx,
-	      int	    dy,
-	      int	    xOrg,
-	      int	    yOrg)
-{
-    FbStip	*stip;
-    FbStride	stipStride;
-    int		stipBpp;
-    int		stipXoff, stipYoff; /* Assumed to be zero */
-
-    fbGetStipDrawable (&pBitmap->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
-
-    fbPushImage (pDrawable, pGC,
-		 stip, stipStride, 0,
-		 xOrg, yOrg, dx, dy);
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+void

+fbPushPattern (DrawablePtr  pDrawable,

+	       GCPtr	    pGC,

+	       

+	       FbStip	    *src,

+	       FbStride	    srcStride,

+	       int	    srcX,

+

+	       int	    x,

+	       int	    y,

+

+	       int	    width,

+	       int	    height)

+{

+    FbStip	    *s, bitsMask, bitsMask0, bits;

+    int		    xspan;

+    int		    w;

+    int		    lenspan;

+    

+    src += srcX >> FB_STIP_SHIFT;

+    srcX &= FB_STIP_MASK;

+    

+    bitsMask0 = FbStipMask (srcX, 1);

+    

+    while (height--)

+    {

+	bitsMask = bitsMask0;

+	w = width;

+	s = src;

+	src += srcStride;

+	bits = READ(s++);

+	xspan = x;

+	while (w)

+	{

+	    if (bits & bitsMask)

+	    {

+		lenspan = 0;

+		do

+		{

+		    lenspan++;

+		    if (lenspan == w)

+			break;

+		    bitsMask = FbStipRight (bitsMask, 1);

+		    if (!bitsMask)

+		    {

+			bits = READ(s++);

+			bitsMask = FbBitsMask(0,1);

+		    }

+		} while (bits & bitsMask);

+		fbFill (pDrawable, pGC, xspan, y, lenspan, 1);

+		xspan += lenspan;

+		w -= lenspan;

+	    }

+	    else

+	    {

+		do

+		{

+		    w--;

+		    xspan++;

+		    if (!w)

+			break;

+		    bitsMask = FbStipRight (bitsMask, 1);

+		    if (!bitsMask)

+		    {

+			bits = READ(s++);

+			bitsMask = FbBitsMask(0,1);

+		    }

+		} while (!(bits & bitsMask));

+	    }

+	}

+	y++;

+    }

+}

+

+void

+fbPushFill (DrawablePtr	pDrawable,

+	    GCPtr	pGC,

+

+	    FbStip	*src,

+	    FbStride	srcStride,

+	    int		srcX,

+	    

+	    int		x,

+	    int		y,

+	    int		width,

+	    int		height)

+{

+    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);

+    

+    if (pGC->fillStyle == FillSolid)

+    {

+	FbBits	    *dst;

+	FbStride    dstStride;

+	int	    dstBpp;

+	int	    dstXoff, dstYoff;

+	int	    dstX;

+	int	    dstWidth;

+

+	fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+	dst = dst + (y + dstYoff) * dstStride;

+	dstX = (x + dstXoff) * dstBpp;

+	dstWidth = width * dstBpp;

+	if (dstBpp == 1)

+	{

+	    fbBltStip (src,

+		       srcStride,

+		       srcX,

+    

+		       (FbStip *) dst,

+		       FbBitsStrideToStipStride (dstStride),

+		       dstX,

+    

+		       dstWidth,

+		       height,

+    

+		       FbStipple1Rop(pGC->alu,pGC->fgPixel),

+		       pPriv->pm,

+		       dstBpp);

+	}

+	else

+	{

+	    fbBltOne (src,

+		      srcStride,

+		      srcX,

+    

+		      dst,

+		      dstStride,

+		      dstX,

+		      dstBpp,

+    

+		      dstWidth,

+		      height,

+    

+		      pPriv->and, pPriv->xor,

+		      fbAnd(GXnoop,(FbBits) 0,FB_ALLONES),

+		      fbXor(GXnoop,(FbBits) 0,FB_ALLONES));

+	}

+	fbFinishAccess (pDrawable);

+    }

+    else

+    {

+	fbPushPattern (pDrawable, pGC, src, srcStride, srcX,

+		       x, y, width, height);

+    }

+}

+	    

+void

+fbPushImage (DrawablePtr    pDrawable,

+	     GCPtr	    pGC,

+	     

+	     FbStip	    *src,

+	     FbStride	    srcStride,

+	     int	    srcX,

+

+	     int	    x,

+	     int	    y,

+	     int	    width,

+	     int	    height)

+{

+    RegionPtr	pClip = fbGetCompositeClip (pGC);

+    int		nbox;

+    BoxPtr	pbox;

+    int		x1, y1, x2, y2;

+    

+    for (nbox = RegionNumRects (pClip),

+	 pbox = RegionRects(pClip);

+	 nbox--;

+	 pbox++)

+    {

+	x1 = x;

+	y1 = y;

+	x2 = x + width;

+	y2 = y + height;

+	if (x1 < pbox->x1)

+	    x1 = pbox->x1;

+	if (y1 < pbox->y1)

+	    y1 = pbox->y1;

+	if (x2 > pbox->x2)

+	    x2 = pbox->x2;

+	if (y2 > pbox->y2)

+	    y2 = pbox->y2;

+	if (x1 >= x2 || y1 >= y2)

+	    continue;

+	fbPushFill (pDrawable,

+		    pGC,

+

+		    src + (y1 - y) * srcStride,

+		    srcStride,

+		    srcX + (x1 - x),

+

+		    x1,

+		    y1,

+		    x2 - x1,

+		    y2 - y1);

+    }

+}

+	     

+void

+fbPushPixels (GCPtr	    pGC,

+	      PixmapPtr	    pBitmap,

+	      DrawablePtr   pDrawable,

+	      int	    dx,

+	      int	    dy,

+	      int	    xOrg,

+	      int	    yOrg)

+{

+    FbStip	*stip;

+    FbStride	stipStride;

+    int		stipBpp;

+    int		stipXoff, stipYoff; /* Assumed to be zero */

+

+    fbGetStipDrawable (&pBitmap->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);

+

+    fbPushImage (pDrawable, pGC,

+		 stip, stipStride, 0,

+		 xOrg, yOrg, dx, dy);

+}

diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c
index 65af64074..f6eda6d64 100644
--- a/xorg-server/fb/fbscreen.c
+++ b/xorg-server/fb/fbscreen.c
@@ -37,22 +37,19 @@ fbCloseScreen (int index, ScreenPtr pScreen)
     free(depths);

     free(pScreen->visuals);

     free(pScreen->devPrivate);

-#ifdef FB_SCREEN_PRIVATE

-    free(dixLookupPrivate(&pScreen->devPrivates, fbGetScreenPrivateKey()));

-#endif

     return TRUE;

 }

 

 Bool

 fbRealizeFont(ScreenPtr pScreen, FontPtr pFont)

 {

-    return (TRUE);

+    return TRUE;

 }

 

 Bool

 fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)

 {

-    return (TRUE);

+    return TRUE;

 }

 

 void

diff --git a/xorg-server/fb/fbseg.c b/xorg-server/fb/fbseg.c
index 0236721ab..8a68857f7 100644
--- a/xorg-server/fb/fbseg.c
+++ b/xorg-server/fb/fbseg.c
@@ -624,8 +624,8 @@ fbSegment (DrawablePtr	pDrawable,
     unsigned int oc1;	/* outcode of point 1 */

     unsigned int oc2;	/* outcode of point 2 */

 

-    nBox = REGION_NUM_RECTS (pClip);

-    pBox = REGION_RECTS (pClip);

+    nBox = RegionNumRects (pClip);

+    pBox = RegionRects (pClip);

     

     bres = fbSelectBres (pDrawable, pGC);

     

diff --git a/xorg-server/fb/fbsetsp.c b/xorg-server/fb/fbsetsp.c
index 227ba4c62..ce016453f 100644
--- a/xorg-server/fb/fbsetsp.c
+++ b/xorg-server/fb/fbsetsp.c
@@ -1,102 +1,102 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-void
-fbSetSpans (DrawablePtr	    pDrawable,
-	    GCPtr	    pGC,
-	    char	    *src,
-	    DDXPointPtr	    ppt,
-	    int		    *pwidth,
-	    int		    nspans,
-	    int		    fSorted)
-{
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    FbBits	    *dst, *d, *s;
-    FbStride	    dstStride;
-    int		    dstBpp;
-    int		    dstXoff, dstYoff;
-    BoxPtr	    pbox;
-    int		    n;
-    int		    xoff;
-    int		    x1, x2;
-    
-#ifdef FB_24_32BIT
-    if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))
-    {
-	fb24_32SetSpans (pDrawable, pGC, src, ppt, pwidth, nspans, fSorted);
-	return;
-    }
-#endif
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    while (nspans--)
-    {
-	d = dst + (ppt->y + dstYoff) * dstStride;
-	xoff = (int) (((long) src) & (FB_MASK >> 3));
-	s = (FbBits *) (src - xoff);
-	xoff <<= 3;
-	n = REGION_NUM_RECTS(pClip);
-	pbox = REGION_RECTS (pClip);
-	while (n--)
-	{
-	    if (pbox->y1 > ppt->y)
-		break;
-	    if (pbox->y2 > ppt->y)
-	    {
-		x1 = ppt->x;
-		x2 = x1 + *pwidth;
-		if (pbox->x1 > x1)
-		    x1 = pbox->x1;
-		if (pbox->x2 < x2)
-		    x2 = pbox->x2;
-		if (x1 < x2)
-		    fbBlt ((FbBits *) s,
-			   0,
-			   (x1 - ppt->x) * dstBpp + xoff,
-			   d,
-			   dstStride,
-			   (x1 + dstXoff) * dstBpp,
-
-			   (x2 - x1) * dstBpp,
-			   1,
-			   pGC->alu,
-			   pPriv->pm,
-			   dstBpp,
-			   
-			   FALSE,
-			   FALSE);
-	    }
-	}
-	src += PixmapBytePad (*pwidth, pDrawable->depth);
-	ppt++;
-	pwidth++;
-    }
-    fbValidateDrawable (pDrawable);
-    fbFinishAccess (pDrawable);
-}
-	    
+/*

+ * Copyright © 1998 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 "fb.h"

+

+void

+fbSetSpans (DrawablePtr	    pDrawable,

+	    GCPtr	    pGC,

+	    char	    *src,

+	    DDXPointPtr	    ppt,

+	    int		    *pwidth,

+	    int		    nspans,

+	    int		    fSorted)

+{

+    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);

+    RegionPtr	    pClip = fbGetCompositeClip(pGC);

+    FbBits	    *dst, *d, *s;

+    FbStride	    dstStride;

+    int		    dstBpp;

+    int		    dstXoff, dstYoff;

+    BoxPtr	    pbox;

+    int		    n;

+    int		    xoff;

+    int		    x1, x2;

+    

+#ifdef FB_24_32BIT

+    if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))

+    {

+	fb24_32SetSpans (pDrawable, pGC, src, ppt, pwidth, nspans, fSorted);

+	return;

+    }

+#endif

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    while (nspans--)

+    {

+	d = dst + (ppt->y + dstYoff) * dstStride;

+	xoff = (int) (((long) src) & (FB_MASK >> 3));

+	s = (FbBits *) (src - xoff);

+	xoff <<= 3;

+	n = RegionNumRects(pClip);

+	pbox = RegionRects (pClip);

+	while (n--)

+	{

+	    if (pbox->y1 > ppt->y)

+		break;

+	    if (pbox->y2 > ppt->y)

+	    {

+		x1 = ppt->x;

+		x2 = x1 + *pwidth;

+		if (pbox->x1 > x1)

+		    x1 = pbox->x1;

+		if (pbox->x2 < x2)

+		    x2 = pbox->x2;

+		if (x1 < x2)

+		    fbBlt ((FbBits *) s,

+			   0,

+			   (x1 - ppt->x) * dstBpp + xoff,

+			   d,

+			   dstStride,

+			   (x1 + dstXoff) * dstBpp,

+

+			   (x2 - x1) * dstBpp,

+			   1,

+			   pGC->alu,

+			   pPriv->pm,

+			   dstBpp,

+			   

+			   FALSE,

+			   FALSE);

+	    }

+	}

+	src += PixmapBytePad (*pwidth, pDrawable->depth);

+	ppt++;

+	pwidth++;

+    }

+    fbValidateDrawable (pDrawable);

+    fbFinishAccess (pDrawable);

+}

+	    

diff --git a/xorg-server/fb/fbwindow.c b/xorg-server/fb/fbwindow.c
index 46c033448..92b23acdb 100644
--- a/xorg-server/fb/fbwindow.c
+++ b/xorg-server/fb/fbwindow.c
@@ -1,250 +1,250 @@
-/*
- * Copyright © 1998 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 "fb.h"
-
-Bool
-fbCreateWindow(WindowPtr pWin)
-{
-    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(),
-		  fbGetScreenPixmap(pWin->drawable.pScreen));
-#ifdef FB_SCREEN_PRIVATE
-    if (pWin->drawable.bitsPerPixel == 32)
-	pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;
-#endif
-    return TRUE;
-}
-
-Bool
-fbDestroyWindow(WindowPtr pWin)
-{
-    return TRUE;
-}
-
-Bool
-fbMapWindow(WindowPtr pWindow)
-{
-    return TRUE;
-}
-
-Bool
-fbPositionWindow(WindowPtr pWin, int x, int y)
-{
-    return TRUE;
-}
-
-Bool
-fbUnmapWindow(WindowPtr pWindow)
-{
-    return TRUE;
-}
-
-void
-fbCopyWindowProc (DrawablePtr	pSrcDrawable,
-		  DrawablePtr	pDstDrawable,
-		  GCPtr		pGC,
-		  BoxPtr	pbox,
-		  int		nbox,
-		  int		dx,
-		  int		dy,
-		  Bool		reverse,
-		  Bool		upsidedown,
-		  Pixel		bitplane,
-		  void		*closure)
-{
-    FbBits	*src;
-    FbStride	srcStride;
-    int		srcBpp;
-    int		srcXoff, srcYoff;
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    
-    fbGetDrawable (pSrcDrawable, src, srcStride, srcBpp, srcXoff, srcYoff);
-    fbGetDrawable (pDstDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    
-    while (nbox--)
-    {
-	fbBlt (src + (pbox->y1 + dy + srcYoff) * srcStride,
-	       srcStride,
-	       (pbox->x1 + dx + srcXoff) * srcBpp,
-    
-	       dst + (pbox->y1 + dstYoff) * dstStride,
-	       dstStride,
-	       (pbox->x1 + dstXoff) * dstBpp,
-    
-	       (pbox->x2 - pbox->x1) * dstBpp,
-	       (pbox->y2 - pbox->y1),
-    
-	       GXcopy,
-	       FB_ALLONES,
-	       dstBpp,
-    
-	       reverse,
-	       upsidedown);
-	pbox++;
-    }
-
-    fbFinishAccess (pDstDrawable);
-    fbFinishAccess (pSrcDrawable);
-}
-
-void
-fbCopyWindow(WindowPtr	    pWin, 
-	     DDXPointRec    ptOldOrg, 
-	     RegionPtr	    prgnSrc)
-{
-    RegionRec	rgnDst;
-    int		dx, dy;
-
-    PixmapPtr	pPixmap = fbGetWindowPixmap (pWin);
-    DrawablePtr	pDrawable = &pPixmap->drawable;
-
-    dx = ptOldOrg.x - pWin->drawable.x;
-    dy = ptOldOrg.y - pWin->drawable.y;
-    REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
-
-    REGION_NULL (pWin->drawable.pScreen, &rgnDst);
-    
-    REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
-
-#ifdef COMPOSITE
-    if (pPixmap->screen_x || pPixmap->screen_y)
-	REGION_TRANSLATE (pWin->drawable.pScreen, &rgnDst, 
-			  -pPixmap->screen_x, -pPixmap->screen_y);
-#endif
-
-    miCopyRegion (pDrawable, pDrawable,
-		  0,
-		  &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
-    
-    REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
-    fbValidateDrawable (&pWin->drawable);
-}
-
-Bool
-fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
-{
-    PixmapPtr	pPixmap;
-    
-    if (mask & CWBackPixmap)
-    {
-	if (pWin->backgroundState == BackgroundPixmap)
-	{
-	    pPixmap = pWin->background.pixmap;
-#ifdef FB_24_32BIT
-	    if (pPixmap->drawable.bitsPerPixel != pWin->drawable.bitsPerPixel)
-	    {
-		pPixmap = fb24_32ReformatTile (pPixmap,
-					       pWin->drawable.bitsPerPixel);
-		if (pPixmap)
-		{
-		    (*pWin->drawable.pScreen->DestroyPixmap) (pWin->background.pixmap);
-		    pWin->background.pixmap = pPixmap;
-		}
-	    }
-#endif
-	    if (FbEvenTile (pPixmap->drawable.width *
-			    pPixmap->drawable.bitsPerPixel))
-		fbPadPixmap (pPixmap);
-	}
-    }
-    if (mask & CWBorderPixmap)
-    {
-	if (pWin->borderIsPixel == FALSE)
-	{
-	    pPixmap = pWin->border.pixmap;
-#ifdef FB_24_32BIT
-	    if (pPixmap->drawable.bitsPerPixel !=
-		pWin->drawable.bitsPerPixel)
-	    {
-		pPixmap = fb24_32ReformatTile (pPixmap,
-					       pWin->drawable.bitsPerPixel);
-		if (pPixmap)
-		{
-		    (*pWin->drawable.pScreen->DestroyPixmap) (pWin->border.pixmap);
-		    pWin->border.pixmap = pPixmap;
-		}
-	    }
-#endif
-	    if (FbEvenTile (pPixmap->drawable.width *
-			    pPixmap->drawable.bitsPerPixel))
-		fbPadPixmap (pPixmap);
-	}
-    }
-    return TRUE;
-}
-
-void
-fbFillRegionSolid (DrawablePtr	pDrawable,
-		   RegionPtr	pRegion,
-		   FbBits	and,
-		   FbBits	xor)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    int		n = REGION_NUM_RECTS(pRegion);
-    BoxPtr	pbox = REGION_RECTS(pRegion);
-
-#ifndef FB_ACCESS_WRAPPER
-    int try_mmx = 0;
-    if (!and)
-        try_mmx = 1;
-#endif
-
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    
-    while (n--)
-    {
-#ifndef FB_ACCESS_WRAPPER
-	if (!try_mmx || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,
-				      pbox->x1 + dstXoff, pbox->y1 + dstYoff,
-				      (pbox->x2 - pbox->x1),
-				      (pbox->y2 - pbox->y1),
-				      xor))
-	{
-#endif
-	    fbSolid (dst + (pbox->y1 + dstYoff) * dstStride,
-		     dstStride,
-		     (pbox->x1 + dstXoff) * dstBpp,
-		     dstBpp,
-		     (pbox->x2 - pbox->x1) * dstBpp,
-		     pbox->y2 - pbox->y1,
-		     and, xor);
-#ifndef FB_ACCESS_WRAPPER
-	}
-#endif
-	fbValidateDrawable (pDrawable);
-	pbox++;
-    }
-    
-    fbFinishAccess (pDrawable);
-}
+/*

+ * Copyright © 1998 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 "fb.h"

+

+Bool

+fbCreateWindow(WindowPtr pWin)

+{

+    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(),

+		  fbGetScreenPixmap(pWin->drawable.pScreen));

+#ifdef FB_SCREEN_PRIVATE

+    if (pWin->drawable.bitsPerPixel == 32)

+	pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;

+#endif

+    return TRUE;

+}

+

+Bool

+fbDestroyWindow(WindowPtr pWin)

+{

+    return TRUE;

+}

+

+Bool

+fbMapWindow(WindowPtr pWindow)

+{

+    return TRUE;

+}

+

+Bool

+fbPositionWindow(WindowPtr pWin, int x, int y)

+{

+    return TRUE;

+}

+

+Bool

+fbUnmapWindow(WindowPtr pWindow)

+{

+    return TRUE;

+}

+

+void

+fbCopyWindowProc (DrawablePtr	pSrcDrawable,

+		  DrawablePtr	pDstDrawable,

+		  GCPtr		pGC,

+		  BoxPtr	pbox,

+		  int		nbox,

+		  int		dx,

+		  int		dy,

+		  Bool		reverse,

+		  Bool		upsidedown,

+		  Pixel		bitplane,

+		  void		*closure)

+{

+    FbBits	*src;

+    FbStride	srcStride;

+    int		srcBpp;

+    int		srcXoff, srcYoff;

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    

+    fbGetDrawable (pSrcDrawable, src, srcStride, srcBpp, srcXoff, srcYoff);

+    fbGetDrawable (pDstDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    

+    while (nbox--)

+    {

+	fbBlt (src + (pbox->y1 + dy + srcYoff) * srcStride,

+	       srcStride,

+	       (pbox->x1 + dx + srcXoff) * srcBpp,

+    

+	       dst + (pbox->y1 + dstYoff) * dstStride,

+	       dstStride,

+	       (pbox->x1 + dstXoff) * dstBpp,

+    

+	       (pbox->x2 - pbox->x1) * dstBpp,

+	       (pbox->y2 - pbox->y1),

+    

+	       GXcopy,

+	       FB_ALLONES,

+	       dstBpp,

+    

+	       reverse,

+	       upsidedown);

+	pbox++;

+    }

+

+    fbFinishAccess (pDstDrawable);

+    fbFinishAccess (pSrcDrawable);

+}

+

+void

+fbCopyWindow(WindowPtr	    pWin, 

+	     DDXPointRec    ptOldOrg, 

+	     RegionPtr	    prgnSrc)

+{

+    RegionRec	rgnDst;

+    int		dx, dy;

+

+    PixmapPtr	pPixmap = fbGetWindowPixmap (pWin);

+    DrawablePtr	pDrawable = &pPixmap->drawable;

+

+    dx = ptOldOrg.x - pWin->drawable.x;

+    dy = ptOldOrg.y - pWin->drawable.y;

+    RegionTranslate(prgnSrc, -dx, -dy);

+

+    RegionNull(&rgnDst);

+    

+    RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);

+

+#ifdef COMPOSITE

+    if (pPixmap->screen_x || pPixmap->screen_y)

+	RegionTranslate(&rgnDst,

+			  -pPixmap->screen_x, -pPixmap->screen_y);

+#endif

+

+    miCopyRegion (pDrawable, pDrawable,

+		  0,

+		  &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);

+    

+    RegionUninit(&rgnDst);

+    fbValidateDrawable (&pWin->drawable);

+}

+

+Bool

+fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)

+{

+    PixmapPtr	pPixmap;

+    

+    if (mask & CWBackPixmap)

+    {

+	if (pWin->backgroundState == BackgroundPixmap)

+	{

+	    pPixmap = pWin->background.pixmap;

+#ifdef FB_24_32BIT

+	    if (pPixmap->drawable.bitsPerPixel != pWin->drawable.bitsPerPixel)

+	    {

+		pPixmap = fb24_32ReformatTile (pPixmap,

+					       pWin->drawable.bitsPerPixel);

+		if (pPixmap)

+		{

+		    (*pWin->drawable.pScreen->DestroyPixmap) (pWin->background.pixmap);

+		    pWin->background.pixmap = pPixmap;

+		}

+	    }

+#endif

+	    if (FbEvenTile (pPixmap->drawable.width *

+			    pPixmap->drawable.bitsPerPixel))

+		fbPadPixmap (pPixmap);

+	}

+    }

+    if (mask & CWBorderPixmap)

+    {

+	if (pWin->borderIsPixel == FALSE)

+	{

+	    pPixmap = pWin->border.pixmap;

+#ifdef FB_24_32BIT

+	    if (pPixmap->drawable.bitsPerPixel !=

+		pWin->drawable.bitsPerPixel)

+	    {

+		pPixmap = fb24_32ReformatTile (pPixmap,

+					       pWin->drawable.bitsPerPixel);

+		if (pPixmap)

+		{

+		    (*pWin->drawable.pScreen->DestroyPixmap) (pWin->border.pixmap);

+		    pWin->border.pixmap = pPixmap;

+		}

+	    }

+#endif

+	    if (FbEvenTile (pPixmap->drawable.width *

+			    pPixmap->drawable.bitsPerPixel))

+		fbPadPixmap (pPixmap);

+	}

+    }

+    return TRUE;

+}

+

+void

+fbFillRegionSolid (DrawablePtr	pDrawable,

+		   RegionPtr	pRegion,

+		   FbBits	and,

+		   FbBits	xor)

+{

+    FbBits	*dst;

+    FbStride	dstStride;

+    int		dstBpp;

+    int		dstXoff, dstYoff;

+    int		n = RegionNumRects(pRegion);

+    BoxPtr	pbox = RegionRects(pRegion);

+

+#ifndef FB_ACCESS_WRAPPER

+    int try_mmx = 0;

+    if (!and)

+        try_mmx = 1;

+#endif

+

+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);

+    

+    while (n--)

+    {

+#ifndef FB_ACCESS_WRAPPER

+	if (!try_mmx || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,

+				      pbox->x1 + dstXoff, pbox->y1 + dstYoff,

+				      (pbox->x2 - pbox->x1),

+				      (pbox->y2 - pbox->y1),

+				      xor))

+	{

+#endif

+	    fbSolid (dst + (pbox->y1 + dstYoff) * dstStride,

+		     dstStride,

+		     (pbox->x1 + dstXoff) * dstBpp,

+		     dstBpp,

+		     (pbox->x2 - pbox->x1) * dstBpp,

+		     pbox->y2 - pbox->y1,

+		     and, xor);

+#ifndef FB_ACCESS_WRAPPER

+	}

+#endif

+	fbValidateDrawable (pDrawable);

+	pbox++;

+    }

+    

+    fbFinishAccess (pDrawable);

+}

diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h
index 73ee510b9..9c45045e7 100644
--- a/xorg-server/fb/wfbrename.h
+++ b/xorg-server/fb/wfbrename.h
@@ -1,190 +1,190 @@
-#define fb16Lane wfb16Lane
-#define fb24_32CopyMtoN wfb24_32CopyMtoN
-#define fb24_32CreateScreenResources wfb24_32CreateScreenResources
-#define fb24_32GetImage wfb24_32GetImage
-#define fb24_32GetSpans wfb24_32GetSpans
-#define fb24_32ModifyPixmapHeader wfb24_32ModifyPixmapHeader
-#define fb24_32PutZImage wfb24_32PutZImage
-#define fb24_32ReformatTile wfb24_32ReformatTile
-#define fb24_32SetSpans wfb24_32SetSpans
-#define fb32Lane wfb32Lane
-#define fb8Lane wfb8Lane
-#define fbAddTraps wfbAddTraps
-#define fbAddTriangles wfbAddTriangles
-#define fbAllocatePrivates wfbAllocatePrivates
-#define fbArc16 wfbArc16
-#define fbArc24 wfbArc24
-#define fbArc32 wfbArc32
-#define fbArc8 wfbArc8
-#define fbBlt wfbBlt
-#define fbBlt24 wfbBlt24
-#define fbBltOne wfbBltOne
-#define fbBltOne24 wfbBltOne24
-#define fbBltPlane wfbBltPlane
-#define fbBltStip wfbBltStip
-#define fbBres wfbBres
-#define fbBresDash wfbBresDash
-#define fbBresDash16 wfbBresDash16
-#define fbBresDash24 wfbBresDash24
-#define fbBresDash32 wfbBresDash32
-#define fbBresDash8 wfbBresDash8
-#define fbBresFill wfbBresFill
-#define fbBresFillDash wfbBresFillDash
-#define fbBresSolid wfbBresSolid
-#define fbBresSolid16 wfbBresSolid16
-#define fbBresSolid24 wfbBresSolid24
-#define fbBresSolid32 wfbBresSolid32
-#define fbBresSolid8 wfbBresSolid8
-#define fbChangeWindowAttributes wfbChangeWindowAttributes
-#define fbClearVisualTypes wfbClearVisualTypes
-#define fbCloseScreen wfbCloseScreen
-#define fbComposite wfbComposite
-#define fbCompositeGeneral wfbCompositeGeneral
-#define fbCompositeSolidMask_nx1xn wfbCompositeSolidMask_nx1xn
-#define fbCompositeSolidMask_nx8888x0565C wfbCompositeSolidMask_nx8888x0565C
-#define fbCompositeSolidMask_nx8888x8888C wfbCompositeSolidMask_nx8888x8888C
-#define fbCompositeSolidMask_nx8x0565 wfbCompositeSolidMask_nx8x0565
-#define fbCompositeSolidMask_nx8x0888 wfbCompositeSolidMask_nx8x0888
-#define fbCompositeSolidMask_nx8x8888 wfbCompositeSolidMask_nx8x8888
-#define fbCompositeSrc_0565x0565 wfbCompositeSrc_0565x0565
-#define fbCompositeSrc_8888x0565 wfbCompositeSrc_8888x0565
-#define fbCompositeSrc_8888x0888 wfbCompositeSrc_8888x0888
-#define fbCompositeSrc_8888x8888 wfbCompositeSrc_8888x8888
-#define fbCompositeSrcAdd_1000x1000 wfbCompositeSrcAdd_1000x1000
-#define fbCompositeSrcAdd_8000x8000 wfbCompositeSrcAdd_8000x8000
-#define fbCompositeSrcAdd_8888x8888 wfbCompositeSrcAdd_8888x8888
-#define fbCopy1toN wfbCopy1toN
-#define fbCopyArea wfbCopyArea
-#define fbCopyNto1 wfbCopyNto1
-#define fbCopyNtoN wfbCopyNtoN
-#define fbCopyPlane wfbCopyPlane
-#define fbCopyRegion wfbCopyRegion
-#define fbCopyWindow wfbCopyWindow
-#define fbCopyWindowProc wfbCopyWindowProc
-#define fbCreateDefColormap wfbCreateDefColormap
-#define fbCreateGC wfbCreateGC
-#define fbCreatePixmap wfbCreatePixmap
-#define fbCreatePixmapBpp wfbCreatePixmapBpp
-#define fbCreateWindow wfbCreateWindow
-#define fbDestroyPixmap wfbDestroyPixmap
-#define fbDestroyWindow wfbDestroyWindow
-#define fbDoCopy wfbDoCopy
-#define fbDots wfbDots
-#define fbDots16 wfbDots16
-#define fbDots24 wfbDots24
-#define fbDots32 wfbDots32
-#define fbDots8 wfbDots8
-#define fbEvenStipple wfbEvenStipple
-#define fbEvenTile wfbEvenTile
-#define fbExpandDirectColors wfbExpandDirectColors
-#define fbFill wfbFill
-#define fbFillRegionSolid wfbFillRegionSolid
-#define fbFillSpans wfbFillSpans
-#define fbFixCoordModePrevious wfbFixCoordModePrevious
-#define fbGCFuncs wfbGCFuncs
-#define fbGCOps wfbGCOps
-#define fbGCPrivateKey wfbGCPrivateKey
-#define fbGeneration wfbGeneration
-#define fbGetGCPrivateKey wfbGetGCPrivateKey
-#define fbGetImage wfbGetImage
-#define fbGetScreenPrivateKey wfbGetScreenPrivateKey
-#define fbGetSpans wfbGetSpans
-#define _fbGetWindowPixmap _wfbGetWindowPixmap
-#define fbGetWinPrivateKey wfbGetWinPrivateKey
-#define fbGlyph16 wfbGlyph16
-#define fbGlyph24 wfbGlyph24
-#define fbGlyph32 wfbGlyph32
-#define fbGlyph8 wfbGlyph8
-#define fbGlyphIn wfbGlyphIn
-#define fbHasVisualTypes wfbHasVisualTypes
-#define fbImageGlyphBlt wfbImageGlyphBlt
-#define fbIn wfbIn
-#define fbInitializeColormap wfbInitializeColormap
-#define fbInitVisuals wfbInitVisuals
-#define fbInstallColormap wfbInstallColormap
-#define fbLaneTable wfbLaneTable
-#define fbListInstalledColormaps wfbListInstalledColormaps
-#define fbMapWindow wfbMapWindow
-#define FbMergeRopBits wFbMergeRopBits
-#define fbOddStipple wfbOddStipple
-#define fbOddTile wfbOddTile
-#define fbOver wfbOver
-#define fbOver24 wfbOver24
-#define fbOverlayCloseScreen wfbOverlayCloseScreen
-#define fbOverlayCopyWindow wfbOverlayCopyWindow
-#define fbOverlayCreateScreenResources wfbOverlayCreateScreenResources
-#define fbOverlayCreateWindow wfbOverlayCreateWindow
-#define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit
-#define fbOverlayGeneration wfbOverlayGeneration
-#define fbOverlayGetScreenPrivateKey wfbOverlayGetScreenPrivateKey
-#define fbOverlayPaintKey wfbOverlayPaintKey
-#define fbOverlayScreenPrivateKey wfbOverlayScreenPrivateKey
-#define fbOverlaySetupScreen wfbOverlaySetupScreen
-#define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion
-#define fbOverlayWindowExposures wfbOverlayWindowExposures
-#define fbOverlayWindowLayer wfbOverlayWindowLayer
-#define fbPadPixmap wfbPadPixmap
-#define fbPictureInit wfbPictureInit
-#define fbPixmapToRegion wfbPixmapToRegion
-#define fbPolyArc wfbPolyArc
-#define fbPolyFillRect wfbPolyFillRect
-#define fbPolyGlyphBlt wfbPolyGlyphBlt
-#define fbPolyLine wfbPolyLine
-#define fbPolyline16 wfbPolyline16
-#define fbPolyline24 wfbPolyline24
-#define fbPolyline32 wfbPolyline32
-#define fbPolyline8 wfbPolyline8
-#define fbPolyPoint wfbPolyPoint
-#define fbPolySegment wfbPolySegment
-#define fbPolySegment16 wfbPolySegment16
-#define fbPolySegment24 wfbPolySegment24
-#define fbPolySegment32 wfbPolySegment32
-#define fbPolySegment8 wfbPolySegment8
-#define fbPositionWindow wfbPositionWindow
-#define fbPushFill wfbPushFill
-#define fbPushImage wfbPushImage
-#define fbPushPattern wfbPushPattern
-#define fbPushPixels wfbPushPixels
-#define fbPutImage wfbPutImage
-#define fbPutXYImage wfbPutXYImage
-#define fbPutZImage wfbPutZImage
-#define fbQueryBestSize wfbQueryBestSize
-#define fbRasterizeEdges wfbRasterizeEdges
-#define fbRasterizeTrapezoid wfbRasterizeTrapezoid
-#define fbRealizeFont wfbRealizeFont
-#define fbReduceRasterOp wfbReduceRasterOp
-#define fbReplicatePixel wfbReplicatePixel
-#define fbResolveColor wfbResolveColor
-#define fbRestoreAreas wfbRestoreAreas
-#define fbSaveAreas wfbSaveAreas
-#define fbScreenPrivateKey wfbScreenPrivateKey
-#define fbSegment wfbSegment
-#define fbSelectBres wfbSelectBres
-#define fbSetSpans wfbSetSpans
-#define fbSetupScreen wfbSetupScreen
-#define fbSetVisualTypes wfbSetVisualTypes
-#define fbSetVisualTypesAndMasks wfbSetVisualTypesAndMasks
-#define _fbSetWindowPixmap _wfbSetWindowPixmap
-#define fbSolid wfbSolid
-#define fbSolid24 wfbSolid24
-#define fbSolidBoxClipped wfbSolidBoxClipped
-#define fbStipple wfbStipple
-#define fbStipple1Bits wfbStipple1Bits
-#define fbStipple24Bits wfbStipple24Bits
-#define fbStipple2Bits wfbStipple2Bits
-#define fbStipple4Bits wfbStipple4Bits
-#define fbStipple8Bits wfbStipple8Bits
-#define fbStippleTable wfbStippleTable
-#define fbTile wfbTile
-#define fbTransparentSpan wfbTransparentSpan
-#define fbUninstallColormap wfbUninstallColormap
-#define fbUnmapWindow wfbUnmapWindow
-#define fbUnrealizeFont wfbUnrealizeFont
-#define fbValidateGC wfbValidateGC
-#define fbWalkCompositeRegion wfbWalkCompositeRegion
-#define fbWinPrivateKey wfbWinPrivateKey
-#define fbZeroLine wfbZeroLine
-#define fbZeroSegment wfbZeroSegment
-#define free_pixman_pict wfb_free_pixman_pict
-#define image_from_pict wfb_image_from_pict
-#define composeFunctions wfbComposeFunctions
+#define fb16Lane wfb16Lane

+#define fb24_32CopyMtoN wfb24_32CopyMtoN

+#define fb24_32CreateScreenResources wfb24_32CreateScreenResources

+#define fb24_32GetImage wfb24_32GetImage

+#define fb24_32GetSpans wfb24_32GetSpans

+#define fb24_32ModifyPixmapHeader wfb24_32ModifyPixmapHeader

+#define fb24_32PutZImage wfb24_32PutZImage

+#define fb24_32ReformatTile wfb24_32ReformatTile

+#define fb24_32SetSpans wfb24_32SetSpans

+#define fb32Lane wfb32Lane

+#define fb8Lane wfb8Lane

+#define fbAddTraps wfbAddTraps

+#define fbAddTriangles wfbAddTriangles

+#define fbAllocatePrivates wfbAllocatePrivates

+#define fbArc16 wfbArc16

+#define fbArc24 wfbArc24

+#define fbArc32 wfbArc32

+#define fbArc8 wfbArc8

+#define fbBlt wfbBlt

+#define fbBlt24 wfbBlt24

+#define fbBltOne wfbBltOne

+#define fbBltOne24 wfbBltOne24

+#define fbBltPlane wfbBltPlane

+#define fbBltStip wfbBltStip

+#define fbBres wfbBres

+#define fbBresDash wfbBresDash

+#define fbBresDash16 wfbBresDash16

+#define fbBresDash24 wfbBresDash24

+#define fbBresDash32 wfbBresDash32

+#define fbBresDash8 wfbBresDash8

+#define fbBresFill wfbBresFill

+#define fbBresFillDash wfbBresFillDash

+#define fbBresSolid wfbBresSolid

+#define fbBresSolid16 wfbBresSolid16

+#define fbBresSolid24 wfbBresSolid24

+#define fbBresSolid32 wfbBresSolid32

+#define fbBresSolid8 wfbBresSolid8

+#define fbChangeWindowAttributes wfbChangeWindowAttributes

+#define fbClearVisualTypes wfbClearVisualTypes

+#define fbCloseScreen wfbCloseScreen

+#define fbComposite wfbComposite

+#define fbCompositeGeneral wfbCompositeGeneral

+#define fbCompositeSolidMask_nx1xn wfbCompositeSolidMask_nx1xn

+#define fbCompositeSolidMask_nx8888x0565C wfbCompositeSolidMask_nx8888x0565C

+#define fbCompositeSolidMask_nx8888x8888C wfbCompositeSolidMask_nx8888x8888C

+#define fbCompositeSolidMask_nx8x0565 wfbCompositeSolidMask_nx8x0565

+#define fbCompositeSolidMask_nx8x0888 wfbCompositeSolidMask_nx8x0888

+#define fbCompositeSolidMask_nx8x8888 wfbCompositeSolidMask_nx8x8888

+#define fbCompositeSrc_0565x0565 wfbCompositeSrc_0565x0565

+#define fbCompositeSrc_8888x0565 wfbCompositeSrc_8888x0565

+#define fbCompositeSrc_8888x0888 wfbCompositeSrc_8888x0888

+#define fbCompositeSrc_8888x8888 wfbCompositeSrc_8888x8888

+#define fbCompositeSrcAdd_1000x1000 wfbCompositeSrcAdd_1000x1000

+#define fbCompositeSrcAdd_8000x8000 wfbCompositeSrcAdd_8000x8000

+#define fbCompositeSrcAdd_8888x8888 wfbCompositeSrcAdd_8888x8888

+#define fbCopy1toN wfbCopy1toN

+#define fbCopyArea wfbCopyArea

+#define fbCopyNto1 wfbCopyNto1

+#define fbCopyNtoN wfbCopyNtoN

+#define fbCopyPlane wfbCopyPlane

+#define fbCopyRegion wfbCopyRegion

+#define fbCopyWindow wfbCopyWindow

+#define fbCopyWindowProc wfbCopyWindowProc

+#define fbCreateDefColormap wfbCreateDefColormap

+#define fbCreateGC wfbCreateGC

+#define fbCreatePixmap wfbCreatePixmap

+#define fbCreatePixmapBpp wfbCreatePixmapBpp

+#define fbCreateWindow wfbCreateWindow

+#define fbDestroyPixmap wfbDestroyPixmap

+#define fbDestroyWindow wfbDestroyWindow

+#define fbDoCopy wfbDoCopy

+#define fbDots wfbDots

+#define fbDots16 wfbDots16

+#define fbDots24 wfbDots24

+#define fbDots32 wfbDots32

+#define fbDots8 wfbDots8

+#define fbEvenStipple wfbEvenStipple

+#define fbEvenTile wfbEvenTile

+#define fbExpandDirectColors wfbExpandDirectColors

+#define fbFill wfbFill

+#define fbFillRegionSolid wfbFillRegionSolid

+#define fbFillSpans wfbFillSpans

+#define fbFixCoordModePrevious wfbFixCoordModePrevious

+#define fbGCFuncs wfbGCFuncs

+#define fbGCOps wfbGCOps

+#define fbGCPrivateKeyRec wfbGCPrivateKeyRec

+#define fbGeneration wfbGeneration

+#define fbGetGCPrivateKey wfbGetGCPrivateKey

+#define fbGetImage wfbGetImage

+#define fbGetScreenPrivateKey wfbGetScreenPrivateKey

+#define fbGetSpans wfbGetSpans

+#define _fbGetWindowPixmap _wfbGetWindowPixmap

+#define fbWinPrivateKeyRec wfbWinPrivateKeyRec

+#define fbGetWinPrivateKey wfbGetWinPrivateKey

+#define fbGlyph16 wfbGlyph16

+#define fbGlyph24 wfbGlyph24

+#define fbGlyph32 wfbGlyph32

+#define fbGlyph8 wfbGlyph8

+#define fbGlyphIn wfbGlyphIn

+#define fbHasVisualTypes wfbHasVisualTypes

+#define fbImageGlyphBlt wfbImageGlyphBlt

+#define fbIn wfbIn

+#define fbInitializeColormap wfbInitializeColormap

+#define fbInitVisuals wfbInitVisuals

+#define fbInstallColormap wfbInstallColormap

+#define fbLaneTable wfbLaneTable

+#define fbListInstalledColormaps wfbListInstalledColormaps

+#define fbMapWindow wfbMapWindow

+#define FbMergeRopBits wFbMergeRopBits

+#define fbOddStipple wfbOddStipple

+#define fbOddTile wfbOddTile

+#define fbOver wfbOver

+#define fbOver24 wfbOver24

+#define fbOverlayCloseScreen wfbOverlayCloseScreen

+#define fbOverlayCopyWindow wfbOverlayCopyWindow

+#define fbOverlayCreateScreenResources wfbOverlayCreateScreenResources

+#define fbOverlayCreateWindow wfbOverlayCreateWindow

+#define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit

+#define fbOverlayGeneration wfbOverlayGeneration

+#define fbOverlayGetScreenPrivateKey wfbOverlayGetScreenPrivateKey

+#define fbOverlayPaintKey wfbOverlayPaintKey

+#define fbOverlaySetupScreen wfbOverlaySetupScreen

+#define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion

+#define fbOverlayWindowExposures wfbOverlayWindowExposures

+#define fbOverlayWindowLayer wfbOverlayWindowLayer

+#define fbPadPixmap wfbPadPixmap

+#define fbPictureInit wfbPictureInit

+#define fbPixmapToRegion wfbPixmapToRegion

+#define fbPolyArc wfbPolyArc

+#define fbPolyFillRect wfbPolyFillRect

+#define fbPolyGlyphBlt wfbPolyGlyphBlt

+#define fbPolyLine wfbPolyLine

+#define fbPolyline16 wfbPolyline16

+#define fbPolyline24 wfbPolyline24

+#define fbPolyline32 wfbPolyline32

+#define fbPolyline8 wfbPolyline8

+#define fbPolyPoint wfbPolyPoint

+#define fbPolySegment wfbPolySegment

+#define fbPolySegment16 wfbPolySegment16

+#define fbPolySegment24 wfbPolySegment24

+#define fbPolySegment32 wfbPolySegment32

+#define fbPolySegment8 wfbPolySegment8

+#define fbPositionWindow wfbPositionWindow

+#define fbPushFill wfbPushFill

+#define fbPushImage wfbPushImage

+#define fbPushPattern wfbPushPattern

+#define fbPushPixels wfbPushPixels

+#define fbPutImage wfbPutImage

+#define fbPutXYImage wfbPutXYImage

+#define fbPutZImage wfbPutZImage

+#define fbQueryBestSize wfbQueryBestSize

+#define fbRasterizeEdges wfbRasterizeEdges

+#define fbRasterizeTrapezoid wfbRasterizeTrapezoid

+#define fbRealizeFont wfbRealizeFont

+#define fbReduceRasterOp wfbReduceRasterOp

+#define fbReplicatePixel wfbReplicatePixel

+#define fbResolveColor wfbResolveColor

+#define fbRestoreAreas wfbRestoreAreas

+#define fbSaveAreas wfbSaveAreas

+#define fbScreenPrivateKeyRec wfbScreenPrivateKeyRec

+#define fbSegment wfbSegment

+#define fbSelectBres wfbSelectBres

+#define fbSetSpans wfbSetSpans

+#define fbSetupScreen wfbSetupScreen

+#define fbSetVisualTypes wfbSetVisualTypes

+#define fbSetVisualTypesAndMasks wfbSetVisualTypesAndMasks

+#define _fbSetWindowPixmap _wfbSetWindowPixmap

+#define fbSolid wfbSolid

+#define fbSolid24 wfbSolid24

+#define fbSolidBoxClipped wfbSolidBoxClipped

+#define fbStipple wfbStipple

+#define fbStipple1Bits wfbStipple1Bits

+#define fbStipple24Bits wfbStipple24Bits

+#define fbStipple2Bits wfbStipple2Bits

+#define fbStipple4Bits wfbStipple4Bits

+#define fbStipple8Bits wfbStipple8Bits

+#define fbStippleTable wfbStippleTable

+#define fbTile wfbTile

+#define fbTransparentSpan wfbTransparentSpan

+#define fbUninstallColormap wfbUninstallColormap

+#define fbUnmapWindow wfbUnmapWindow

+#define fbUnrealizeFont wfbUnrealizeFont

+#define fbValidateGC wfbValidateGC

+#define fbWalkCompositeRegion wfbWalkCompositeRegion

+#define fbWinPrivateKeyRec wfbWinPrivateKeyRec

+#define fbZeroLine wfbZeroLine

+#define fbZeroSegment wfbZeroSegment

+#define free_pixman_pict wfb_free_pixman_pict

+#define image_from_pict wfb_image_from_pict

+#define composeFunctions wfbComposeFunctions