From e281288d5afedb154f52c31f70a350a013ecfb06 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 31 May 2014 13:04:43 -0700 Subject: [PATCH 1/3] XQuartz: Bump to 2.7.7 Signed-off-by: Jeremy Huddleston Sequoia --- hw/xquartz/bundle/Info.plist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp index 5fbb0ad55..a0d9050ac 100644 --- a/hw/xquartz/bundle/Info.plist.cpp +++ b/hw/xquartz/bundle/Info.plist.cpp @@ -19,9 +19,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.7.6 + 2.7.7 CFBundleVersion - 2.7.6 + 2.7.7 CFBundleSignature x11a CSResourcesFileMapped From ad0ff649c68b18c4b95b078c2d1d1e7de71a7c6f Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 31 May 2014 17:22:51 -0700 Subject: [PATCH 2/3] XQuartz: Dead code removal (ENABLE_DEBUG_LOG) Signed-off-by: Jeremy Huddleston Sequoia --- hw/xquartz/darwin.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index e0983d6ef..29c6438a0 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -704,22 +704,6 @@ OsVendorInit(void) free(lf); DarwinPrintBanner(); -#ifdef ENABLE_DEBUG_LOG - { - char *home_dir = NULL, *log_file_path = NULL; - home_dir = getenv("HOME"); - if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, - DEBUG_LOG_NAME); - if (log_file_path) { - if (!access(log_file_path, F_OK)) { - debug_log_fp = fopen(log_file_path, "a"); - if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", - log_file_path); - } - free(log_file_path); - } - } -#endif } } From 1c10b37380d228b35db8a8616a6312ac54f5e59b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 31 May 2014 17:45:02 -0700 Subject: [PATCH 3/3] XQuartz: Update logic to account for title bar on every display in Mavericks http://xquartz.macosforge.org/trac/ticket/832 Signed-off-by: Jeremy Huddleston Sequoia --- hw/xquartz/xpr/xprScreen.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index e37601995..7aa1ae1df 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -54,6 +54,11 @@ #include "damage.h" #endif +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 +// From NSApplication.h +extern const double NSAppKitVersionNumber; +#endif + /* 10.4's deferred update makes X slower.. have to live with the tearing * for now.. */ #define XP_NO_DEFERRED_UPDATES 8 @@ -164,9 +169,14 @@ 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. */ - if (XQuartzIsRootless && - frame.origin.x == 0 && frame.origin.y == 0) { + /* Remove menubar to help standard X11 window managers. + * On Mavericks and later, the menu bar is on all displays. + */ + if (XQuartzIsRootless +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 + && (NSAppKitVersionNumber >= 1265 || (frame.origin.x == 0 && frame.origin.y == 0)) +#endif + ) { frame.origin.y += aquaMenuBarHeight; frame.size.height -= aquaMenuBarHeight; }