Synchronised line endinge with release branch

1 files changed, 229 insertions, 229 deletions

diff --git a/xorg-server/fb/fbwindow.c b/xorg-server/fb/fbwindow.c
index f4032b053..7906f8dd2 100644
--- a/xorg-server/fb/fbwindow.c
+++ b/xorg-server/fb/fbwindow.c
@@ -1,229 +1,229 @@
-/*

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

-    if (pWin->drawable.bitsPerPixel == 32)

-	pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;

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

-}

-

-static void

-fbFixupWindowPixmap(DrawablePtr pDrawable, PixmapPtr *ppPixmap)

-{

-    PixmapPtr pPixmap = *ppPixmap;

-

-    if (pPixmap->drawable.bitsPerPixel != pDrawable->bitsPerPixel)

-    {

-	pPixmap = fb24_32ReformatTile (pPixmap, pDrawable->bitsPerPixel);

-	if (!pPixmap)

-	    return;

-	(*pDrawable->pScreen->DestroyPixmap) (*ppPixmap);

-	*ppPixmap = pPixmap;

-    }

-    if (FbEvenTile (pPixmap->drawable.width *

-		    pPixmap->drawable.bitsPerPixel))

-	fbPadPixmap (pPixmap);

-}

-

-Bool

-fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)

-{

-    if (mask & CWBackPixmap)

-    {

-	if (pWin->backgroundState == BackgroundPixmap)

-	    fbFixupWindowPixmap(&pWin->drawable, &pWin->background.pixmap);

-    }

-    if (mask & CWBorderPixmap)

-    {

-	if (pWin->borderIsPixel == FALSE)

-	    fbFixupWindowPixmap(&pWin->drawable, &pWin->border.pixmap);

-    }

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

-}

+/*
+ * 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));
+    if (pWin->drawable.bitsPerPixel == 32)
+	pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;
+    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);
+}
+
+static void
+fbFixupWindowPixmap(DrawablePtr pDrawable, PixmapPtr *ppPixmap)
+{
+    PixmapPtr pPixmap = *ppPixmap;
+
+    if (pPixmap->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
+    {
+	pPixmap = fb24_32ReformatTile (pPixmap, pDrawable->bitsPerPixel);
+	if (!pPixmap)
+	    return;
+	(*pDrawable->pScreen->DestroyPixmap) (*ppPixmap);
+	*ppPixmap = pPixmap;
+    }
+    if (FbEvenTile (pPixmap->drawable.width *
+		    pPixmap->drawable.bitsPerPixel))
+	fbPadPixmap (pPixmap);
+}
+
+Bool
+fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
+{
+    if (mask & CWBackPixmap)
+    {
+	if (pWin->backgroundState == BackgroundPixmap)
+	    fbFixupWindowPixmap(&pWin->drawable, &pWin->background.pixmap);
+    }
+    if (mask & CWBorderPixmap)
+    {
+	if (pWin->borderIsPixel == FALSE)
+	    fbFixupWindowPixmap(&pWin->drawable, &pWin->border.pixmap);
+    }
+    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);
+}