diff options
Diffstat (limited to 'linux/X/symbols')
-rw-r--r-- | linux/X/symbols/de | 18 | ||||
-rw-r--r-- | linux/X/symbols/level3 | 6 | ||||
-rw-r--r-- | linux/X/symbols/level5 | 46 |
3 files changed, 37 insertions, 33 deletions
diff --git a/linux/X/symbols/de b/linux/X/symbols/de index d81869a..60b53b5 100644 --- a/linux/X/symbols/de +++ b/linux/X/symbols/de @@ -257,7 +257,7 @@ xkb_symbols "neo_base" { // Alphanumeric-keys // =============== - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Tab as Multi_key (Compose) // -------------------------------------------------------------- @@ -285,7 +285,7 @@ xkb_symbols "neo_base" { // Top row // -------------------------------------------------------------- - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUARTERALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key <AD01> { [ x, X, ellipsis, Greek_xi, Prior, Prior, Greek_XI, NoSymbol ] }; key <AD02> { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, radical, NoSymbol ] }; key <AD03> { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA, NoSymbol ] }; @@ -300,12 +300,12 @@ xkb_symbols "neo_base" { key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key <AD12> { [ dead_acute, dead_tilde, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_breve, NoSymbol ] }; // Middle row // -------------------------------------------------------------- - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUARTERALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key <AC01> { [ u, U, backslash, NoSymbol, Home, Home, includedin, NoSymbol ] }; key <AC02> { [ i, I, slash, Greek_iota, Left, Left, integral, NoSymbol ] }; key <AC03> { [ a, A, braceleft, Greek_alpha, Down, Down, U2200, NoSymbol ] }; @@ -330,12 +330,12 @@ xkb_symbols "neo_base" { key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] }; key <AB07> { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key <AB08> { [ comma, endash, quotedbl, U03F1, KP_2, KP_2, U21D2, NoSymbol ] }; key <AB09> { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, KP_3, U21A6, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUARTERALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key <AB10> { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, Greek_THETA, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Space key // -------------------------------------------------------------- @@ -389,8 +389,8 @@ xkb_symbols "neo" { include "shift(both_capslock)" include "level3(caps_switch)" include "level3(bksl_switch)" - include "level5(lsgt_switch_numlock)" - include "level5(ralt_switch_numlock)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" }; // Copied from macintosh_vndr/de diff --git a/linux/X/symbols/level3 b/linux/X/symbols/level3 index f4a0603..c2c6b13 100644 --- a/linux/X/symbols/level3 +++ b/linux/X/symbols/level3 @@ -116,7 +116,7 @@ xkb_symbols "lwin_switch" { key <LWIN> { type[Group1]="ONE_LEVEL", symbols[Group1] = [ ISO_Level3_Shift ] - }; + }; modifier_map Mod5 { ISO_Level3_Shift }; }; @@ -129,7 +129,7 @@ xkb_symbols "rwin_switch" { key <RWIN> { type[Group1]="ONE_LEVEL", symbols[Group1] = [ ISO_Level3_Shift ] - }; + }; modifier_map Mod5 { ISO_Level3_Shift }; }; @@ -141,7 +141,7 @@ xkb_symbols "enter_switch" { key <KPEN> { type[Group1]="ONE_LEVEL", symbols[Group1] = [ ISO_Level3_Shift ] - }; + }; modifier_map Mod5 { ISO_Level3_Shift }; }; diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5 index ff7041c..19db36c 100644 --- a/linux/X/symbols/level5 +++ b/linux/X/symbols/level5 @@ -21,7 +21,11 @@ xkb_symbols "rctrl_switch" { // corresponding lock, implemented as NumLock. partial modifier_keys -xkb_symbols "neomod_map" { +xkb_symbols "lock" { + // This adds the definitions needed to create a level5-lock behaviour, using + // the real modifier NumLock as a lock indicator. + // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK + // See also: compat/level5(level5_lock) key.type[Group1] = "ONE_LEVEL"; replace key <MDSW> { @@ -40,9 +44,9 @@ xkb_symbols "neomod_map" { }; partial modifier_keys -xkb_symbols "lsgt_switch_numlock" { +xkb_symbols "lsgt_switch_lock" { - include "level5(neomod_map)" + include "level5(lock)" key <LSGT> { type[Group1] = "EIGHT_LEVEL", @@ -51,9 +55,9 @@ xkb_symbols "lsgt_switch_numlock" { }; partial modifier_keys -xkb_symbols "lwin_switch_numlock" { +xkb_symbols "lwin_switch_lock" { - include "level5(neomod_map)" + include "level5(lock)" key <LWIN> { type[Group1] = "EIGHT_LEVEL", @@ -62,9 +66,9 @@ xkb_symbols "lwin_switch_numlock" { }; partial modifier_keys -xkb_symbols "ralt_switch_numlock" { +xkb_symbols "ralt_switch_lock" { - include "level5(neomod_map)" + include "level5(lock)" key <RALT> { type[Group1] = "EIGHT_LEVEL", @@ -73,9 +77,9 @@ xkb_symbols "ralt_switch_numlock" { }; partial modifier_keys -xkb_symbols "rwin_switch_numlock" { +xkb_symbols "rwin_switch_lock" { - include "level5(neomod_map)" + include "level5(lock)" key <RWIN> { type[Group1] = "EIGHT_LEVEL", @@ -84,45 +88,45 @@ xkb_symbols "rwin_switch_numlock" { }; partial modifier_keys -xkb_symbols "lsgt_switch_numlock_cancel" { +xkb_symbols "lsgt_switch_lock_cancel" { - include "level5(neomod_map)" + include "level5(lock)" key <LSGT> { - type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; }; partial modifier_keys -xkb_symbols "lwin_switch_numlock_cancel" { +xkb_symbols "lwin_switch_lock_cancel" { - include "level5(neomod_map)" + include "level5(lock)" key <LWIN> { - type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; }; partial modifier_keys -xkb_symbols "ralt_switch_numlock_cancel" { +xkb_symbols "ralt_switch_lock_cancel" { - include "level5(neomod_map)" + include "level5(lock)" key <RALT> { - type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; }; partial modifier_keys -xkb_symbols "rwin_switch_numlock_cancel" { +xkb_symbols "rwin_switch_lock_cancel" { - include "level5(neomod_map)" + include "level5(lock)" key <RWIN> { - type[Group1] = "EIGHT_LEVEL_NEO_LOCKS", + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; }; |