diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-20 09:41:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-20 09:41:09 +0100 |
| commit | c5f912c7b9248440bf9dff4b3c64513ec0f3ec98 (patch) | |
| tree | 7986b288489dac6a8a70787dbdedfc0c064a0c02 /xorg-server/xkeyboard-config/rules | |
| parent | 27bec2ba601ec12334e6b7564034f87ab7c9522b (diff) | |
| parent | a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (diff) | |
| download | vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.gz vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.bz2 vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_c.part | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 6 |
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 --> |