Skip to content

Commit

Permalink
formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Byer committed Nov 7, 2007
1 parent db8cd44 commit 534bcdb
Showing 1 changed file with 33 additions and 41 deletions.
74 changes: 33 additions & 41 deletions hw/darwin/apple/X11Application.m
Expand Up @@ -889,50 +889,42 @@ - (BOOL) x_active

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
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 ();

/*
* 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))
{
fprintf (stderr, "can't create secondary thread\n");
exit (1);
}

[NSApp run];

/* not reached */

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];

/* not reached */
}


Expand Down

0 comments on commit 534bcdb

Please sign in to comment.