summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-11-10 11:12:33 +1000
committerSergey V. Udaltsov <svu@gnome.org>2010-11-12 22:52:02 +0000
commit1bc01a5eaa1180c026ebf8fc75e9bc3cb6876c66 (patch)
treeeda4169ac563b80bdbe71c505a928218396d3e53
parente5c77e30a9457a301e0a3857db450310584dae1a (diff)
Remove Pointer_EnableKeys from default layout, move to option instead.
Pointer_EnableKeys allows the use of the keypad to move the pointer around. This is a rarely used feature but can be enabled by default with Shift+NumLock. No desktop or keyboard has a visualisation that the feature is enabled, leading to user confusion when erroneous mouse clicks or movements are emitted. Remove Pointer_EnableKeys from the default keymap and move it to option "keypad:pointerkeys" instead. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--rules/base.o_s.part1
-rw-r--r--rules/base.xml.in6
-rw-r--r--symbols/keypad7
-rw-r--r--symbols/pc2
4 files changed, 15 insertions, 1 deletions
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 25991943..70c0fdfe 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -111,6 +111,7 @@
esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
+ keypad:pointerkeys = +keypad(pointerkeys)
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
shift:both_capslock = +shift(both_capslock)
shift:lshift_both_capslock = +shift(lshift_both_capslock)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 1a9cb5f6..75f88fc8 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5304,6 +5304,12 @@
<description>Both Shift-Keys together toggle ShiftLock</description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>keypad:pointerkeys</name>
+ <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="true">
<!-- Special shortcuts for the Euro character -->
diff --git a/symbols/keypad b/symbols/keypad
index e99d0f60..a6aaa144 100644
--- a/symbols/keypad
+++ b/symbols/keypad
@@ -579,3 +579,10 @@ xkb_symbols "atm" {
key <KP2> { [ NoSymbol, KP_8 ] };
key <KP3> { [ NoSymbol, KP_9 ] };
};
+
+
+partial default modifier_keys
+xkb_symbols "pointerkeys" {
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+};
+
diff --git a/symbols/pc b/symbols/pc
index a359b802..c3a3fc00 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -26,7 +26,7 @@ xkb_symbols "pc105" {
key <CAPS> { [ Caps_Lock ] };
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+ key <NMLK> { [ Num_Lock ] };
key <LFSH> { [ Shift_L ] };
key <LCTL> { [ Control_L ] };