svn merge ^/branches/released .

1 files changed, 250 insertions, 250 deletions

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);

+}