diff options
authorPeter Hutterer <>2009-04-09 15:40:24 +1000
committerPeter Hutterer <>2009-04-28 16:17:16 +1000
commit737b49199a05299486064e6e762cf2a2f6f95be6 (patch)
parentdc2767d1c5db60385867c76ba2de507fe0cb8a90 (diff)
xfree86: restore default off for DontZap
Zapping is triggered by xkb these days, so note in the man page that it's the Terminate_Server action. Since it's XKB, personal preferences towards or against zapping should be achieved through xkb rulesets. If Terminate_Server is not in the xkb actions, then we can't zap anyway and we don't need a default of DontZap "on". This patch restores the old meaning of DontZap - disallow zapping altogether, regardless of XKB's current keymap. Ideally, this patch should be accompanied by b0f64bdab00db652e in xkeyboard-config. Signed-off-by: Peter Hutterer <>
3 files changed, 8 insertions, 10 deletions
diff --git a/doc/ b/doc/
index e9a3b9c7d..e2673f7be 100644
--- a/doc/
+++ b/doc/
@@ -219,7 +219,7 @@ turns on auto-repeat.
starts the stipple with the classic stipple and cursor visible. The default
is to start with a black root window, and to suppress display of the cursor
until the first time an application calls XDefineCursor(). For the Xorg
-server, this also changes the default for the DontZap option to FALSE. For
+server, this also sets the default for the DontZap option to FALSE. For
kdrive servers, this implies -zap.
.TP 8
.B \-s \fIminutes\fP
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 7ea6197de..8b07566be 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -726,7 +726,7 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
- {0}, TRUE },
+ {0}, FALSE },
{0}, FALSE },
@@ -834,8 +834,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
- xf86Info.dontZap = !party_like_its_1989;
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
diff --git a/hw/xfree86/doc/man/ b/hw/xfree86/doc/man/
index 7349def0d..fbb2c6b73 100644
--- a/hw/xfree86/doc/man/
+++ b/hw/xfree86/doc/man/
@@ -464,12 +464,11 @@ Default: off.
.TP 7
.BI "Option \*qDontZap\*q \*q" boolean \*q
This disallows the use of the
-.B Ctrl+Alt+Backspace
-That sequence is normally used to terminate the __xservername__ server.
-When this option is enabled (as per default), that key sequence has no
-special meaning.
-Default: on.
+.B Terminate_Server
+XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
+This action is normally used to terminate the __xservername__ server.
+When this option is enabled, the action has no effect.
+Default: off.
.TP 7
.BI "Option \*qDontZoom\*q \*q" boolean \*q
This disallows the use of the