[69691] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Tue Jul 13 09:10:09 PDT 2010
Revision: 69691
http://trac.macports.org/changeset/69691
Author: jeremyhu at macports.org
Date: 2010-07-13 09:10:08 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
xorg-server: Fix a possible memory corruption issue on ppc
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Added Paths:
-----------
trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch
trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch
trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch
trunk/dports/x11/xorg-server/files/0004-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
trunk/dports/x11/xorg-server/files/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch
trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2010-07-13 16:06:42 UTC (rev 69690)
+++ trunk/dports/x11/xorg-server/Portfile 2010-07-13 16:10:08 UTC (rev 69691)
@@ -82,8 +82,11 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch \
- 0002-fb-Revert-fb-changes-that-broke-XQuartz.patch
+ 0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch \
+ 0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch \
+ 0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch \
+ 0004-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
+ 0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
patch.pre_args -p1
Added: trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -0,0 +1,68 @@
+From 665aa7ce8645b50b888db32ebab4e192dbe00649 Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date: Wed, 30 Jun 2010 07:59:04 -0700
+Subject: [PATCH 1/5] OS support: fix writeable client vs IgnoreClient behavior
+
+When ResetCurrentRequest is called, or IgnoreClient is called when a
+client has input pending, IgnoredClientsWithInput will be set. However,
+a subsequent IgnoreClient request will clear the client fd from that fd
+set, potentially causing the client to hang.
+
+So add an Ignore/Attend count, and only apply the ignore logic on the
+first ignore and the attend logic on the last attend. This is
+consistent with the comments for these functions; callers must pair
+them.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27035.
+
+Reviewed-by: Keith Packard <keithp at keithp.com>
+Reviewed-by: Daniel Stone <daniel at fooishbar.org>
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+---
+ include/dixstruct.h | 1 +
+ os/connection.c | 9 +++++++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git xorg-server-1.8.2/include/dixstruct.h xorg-server-1.8.2/include/dixstruct.h
+index 696b793..568ea1f 100644
+--- xorg-server-1.8.2/include/dixstruct.h
++++ xorg-server-1.8.2/include/dixstruct.h
+@@ -99,6 +99,7 @@ typedef struct _Client {
+ int clientGone;
+ int noClientException; /* this client died or needs to be
+ * killed */
++ int ignoreCount; /* count for Attend/IgnoreClient */
+ SaveSetElt *saveSet;
+ int numSaved;
+ void *unused_screenPrivate[16];
+diff --git xorg-server-1.8.2/os/connection.c xorg-server-1.8.2/os/connection.c
+index 61ba72a..3178b7e 100644
+--- xorg-server-1.8.2/os/connection.c
++++ xorg-server-1.8.2/os/connection.c
+@@ -1147,6 +1147,10 @@ IgnoreClient (ClientPtr client)
+ OsCommPtr oc = (OsCommPtr)client->osPrivate;
+ int connection = oc->fd;
+
++ client->ignoreCount++;
++ if (client->ignoreCount > 1)
++ return;
++
+ isItTimeToYield = TRUE;
+ if (!GrabInProgress || FD_ISSET(connection, &AllClients))
+ {
+@@ -1181,6 +1185,11 @@ AttendClient (ClientPtr client)
+ {
+ OsCommPtr oc = (OsCommPtr)client->osPrivate;
+ int connection = oc->fd;
++
++ client->ignoreCount--;
++ if (client->ignoreCount)
++ return;
++
+ if (!GrabInProgress || GrabInProgress == client->index ||
+ FD_ISSET(connection, &GrabImperviousClients))
+ {
+--
+1.7.1.1
+
Deleted: trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch 2010-07-13 16:06:42 UTC (rev 69690)
+++ trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -1,165 +0,0 @@
-From 43162c50db7b6d05865e05fc7e39fc9578041df0 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 30 Apr 2010 13:08:25 -0700
-Subject: [PATCH] Workaround the GC clipping problem in miPaintWindow and add some debugging output.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit a9c526bbe10ecf97b6c065fdbc03cc341917a5a6)
----
- mi/miexpose.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 94 insertions(+), 11 deletions(-)
-
-diff --git xorg-server-1.8.2/mi/miexpose.c xorg-server-1.8.2/mi/miexpose.c
-index f52b492..21493cb 100644
---- xorg-server-1.8.2/mi/miexpose.c
-+++ xorg-server-1.8.2/mi/miexpose.c
-@@ -524,6 +524,7 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
- void RootlessStartDrawing(WindowPtr pWin);
- void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
- Bool IsFramedWindow(WindowPtr pWin);
-+#include "../fb/fb.h"
- #endif
-
- void
-@@ -551,24 +552,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- Bool solid = TRUE;
- DrawablePtr drawable = &pWin->drawable;
-
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative);
-+ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1,
-+ prgn->extents.x2 - prgn->extents.x1,
-+ prgn->extents.y2 - prgn->extents.y1);
-+ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y,
-+ pWin->winSize.extents.x1, pWin->winSize.extents.y1,
-+ pWin->winSize.extents.x2 - pWin->winSize.extents.x1,
-+ pWin->winSize.extents.y2 - pWin->winSize.extents.y1);
-+ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y,
-+ pWin->drawable.width, pWin->drawable.height);
-+#endif
-+
- #ifdef ROOTLESS
- if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
- return;
--
-- if(IsFramedWindow(pWin)) {
-- RootlessStartDrawing(pWin);
-- RootlessDamageRegion(pWin, prgn);
--
-- if(pWin->backgroundState == ParentRelative) {
-- if((what == PW_BACKGROUND) ||
-- (what == PW_BORDER && !pWin->borderIsPixel))
-- RootlessSetPixmapOfAncestors(pWin);
-- }
-- }
- #endif
-
- if (what == PW_BACKGROUND)
- {
-+#ifdef ROOTLESS
-+ if(IsFramedWindow(pWin)) {
-+ RootlessStartDrawing(pWin);
-+ RootlessDamageRegion(pWin, prgn);
-+
-+ if(pWin->backgroundState == ParentRelative) {
-+ RootlessSetPixmapOfAncestors(pWin);
-+ }
-+ }
-+#endif
-+
- while (pWin->backgroundState == ParentRelative)
- pWin = pWin->parent;
-
-@@ -590,6 +604,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- {
- PixmapPtr pixmap;
-
-+#ifdef ROOTLESS
-+ if(IsFramedWindow(pWin)) {
-+ RootlessStartDrawing(pWin);
-+ RootlessDamageRegion(pWin, prgn);
-+
-+ if(!pWin->borderIsPixel &&
-+ pWin->backgroundState == ParentRelative) {
-+ RootlessSetPixmapOfAncestors(pWin);
-+ }
-+ }
-+#endif
-+
- tile_x_off = drawable->x;
- tile_y_off = drawable->y;
-
-@@ -598,6 +624,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- return;
- pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
- drawable = &pixmap->drawable;
-+
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF(" Draw: %d %d %d %d\n",
-+ drawable->x, drawable->y, drawable->width, drawable->height);
-+#endif
-+
- #ifdef COMPOSITE
- draw_x_off = pixmap->screen_x;
- draw_y_off = pixmap->screen_y;
-@@ -660,6 +692,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- dixChangeGC (NullClient, pGC, gcmask, NULL, gcval);
- ValidateGC (drawable, pGC);
-
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF(" GC: %d %d %d %d\n",
-+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
-+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
-+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
-+#endif
-+
-+#ifdef XQUARTZ
-+ /* Looks like our clipping isn't set right for some reason:
-+ * http://xquartz.macosforge.org/trac/ticket/290
-+ */
-+ if(what == PW_BORDER) {
-+
-+#if 0
-+ if(solid) {
-+#if 1
-+ fbFillRegionSolid(&pWin->drawable,
-+ prgn,
-+ 0,
-+ fbReplicatePixel(fill.pixel,
-+ pWin->drawable.bitsPerPixel));
-+#else
-+ fbFillRegionSolid(drawable,
-+ prgn,
-+ 0,
-+ fbReplicatePixel(fill.pixel,
-+ drawable->bitsPerPixel));
-+#endif
-+ return;
-+ }
-+#endif
-+
-+ pGC->pCompositeClip->extents.x1 += prgn->extents.x1;
-+ pGC->pCompositeClip->extents.y1 += prgn->extents.y1;
-+ pGC->pCompositeClip->extents.x2 += prgn->extents.x1;
-+ pGC->pCompositeClip->extents.y2 += prgn->extents.y1;
-+
-+ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width)
-+ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width;
-+ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height)
-+ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height;
-+ }
-+#endif
-+
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF(" GC: %d %d %d %d\n",
-+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
-+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
-+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
-+#endif
-+
- numRects = REGION_NUM_RECTS(prgn);
- pbox = REGION_RECTS(prgn);
- for (i= numRects; --i >= 0; pbox++, prect++)
---
-1.5.6.6
-
Added: trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -0,0 +1,36 @@
+From 090d26723f7cdbb3aebfe212170b7f81c163dd7b Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date: Thu, 8 Jul 2010 09:08:51 -0700
+Subject: [PATCH 2/5] dixstruct: make ignoreCount change more ABI friendly
+
+Move ignoreCount to the bottom of the ClientRec where it should have
+less impact on the ABI.
+
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+---
+ include/dixstruct.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.2/include/dixstruct.h xorg-server-1.8.2/include/dixstruct.h
+index 568ea1f..5d24f0d 100644
+--- xorg-server-1.8.2/include/dixstruct.h
++++ xorg-server-1.8.2/include/dixstruct.h
+@@ -99,7 +99,6 @@ typedef struct _Client {
+ int clientGone;
+ int noClientException; /* this client died or needs to be
+ * killed */
+- int ignoreCount; /* count for Attend/IgnoreClient */
+ SaveSetElt *saveSet;
+ int numSaved;
+ void *unused_screenPrivate[16];
+@@ -125,6 +124,7 @@ typedef struct _Client {
+ long smart_check_tick;
+
+ DeviceIntPtr clientPtr;
++ int ignoreCount; /* count for Attend/IgnoreClient */
+ } ClientRec;
+
+ /*
+--
+1.7.1.1
+
Deleted: trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-07-13 16:06:42 UTC (rev 69690)
+++ trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -1,231 +0,0 @@
-From e47104d9a7d19b325a820ec42046573347f43eaf Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 12 Feb 2010 19:48:52 -0800
-Subject: [PATCH] fb: Revert fb changes that broke XQuartz
-
-http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
-Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
-Revert "fb: Adjust transform or composite coordinates for pixman operations"
-
-http://bugs.freedesktop.org/26124
-
-This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
-This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- fb/fb.h | 7 +----
- fb/fbpict.c | 72 ++++++++++++++++++-----------------------------------------
- fb/fbtrap.c | 6 +---
- 3 files changed, 26 insertions(+), 59 deletions(-)
-
-diff --git xorg-server-1.8.2/fb/fb.h xorg-server-1.8.2/fb/fb.h
-index 02d6c03..ed21f9e 100644
---- xorg-server-1.8.2/fb/fb.h
-+++ xorg-server-1.8.2/fb/fb.h
-@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
- FbBits xor);
-
- extern _X_EXPORT pixman_image_t *
--image_from_pict (PicturePtr pict,
-- Bool has_clip,
-- int *xoff,
-- int *yoff);
--
-+image_from_pict (PicturePtr pict,
-+ Bool has_clip);
- extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
-
- #endif /* _FB_H_ */
-diff --git xorg-server-1.8.2/fb/fbpict.c xorg-server-1.8.2/fb/fbpict.c
-index dddfce8..07a2286 100644
---- xorg-server-1.8.2/fb/fbpict.c
-+++ xorg-server-1.8.2/fb/fbpict.c
-@@ -158,24 +158,19 @@ fbComposite (CARD8 op,
- 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);
-+ src = image_from_pict (pSrc, TRUE);
-+ mask = image_from_pict (pMask, TRUE);
-+ dest = image_from_pict (pDst, TRUE);
-
- 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,
-+ xSrc, ySrc, xMask, yMask, xDst, yDst,
- width, height);
- }
-
-@@ -275,22 +270,22 @@ create_conical_gradient_image (PictGradient *gradient)
-
- static pixman_image_t *
- create_bits_picture (PicturePtr pict,
-- Bool has_clip,
-- int *xoff,
-- int *yoff)
-+ Bool has_clip)
- {
-- PixmapPtr pixmap;
- FbBits *bits;
- FbStride stride;
-- int bpp;
-+ int bpp, xoff, yoff;
- pixman_image_t *image;
-
-- fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
-- fbGetPixmapBitsData(pixmap, bits, stride, bpp);
-+ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
-+
-+ bits = (FbBits*)((CARD8*)bits +
-+ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
-+ (pict->pDrawable->x + xoff) * (bpp / 8));
-
- image = pixman_image_create_bits (
- pict->format,
-- pixmap->drawable.width, pixmap->drawable.height,
-+ pict->pDrawable->width, pict->pDrawable->height,
- (uint32_t *)bits, stride * sizeof (FbStride));
-
-
-@@ -316,52 +311,30 @@ create_bits_picture (PicturePtr pict,
- if (pict->clientClipType != CT_NONE)
- pixman_image_set_has_client_clip (image, TRUE);
-
-- if (*xoff || *yoff)
-- pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
-+ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
-
- pixman_image_set_clip_region (image, pict->pCompositeClip);
-
-- if (*xoff || *yoff)
-- pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
-+ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
- }
-
- /* 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)
-+set_image_properties (pixman_image_t *image, PicturePtr pict)
- {
- 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);
-+ pixman_image_set_transform (
-+ image, (pixman_transform_t *)pict->transform);
- }
-
- switch (pict->repeatType)
-@@ -388,8 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
-
- 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_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
-
- pixman_image_set_alpha_map (
- image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
-@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
- }
-
- pixman_image_t *
--image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+image_from_pict (PicturePtr pict,
-+ Bool has_clip)
- {
- pixman_image_t *image = NULL;
-
-@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-
- if (pict->pDrawable)
- {
-- image = create_bits_picture (pict, has_clip, xoff, yoff);
-+ image = create_bits_picture (pict, has_clip);
- }
- else if (pict->pSourcePict)
- {
-@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
- 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);
-+ set_image_properties (image, pict);
-
- return image;
- }
-diff --git xorg-server-1.8.2/fb/fbtrap.c xorg-server-1.8.2/fb/fbtrap.c
-index 515e2e1..830603a 100644
---- xorg-server-1.8.2/fb/fbtrap.c
-+++ xorg-server-1.8.2/fb/fbtrap.c
-@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr pPicture,
- int ntrap,
- xTrap *traps)
- {
-- int image_xoff, image_yoff;
-- pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
-+ pixman_image_t *image = image_from_pict (pPicture, FALSE);
-
- if (!image)
- return;
-@@ -57,8 +56,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
- int x_off,
- int y_off)
- {
-- int mask_xoff, mask_yoff;
-- pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff);
-+ pixman_image_t *image = image_from_pict (pPicture, FALSE);
-
- if (!image)
- return;
---
-1.5.6.6
-
Added: trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -0,0 +1,52 @@
+From 9168c63e275767c728afe7b2bba8bc391aceeeb8 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Tue, 13 Jul 2010 08:25:27 -0700
+Subject: [PATCH 3/5] XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 648d189548530fa23d97d1e8737f89d297f1c443)
+---
+ hw/xquartz/xpr/xprCursor.c | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c
+index fbaf825..95eaed9 100644
+--- xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c
++++ xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c
+@@ -68,6 +68,7 @@ static Bool
+ load_cursor(CursorPtr src, int screen)
+ {
+ uint32_t *data;
++ Bool free_data = FALSE;
+ uint32_t rowbytes;
+ int width, height;
+ int hot_x, hot_y;
+@@ -96,6 +97,7 @@ load_cursor(CursorPtr src, int screen)
+ unsigned i;
+ rowbytes = src->bits->width * sizeof (CARD32);
+ data = xalloc(rowbytes * src->bits->height);
++ free_data = TRUE;
+ if(!data) {
+ FatalError("Failed to allocate memory in %s\n", __func__);
+ }
+@@ -122,6 +124,7 @@ load_cursor(CursorPtr src, int screen)
+ /* round up to 8 pixel boundary so we can convert whole bytes */
+ rowbytes = ((src->bits->width * 4) + 31) & ~31;
+ data = xalloc(rowbytes * src->bits->height);
++ free_data = TRUE;
+ if(!data) {
+ FatalError("Failed to allocate memory in %s\n", __func__);
+ }
+@@ -174,7 +177,8 @@ load_cursor(CursorPtr src, int screen)
+ }
+
+ err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
+- xfree(data);
++ if(free_data)
++ xfree(data);
+ return err == Success;
+ }
+
+--
+1.7.1.1
+
Added: trunk/dports/x11/xorg-server/files/0004-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0004-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0004-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -0,0 +1,165 @@
+From d65f52ef67251c36258205a2df0191b9ed329a9c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 30 Apr 2010 13:08:25 -0700
+Subject: [PATCH 4/5] Workaround the GC clipping problem in miPaintWindow and add some debugging output.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit a9c526bbe10ecf97b6c065fdbc03cc341917a5a6)
+---
+ mi/miexpose.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 94 insertions(+), 11 deletions(-)
+
+diff --git xorg-server-1.8.2/mi/miexpose.c xorg-server-1.8.2/mi/miexpose.c
+index f52b492..21493cb 100644
+--- xorg-server-1.8.2/mi/miexpose.c
++++ xorg-server-1.8.2/mi/miexpose.c
+@@ -524,6 +524,7 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
+ void RootlessStartDrawing(WindowPtr pWin);
+ void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
+ Bool IsFramedWindow(WindowPtr pWin);
++#include "../fb/fb.h"
+ #endif
+
+ void
+@@ -551,24 +552,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ Bool solid = TRUE;
+ DrawablePtr drawable = &pWin->drawable;
+
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative);
++ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1,
++ prgn->extents.x2 - prgn->extents.x1,
++ prgn->extents.y2 - prgn->extents.y1);
++ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y,
++ pWin->winSize.extents.x1, pWin->winSize.extents.y1,
++ pWin->winSize.extents.x2 - pWin->winSize.extents.x1,
++ pWin->winSize.extents.y2 - pWin->winSize.extents.y1);
++ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y,
++ pWin->drawable.width, pWin->drawable.height);
++#endif
++
+ #ifdef ROOTLESS
+ if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
+ return;
+-
+- if(IsFramedWindow(pWin)) {
+- RootlessStartDrawing(pWin);
+- RootlessDamageRegion(pWin, prgn);
+-
+- if(pWin->backgroundState == ParentRelative) {
+- if((what == PW_BACKGROUND) ||
+- (what == PW_BORDER && !pWin->borderIsPixel))
+- RootlessSetPixmapOfAncestors(pWin);
+- }
+- }
+ #endif
+
+ if (what == PW_BACKGROUND)
+ {
++#ifdef ROOTLESS
++ if(IsFramedWindow(pWin)) {
++ RootlessStartDrawing(pWin);
++ RootlessDamageRegion(pWin, prgn);
++
++ if(pWin->backgroundState == ParentRelative) {
++ RootlessSetPixmapOfAncestors(pWin);
++ }
++ }
++#endif
++
+ while (pWin->backgroundState == ParentRelative)
+ pWin = pWin->parent;
+
+@@ -590,6 +604,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ {
+ PixmapPtr pixmap;
+
++#ifdef ROOTLESS
++ if(IsFramedWindow(pWin)) {
++ RootlessStartDrawing(pWin);
++ RootlessDamageRegion(pWin, prgn);
++
++ if(!pWin->borderIsPixel &&
++ pWin->backgroundState == ParentRelative) {
++ RootlessSetPixmapOfAncestors(pWin);
++ }
++ }
++#endif
++
+ tile_x_off = drawable->x;
+ tile_y_off = drawable->y;
+
+@@ -598,6 +624,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ return;
+ pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
+ drawable = &pixmap->drawable;
++
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF(" Draw: %d %d %d %d\n",
++ drawable->x, drawable->y, drawable->width, drawable->height);
++#endif
++
+ #ifdef COMPOSITE
+ draw_x_off = pixmap->screen_x;
+ draw_y_off = pixmap->screen_y;
+@@ -660,6 +692,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ dixChangeGC (NullClient, pGC, gcmask, NULL, gcval);
+ ValidateGC (drawable, pGC);
+
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF(" GC: %d %d %d %d\n",
++ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
++ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
++ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
++#endif
++
++#ifdef XQUARTZ
++ /* Looks like our clipping isn't set right for some reason:
++ * http://xquartz.macosforge.org/trac/ticket/290
++ */
++ if(what == PW_BORDER) {
++
++#if 0
++ if(solid) {
++#if 1
++ fbFillRegionSolid(&pWin->drawable,
++ prgn,
++ 0,
++ fbReplicatePixel(fill.pixel,
++ pWin->drawable.bitsPerPixel));
++#else
++ fbFillRegionSolid(drawable,
++ prgn,
++ 0,
++ fbReplicatePixel(fill.pixel,
++ drawable->bitsPerPixel));
++#endif
++ return;
++ }
++#endif
++
++ pGC->pCompositeClip->extents.x1 += prgn->extents.x1;
++ pGC->pCompositeClip->extents.y1 += prgn->extents.y1;
++ pGC->pCompositeClip->extents.x2 += prgn->extents.x1;
++ pGC->pCompositeClip->extents.y2 += prgn->extents.y1;
++
++ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width)
++ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width;
++ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height)
++ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height;
++ }
++#endif
++
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF(" GC: %d %d %d %d\n",
++ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
++ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
++ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
++#endif
++
+ numRects = REGION_NUM_RECTS(prgn);
+ pbox = REGION_RECTS(prgn);
+ for (i= numRects; --i >= 0; pbox++, prect++)
+--
+1.7.1.1
+
Added: trunk/dports/x11/xorg-server/files/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-07-13 16:10:08 UTC (rev 69691)
@@ -0,0 +1,231 @@
+From 063d4b2d4d895018f128bf58cef6ff7ee82a074e Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 12 Feb 2010 19:48:52 -0800
+Subject: [PATCH 5/5] fb: Revert fb changes that broke XQuartz
+
+http://bugs.freedesktop.org/show_bug.cgi?id=26124
+
+Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
+Revert "fb: Adjust transform or composite coordinates for pixman operations"
+
+http://bugs.freedesktop.org/26124
+
+This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
+This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ fb/fb.h | 7 +----
+ fb/fbpict.c | 72 ++++++++++++++++++-----------------------------------------
+ fb/fbtrap.c | 6 +---
+ 3 files changed, 26 insertions(+), 59 deletions(-)
+
+diff --git xorg-server-1.8.2/fb/fb.h xorg-server-1.8.2/fb/fb.h
+index 02d6c03..ed21f9e 100644
+--- xorg-server-1.8.2/fb/fb.h
++++ xorg-server-1.8.2/fb/fb.h
+@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
+ FbBits xor);
+
+ extern _X_EXPORT pixman_image_t *
+-image_from_pict (PicturePtr pict,
+- Bool has_clip,
+- int *xoff,
+- int *yoff);
+-
++image_from_pict (PicturePtr pict,
++ Bool has_clip);
+ extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
+
+ #endif /* _FB_H_ */
+diff --git xorg-server-1.8.2/fb/fbpict.c xorg-server-1.8.2/fb/fbpict.c
+index dddfce8..07a2286 100644
+--- xorg-server-1.8.2/fb/fbpict.c
++++ xorg-server-1.8.2/fb/fbpict.c
+@@ -158,24 +158,19 @@ fbComposite (CARD8 op,
+ 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);
++ src = image_from_pict (pSrc, TRUE);
++ mask = image_from_pict (pMask, TRUE);
++ dest = image_from_pict (pDst, TRUE);
+
+ 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,
++ xSrc, ySrc, xMask, yMask, xDst, yDst,
+ width, height);
+ }
+
+@@ -275,22 +270,22 @@ create_conical_gradient_image (PictGradient *gradient)
+
+ static pixman_image_t *
+ create_bits_picture (PicturePtr pict,
+- Bool has_clip,
+- int *xoff,
+- int *yoff)
++ Bool has_clip)
+ {
+- PixmapPtr pixmap;
+ FbBits *bits;
+ FbStride stride;
+- int bpp;
++ int bpp, xoff, yoff;
+ pixman_image_t *image;
+
+- fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
+- fbGetPixmapBitsData(pixmap, bits, stride, bpp);
++ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
++
++ bits = (FbBits*)((CARD8*)bits +
++ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
++ (pict->pDrawable->x + xoff) * (bpp / 8));
+
+ image = pixman_image_create_bits (
+ pict->format,
+- pixmap->drawable.width, pixmap->drawable.height,
++ pict->pDrawable->width, pict->pDrawable->height,
+ (uint32_t *)bits, stride * sizeof (FbStride));
+
+
+@@ -316,52 +311,30 @@ create_bits_picture (PicturePtr pict,
+ if (pict->clientClipType != CT_NONE)
+ pixman_image_set_has_client_clip (image, TRUE);
+
+- if (*xoff || *yoff)
+- pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
++ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
+
+ pixman_image_set_clip_region (image, pict->pCompositeClip);
+
+- if (*xoff || *yoff)
+- pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
++ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
+ }
+
+ /* 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)
++set_image_properties (pixman_image_t *image, PicturePtr pict)
+ {
+ 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);
++ pixman_image_set_transform (
++ image, (pixman_transform_t *)pict->transform);
+ }
+
+ switch (pict->repeatType)
+@@ -388,8 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+
+ 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_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
+
+ pixman_image_set_alpha_map (
+ image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
+@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+ }
+
+ pixman_image_t *
+-image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
++image_from_pict (PicturePtr pict,
++ Bool has_clip)
+ {
+ pixman_image_t *image = NULL;
+
+@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+
+ if (pict->pDrawable)
+ {
+- image = create_bits_picture (pict, has_clip, xoff, yoff);
++ image = create_bits_picture (pict, has_clip);
+ }
+ else if (pict->pSourcePict)
+ {
+@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+ 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);
++ set_image_properties (image, pict);
+
+ return image;
+ }
+diff --git xorg-server-1.8.2/fb/fbtrap.c xorg-server-1.8.2/fb/fbtrap.c
+index 515e2e1..830603a 100644
+--- xorg-server-1.8.2/fb/fbtrap.c
++++ xorg-server-1.8.2/fb/fbtrap.c
+@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr pPicture,
+ int ntrap,
+ xTrap *traps)
+ {
+- int image_xoff, image_yoff;
+- pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
++ pixman_image_t *image = image_from_pict (pPicture, FALSE);
+
+ if (!image)
+ return;
+@@ -57,8 +56,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
+ int x_off,
+ int y_off)
+ {
+- int mask_xoff, mask_yoff;
+- pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff);
++ pixman_image_t *image = image_from_pict (pPicture, FALSE);
+
+ if (!image)
+ return;
+--
+1.7.1.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100713/77971b0b/attachment-0001.html>
More information about the macports-changes
mailing list