andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Ignore mach IPC until the appkit thread is ready to avoid possible deadlock (this can be reversed once pbproxy uses server API)

Browse Source
This commit is contained in:
Jeremy Huddleston 2008-12-31 14:11:47 -08:00
parent cb912aca3a
commit 9eec2d3e3b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xquartz/X11Application.m
View File

@ -69,6 +69,8 @@ static NSEventType keyState[NUM_KEYCODES];
int X11EnableKeyEquivalents = TRUE, quartzFullscreenMenu = FALSE;
int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
static Bool appkitReady = FALSE;
extern Bool noTestExtensions;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
@ -122,6 +124,14 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
message msg;
kern_return_t r;
if(!appkitReady) {
#if 0
ErrorF("%s: mach_msg failed: Appkit thread not ready\n", __FUNCTION__);
spewCallStack();
#endif
return;
}
msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);
msg.hdr.msgh_size = sizeof (msg);
msg.hdr.msgh_remote_port = _port;
@ -927,6 +937,8 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
if(!xpbproxy_init())
fprintf(stderr, "Error initializing xpbproxy\n");
appkitReady = TRUE;
[NSApp run];
/* not reached */
}