Move switch VT mapping to 5th level, amending CTRL+ALT

The idea is to allow functional keys to have mappings on 2-4 levels (with Shift and RAlt)
https://bugs.freedesktop.org/show_bug.cgi?id=11822

2 files changed, 22 insertions, 15 deletions

diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
index 7743bb15..8bdf503a 100644
--- a/symbols/srvr_ctrl
+++ b/symbols/srvr_ctrl
@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
 
     key <FK01> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
+	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
     };
 
     key <FK02> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
+	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
     };
 
     key <FK03> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
+	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
     };
 
     key <FK04> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
+	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
     };
 
     key <FK05> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
+	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
     };
 
     key <FK06> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
+	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
     };
 
     key <FK07> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
+	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
     };
 
     key <FK08> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
+	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
     };
 
     key <FK09> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
+	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
     };
 
     key <FK10> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
+	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
     };
 
     key <FK11> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
+	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
     };
 
     key <FK12> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
+	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
     };
 
 };
diff --git a/types/pc b/types/pc
index a123f589..01a5634a 100644
--- a/types/pc
+++ b/types/pc
@@ -59,10 +59,17 @@ partial default xkb_types "default" {
     };
 
     type "CTRL+ALT" {
-	modifiers = Control+Alt;
-	map[Control+Alt] = Level2;
+	modifiers = Control+Alt+Shift+LevelThree;
+        map[None] = Level1;
+        map[Shift] = Level2;
+        map[LevelThree] = Level3;
+        map[Shift+LevelThree] = Level4;
+	map[Control+Alt] = Level5;
         level_name[Level1] = "Base";
-	level_name[Level2] = "Ctrl+Alt";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "Ctrl+Alt";
     };
 
    // Local eight level