xserver: Branch 'master'
Daniel Stone
daniels at kemper.freedesktop.org
Tue Oct 7 16:31:54 PDT 2008
hw/kdrive/src/kdrive.c | 6 +++---
hw/kdrive/src/kinput.c | 4 ++--
hw/xfree86/common/xf86Config.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9d135ac10a7374c7ccda705f1eeb02cc53076c34
Author: Daniel Stone <daniel at fooishbar.org>
Date: Wed Oct 8 02:30:05 2008 +0300
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.
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,
More information about the xorg-commit
mailing list