From 603a8b73d46d59e5f9f0be39be8317f3fadfe7e6 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 20 Dec 2007 18:29:57 -0800 Subject: [PATCH] XQuartz: Cleaned up command line arguments. --- hw/xquartz/darwin.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index d6eb100ac..463073485 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -701,20 +701,15 @@ void ddxInitGlobals(void) */ int ddxProcessArgument( int argc, char *argv[], int i ) { - if( !strcmp( argv[i], "-launchd" ) ) { - ErrorF( "Launchd command line argument noticed.\n" ); - return 1; - } +// if ( !strcmp( argv[i], "-fullscreen" ) ) { +// ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" ); +// return 1; +// } - if ( !strcmp( argv[i], "-fullscreen" ) ) { - ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" ); - return 1; - } - - if ( !strcmp( argv[i], "-rootless" ) ) { - ErrorF( "Running rootless inside Mac OS X window server.\n" ); - return 1; - } +// if ( !strcmp( argv[i], "-rootless" ) ) { +// ErrorF( "Running rootless inside Mac OS X window server.\n" ); +// return 1; +// } // This command line arg is passed when launched from the Aqua GUI. if ( !strncmp( argv[i], "-psn_", 5 ) ) { @@ -838,12 +833,6 @@ int ddxProcessArgument( int argc, char *argv[], int i ) exit(0); } - // XDarwinStartup uses this argument to indicate the IOKit X server - // should be started. Ignore it here. - if ( !strcmp( argv[i], "-iokit" ) ) { - return 1; - } - return 0; }