[Xquartz-changes] xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit fd56204e70d1591bcc09f38208cf4f1ff7bb657c
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>

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 8a928ba..b0e303e 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1239,7 +1239,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 cd9ca024a82f0bb8ed274b5af7f029021e44566e
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>

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