<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129793] trunk/dports/x11/xorg-server</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129793">129793</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-12-20 12:46:23 -0800 (Sat, 20 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Bump to 1.16.3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverPortfile">trunk/dports/x11/xorg-server/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles0001glamorFixtemppicturecoordinatesinglamor_compospatch">trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0002mieqFixacrashregressioninmieqProcessDeviceEvenpatch">trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0003ListenOnOpenFDRemoveResetssincethisisintendedpatch">trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0004XQuartzBettersupportturningoffDisplayshaveseppatch">trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/Portfile (129792 => 129793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2014-12-20 20:45:40 UTC (rev 129792)
+++ trunk/dports/x11/xorg-server/Portfile 2014-12-20 20:46:23 UTC (rev 129793)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> name xorg-server
</span><span class="cx"> conflicts xorg-server-devel
</span><span class="cx"> set my_name xorg-server
</span><del>-version 1.16.0
-revision 2
</del><ins>+version 1.16.3
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -16,14 +15,15 @@
</span><span class="cx"> long_description The X.org X server allows you to run X11 applications on your computer.
</span><span class="cx">
</span><span class="cx"> #master_sites http://xquartz.macosforge.org/downloads/src
</span><del>-master_sites xorg:individual/xserver/
</del><ins>+master_sites http://xorg.freedesktop.org/archive/individual/xserver/
+#master_sites xorg:individual/xserver/
</ins><span class="cx">
</span><span class="cx"> dist_subdir ${my_name}
</span><span class="cx"> distname ${my_name}-${version}
</span><span class="cx">
</span><del>-checksums sha1 0b5ce3868c1c617c21e19ce863aab1ede6e154c4 \
- rmd160 9a1eca0d7e3a3e1a536269f4ceeb47a551e1d60b \
- sha256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b
</del><ins>+checksums sha1 cf903e3b02cd4f4b075d139ee7d6b0a3741cd9cf \
+ rmd160 f263d3106c164967851077a6824512eb31528dd3 \
+ sha256 5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -88,10 +88,6 @@
</span><span class="cx"> RAWCPP=${configure.cpp}
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><del>- 0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch \
- 0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
- 0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
- 0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch \
</del><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span class="cx"> 5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0001glamorFixtemppicturecoordinatesinglamor_compospatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch (129792 => 129793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch 2014-12-20 20:45:40 UTC (rev 129792)
+++ trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch 2014-12-20 20:46:23 UTC (rev 129793)
</span><span class="lines">@@ -1,182 +0,0 @@
</span><del>-From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 16 Jul 2014 16:03:23 -0700
-Subject: [PATCH 1/4] glamor: Fix temp picture coordinates in
- glamor_composite_clipped_region
-
-To understand this patch, let's start at the protocol interface where
-the relationship between the coordinate spaces is documented:
-
- static Bool
- _glamor_composite(CARD8 op,
- PicturePtr source,
- PicturePtr mask,
- PicturePtr dest,
- INT16 x_source,
- INT16 y_source,
- INT16 x_mask,
- INT16 y_mask,
- INT16 x_dest, INT16 y_dest,
- CARD16 width, CARD16 height, Bool fallback)
-
-The coordinates are passed to this function directly off the wire and
-are all relative to their respective drawables. For Windows, this means
-that they are relative to the upper left corner of the window, in
-whatever pixmap that window is getting drawn to.
-
-_glamor_composite calls miComputeCompositeRegion to construct a clipped
-region to actually render to. In reality, miComputeCompositeRegion clips
-only to the destination these days; source clip region based clipping
-would have to respect the transform, which isn't really possible. The
-returned region is relative to the screen in which dest lives; offset by
-dest->drawable.x and dest->drawable.y.
-
-What is important to realize here is that, because of clipping, the
-composite region may not have the same position within the destination
-drawable as x_dest, y_dest. The protocol coordinates now exist solely to
-'pin' the three objects together.
-
- extents->x1,y1 Screen origin of clipped operation
- width,height Extents of the clipped operation
- x_dest,y_dest Unclipped destination-relative operation coordinate
- x_source,y_source Unclipped source-relative operation coordinate
- x_mask,y_mask Unclipped mask-relative operation coordinate
-
-One thing we want to know is what the offset is from the original
-operation origin to the clipped origin
-
- Destination drawable relative coordinates of the clipped operation:
-
- x_dest_clipped = extents->x1 - dest->drawable.x
- y_dest_clipped = extents->y1 - dest->drawable.y
-
- Offset from the original operation origin:
-
- x_off_clipped = x_dest_clipped - x_dest
- y_off_clipped = y_dest_clipped - y_dest
-
- Source drawable relative coordinates of the clipped operation:
-
- x_source_clipped = x_source + x_off_clipped;
- y_source_clipped = y_source + y_off_clipped;
-
- Mask drawable relative coordinates of the clipped operation:
-
- x_mask_clipped = x_source + x_off_clipped;
- y_mask_clipped = y_source + y_off_clipped;
-
-This is where the original code fails -- it doesn't subtract the
-destination drawable location when computing the distance that the
-operation has been moved by clipping. Here's what it does when
-constructing a temporary source picture:
-
- temp_src =
- glamor_convert_gradient_picture(screen, source,
- extent->x1 + x_source - x_dest,
- extent->y1 + y_source - y_dest,
- width, height);
- ...
- x_temp_src = -extent->x1 + x_dest;
- y_temp_src = -extent->y1 + y_dest;
-
-glamor_convert_gradient_picture needs source drawable relative
-coordinates, but that is not what it's getting; it's getting
-screen-relative coordinates for the destination, adjusted by the
-distance between the provided source and destination operation
-coordinates. We want x_source_clipped and y_source_clipped:
-
- x_source_clipped = x_source + x_off_clipped
- = x_source + x_dest_clipped - x_dest
- = x_source + extents->x1 - dest->drawable.x - x_dest
-
-x_temp_src/y_temp_src are supposed to be the coordinates of the original
-operation translated to the temporary picture:
-
- x_temp_src = x_source - x_source_clipped;
- y_temp_src = y_source - y_source_clipped;
-
-Note that x_source_clipped/y_source_clipped will never be less than
-x_source/y_source because all we're doing is clipping. This means that
-x_temp_src/y_temp_src will always be non-positive; the original source
-coordinate can never be strictly *inside* the temporary image or we
-could have made the temporary image smaller.
-
- x_temp_src = x_source - x_source_clipped
- = x_source - (x_source + x_off_clipped)
- = -x_off_clipped
- = x_dest - x_dest_clipped
- = x_dest - (extents->x1 - dest->drawable.x)
-
-Again, this is off by the destination origin within the screen
-coordinate space.
-
-The code should look like:
-
- temp_src =
- glamor_convert_gradient_picture(screen, source,
- extent->x1 + x_source - x_dest - dest->pDrawable->x,
- extent->y1 + y_source - y_dest - dest->pDrawable->y,
- width, height);
-
- x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
- y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Markus Wick <markus@selfnet.de>
-(cherry picked from commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7)
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- glamor/glamor_render.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git xorg-server-1.16.0/glamor/glamor_render.c xorg-server-1.16.0/glamor/glamor_render.c
-index 14ab738..e5d5d2c 100644
---- xorg-server-1.16.0/glamor/glamor_render.c
-+++ xorg-server-1.16.0/glamor/glamor_render.c
-@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op,
- || source_pixmap->drawable.height != height)))) {
- temp_src =
- glamor_convert_gradient_picture(screen, source,
-- extent->x1 + x_source - x_dest,
-- extent->y1 + y_source - y_dest,
-+ extent->x1 + x_source - x_dest - dest->pDrawable->x,
-+ extent->y1 + y_source - y_dest - dest->pDrawable->y,
- width, height);
- if (!temp_src) {
- temp_src = source;
-@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op,
- }
- temp_src_priv =
- glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable));
-- x_temp_src = -extent->x1 + x_dest;
-- y_temp_src = -extent->y1 + y_dest;
-+ x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
-+ y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
- }
-
- if (mask
-@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op,
- * to do reduce one convertion. */
- temp_mask =
- glamor_convert_gradient_picture(screen, mask,
-- extent->x1 + x_mask - x_dest,
-- extent->y1 + y_mask - y_dest,
-+ extent->x1 + x_mask - x_dest - dest->pDrawable->x,
-+ extent->y1 + y_mask - y_dest - dest->pDrawable->y,
- width, height);
- if (!temp_mask) {
- temp_mask = mask;
-@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op,
- }
- temp_mask_priv =
- glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable));
-- x_temp_mask = -extent->x1 + x_dest;
-- y_temp_mask = -extent->y1 + y_dest;
-+ x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x;
-+ y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y;
- }
- /* Do two-pass PictOpOver componentAlpha, until we enable
- * dual source color blending.
---
-2.0.4
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0002mieqFixacrashregressioninmieqProcessDeviceEvenpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch (129792 => 129793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2014-12-20 20:45:40 UTC (rev 129792)
+++ trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2014-12-20 20:46:23 UTC (rev 129793)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-From a793483e38bfb8af19877f69e873c1776de18d1f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 19 Jul 2014 17:08:09 -0700
-Subject: [PATCH 2/4] mieq: Fix a crash regression in mieqProcessDeviceEvent
-
-(lldb) bt
-* thread #6: tid = 0x92d4eb, 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0,
-screen=0x0000000000000000) + 36 at mieq.c:519, stop reason = EXC_BAD_ACCESS (code=1, address=0x44)
- * frame #0: 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0, screen=0x0000000000000000) + 36 at
-mieq.c:519
- frame #1: 0x00000001001df3eb X11.bin`mieqProcessInputEvents + 555 at mieq.c:631
- frame #2: 0x0000000100017674 X11.bin`ProcessInputEvents + 20 at darwinEvents.c:422
- frame #3: 0x0000000100175eaa X11.bin`Dispatch + 154 at dispatch.c:357
- frame #4: 0x0000000100181b4a X11.bin`dix_main(argc=4, argv=0x00007fff5fbff750, envp=0x00007fff5fbff650) + 1594 at main.c:296
- frame #5: 0x000000010001ba80 X11.bin`server_thread(arg=0x0000000101208220) + 64 at quartzStartup.c:66
- frame #6: 0x00007fff89bb9899 libsystem_pthread.dylib`_pthread_body + 138
- frame #7: 0x00007fff89bb972a libsystem_pthread.dylib`_pthread_start + 137
- frame #8: 0x00007fff89bbdfc9 libsystem_pthread.dylib`thread_start + 13
-
-Regression from: 9fb08310b51b46736f3ca8dbc04efdf502420403
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 1faa76670572e3478965fd2cd9ab60ab2d865e3a)
----
- mi/mieq.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git xorg-server-1.16.0/mi/mieq.c xorg-server-1.16.0/mi/mieq.c
-index 872ff93..8907a6e 100644
---- xorg-server-1.16.0/mi/mieq.c
-+++ xorg-server-1.16.0/mi/mieq.c
-@@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
- verify_internal_event(event);
-
- /* refuse events from disabled devices */
-- if (!dev->enabled)
-+ if (dev && !dev->enabled)
- return;
-
- /* Custom event handler */
---
-2.0.4
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0003ListenOnOpenFDRemoveResetssincethisisintendedpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch (129792 => 129793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2014-12-20 20:45:40 UTC (rev 129792)
+++ trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2014-12-20 20:46:23 UTC (rev 129793)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-From b7a24467f738bfd9437e8de02ed5e44409054185 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Wed, 23 Jul 2014 11:53:33 -0700
-Subject: [PATCH 3/4] ListenOnOpenFD: Remove Resets since this is intended to
- be for hotplugging connections
-
-pharris says that the resets should not be done in the hotplugging case.
-
-This may fix a crash reported against XQuartz:
-http://xquartz.macosforge.org/trac/ticket/869
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Reviewed-by: Peter Harris <pharris@opentext.com>
-(cherry picked from commit dfbc6a1a78ff3192baae6f7f2af98b6e51422f75)
----
- os/connection.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git xorg-server-1.16.0/os/connection.c xorg-server-1.16.0/os/connection.c
-index 40d9ff3..f915e12 100644
---- xorg-server-1.16.0/os/connection.c
-+++ xorg-server-1.16.0/os/connection.c
-@@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
-
- /* Increment the count */
- ListenTransCount++;
--
-- /* This *might* not be needed... /shrug */
-- ResetAuthorization();
-- ResetHosts(display);
--#ifdef XDMCP
-- XdmcpReset();
--#endif
- }
-
- /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
---
-2.0.4
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0004XQuartzBettersupportturningoffDisplayshaveseppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch (129792 => 129793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch 2014-12-20 20:45:40 UTC (rev 129792)
+++ trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch 2014-12-20 20:46:23 UTC (rev 129793)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-From af2e9e3bb173885106f041f89b9f39b57fe3550a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon, 11 Aug 2014 13:15:24 -0700
-Subject: [PATCH 4/4] XQuartz: Better support turning off "Displays have
- separate Spaces" on OS X Mavericks
-
-http://xquartz.macosforge.org/trac/ticket/1876
-
-Follow-up to: 1c10b37380d228b35db8a8616a6312ac54f5e59b
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit ab32ee35890be51137b56525826ffe219b63eb88)
----
- hw/xquartz/xpr/xprScreen.c | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
-index 7aa1ae1..d0a525f 100644
---- xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
-+++ xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
-@@ -169,14 +169,25 @@ displayScreenBounds(CGDirectDisplayID id)
- (int)frame.size.width, (int)frame.size.height,
- (int)frame.origin.x, (int)frame.origin.y);
-
-- /* Remove menubar to help standard X11 window managers.
-- * On Mavericks and later, the menu bar is on all displays.
-- */
-- if (XQuartzIsRootless
-+ Boolean spacePerDisplay = false;
- #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-- && (NSAppKitVersionNumber >= 1265 || (frame.origin.x == 0 && frame.origin.y == 0))
-+ if (NSAppKitVersionNumber >= 1265)
- #endif
-- ) {
-+ {
-+ Boolean ok;
-+ (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
-+ spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
-+ CFSTR("com.apple.spaces"),
-+ &ok);
-+ if (!ok)
-+ spacePerDisplay = true;
-+ }
-+
-+ /* Remove menubar to help standard X11 window managers.
-+ * On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset.
-+ */
-+ if (XQuartzIsRootless &&
-+ (spacePerDisplay || (frame.origin.x == 0 && frame.origin.y == 0))) {
- frame.origin.y += aquaMenuBarHeight;
- frame.size.height -= aquaMenuBarHeight;
- }
---
-2.0.4
-
</del></span></pre>
</div>
</div>
</body>
</html>