From 98958a9d5de592ba02963e603702e73bec54cc69 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Thu, 16 Oct 2014 20:00:51 +0300 Subject: [PATCH 3/3] symbols/keypad: move the default map to be the first in the file This is the sensible convention (especially since xkbcomp ignores "default" in includes). The change doesn't affect any keymap in xkeyboard-config after the previous commit. Signed-off-by: Ran Benita --- symbols/keypad | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/symbols/keypad b/symbols/keypad index 1efc02b..a266024 100644 --- a/symbols/keypad +++ b/symbols/keypad @@ -1,3 +1,27 @@ +default hidden partial keypad_keys +xkb_symbols "x11" { + + include "keypad(operators)" + + key { [ KP_Home, KP_7 ] }; + key { [ KP_Up, KP_8 ] }; + key { [ KP_Prior, KP_9 ] }; + + key { [ KP_Left, KP_4 ] }; + key { [ KP_Begin, KP_5 ] }; + key { [ KP_Right, KP_6 ] }; + + key { [ KP_End, KP_1 ] }; + key { [ KP_Down, KP_2 ] }; + key { [ KP_Next, KP_3 ] }; + key { [ KP_Enter ] }; + key { [ KP_Equal ] }; + + key { [ KP_Insert, KP_0 ] }; + key { [ KP_Delete, KP_Decimal ] }; + key { [ KP_Decimal, KP_Decimal ] }; +}; + hidden partial keypad_keys xkb_symbols "overlay" { include "keypad(overlay1)" @@ -93,31 +117,6 @@ xkb_symbols "operators" { }; }; -default hidden partial keypad_keys -xkb_symbols "x11" { - - include "keypad(operators)" - - key { [ KP_Home, KP_7 ] }; - key { [ KP_Up, KP_8 ] }; - key { [ KP_Prior, KP_9 ] }; - - key { [ KP_Left, KP_4 ] }; - key { [ KP_Begin, KP_5 ] }; - key { [ KP_Right, KP_6 ] }; - - key { [ KP_End, KP_1 ] }; - key { [ KP_Down, KP_2 ] }; - key { [ KP_Next, KP_3 ] }; - key { [ KP_Enter ] }; - key { [ KP_Equal ] }; - - key { [ KP_Insert, KP_0 ] }; - key { [ KP_Delete, KP_Decimal ] }; - key { [ KP_Decimal, KP_Decimal ] }; -}; - - // Legacy PC keypad definition // Copyright © 2006-2007 Nicolas Mailhot keypad_keys -- 2.1.2