Merge remote-tracking branch 'jeremyhu/master'
This commit is contained in:
commit
a6ffdc69c4
|
@ -19,9 +19,9 @@
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>2.7.6</string>
|
<string>2.7.7</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>2.7.6</string>
|
<string>2.7.7</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>x11a</string>
|
<string>x11a</string>
|
||||||
<key>CSResourcesFileMapped</key>
|
<key>CSResourcesFileMapped</key>
|
||||||
|
|
|
@ -704,22 +704,6 @@ OsVendorInit(void)
|
||||||
free(lf);
|
free(lf);
|
||||||
|
|
||||||
DarwinPrintBanner();
|
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,11 @@
|
||||||
#include "damage.h"
|
#include "damage.h"
|
||||||
#endif
|
#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
|
/* 10.4's deferred update makes X slower.. have to live with the tearing
|
||||||
* for now.. */
|
* for now.. */
|
||||||
#define XP_NO_DEFERRED_UPDATES 8
|
#define XP_NO_DEFERRED_UPDATES 8
|
||||||
|
@ -164,9 +169,14 @@ displayScreenBounds(CGDirectDisplayID id)
|
||||||
(int)frame.size.width, (int)frame.size.height,
|
(int)frame.size.width, (int)frame.size.height,
|
||||||
(int)frame.origin.x, (int)frame.origin.y);
|
(int)frame.origin.x, (int)frame.origin.y);
|
||||||
|
|
||||||
/* Remove menubar to help standard X11 window managers. */
|
/* Remove menubar to help standard X11 window managers.
|
||||||
if (XQuartzIsRootless &&
|
* On Mavericks and later, the menu bar is on all displays.
|
||||||
frame.origin.x == 0 && frame.origin.y == 0) {
|
*/
|
||||||
|
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.origin.y += aquaMenuBarHeight;
|
||||||
frame.size.height -= aquaMenuBarHeight;
|
frame.size.height -= aquaMenuBarHeight;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user