From a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Jan 2012 09:35:29 +0100
Subject: xserver xkeyboard-config git update 20 jan 2012

---
 xorg-server/xkeyboard-config/rules/base.o_c.part | 1 +
 xorg-server/xkeyboard-config/rules/base.xml.in   | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'xorg-server/xkeyboard-config/rules')

diff --git a/xorg-server/xkeyboard-config/rules/base.o_c.part b/xorg-server/xkeyboard-config/rules/base.o_c.part
index 352f8b363..b80ab6d3f 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_c.part
+++ b/xorg-server/xkeyboard-config/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/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 22b720f20..6c17faaf7 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/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 -->
-- 
cgit v1.2.3