aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-20 09:35:29 +0100
committermarha <marha@users.sourceforge.net>2012-01-20 09:35:29 +0100
commita8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (patch)
tree8bc980551565964e13d046f54ee3876ba2bb7f14 /xorg-server/xkeyboard-config/rules
parent34c1e86406451a3604de4982339058088434ab40 (diff)
downloadvcxsrv-a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8.tar.gz
vcxsrv-a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8.tar.bz2
vcxsrv-a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8.zip
xserver xkeyboard-config git update 20 jan 2012
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_c.part1
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
2 files changed, 7 insertions, 0 deletions
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 -->