| author | Daniel Stone <daniel@fooishbar.org> | 2008-10-07 23:30:05 (GMT) |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-10-07 23:30:05 (GMT) |
| commit | 9d135ac10a7374c7ccda705f1eeb02cc53076c34 (patch) | |
| tree | 24a7631c2f69137e559e4a9aef35e5c9c646c5b1 | |
| parent | b574365fca954a999ebaeb7203d1e0ea6d99b3ea (diff) | |
| download | xserver-9d135ac10a7374c7ccda705f1eeb02cc53076c34.zip xserver-9d135ac10a7374c7ccda705f1eeb02cc53076c34.tar.gz xserver-9d135ac10a7374c7ccda705f1eeb02cc53076c34.tar.bz2 | |
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.
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 6 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index d93e343..27513a7 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -76,7 +76,7 @@ unsigned long kdVideoTestTime; Bool kdEmulateMiddleButton; Bool kdRawPointerCoordinates; Bool kdDisableZaphod; -Bool kdDontZap; +Bool kdAllowZap; Bool kdEnabled; int kdSubpixelOrder; int kdVirtualTerminal = -1; @@ -613,9 +613,9 @@ KdProcessArgument (int argc, char **argv, int i) kdDisableZaphod = TRUE; return 1; } - if (!strcmp (argv[i], "-nozap")) + if (!strcmp (argv[i], "-zap")) { - kdDontZap = TRUE; + kdAllowZap = TRUE; return 1; } if (!strcmp (argv[i], "-3button")) diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index b44218d..fcd94e2 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1921,11 +1921,11 @@ KdCheckSpecialKeys(KdKeyboardInfo *ki, int type, int sym) case XK_BackSpace: case XK_Delete: case XK_KP_Delete: - /* + /* * Set the dispatch exception flag so the server will terminate the * next time through the dispatch loop. */ - if (kdDontZap == FALSE) + if (kdAllowZap) dispatchException |= DE_TERMINATE; break; } diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 7cf4040..8c958b4 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -766,7 +766,7 @@ static OptionInfoRec FlagOptions[] = { { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN, {0}, FALSE }, { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, - {0}, FALSE }, + {0}, TRUE }, { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, {0}, FALSE }, { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, |