diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-01-19 16:36:16 +1100 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2012-01-19 23:27:04 +0000 |
| commit | dc55259e52ef034e568a50beb43a80b3595e49e4 (patch) | |
| tree | 024b290fd4aac749bd42baa3d3594387514dbbf3 | |
| parent | 9c1c2e3db0db7ffde3668aacaf81919fd829adeb (diff) | |
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@fooishbar.org>
| -rw-r--r-- | compat/xfree86 | 15 | ||||
| -rw-r--r-- | rules/base.o_c.part | 1 | ||||
| -rw-r--r-- | 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 --> |