frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: Make DontZap the default 

If you need to bail out the server, use Ctrl-Alt-Fx, or enable zapping
if it bothers you that much.  If Ctrl-Alt-Fx is broken, nag me until
it's permanently fixed.
This commit is contained in:
Daniel Stone 2008-10-08 02:30:05 +03:00
parent b574365fca
commit 9d135ac10a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/kdrive/src/kdrive.c
View File

@ -76,7 +76,7 @@ unsigned long kdVideoTestTime;
Bool kdEmulateMiddleButton; Bool kdEmulateMiddleButton;
Bool kdRawPointerCoordinates; Bool kdRawPointerCoordinates;
Bool kdDisableZaphod; Bool kdDisableZaphod;
Bool kdDontZap; Bool kdAllowZap;
Bool kdEnabled; Bool kdEnabled;
int kdSubpixelOrder; int kdSubpixelOrder;
int kdVirtualTerminal = -1; int kdVirtualTerminal = -1;
@ -613,9 +613,9 @@ KdProcessArgument (int argc, char **argv, int i)
kdDisableZaphod = TRUE; kdDisableZaphod = TRUE;
return 1; return 1;
} }
if (!strcmp (argv[i], "-nozap")) if (!strcmp (argv[i], "-zap"))
{ {
kdDontZap = TRUE; kdAllowZap = TRUE;
return 1; return 1;
} }
if (!strcmp (argv[i], "-3button")) if (!strcmp (argv[i], "-3button"))

2
hw/kdrive/src/kinput.c
View File

@ -1925,7 +1925,7 @@ KdCheckSpecialKeys(KdKeyboardInfo *ki, int type, int sym)
* Set the dispatch exception flag so the server will terminate the * Set the dispatch exception flag so the server will terminate the
* next time through the dispatch loop. * next time through the dispatch loop.
*/ */
if (kdDontZap == FALSE) if (kdAllowZap)
dispatchException |= DE_TERMINATE; dispatchException |= DE_TERMINATE;
break; break;
} }

2
hw/xfree86/common/xf86Config.c
View File

@ -766,7 +766,7 @@ static OptionInfoRec FlagOptions[] = {
{ FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN, { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
{0}, FALSE }, {0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
{0}, FALSE }, {0}, TRUE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE }, {0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,