rpms/xkeyboard-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Move Ungrab and ClearGrab from the default layout to option

Browse Source 
grab:break_actions (#783044)
This commit is contained in:
Peter Hutterer 2012-01-19 16:37:39 +10:00
parent 27fbfd6284
commit abc012c67a
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch Normal file
View File

@ -0,0 +1,76 @@
From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@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@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

7
xkeyboard-config.spec
View File

@ -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@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@lists.fedoraproject.org> - 2.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild