xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Thu Dec 20 18:32:50 PST 2007
hw/xquartz/darwin.c | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
New commits:
commit 82c97a5475d3562b1894a0e6273aa2492f707bd2
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Thu Dec 20 18:29:57 2007 -0800
XQuartz: Cleaned up command line arguments.
(cherry picked from commit 603a8b73d46d59e5f9f0be39be8317f3fadfe7e6)
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index ad46a3f..5353893 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -708,20 +708,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 ) ) {
@@ -845,12 +840,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;
}
More information about the xorg-commit
mailing list