From dd831c7a5c1b0c540a78350aadaeb34a8aa67395 Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Sat, 19 Jun 2004 21:56:01 +0000 Subject: Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=764 : Rework previous solution and make Xprt to default to "-noreset" (the default of Solaris version of Xprt) and add a "-reset" option which can be used to restore the default behaviour on demand. --- os/utils.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'os') diff --git a/os/utils.c b/os/utils.c index 51931ae4c..30dcd5f73 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.6.2.4.6.3 2004/04/20 03:27:09 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.2 2004/04/23 19:54:28 eich Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -516,6 +516,8 @@ void UseMsg(void) ErrorF("nologo disable logo in screen saver\n"); #endif ErrorF("-nolisten string don't listen on protocol\n"); + ErrorF("-noreset don't reset after last client exists\n"); + ErrorF("-reset reset after last client exists\n"); ErrorF("-p # screen-saver pattern duration (minutes)\n"); ErrorF("-pn accept failure to listen on all ports\n"); ErrorF("-nopn reject failure to listen on all ports\n"); @@ -823,6 +825,10 @@ ProcessCommandLine(int argc, char *argv[]) { dispatchExceptionAtReset = 0; } + else if ( strcmp( argv[i], "-reset") == 0) + { + dispatchExceptionAtReset = DE_RESET; + } else if ( strcmp( argv[i], "-p") == 0) { if(++i < argc) -- cgit v1.2.3