debrix/fb fb.h, 1.3, 1.4 fb24_32.c, 1.2, 1.3 fb24_32.h, 1.2, 1.3 fballpriv.c, 1.2, 1.3 fbarc.c, 1.2, 1.3 fbbits.c, 1.2, 1.3 fbbits.h, 1.2, 1.3 fbblt.c, 1.2, 1.3 fbbltone.c, 1.2, 1.3 fbbstore.c, 1.2, 1.3 fbcmap.c, 1.2, 1.3 fbcompose.c, 1.3, 1.4 fbcopy.c, 1.2, 1.3 fbfill.c, 1.2, 1.3 fbfillrect.c, 1.2, 1.3 fbfillsp.c, 1.2, 1.3 fbgc.c, 1.2, 1.3 fbgetsp.c, 1.2, 1.3 fbglyph.c, 1.2, 1.3 fbimage.c, 1.2, 1.3 fbline.c, 1.2, 1.3 fbmodule.c, 1.2, 1.3 fboverlay.c, 1.3, 1.4 fboverlay.h, 1.2, 1.3 fbpict.c, 1.3, 1.4 fbpict.h, 1.3, 1.4 fbpixmap.c, 1.2, 1.3 fbpoint.c, 1.2, 1.3 fbpush.c, 1.2, 1.3 fbrop.h, 1.2, 1.3 fbscreen.c, 1.3, 1.4 fbseg.c, 1.2, 1.3 fbsetsp.c, 1.2, 1.3 fbsolid.c, 1.2, 1.3 fbstipple.c, 1.2, 1.3 fbtile.c, 1.2, 1.3 fbtrap.c, 1.2, 1.3 fbutil.c, 1.2, 1.3 fbwindow.c, 1.2, 1.3

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix/fb
In directory pdx:/home/daniel/x/debrix/debrix/fb

Modified Files:
	fb.h fb24_32.c fb24_32.h fballpriv.c fbarc.c fbbits.c fbbits.h 
	fbblt.c fbbltone.c fbbstore.c fbcmap.c fbcompose.c fbcopy.c 
	fbfill.c fbfillrect.c fbfillsp.c fbgc.c fbgetsp.c fbglyph.c 
	fbimage.c fbline.c fbmodule.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 
Log Message:
Initial import from modular sources.


Index: fb.h
===================================================================
RCS file: /cvs/xserver/debrix/fb/fb.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fb.h	16 May 2004 05:08:39 -0000	1.3
+++ fb.h	10 Jun 2004 19:39:59 -0000	1.4
@@ -27,7 +27,11 @@
 #ifndef _FB_H_
 #define _FB_H_
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmap.h"
 #include "pixmapstr.h"
@@ -645,34 +649,49 @@
 #define __fbPixOriginX(pPix)	((pPix)->drawable.x)
 #define __fbPixOriginY(pPix)	((pPix)->drawable.y)
 #else
-#define __fbPixOriginX(pPix)	0
-#define __fbPixOriginY(pPix)	0
+#ifdef COMPOSITE
+#define __fbPixOriginXWin(pPix)	((pPix)->drawable.x-(pPix)->screen_x)
+#define __fbPixOriginYWin(pPix)	((pPix)->drawable.y-(pPix)->screen_y)
+#else
+#define __fbPixOriginXWin(pPix)	((pPix)->drawable.x)
+#define __fbPixOriginYWin(pPix)	((pPix)->drawable.y)
+#endif
+#define __fbPixOriginXPix(pPix)	((pPix)->drawable.x)
+#define __fbPixOriginYPix(pPix)	((pPix)->drawable.y)
 #endif
 
 #define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
     PixmapPtr   _pPix; \
-    if ((pDrawable)->type != DRAWABLE_PIXMAP) \
+    if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
 	_pPix = fbGetWindowPixmap(pDrawable); \
