diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-02 11:30:24 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-02 11:30:24 -0700 |
| commit | a6ffdc69c4ac45bc39924159c7fab5f02f720f1f (patch) | |
| tree | a83acb3b3f9b7f3a931934dc6f9a03e8bd92f6ec | |
| parent | 63c48de63becdee680e90cb2363984c2f8f77fd1 (diff) | |
| parent | 1c10b37380d228b35db8a8616a6312ac54f5e59b (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
| -rw-r--r-- | hw/xquartz/bundle/Info.plist.cpp | 4 | ||||
| -rw-r--r-- | hw/xquartz/darwin.c | 16 | ||||
| -rw-r--r-- | hw/xquartz/xpr/xprScreen.c | 16 |
3 files changed, 15 insertions, 21 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 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.7.6</string> + <string>2.7.7</string> <key>CFBundleVersion</key> - <string>2.7.6</string> + <string>2.7.7</string> <key>CFBundleSignature</key> <string>x11a</string> <key>CSResourcesFileMapped</key> 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 } } 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; } |