summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-10-07 20:32:02 -0400
committerAdam Jackson <ajax@redhat.com>2008-10-07 20:32:02 -0400
commit42e7b64bf90604e0099702f5447163be80a2efb6 (patch)
tree9629eabbb75c5044f5f4a4b44c94794df5a56ca3
parent9d135ac10a7374c7ccda705f1eeb02cc53076c34 (diff)
-retro enables zapping
-rw-r--r--hw/kdrive/src/kinput.c2
-rw-r--r--hw/xfree86/common/xf86Config.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index fcd94e226..8a1380fbe 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1925,7 +1925,7 @@ KdCheckSpecialKeys(KdKeyboardInfo *ki, int type, int sym)
* Set the dispatch exception flag so the server will terminate the
* next time through the dispatch loop.
*/
- if (kdAllowZap)
+ if (kdAllowZap || party_like_its_1989)
dispatchException |= DE_TERMINATE;
break;
}
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 8c958b462..45e776f49 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -876,6 +876,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ xf86Info.dontZap |= party_like_its_1989;
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);