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>

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 2599194..70c0fdf 100644 (file)
--- 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 1a9cb5f..75f88fc 100644 (file)
--- 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 e99d0f6..a6aaa14 100644 (file)
--- 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 a359b80..c3a3fc0 100644 (file)
--- 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     ]       };