diff options
| -rw-r--r-- | compat/level5 | 7 | ||||
| -rw-r--r-- | symbols/level5 | 12 | ||||
| -rw-r--r-- | types/level5 | 10 |
3 files changed, 11 insertions, 18 deletions
diff --git a/compat/level5 b/compat/level5 index 54f749d..2e52901 100644 --- a/compat/level5 +++ b/compat/level5 @@ -42,11 +42,8 @@ default partial xkb_compatibility "default" { }; partial xkb_compatibility "level5_lock" { - // This defines a Level5-Lock using the NumLock real modifier - // in order to create arbitrary level-behaviour, which would - // not be possible with the virtual modifier. - // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK - // See also: symbols/level5(lock) + // This defines a Level5-Lock using the NumLock virtual modifier. + // See also types/level5 (EIGHT_LEVEL_LEVEL_FIVE_LOCK) and symbols/level5(lock). virtual_modifiers NumLock; diff --git a/symbols/level5 b/symbols/level5 index 4b67ffc..2e0df19 100644 --- a/symbols/level5 +++ b/symbols/level5 @@ -61,21 +61,19 @@ xkb_symbols "modifier_mapping" { modifier_map Mod3 { <MDSW> }; }; - -// 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) +// This adds the definitions needed to create a level5-locking behaviour, +// using the virtual modifier NumLock (mapped to Mod2) as lock indicator. +// See also types/level5 (EIGHT_LEVEL_LEVEL_FIVE_LOCK) and compat/level5 (level5_lock). partial modifier_keys xkb_symbols "lock" { - key.type[Group1] = "ONE_LEVEL"; - include "level5(modifier_mapping)" replace key <HYPR> { vmods = NumLock, + type[Group1] = "ONE_LEVEL", symbols[Group1] = [ NoSymbol ], actions[Group1] = [ SetMods(modifiers=NumLock) ] }; modifier_map Mod2 { <HYPR> }; + include "level5(modifier_mapping)" }; // The following modifier keys are used to switch to the third shift level diff --git a/types/level5 b/types/level5 index 19d1552..51770a2 100644 --- a/types/level5 +++ b/types/level5 @@ -54,10 +54,9 @@ default partial xkb_types "default" { }; type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { - // Level5-Lock is implemented by using NumLock, because a real modifier - // is required. + // Level5-Lock is implemented with virtual modifier NumLock. - modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; + modifiers = Shift + Lock + LevelThree + LevelFive + NumLock; map[None] = Level1; map[Shift] = Level2; @@ -116,10 +115,9 @@ default partial xkb_types "default" { }; type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { - // Level5-Lock is implemented by using NumLock, because a real modifier - // is required. + // Level5-Lock is implemented with virtual modifier NumLock. - modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; + modifiers = Shift + Lock + LevelThree + LevelFive + NumLock; map[None] = Level1; map[Shift] = Level2; |