formatting fixes
This commit is contained in:
parent
bd269d0d78
commit
338c1aedbd
|
@ -789,44 +789,40 @@ environment?", @"Startup xinitrc dialog");
|
|||
|
||||
void X11ApplicationMain (int argc, const char *argv[],
|
||||
void (*server_thread) (void *), void *server_arg) {
|
||||
NSAutoreleasePool *pool;
|
||||
|
||||
NSAutoreleasePool *pool;
|
||||
|
||||
#ifdef DEBUG
|
||||
while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
|
||||
while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
|
||||
#endif
|
||||
|
||||
pool = [[NSAutoreleasePool alloc] init];
|
||||
X11App = (X11Application *) [X11Application sharedApplication];
|
||||
init_ports ();
|
||||
[NSApp read_defaults];
|
||||
[NSBundle loadNibNamed:@"main" owner:NSApp];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:NSApp
|
||||
selector:@selector (became_key:)
|
||||
name:NSWindowDidBecomeKeyNotification object:nil];
|
||||
check_xinitrc ();
|
||||
|
||||
pool = [[NSAutoreleasePool alloc] init];
|
||||
|
||||
X11App = (X11Application *) [X11Application sharedApplication];
|
||||
|
||||
init_ports ();
|
||||
|
||||
[NSApp read_defaults];
|
||||
|
||||
[NSBundle loadNibNamed:@"main" owner:NSApp];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:NSApp
|
||||
selector:@selector (became_key:)
|
||||
name:NSWindowDidBecomeKeyNotification object:nil];
|
||||
|
||||
check_xinitrc ();
|
||||
|
||||
/*
|
||||
* The xpr Quartz mode is statically linked into this server.
|
||||
* Initialize all the Quartz functions.
|
||||
*/
|
||||
QuartzModeBundleInit();
|
||||
|
||||
/* Calculate the height of the menubar so we can avoid it. */
|
||||
aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
|
||||
NSMaxY([[NSScreen mainScreen] visibleFrame]);
|
||||
|
||||
if (!create_thread (server_thread, server_arg)) {
|
||||
ErrorF("can't create secondary thread\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
[NSApp run];
|
||||
/*
|
||||
* The xpr Quartz mode is statically linked into this server.
|
||||
* Initialize all the Quartz functions.
|
||||
*/
|
||||
QuartzModeBundleInit();
|
||||
|
||||
/* Calculate the height of the menubar so we can avoid it. */
|
||||
aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
|
||||
NSMaxY([[NSScreen mainScreen] visibleFrame]);
|
||||
|
||||
if (!create_thread (server_thread, server_arg)) {
|
||||
ErrorF("can't create secondary thread\n");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
[NSApp run];
|
||||
|
||||
/* not reached */
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user