frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting fixes

This commit is contained in:
Ben Byer 2007-11-07 03:56:44 -08:00 committed by Ben Byer
parent bd269d0d78
commit 338c1aedbd
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
hw/darwin/apple/X11Application.m
View File

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