summaryrefslogtreecommitdiff
authorSergey V. Udaltsov <svu@gnome.org>2011-06-15 20:40:11 (GMT)
committer Sergey V. Udaltsov <svu@gnome.org>2011-06-15 20:40:11 (GMT)
commit062b5bfcc59f9f6e4e11ba394bbe459af2a07b7e (patch) (side-by-side diff)
treeb8aa4eec20ab707d49b94909233b0b2491b6a425
parent7ba36852440d38273ea895372a34f95edfcf63ea (diff)
downloadxkeyboard-config-062b5bfcc59f9f6e4e11ba394bbe459af2a07b7e.zip
xkeyboard-config-062b5bfcc59f9f6e4e11ba394bbe459af2a07b7e.tar.gz
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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--symbols/srvr_ctrl24
-rw-r--r--types/pc15
2 files changed, 23 insertions, 16 deletions
diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
index 7743bb1..8bdf503 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 a123f58..01a5634 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;
- level_name[Level1] = "Base";
- level_name[Level2] = "Ctrl+Alt";
+ 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] = "Shift";
+ level_name[Level3] = "Alt Base";
+ level_name[Level4] = "Shift Alt";
+ level_name[Level5] = "Ctrl+Alt";
};
// Local eight level