libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 131 insertions, 137 deletions

diff --git a/xorg-server/dix/pixmap.c b/xorg-server/dix/pixmap.c
index 3943f5582..47b220b58 100644
--- a/xorg-server/dix/pixmap.c
+++ b/xorg-server/dix/pixmap.c
@@ -1,137 +1,131 @@
-/*

-

-Copyright 1993, 1998  The Open Group

-

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

-

-The above copyright notice and this permission notice shall be included

-in all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall

-not be used in advertising or otherwise to promote the sale, use or

-other dealings in this Software without prior written authorization

-from The Open Group.

-

-*/

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include "scrnintstr.h"

-#include "misc.h"

-#include "os.h"

-#include "windowstr.h"

-#include "resource.h"

-#include "dixstruct.h"

-#include "gcstruct.h"

-#include "servermd.h"

-#include "site.h"

-

-

-/*

- *  Scratch pixmap management and device independent pixmap allocation

- *  function.

- */

-

-

-/* callable by ddx */

-PixmapPtr

-GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth, 

-                       int bitsPerPixel, int devKind, pointer pPixData)

-{

-    PixmapPtr pPixmap = pScreen->pScratchPixmap;

-

-    if (pPixmap)

-	pScreen->pScratchPixmap = NULL;

-    else

-	/* width and height of 0 means don't allocate any pixmap data */

-	pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);

-

-    if (pPixmap) {

-	if ((*pScreen->ModifyPixmapHeader)(pPixmap, width, height, depth,

-					   bitsPerPixel, devKind, pPixData))

-	    return pPixmap;

-	(*pScreen->DestroyPixmap)(pPixmap);

-    }

-    return NullPixmap;

-}

-

-

-/* callable by ddx */

-void

-FreeScratchPixmapHeader(PixmapPtr pPixmap)

-{

-    if (pPixmap)

-    {

-	ScreenPtr pScreen = pPixmap->drawable.pScreen;

-

-	pPixmap->devPrivate.ptr = NULL; /* lest ddx chases bad ptr */

-	if (pScreen->pScratchPixmap)

-	    (*pScreen->DestroyPixmap)(pPixmap);

-	else

-	    pScreen->pScratchPixmap = pPixmap;

-    }

-}

-

-

-Bool

-CreateScratchPixmapsForScreen(int scrnum)

-{

-    unsigned int	pixmap_size;

-

-    pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP);

-    screenInfo.screens[scrnum]->totalPixmapSize = BitmapBytePad(pixmap_size * 8);

-

-    /* let it be created on first use */

-    screenInfo.screens[scrnum]->pScratchPixmap = NULL;

-    return TRUE;

-}

-

-

-void

-FreeScratchPixmapsForScreen(int scrnum)

-{

-    FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);

-}

-

-

-/* callable by ddx */

-PixmapPtr

-AllocatePixmap(ScreenPtr pScreen, int pixDataSize)

-{

-    PixmapPtr pPixmap;

-

-    assert(pScreen->totalPixmapSize > 0);

-

-    if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)

-	return NullPixmap;

-    

-    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);

-    if (!pPixmap)

-	return NullPixmap;

-

-    dixInitPrivates(pPixmap, pPixmap + 1, PRIVATE_PIXMAP);

-    return pPixmap;

-}

-

-/* callable by ddx */

-void

-FreePixmap(PixmapPtr pPixmap)

-{

-    dixFiniPrivates(pPixmap, PRIVATE_PIXMAP);

-    free(pPixmap);

-}

+/*
+
+Copyright 1993, 1998  The Open Group
+
+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.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "misc.h"
+#include "os.h"
+#include "windowstr.h"
+#include "resource.h"
+#include "dixstruct.h"
+#include "gcstruct.h"
+#include "servermd.h"
+#include "site.h"
+
+/*
+ *  Scratch pixmap management and device independent pixmap allocation
+ *  function.
+ */
+
+/* callable by ddx */
+PixmapPtr
+GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
+                       int bitsPerPixel, int devKind, pointer pPixData)
+{
+    PixmapPtr pPixmap = pScreen->pScratchPixmap;
+
+    if (pPixmap)
+        pScreen->pScratchPixmap = NULL;
+    else
+        /* width and height of 0 means don't allocate any pixmap data */
+        pPixmap = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, 0);
+
+    if (pPixmap) {
+        if ((*pScreen->ModifyPixmapHeader) (pPixmap, width, height, depth,
+                                            bitsPerPixel, devKind, pPixData))
+            return pPixmap;
+        (*pScreen->DestroyPixmap) (pPixmap);
+    }
+    return NullPixmap;
+}
+
+/* callable by ddx */
+void
+FreeScratchPixmapHeader(PixmapPtr pPixmap)
+{
+    if (pPixmap) {
+        ScreenPtr pScreen = pPixmap->drawable.pScreen;
+
+        pPixmap->devPrivate.ptr = NULL; /* lest ddx chases bad ptr */
+        if (pScreen->pScratchPixmap)
+            (*pScreen->DestroyPixmap) (pPixmap);
+        else
+            pScreen->pScratchPixmap = pPixmap;
+    }
+}
+
+Bool
+CreateScratchPixmapsForScreen(int scrnum)
+{
+    unsigned int pixmap_size;
+
+    pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP);
+    screenInfo.screens[scrnum]->totalPixmapSize =
+        BitmapBytePad(pixmap_size * 8);
+
+    /* let it be created on first use */
+    screenInfo.screens[scrnum]->pScratchPixmap = NULL;
+    return TRUE;
+}
+
+void
+FreeScratchPixmapsForScreen(int scrnum)
+{
+    FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);
+}
+
+/* callable by ddx */
+PixmapPtr
+AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
+{
+    PixmapPtr pPixmap;
+
+    assert(pScreen->totalPixmapSize > 0);
+
+    if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
+        return NullPixmap;
+
+    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
+    if (!pPixmap)
+        return NullPixmap;
+
+    dixInitPrivates(pPixmap, pPixmap + 1, PRIVATE_PIXMAP);
+    return pPixmap;
+}
+
+/* callable by ddx */
+void
+FreePixmap(PixmapPtr pPixmap)
+{
+    dixFiniPrivates(pPixmap, PRIVATE_PIXMAP);
+    free(pPixmap);
+}