andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Roland Mainz 2004-06-19 21:56:01 +00:00
parent da78a4ddd8
commit dd831c7a5c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xprint/Init.c
View File

@ -295,6 +295,8 @@ static Bool xprintInitGlobalsCalled = FALSE;
*/
void XprintInitGlobals(void)
{
extern char dispatchExceptionAtReset; /* defined in Xserver/dix/dispatch.c */
xprintInitGlobalsCalled = TRUE;
#ifdef SMART_SCHEDULE
@ -315,6 +317,10 @@ void XprintInitGlobals(void)
* Xprt's default BIGREQUESTS extension buffer size should be 8MB")
*/
maxBigRequestSize = (8*1048576)-1;
/* Xprt should not reset by default when the last client exists
* (default for Xprt is |0|, video Xservers use |DE_RESET|) */
dispatchExceptionAtReset = 0;
}
/*

8
os/utils.c
View File

@ -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)