mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-01-04 16:50:13 +01:00
formatting fixes
This commit is contained in:
parent
6efdc6ca7b
commit
7768c63675
1 changed files with 32 additions and 40 deletions
|
|
@ -889,50 +889,42 @@ environment?", @"Startup xinitrc dialog");
|
|||
|
||||
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 ();
|
||||
|
||||
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 */
|
||||
/*
|
||||
* 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…
Add table
Reference in a new issue