[Xquartz-changes] xserver: Branch 'server-1.16-branch' - 3 commits

[Jeremy Huddleston]

 dev/null                         |binary
 hw/xquartz/X11Application.m      |    2 +-
 hw/xquartz/bundle/Info.plist.cpp |   13 +++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit cac50177f99fb819bfaeea1f2ac33e38fc574eb3
Author: Tom Seddon <xquartz-dev at tomseddon.plus.com>
Date:   Mon Oct 12 16:45:41 2015 -0700

    XQuartz: Fix how we calculate the height of the OSX menu bar
    
    I've been having all sorts of problems with XQuartz and quartz-wm when the
    `Displays have separate Spaces' option is set. This sejems to be due to the
    aquaBarMenuHeight calculation being a bit unusual - on my system it gets
    things hopelessly wrong, and decides the menu bar is -500 pixels high.
    
    With my change it gets the right value, and windows are appropriately
    constrained to the screens' visible frames. Full screen mode still doesn't
    work, though.
    
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Signed-off-by: Tom Seddon <xquartz-dev at tomseddon.plus.com>
    (cherry picked from commit fd56204e70d1591bcc09f38208cf4f1ff7bb657c)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 2efbd65..a9ee693 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1240,7 +1240,7 @@ X11ApplicationMain(int argc, char **argv, char **envp)
 
     /* Calculate the height of the menubar so we can avoid it. */
     aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
-                        NSMaxY([[NSScreen mainScreen] visibleFrame]);
+                        NSHeight([[NSScreen mainScreen] visibleFrame]);
 
 #ifdef HAVE_LIBDISPATCH
     eventTranslationQueue = dispatch_queue_create(
commit 003a4a0124cba2803c138e9f598e9bb1b8a50f8b
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Oct 12 02:06:10 2015 -0700

    XQuartz: Remove InfoPlist.strings
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit cd9ca024a82f0bb8ed274b5af7f029021e44566e)

diff --git a/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
deleted file mode 100644
index 88e1f04..0000000
Binary files a/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings and /dev/null differ
commit 02dc919f5d3c5b76d30b035ad2eda38472ff18e1
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Oct 12 02:04:11 2015 -0700

    XQuartz: Relax App Transport Security for communicating with the update server
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit df80e2649aa47957986554928e6bf41b86c15240)

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index a0d9050..06e33f8 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -35,6 +35,19 @@
 		<string>sparkle.pem</string>
         <key>SUFeedURL</key>
                 <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>macosforge.org</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
 #endif
 	<key>LSApplicationCategoryType</key>
 		<string>public.app-category.utilities</string>