[xkeyboard-config] Move Ungrab and ClearGrab from the default layout to option grab:break_actions (#783044)

[Peter Hutterer]

commit abc012c67a7d799667f588d29d609d5185ba216d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jan 19 16:37:39 2012 +1000

    Move Ungrab and ClearGrab from the default layout to option
    grab:break_actions (#783044)

 ...rGrab-CloseGrabs-actions-behind-an-option.patch |   76 ++++++++++++++++++++
 xkeyboard-config.spec                              |    7 ++-
 2 files changed, 82 insertions(+), 1 deletions(-)
---
diff --git a/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch b/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch
new file mode 100644
index 0000000..8d788ac
--- /dev/null
+++ b/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch
@@ -0,0 +1,76 @@
+From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel at fooishbar.org>
+Date: Thu, 19 Jan 2012 16:36:16 +1100
+Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option
+
+Similar to how we put the Terminate mapping behind an option rather than
+enabling it by default, put the ClearGrab/CloseGrab action handlers
+behind an option too, so we don't ship 'break my screensaver'.  Oops.
+
+Signed-off-by: Daniel Stone <daniel at fooishbar.org>
+---
+ compat/xfree86      |   15 +++++++++------
+ rules/base.o_c.part |    1 +
+ rules/base.xml.in   |    6 ++++++
+ 3 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/compat/xfree86 b/compat/xfree86
+index cf4a8b2..52e661d 100644
+--- a/compat/xfree86
++++ b/compat/xfree86
+@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic"  {
+         action = SwitchScreen(Screen=12, !SameServer);
+     };
+ 
+-    interpret XF86_Ungrab {
+-        action = Private(type=0x86, data="Ungrab");
+-    };
+-    interpret XF86_ClearGrab {
+-        action = Private(type=0x86, data="ClsGrb");
+-    };
+     interpret XF86LogGrabInfo {
+         action = Private(type=0x86, data="PrGrbs");
+     };
+@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic"  {
+         action = Private(type=0x86, data="-VMode");
+     };
+ };
++
++partial xkb_compatibility "grab_break" {
++    interpret XF86_Ungrab {
++        action = Private(type=0x86, data="Ungrab");
++    };
++    interpret XF86_ClearGrab {
++        action = Private(type=0x86, data="ClsGrb");
++    };
++};
+diff --git a/rules/base.o_c.part b/rules/base.o_c.part
+index 352f8b3..b80ab6d 100644
+--- a/rules/base.o_c.part
++++ b/rules/base.o_c.part
+@@ -3,4 +3,5 @@
+   grp_led:scroll	=	+ledscroll(group_lock)
+   japan:kana_lock	=	+japan(kana_lock)
+   caps:shiftlock	=	+ledcaps(shift_lock)
++  grab:break_actions    =       +xfree86(grab_break)
+ 
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index 22b720f..6c17faa 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -6278,6 +6278,12 @@
+           <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+         </configItem>
+       </option>
++      <option>
++        <configItem>
++          <name>grab:break_actions</name>
++          <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
++        </configItem>
++      </option>
+     </group>
+     <group allowMultipleSelection="true">
+       <!-- Special shortcuts for the Euro character -->
+-- 
+1.7.8.3
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 1d2fbf6..9dc2cdc 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -7,7 +7,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 2.4.1
-Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -20,6 +20,7 @@ Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.
 %endif
 
 Patch01: 0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch
+Patch02: 0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch
 
 BuildArch: noarch
 
@@ -112,6 +113,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Thu Jan 19 2012 Peter Hutterer <peter.hutterer at redhat.com> 2.4.1-4
+- Move Ungrab and ClearGrab from the default layout to option
+  grab:break_actions (#783044)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild