diff options
author | Sergey V. Udaltsov <svu@gnome.org> | 2011-06-15 21:40:11 +0100 |
---|---|---|
committer | Sergey V. Udaltsov <svu@gnome.org> | 2011-06-15 21:40:11 +0100 |
commit | 062b5bfcc59f9f6e4e11ba394bbe459af2a07b7e (patch) | |
tree | b8aa4eec20ab707d49b94909233b0b2491b6a425 | |
parent | 7ba36852440d38273ea895372a34f95edfcf63ea (diff) |
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
-rw-r--r-- | symbols/srvr_ctrl | 24 | ||||
-rw-r--r-- | types/pc | 15 |
2 files changed, 23 insertions, 16 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" { | |||
40 | 40 | ||
41 | key <FK01> { | 41 | key <FK01> { |
42 | type="CTRL+ALT", | 42 | type="CTRL+ALT", |
43 | symbols[Group1]= [ F1, XF86_Switch_VT_1 ] | 43 | symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ] |
44 | }; | 44 | }; |
45 | 45 | ||
46 | key <FK02> { | 46 | key <FK02> { |
47 | type="CTRL+ALT", | 47 | type="CTRL+ALT", |
48 | symbols[Group1]= [ F2, XF86_Switch_VT_2 ] | 48 | symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ] |
49 | }; | 49 | }; |
50 | 50 | ||
51 | key <FK03> { | 51 | key <FK03> { |
52 | type="CTRL+ALT", | 52 | type="CTRL+ALT", |
53 | symbols[Group1]= [ F3, XF86_Switch_VT_3 ] | 53 | symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ] |
54 | }; | 54 | }; |
55 | 55 | ||
56 | key <FK04> { | 56 | key <FK04> { |
57 | type="CTRL+ALT", | 57 | type="CTRL+ALT", |
58 | symbols[Group1]= [ F4, XF86_Switch_VT_4 ] | 58 | symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ] |
59 | }; | 59 | }; |
60 | 60 | ||
61 | key <FK05> { | 61 | key <FK05> { |
62 | type="CTRL+ALT", | 62 | type="CTRL+ALT", |
63 | symbols[Group1]= [ F5, XF86_Switch_VT_5 ] | 63 | symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ] |
64 | }; | 64 | }; |
65 | 65 | ||
66 | key <FK06> { | 66 | key <FK06> { |
67 | type="CTRL+ALT", | 67 | type="CTRL+ALT", |
68 | symbols[Group1]= [ F6, XF86_Switch_VT_6 ] | 68 | symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ] |
69 | }; | 69 | }; |
70 | 70 | ||
71 | key <FK07> { | 71 | key <FK07> { |
72 | type="CTRL+ALT", | 72 | type="CTRL+ALT", |
73 | symbols[Group1]= [ F7, XF86_Switch_VT_7 ] | 73 | symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ] |
74 | }; | 74 | }; |
75 | 75 | ||
76 | key <FK08> { | 76 | key <FK08> { |
77 | type="CTRL+ALT", | 77 | type="CTRL+ALT", |
78 | symbols[Group1]= [ F8, XF86_Switch_VT_8 ] | 78 | symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ] |
79 | }; | 79 | }; |
80 | 80 | ||
81 | key <FK09> { | 81 | key <FK09> { |
82 | type="CTRL+ALT", | 82 | type="CTRL+ALT", |
83 | symbols[Group1]= [ F9, XF86_Switch_VT_9 ] | 83 | symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ] |
84 | }; | 84 | }; |
85 | 85 | ||
86 | key <FK10> { | 86 | key <FK10> { |
87 | type="CTRL+ALT", | 87 | type="CTRL+ALT", |
88 | symbols[Group1]= [ F10, XF86_Switch_VT_10 ] | 88 | symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ] |
89 | }; | 89 | }; |
90 | 90 | ||
91 | key <FK11> { | 91 | key <FK11> { |
92 | type="CTRL+ALT", | 92 | type="CTRL+ALT", |
93 | symbols[Group1]= [ F11, XF86_Switch_VT_11 ] | 93 | symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ] |
94 | }; | 94 | }; |
95 | 95 | ||
96 | key <FK12> { | 96 | key <FK12> { |
97 | type="CTRL+ALT", | 97 | type="CTRL+ALT", |
98 | symbols[Group1]= [ F12, XF86_Switch_VT_12 ] | 98 | symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ] |
99 | }; | 99 | }; |
100 | 100 | ||
101 | }; | 101 | }; |
@@ -59,10 +59,17 @@ partial default xkb_types "default" { | |||
59 | }; | 59 | }; |
60 | 60 | ||
61 | type "CTRL+ALT" { | 61 | type "CTRL+ALT" { |
62 | modifiers = Control+Alt; | 62 | modifiers = Control+Alt+Shift+LevelThree; |
63 | map[Control+Alt] = Level2; | 63 | map[None] = Level1; |
64 | level_name[Level1] = "Base"; | 64 | map[Shift] = Level2; |
65 | level_name[Level2] = "Ctrl+Alt"; | 65 | map[LevelThree] = Level3; |
66 | map[Shift+LevelThree] = Level4; | ||
67 | map[Control+Alt] = Level5; | ||
68 | level_name[Level1] = "Base"; | ||
69 | level_name[Level2] = "Shift"; | ||
70 | level_name[Level3] = "Alt Base"; | ||
71 | level_name[Level4] = "Shift Alt"; | ||
72 | level_name[Level5] = "Ctrl+Alt"; | ||
66 | }; | 73 | }; |
67 | 74 | ||
68 | // Local eight level | 75 | // Local eight level |