-    else \
+        (xoff) = __fbPixOriginXWin(_pPix); \
+        (yoff) = __fbPixOriginYWin(_pPix); \
+    } \
+    else { \
 	_pPix = (PixmapPtr) (pDrawable); \
+        (xoff) = __fbPixOriginXPix(_pPix); \
+        (yoff) = __fbPixOriginYPix(_pPix); \
+    } \
     (pointer) = (FbBits *) _pPix->devPrivate.ptr; \
     (stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \
     (bpp) = _pPix->drawable.bitsPerPixel;  (void)(bpp); \
-    (xoff) = __fbPixOriginX(_pPix); (void)(xoff); \
-    (yoff) = __fbPixOriginY(_pPix); (void)(yoff); \
 }
 
 #define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
     PixmapPtr   _pPix; \
-    if ((pDrawable)->type != DRAWABLE_PIXMAP) \
+    if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
 	_pPix = fbGetWindowPixmap(pDrawable); \
-    else \
+        (xoff) = __fbPixOriginXWin(_pPix); \
+        (yoff) = __fbPixOriginYWin(_pPix); \
+    } \
+    else { \
 	_pPix = (PixmapPtr) (pDrawable); \
+        (xoff) = __fbPixOriginXPix(_pPix); \
+        (yoff) = __fbPixOriginYPix(_pPix); \
+    } \
     (pointer) = (FbStip *) _pPix->devPrivate.ptr; \
     (stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \
     (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
-    (xoff) = __fbPixOriginX(_pPix); (void)(xoff); \
-    (yoff) = __fbPixOriginY(_pPix); (void)(yoff); \
 }
 
 /*

Index: fb24_32.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fb24_32.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fb24_32.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fb24_32.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: fb24_32.h
===================================================================
RCS file: /cvs/xserver/debrix/fb/fb24_32.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fb24_32.h	23 Apr 2004 19:05:14 -0000	1.2
+++ fb24_32.h	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _FB24_32_H_
 #define _FB24_32_H_
 

Index: fballpriv.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fballpriv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fballpriv.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fballpriv.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 #ifdef FB_SCREEN_PRIVATE

Index: fbarc.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbarc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbarc.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbarc.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include "mizerarc.h"
 #ifdef IN_MODULE

Index: fbbits.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbbits.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbbits.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbbits.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include "miline.h"
 #include "mizerarc.h"

Index: fbbits.h
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbbits.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbbits.h	23 Apr 2004 19:05:14 -0000	1.2
+++ fbbits.h	10 Jun 2004 19:39:59 -0000	1.3
@@ -27,6 +27,9 @@
  * underlying datatypes instead of masks
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define isClipped(c,ul,lr)  ((((c) - (ul)) | ((lr) - (c))) & 0x80008000)
 
 #ifdef BITSMUL

Index: fbblt.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbblt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbblt.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbblt.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 #define InitializeShifts(sx,dx,ls,rs) { \

Index: fbbltone.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbbltone.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbbltone.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbbltone.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 /*

Index: fbbstore.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbbstore.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbbstore.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbbstore.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbcmap.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbcmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbcmap.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbcmap.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -30,8 +30,11 @@
 ********************************************************/
 
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"
@@ -520,6 +523,10 @@
 	    visual->ColormapEntries = 1 << d;
 	    visual->nplanes = d;
 	    visual->vid = *vid = FakeClientID (0);
+#ifdef COMPOSITE
+	    visual->alphaMask = 0;
+	    visual->offsetAlpha = 0;
+#endif
 	    switch (visual->class) {
 	    case PseudoColor:
 	    case GrayScale:

Index: fbcompose.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbcompose.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbcompose.c	12 May 2004 01:49:46 -0000	1.3
+++ fbcompose.c	10 Jun 2004 19:39:59 -0000	1.4
@@ -23,6 +23,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include "picturestr.h"
 #include "mipict.h"

Index: fbcopy.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbcopy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbcopy.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbcopy.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #ifdef IN_MODULE
 #include "xf86_ansic.h"

Index: fbfill.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbfill.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbfill.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbfill.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbfillrect.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbfillrect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbfillrect.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbfillrect.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbfillsp.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbfillsp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbfillsp.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbfillsp.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbgc.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbgc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbgc.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbgc.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -24,6 +24,9 @@
 /* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
 /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #ifdef IN_MODULE
 #include "xf86_ansic.h"

Index: fbgetsp.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbgetsp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbgetsp.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbgetsp.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbglyph.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbglyph.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbglyph.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbglyph.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include	"fontstruct.h"
 #include	"dixfontstr.h"

Index: fbimage.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbimage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbimage.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbimage.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #ifdef XFree86LOADER
 #include "xf86.h"

Index: fbline.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbline.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbline.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbmodule.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbmodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbmodule.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbmodule.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -25,6 +25,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbmodule.c,v 1.3 2000/02/14 19:20:29 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "xf86Module.h"

Index: fboverlay.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fboverlay.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fboverlay.c	16 May 2004 05:08:39 -0000	1.3
+++ fboverlay.c	10 Jun 2004 19:39:59 -0000	1.4
@@ -25,6 +25,9 @@
 
 /* $XdotOrg: $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include "fboverlay.h"
 

Index: fboverlay.h
===================================================================
RCS file: /cvs/xserver/debrix/fb/fboverlay.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fboverlay.h	23 Apr 2004 19:05:14 -0000	1.2
+++ fboverlay.h	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _FBOVERLAY_H_
 #define _FBOVERLAY_H_
 

Index: fbpict.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbpict.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbpict.c	12 May 2004 01:49:46 -0000	1.3
+++ fbpict.c	10 Jun 2004 19:39:59 -0000	1.4
@@ -23,6 +23,9 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 #ifdef RENDER

Index: fbpict.h
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbpict.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbpict.h	12 May 2004 01:49:46 -0000	1.3
+++ fbpict.h	10 Jun 2004 19:39:59 -0000	1.4
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _FBPICT_H_
 #define _FBPICT_H_
 

Index: fbpixmap.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbpixmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbpixmap.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbpixmap.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #ifdef IN_MODULE
 #include "xf86_ansic.h"
@@ -65,6 +68,10 @@
     pPixmap->drawable.y = 0;
     pPixmap->drawable.width = width;
     pPixmap->drawable.height = height;
+#ifdef COMPOSITE
+    pPixmap->screen_x = 0;
+    pPixmap->screen_y = 0;
+#endif
     pPixmap->devKind = paddedWidth;
     pPixmap->refcnt = 1;
     pPixmap->devPrivate.ptr = (pointer) ((char *)pPixmap + base + adjust);

Index: fbpoint.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbpoint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbpoint.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbpoint.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 typedef void	(*FbDots)  (FbBits	*dst,

Index: fbpush.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbpush.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbpush.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbpush.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbrop.h
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbrop.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbrop.h	23 Apr 2004 19:05:14 -0000	1.2
+++ fbrop.h	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _FBROP_H_
 #define _FBROP_H_
 

Index: fbscreen.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbscreen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbscreen.c	16 May 2004 05:08:39 -0000	1.3
+++ fbscreen.c	10 Jun 2004 19:39:59 -0000	1.4
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 Bool

Index: fbseg.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbseg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbseg.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbseg.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include "miline.h"
 

Index: fbsetsp.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbsetsp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbsetsp.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbsetsp.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 void

Index: fbsolid.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbsolid.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbsolid.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbsolid.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define FbSelectPart(xor,o,t)    xor
 
 #include "fb.h"

Index: fbstipple.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbstipple.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbstipple.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbstipple.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 #ifndef FBNOPIXADDR

Index: fbtile.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbtile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbtile.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbtile.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 /*

Index: fbtrap.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbtrap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbtrap.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbtrap.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -26,6 +26,9 @@
  *
  * Author: Carl Worth, USC, Information Sciences Institute */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 #ifdef RENDER

Index: fbutil.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbutil.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbutil.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 FbBits

Index: fbwindow.c
===================================================================
RCS file: /cvs/xserver/debrix/fb/fbwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbwindow.c	23 Apr 2004 19:05:14 -0000	1.2
+++ fbwindow.c	10 Jun 2004 19:39:59 -0000	1.3
@@ -24,6 +24,9 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #ifdef IN_MODULE
 #include "xf86_ansic.h"
@@ -123,7 +126,8 @@
     RegionRec	rgnDst;
     int		dx, dy;
     WindowPtr	pwinRoot;
-
+    PixmapPtr   pPixmap = fbGetWindowPixmap (pWin);
+    
     pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
 
     dx = ptOldOrg.x - pWin->drawable.x;
@@ -133,6 +137,11 @@
     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
 
     fbCopyRegion ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
 		  0,