From b0f64bdab00db652e189d1b16fed8bdd8921c707 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Sat, 25 Apr 2009 22:12:53 +0100
Subject: [PATCH] This disables zapping by default, it can be reenabled with
 'setxkbmap -option terminate:ctrl_alt_bksp'.

---
 ChangeLog           |  6 ++++++
 rules/base.o_s.part |  2 ++
 rules/base.xml.in   | 12 ++++++++++++
 symbols/Makefile.am |  1 +
 symbols/pc          |  5 +----
 symbols/srvr_ctrl   |  7 -------
 symbols/terminate   |  8 ++++++++
 7 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 symbols/terminate

diff --git a/ChangeLog b/ChangeLog
index 539494c..e832f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-25 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am,
+	symbols/pc, symbols/srvr_ctrl: Make C-A-Bksp an option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21274
+
 2009-04-23 Sergey Udaltsov
 
 	* rules/base.xml.in, symbols/ua: making ua(unicode) default,
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 0095d0e..d3078bf 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -98,4 +98,6 @@
   shift:breaks_caps     =	+shift(breaks_caps)
   esperanto:qwerty      =	+epo(qwerty)
   esperanto:dvorak      =	+epo(dvorak)
+  terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)
+
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 7d5944a..3c545aa 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4956,5 +4956,17 @@
        </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>terminate</name>
+        <_description>Key sequence to kill the X server</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>terminate:ctrl_alt_bksp</name>
+          <_description>Control + Alt + Backspace</_description>
+        </configItem>
+      </option>
+    </group>
   </optionList>
 </xkbConfigRegistry>
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index d7d08a2..d033a15 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -26,6 +26,7 @@ pc pk pl pt \
 ro rs ru \
 se si sk sn \
 sy th \
+terminate \
 tj tm tr \
 ua us uz vn \
 za \
diff --git a/symbols/pc b/symbols/pc
index 07472b8..9f3da66 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -19,10 +19,7 @@ xkb_symbols "pc105" {
     include "pc(editing)"
     include "keypad(x11)"
 
-    key <BKSP> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
+    key <BKSP> {	[ BackSpace	]	};
 
     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
     key <RTRN> {	[ Return	]	};
diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
index 712f763..cf7012b 100644
--- a/symbols/srvr_ctrl
+++ b/symbols/srvr_ctrl
@@ -13,11 +13,6 @@ xkb_symbols "xfree86" {
 partial keypad_keys 
 xkb_symbols "stdkeypad" {
 
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
-
 // Ungrab cancels server/keyboard/pointer grabs
     key <KPDV> {
 	type="CTRL+ALT",
@@ -127,8 +122,6 @@ xkb_symbols "no_srvr_keys" {
     key <FK11> { [ F11, F11 ]	};
     key <FK12> { [ F12, F12 ]	};
 
-    key <BKSP> { [ BackSpace,	BackSpace	] };
-
     key <KPDV> { [ KP_Divide,	KP_Divide	] };
     key <KPMU> { [ KP_Multiply,	KP_Multiply	] };
     key <KPSU> { [ KP_Subtract,	KP_Subtract	] };
diff --git a/symbols/terminate b/symbols/terminate
new file mode 100644
index 0000000..47e434d
--- /dev/null
+++ b/symbols/terminate
@@ -0,0 +1,8 @@
+partial default modifier_keys
+xkb_symbols "ctrl_alt_bksp" {
+    key <BKSP> {
+        type="CTRL+ALT",
+        symbols[Group1] = [ NoSymbol,        Terminate_Server ]
+    };
+};
+
-- 
2.32.0.93.g670b81a890