From ccd009297b2162991e0415b24ab1c2026e99c2b4 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 10 Apr 2023 12:37:40 +0200 Subject: types: move an 8-level type to the file with the other 8-level types Also rename it, so that the name is more descriptive. Signed-off-by: Benno Schulenberg --- types/level5 | 37 +++++++++++++++++++++++++++++++++++++ types/pc | 39 --------------------------------------- 2 files changed, 37 insertions(+), 39 deletions(-) (limited to 'types') diff --git a/types/level5 b/types/level5 index 96fb3a7..240be8e 100644 --- a/types/level5 +++ b/types/level5 @@ -187,4 +187,41 @@ default partial xkb_types "default" { level_name[Level8] = "X Shift AltGr"; }; + // When you want part of your layout to have eight levels but cannot use + // LevelFive as modifier, as this would take over the right Ctrl key for + // the whole layout and is too invasive for the average four-level user. + // Needed to fix https://bugs.freedesktop.org/9529. + type "EIGHT_LEVEL_BY_CTRL" { + modifiers = Shift + Lock + LevelThree + Control; + + map[None] = Level1; + map[Lock+Shift] = Level1; + map[Shift] = Level2; + map[Lock] = Level2; + + map[LevelThree] = Level3; + map[Lock+Shift+LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Lock+LevelThree] = Level4; + + map[Control] = Level5; + map[Lock+Shift+Control] = Level5; + map[Shift+Control] = Level6; + map[Lock+Control] = Level6; + + map[LevelThree+Control] = Level7; + map[Lock+Shift+LevelThree+Control] = Level7; + map[Shift+LevelThree+Control] = Level8; + map[Lock+LevelThree+Control] = Level8; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Level3"; + level_name[Level4] = "Shift Level3"; + level_name[Level5] = "Ctrl"; + level_name[Level6] = "Shift Ctrl"; + level_name[Level7] = "Level3 Ctrl"; + level_name[Level8] = "Shift Level3 Ctrl"; + }; + }; diff --git a/types/pc b/types/pc index 4a4d6d7..cc1caf2 100644 --- a/types/pc +++ b/types/pc @@ -46,43 +46,4 @@ default partial xkb_types "default" { level_name[Level5] = "Ctrl+Alt"; }; - // Local eight level. - // Needed when you want part of your layout eight-level but cannot use - // LevelFive as modifier, as this will take over the right Ctrl by default - // for the whole layout and is too invasive for the average four-level user. - // Needed to fix bug #9529. - // FIXME: Should really use RControl but it seems not to be enabled by - // default and touching this requires a lot of testing. - type "LOCAL_EIGHT_LEVEL" { - modifiers = Shift + Lock + LevelThree + Control; - - map[None] = Level1; - map[Lock+Shift] = Level1; - map[Shift] = Level2; - map[Lock] = Level2; - - map[LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level3; - map[Shift+LevelThree] = Level4; - map[Lock+LevelThree] = Level4; - - map[Control] = Level5; - map[Lock+Shift+Control] = Level5; - map[Shift+Control] = Level6; - map[Lock+Control] = Level6; - - map[LevelThree+Control] = Level7; - map[Lock+Shift+LevelThree+Control] = Level7; - map[Shift+LevelThree+Control] = Level8; - map[Lock+LevelThree+Control] = Level8; - - level_name[Level1] = "Base"; - level_name[Level2] = "Shift"; - level_name[Level3] = "Level3"; - level_name[Level4] = "Shift Level3"; - level_name[Level5] = "Ctrl"; - level_name[Level6] = "Shift Ctrl"; - level_name[Level7] = "Level3 Ctrl"; - level_name[Level8] = "Shift Level3 Ctrl"; - }; }; -- cgit v1.2.1