Root/
Source at commit 1c406daf9520ee85932009a7d9367b39a2336ad4 created 12 years 7 months ago. By Xiangfu Liu, ben nanonote: forward patches to linux-3.0 | |
---|---|
1 | From 15bd698ca3f4104f3e3c28dcc7619dcef21f40ad Mon Sep 17 00:00:00 2001 |
2 | From: Xiangfu Liu <xiangfu@macbook.(none)> |
3 | Date: Fri, 19 Aug 2011 15:40:08 +0800 |
4 | Subject: [PATCH 15/29] 500-modifier-keys.patch |
5 | |
6 | --- |
7 | drivers/tty/vt/defkeymap.c_shipped | 326 +++++++++++++++++++++++++++--------- |
8 | drivers/tty/vt/defkeymap.map | 88 +++++++--- |
9 | 2 files changed, 305 insertions(+), 109 deletions(-) |
10 | |
11 | diff --git a/drivers/tty/vt/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped |
12 | index d2208dfe..41ea840 100644 |
13 | --- a/drivers/tty/vt/defkeymap.c_shipped |
14 | +++ b/drivers/tty/vt/defkeymap.c_shipped |
15 | @@ -9,10 +9,10 @@ u_short plain_map[NR_KEYS] = { |
16 | 0xf200, 0xf01b, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, |
17 | 0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf03d, 0xf07f, 0xf009, |
18 | 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, |
19 | - 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf702, 0xfb61, 0xfb73, |
20 | + 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf706, 0xfb61, 0xfb73, |
21 | 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b, |
22 | 0xf027, 0xf060, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, |
23 | - 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf700, 0xf30c, |
24 | + 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf701, 0xf30c, |
25 | 0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, |
26 | 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307, |
27 | 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, |
28 | @@ -20,56 +20,104 @@ u_short plain_map[NR_KEYS] = { |
29 | 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
30 | 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
31 | 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, |
32 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
33 | + 0xf11a, 0xf10c, 0xf10b, 0xf10a, 0xf11c, 0xf110, 0xf311, 0xf11d, |
34 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
35 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
36 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
37 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
38 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
39 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
40 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
41 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
42 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
43 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
44 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
45 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
46 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
47 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
48 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
49 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
50 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
51 | }; |
52 | |
53 | -u_short shift_map[NR_KEYS] = { |
54 | +static u_short shift_map[NR_KEYS] = { |
55 | 0xf200, 0xf01b, 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e, |
56 | 0xf026, 0xf02a, 0xf028, 0xf029, 0xf05f, 0xf02b, 0xf07f, 0xf009, |
57 | 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, |
58 | - 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf702, 0xfb41, 0xfb53, |
59 | + 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf706, 0xfb41, 0xfb53, |
60 | 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a, |
61 | 0xf022, 0xf07e, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, |
62 | - 0xfb42, 0xfb4e, 0xfb4d, 0xf03c, 0xf03e, 0xf03f, 0xf700, 0xf30c, |
63 | + 0xfb42, 0xfb4e, 0xfb4d, 0xf03b, 0xf03a, 0xf03f, 0xf701, 0xf30c, |
64 | 0xf703, 0xf020, 0xf207, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf10e, |
65 | 0xf10f, 0xf110, 0xf111, 0xf112, 0xf113, 0xf213, 0xf203, 0xf307, |
66 | 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, |
67 | - 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf10a, |
68 | - 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
69 | - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, |
70 | + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf20b, |
71 | + 0xf20a, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
72 | + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
73 | 0xf20b, 0xf601, 0xf602, 0xf117, 0xf600, 0xf20a, 0xf115, 0xf116, |
74 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
75 | + 0xf11a, 0xf10c, 0xf20a, 0xf20b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
76 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
77 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
78 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
79 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
80 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
81 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
82 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
83 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
84 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
85 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
86 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
87 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
88 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
89 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
90 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
91 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
92 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
93 | }; |
94 | |
95 | -u_short altgr_map[NR_KEYS] = { |
96 | +static u_short altgr_map[NR_KEYS] = { |
97 | 0xf200, 0xf200, 0xf200, 0xf040, 0xf200, 0xf024, 0xf200, 0xf200, |
98 | - 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf200, 0xf200, 0xf200, |
99 | - 0xfb71, 0xfb77, 0xf918, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, |
100 | - 0xfb6f, 0xfb70, 0xf200, 0xf07e, 0xf201, 0xf702, 0xf914, 0xfb73, |
101 | - 0xf917, 0xf919, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf200, |
102 | - 0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xf916, 0xfb76, |
103 | - 0xf915, 0xfb6e, 0xfb6d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, |
104 | - 0xf703, 0xf200, 0xf207, 0xf50c, 0xf50d, 0xf50e, 0xf50f, 0xf510, |
105 | - 0xf511, 0xf512, 0xf513, 0xf514, 0xf515, 0xf208, 0xf202, 0xf911, |
106 | + 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf07e, 0xf116, 0xf200, |
107 | + 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e, 0xf026, 0xf02a, |
108 | + 0xf028, 0xf029, 0xf200, 0xf07e, 0xf201, 0xf706, 0xf0b0, 0xf0a8, |
109 | + 0xf0a4, 0xf02d, 0xf05f, 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf200, |
110 | + 0xf200, 0xf200, 0xf700, 0xf200, 0xf039, 0xf030, 0xf916, 0xfb76, |
111 | + 0xf915, 0xf03c, 0xf03e, 0xf027, 0xf022, 0xf200, 0xf701, 0xf30c, |
112 | + 0xf703, 0xf200, 0xf207, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, |
113 | + 0xf036, 0xf037, 0xf038, 0xf514, 0xf515, 0xf208, 0xf202, 0xf911, |
114 | 0xf912, 0xf913, 0xf30b, 0xf90e, 0xf90f, 0xf910, 0xf30a, 0xf90b, |
115 | 0xf90c, 0xf90d, 0xf90a, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf516, |
116 | 0xf517, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
117 | - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, |
118 | + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
119 | 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, |
120 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
121 | + 0xf11a, 0xf10c, 0xf517, 0xf516, 0xf11c, 0xf110, 0xf311, 0xf11d, |
122 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
123 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
124 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
125 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
126 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
127 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
128 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
129 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
130 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
131 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
132 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
133 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
134 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
135 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
136 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
137 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
138 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
139 | }; |
140 | |
141 | -u_short ctrl_map[NR_KEYS] = { |
142 | +static u_short ctrl_map[NR_KEYS] = { |
143 | 0xf200, 0xf200, 0xf200, 0xf000, 0xf01b, 0xf01c, 0xf01d, 0xf01e, |
144 | - 0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200, |
145 | + 0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200, |
146 | 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, |
147 | - 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf702, 0xf001, 0xf013, |
148 | + 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf706, 0xf001, 0xf013, |
149 | 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, |
150 | 0xf007, 0xf000, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016, |
151 | - 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf700, 0xf30c, |
152 | + 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf701, 0xf30c, |
153 | 0xf703, 0xf000, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, |
154 | 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf204, 0xf307, |
155 | 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, |
156 | @@ -77,37 +125,69 @@ u_short ctrl_map[NR_KEYS] = { |
157 | 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
158 | 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
159 | 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, |
160 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
161 | + 0xf11a, 0xf10c, 0xf10b, 0xf10a, 0xf11c, 0xf110, 0xf311, 0xf11d, |
162 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
163 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
164 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
165 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
166 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
167 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
168 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
169 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
170 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
171 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
172 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
173 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
174 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
175 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
176 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
177 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
178 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
179 | }; |
180 | |
181 | -u_short shift_ctrl_map[NR_KEYS] = { |
182 | +static u_short shift_ctrl_map[NR_KEYS] = { |
183 | 0xf200, 0xf200, 0xf200, 0xf000, 0xf200, 0xf200, 0xf200, 0xf200, |
184 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200, |
185 | 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, |
186 | - 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, |
187 | + 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf706, 0xf001, 0xf013, |
188 | 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, |
189 | 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, |
190 | - 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, |
191 | + 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf701, 0xf30c, |
192 | 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
193 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, |
194 | 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, |
195 | 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, |
196 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
197 | - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, |
198 | + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
199 | 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, |
200 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
201 | + 0xf11a, 0xf10c, 0xf200, 0xf200, 0xf11c, 0xf110, 0xf311, 0xf11d, |
202 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
203 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
204 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
205 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
206 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
207 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
208 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
209 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
210 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
211 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
212 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
213 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
214 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
215 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
216 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
217 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
218 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
219 | }; |
220 | |
221 | -u_short alt_map[NR_KEYS] = { |
222 | +static u_short alt_map[NR_KEYS] = { |
223 | 0xf200, 0xf81b, 0xf831, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836, |
224 | 0xf837, 0xf838, 0xf839, 0xf830, 0xf82d, 0xf83d, 0xf87f, 0xf809, |
225 | 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, |
226 | - 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf702, 0xf861, 0xf873, |
227 | + 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf706, 0xf861, 0xf873, |
228 | 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b, |
229 | 0xf827, 0xf860, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876, |
230 | - 0xf862, 0xf86e, 0xf86d, 0xf82c, 0xf82e, 0xf82f, 0xf700, 0xf30c, |
231 | + 0xf862, 0xf86e, 0xf86d, 0xf200, 0xf200, 0xf82f, 0xf701, 0xf30c, |
232 | 0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, |
233 | 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907, |
234 | 0xf908, 0xf909, 0xf30b, 0xf904, 0xf905, 0xf906, 0xf30a, 0xf901, |
235 | @@ -115,37 +195,117 @@ u_short alt_map[NR_KEYS] = { |
236 | 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
237 | 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
238 | 0xf118, 0xf210, 0xf211, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, |
239 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
240 | + 0xf11a, 0xf10c, 0xf50b, 0xf50a, 0xf11c, 0xf110, 0xf311, 0xf11d, |
241 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
242 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
243 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
244 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
245 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
246 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
247 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
248 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
249 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
250 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
251 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
252 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
253 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
254 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
255 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
256 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
257 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
258 | }; |
259 | |
260 | -u_short ctrl_alt_map[NR_KEYS] = { |
261 | +static u_short ctrl_alt_map[NR_KEYS] = { |
262 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
263 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
264 | 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, |
265 | - 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, |
266 | + 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf706, 0xf801, 0xf813, |
267 | 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, |
268 | 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, |
269 | - 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, |
270 | + 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf701, 0xf30c, |
271 | 0xf703, 0xf200, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, |
272 | 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf200, 0xf307, |
273 | 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, |
274 | 0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf50a, |
275 | 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
276 | - 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, |
277 | + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
278 | 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c, |
279 | - 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, |
280 | + 0xf11a, 0xf10c, 0xf50b, 0xf50a, 0xf11c, 0xf110, 0xf311, 0xf11d, |
281 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
282 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
283 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
284 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
285 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
286 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
287 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
288 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
289 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
290 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
291 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
292 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
293 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
294 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
295 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
296 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
297 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
298 | +}; |
299 | + |
300 | +static u_short ctl_map[NR_KEYS] = { |
301 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
302 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf033, 0xf200, 0xf200, |
303 | + 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xf037, 0xf038, |
304 | + 0xf039, 0xfb70, 0xf200, 0xf200, 0xf201, 0xf706, 0xfb61, 0xfb73, |
305 | + 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xf034, 0xf035, 0xf036, 0xf200, |
306 | + 0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, |
307 | + 0xfb62, 0xf031, 0xf032, 0xf200, 0xf200, 0xf030, 0xf701, 0xf30c, |
308 | + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
309 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, |
310 | + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, |
311 | + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, |
312 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
313 | + 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, |
314 | + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, |
315 | + 0xf11a, 0xf10c, 0xf200, 0xf200, 0xf11c, 0xf110, 0xf311, 0xf11d, |
316 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
317 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
318 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
319 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
320 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
321 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
322 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
323 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
324 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
325 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
326 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
327 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
328 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
329 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
330 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
331 | + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
332 | 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, |
333 | }; |
334 | |
335 | ushort *key_maps[MAX_NR_KEYMAPS] = { |
336 | - plain_map, shift_map, altgr_map, NULL, |
337 | - ctrl_map, shift_ctrl_map, NULL, NULL, |
338 | - alt_map, NULL, NULL, NULL, |
339 | - ctrl_alt_map, NULL |
340 | + plain_map, shift_map, altgr_map, 0, |
341 | + ctrl_map, shift_ctrl_map, 0, 0, |
342 | + alt_map, 0, 0, 0, |
343 | + ctrl_alt_map, 0, 0, 0, |
344 | + 0, 0, 0, 0, |
345 | + 0, 0, 0, 0, |
346 | + 0, 0, 0, 0, |
347 | + 0, 0, 0, 0, |
348 | + 0, 0, 0, 0, |
349 | + 0, 0, 0, 0, |
350 | + 0, 0, 0, 0, |
351 | + 0, 0, 0, 0, |
352 | + 0, 0, 0, 0, |
353 | + 0, 0, 0, 0, |
354 | + 0, 0, 0, 0, |
355 | + 0, 0, 0, 0, |
356 | + ctl_map, 0 |
357 | }; |
358 | |
359 | -unsigned int keymap_count = 7; |
360 | +unsigned int keymap_count = 8; |
361 | |
362 | /* |
363 | * Philosophy: most people do not define more strings, but they who do |
364 | @@ -216,47 +376,47 @@ char *func_table[MAX_NR_FUNC] = { |
365 | func_buf + 135, |
366 | func_buf + 140, |
367 | func_buf + 145, |
368 | - NULL, |
369 | - NULL, |
370 | + 0, |
371 | + 0, |
372 | func_buf + 149, |
373 | - NULL, |
374 | + 0, |
375 | }; |
376 | |
377 | -struct kbdiacruc accent_table[MAX_DIACR] = { |
378 | - {'`', 'A', 0300}, {'`', 'a', 0340}, |
379 | - {'\'', 'A', 0301}, {'\'', 'a', 0341}, |
380 | - {'^', 'A', 0302}, {'^', 'a', 0342}, |
381 | - {'~', 'A', 0303}, {'~', 'a', 0343}, |
382 | - {'"', 'A', 0304}, {'"', 'a', 0344}, |
383 | - {'O', 'A', 0305}, {'o', 'a', 0345}, |
384 | - {'0', 'A', 0305}, {'0', 'a', 0345}, |
385 | - {'A', 'A', 0305}, {'a', 'a', 0345}, |
386 | - {'A', 'E', 0306}, {'a', 'e', 0346}, |
387 | - {',', 'C', 0307}, {',', 'c', 0347}, |
388 | - {'`', 'E', 0310}, {'`', 'e', 0350}, |
389 | - {'\'', 'E', 0311}, {'\'', 'e', 0351}, |
390 | - {'^', 'E', 0312}, {'^', 'e', 0352}, |
391 | - {'"', 'E', 0313}, {'"', 'e', 0353}, |
392 | - {'`', 'I', 0314}, {'`', 'i', 0354}, |
393 | - {'\'', 'I', 0315}, {'\'', 'i', 0355}, |
394 | - {'^', 'I', 0316}, {'^', 'i', 0356}, |
395 | - {'"', 'I', 0317}, {'"', 'i', 0357}, |
396 | - {'-', 'D', 0320}, {'-', 'd', 0360}, |
397 | - {'~', 'N', 0321}, {'~', 'n', 0361}, |
398 | - {'`', 'O', 0322}, {'`', 'o', 0362}, |
399 | - {'\'', 'O', 0323}, {'\'', 'o', 0363}, |
400 | - {'^', 'O', 0324}, {'^', 'o', 0364}, |
401 | - {'~', 'O', 0325}, {'~', 'o', 0365}, |
402 | - {'"', 'O', 0326}, {'"', 'o', 0366}, |
403 | - {'/', 'O', 0330}, {'/', 'o', 0370}, |
404 | - {'`', 'U', 0331}, {'`', 'u', 0371}, |
405 | - {'\'', 'U', 0332}, {'\'', 'u', 0372}, |
406 | - {'^', 'U', 0333}, {'^', 'u', 0373}, |
407 | - {'"', 'U', 0334}, {'"', 'u', 0374}, |
408 | - {'\'', 'Y', 0335}, {'\'', 'y', 0375}, |
409 | - {'T', 'H', 0336}, {'t', 'h', 0376}, |
410 | - {'s', 's', 0337}, {'"', 'y', 0377}, |
411 | - {'s', 'z', 0337}, {'i', 'j', 0377}, |
412 | +struct kbdiacr accent_table[MAX_DIACR] = { |
413 | + {'`', 'A', '\300'}, {'`', 'a', '\340'}, |
414 | + {'\'', 'A', '\301'}, {'\'', 'a', '\341'}, |
415 | + {'^', 'A', '\302'}, {'^', 'a', '\342'}, |
416 | + {'~', 'A', '\303'}, {'~', 'a', '\343'}, |
417 | + {'"', 'A', '\304'}, {'"', 'a', '\344'}, |
418 | + {'O', 'A', '\305'}, {'o', 'a', '\345'}, |
419 | + {'0', 'A', '\305'}, {'0', 'a', '\345'}, |
420 | + {'A', 'A', '\305'}, {'a', 'a', '\345'}, |
421 | + {'A', 'E', '\306'}, {'a', 'e', '\346'}, |
422 | + {',', 'C', '\307'}, {',', 'c', '\347'}, |
423 | + {'`', 'E', '\310'}, {'`', 'e', '\350'}, |
424 | + {'\'', 'E', '\311'}, {'\'', 'e', '\351'}, |
425 | + {'^', 'E', '\312'}, {'^', 'e', '\352'}, |
426 | + {'"', 'E', '\313'}, {'"', 'e', '\353'}, |
427 | + {'`', 'I', '\314'}, {'`', 'i', '\354'}, |
428 | + {'\'', 'I', '\315'}, {'\'', 'i', '\355'}, |
429 | + {'^', 'I', '\316'}, {'^', 'i', '\356'}, |
430 | + {'"', 'I', '\317'}, {'"', 'i', '\357'}, |
431 | + {'-', 'D', '\320'}, {'-', 'd', '\360'}, |
432 | + {'~', 'N', '\321'}, {'~', 'n', '\361'}, |
433 | + {'`', 'O', '\322'}, {'`', 'o', '\362'}, |
434 | + {'\'', 'O', '\323'}, {'\'', 'o', '\363'}, |
435 | + {'^', 'O', '\324'}, {'^', 'o', '\364'}, |
436 | + {'~', 'O', '\325'}, {'~', 'o', '\365'}, |
437 | + {'"', 'O', '\326'}, {'"', 'o', '\366'}, |
438 | + {'/', 'O', '\330'}, {'/', 'o', '\370'}, |
439 | + {'`', 'U', '\331'}, {'`', 'u', '\371'}, |
440 | + {'\'', 'U', '\332'}, {'\'', 'u', '\372'}, |
441 | + {'^', 'U', '\333'}, {'^', 'u', '\373'}, |
442 | + {'"', 'U', '\334'}, {'"', 'u', '\374'}, |
443 | + {'\'', 'Y', '\335'}, {'\'', 'y', '\375'}, |
444 | + {'T', 'H', '\336'}, {'t', 'h', '\376'}, |
445 | + {'s', 's', '\337'}, {'"', 'y', '\377'}, |
446 | + {'s', 'z', '\337'}, {'i', 'j', '\377'}, |
447 | }; |
448 | |
449 | unsigned int accent_table_size = 68; |
450 | diff --git a/drivers/tty/vt/defkeymap.map b/drivers/tty/vt/defkeymap.map |
451 | index 50b30ca..732f395 100644 |
452 | --- a/drivers/tty/vt/defkeymap.map |
453 | +++ b/drivers/tty/vt/defkeymap.map |
454 | @@ -1,5 +1,5 @@ |
455 | # Default kernel keymap. This uses 7 modifier combinations. |
456 | -keymaps 0-2,4-5,8,12 |
457 | +keymaps 0-2,4-5,8,12,64 |
458 | # Change the above line into |
459 | # keymaps 0-2,4-6,8,12 |
460 | # in case you want the entries |
461 | @@ -45,24 +45,38 @@ keycode 12 = minus underscore backslash |
462 | control keycode 12 = Control_underscore |
463 | shift control keycode 12 = Control_underscore |
464 | alt keycode 12 = Meta_minus |
465 | -keycode 13 = equal plus |
466 | +keycode 13 = equal plus |
467 | alt keycode 13 = Meta_equal |
468 | + altgr keycode 13 = asciitilde |
469 | + ctrll keycode 13 = three |
470 | keycode 14 = Delete Delete |
471 | - control keycode 14 = BackSpace |
472 | + altgr keycode 14 = Remove |
473 | alt keycode 14 = Meta_Delete |
474 | keycode 15 = Tab Tab |
475 | alt keycode 15 = Meta_Tab |
476 | keycode 16 = q |
477 | + altgr keycode 16 = exclam |
478 | keycode 17 = w |
479 | + altgr keycode 17 = at |
480 | keycode 18 = e |
481 | - altgr keycode 18 = Hex_E |
482 | + altgr keycode 18 = numbersign |
483 | keycode 19 = r |
484 | + altgr keycode 19 = dollar |
485 | keycode 20 = t |
486 | + altgr keycode 20 = percent |
487 | keycode 21 = y |
488 | + altgr keycode 21 = asciicircum |
489 | keycode 22 = u |
490 | + altgr keycode 22 = ampersand |
491 | + ctrll keycode 22 = seven |
492 | keycode 23 = i |
493 | + altgr keycode 23 = asterisk |
494 | + ctrll keycode 23 = eight |
495 | keycode 24 = o |
496 | + altgr keycode 24 = parenleft |
497 | + ctrll keycode 24 = nine |
498 | keycode 25 = p |
499 | + altgr keycode 25 = parenright |
500 | keycode 26 = bracketleft braceleft |
501 | control keycode 26 = Escape |
502 | alt keycode 26 = Meta_bracketleft |
503 | @@ -71,19 +85,28 @@ keycode 27 = bracketright braceright asciitilde |
504 | alt keycode 27 = Meta_bracketright |
505 | keycode 28 = Return |
506 | alt keycode 28 = Meta_Control_m |
507 | -keycode 29 = Control |
508 | +keycode 29 = CtrlL |
509 | keycode 30 = a |
510 | - altgr keycode 30 = Hex_A |
511 | + altgr keycode 30 = U+00B0 |
512 | keycode 31 = s |
513 | + altgr keycode 31 = U+00A8 |
514 | keycode 32 = d |
515 | - altgr keycode 32 = Hex_D |
516 | + altgr keycode 32 = U+20AC |
517 | keycode 33 = f |
518 | - altgr keycode 33 = Hex_F |
519 | + altgr keycode 33 = minus |
520 | keycode 34 = g |
521 | + altgr keycode 34 = underscore |
522 | keycode 35 = h |
523 | + altgr keycode 35 = braceleft |
524 | keycode 36 = j |
525 | + altgr keycode 36 = bracketleft |
526 | + ctrll keycode 36 = four |
527 | keycode 37 = k |
528 | + altgr keycode 37 = bracketright |
529 | + ctrll keycode 37 = five |
530 | keycode 38 = l |
531 | + altgr keycode 38 = braceright |
532 | + ctrll keycode 38 = six |
533 | keycode 39 = semicolon colon |
534 | alt keycode 39 = Meta_semicolon |
535 | keycode 40 = apostrophe quotedbl |
536 | @@ -97,58 +120,65 @@ keycode 43 = backslash bar |
537 | control keycode 43 = Control_backslash |
538 | alt keycode 43 = Meta_backslash |
539 | keycode 44 = z |
540 | + altgr keycode 44 = nine |
541 | keycode 45 = x |
542 | + altgr keycode 45 = zero |
543 | keycode 46 = c |
544 | altgr keycode 46 = Hex_C |
545 | keycode 47 = v |
546 | keycode 48 = b |
547 | altgr keycode 48 = Hex_B |
548 | keycode 49 = n |
549 | + altgr keycode 49 = less |
550 | + ctrll keycode 49 = one |
551 | keycode 50 = m |
552 | -keycode 51 = comma less |
553 | - alt keycode 51 = Meta_comma |
554 | -keycode 52 = period greater |
555 | + altgr keycode 50 = greater |
556 | + ctrll keycode 50 = two |
557 | +keycode 51 = comma semicolon |
558 | + altgr keycode 51 = apostrophe |
559 | +keycode 52 = period colon |
560 | control keycode 52 = Compose |
561 | - alt keycode 52 = Meta_period |
562 | + altgr keycode 52 = quotedbl |
563 | keycode 53 = slash question |
564 | control keycode 53 = Delete |
565 | alt keycode 53 = Meta_slash |
566 | -keycode 54 = Shift |
567 | + ctrll keycode 53 = zero |
568 | +keycode 54 = AltGr |
569 | keycode 55 = KP_Multiply |
570 | keycode 56 = Alt |
571 | keycode 57 = space space |
572 | control keycode 57 = nul |
573 | alt keycode 57 = Meta_space |
574 | keycode 58 = Caps_Lock |
575 | -keycode 59 = F1 F11 Console_13 |
576 | +keycode 59 = F1 F11 one |
577 | control keycode 59 = F1 |
578 | alt keycode 59 = Console_1 |
579 | control alt keycode 59 = Console_1 |
580 | -keycode 60 = F2 F12 Console_14 |
581 | +keycode 60 = F2 F12 two |
582 | control keycode 60 = F2 |
583 | alt keycode 60 = Console_2 |
584 | control alt keycode 60 = Console_2 |
585 | -keycode 61 = F3 F13 Console_15 |
586 | +keycode 61 = F3 F13 three |
587 | control keycode 61 = F3 |
588 | alt keycode 61 = Console_3 |
589 | control alt keycode 61 = Console_3 |
590 | -keycode 62 = F4 F14 Console_16 |
591 | +keycode 62 = F4 F14 four |
592 | control keycode 62 = F4 |
593 | alt keycode 62 = Console_4 |
594 | control alt keycode 62 = Console_4 |
595 | -keycode 63 = F5 F15 Console_17 |
596 | +keycode 63 = F5 F15 five |
597 | control keycode 63 = F5 |
598 | alt keycode 63 = Console_5 |
599 | control alt keycode 63 = Console_5 |
600 | -keycode 64 = F6 F16 Console_18 |
601 | +keycode 64 = F6 F16 six |
602 | control keycode 64 = F6 |
603 | alt keycode 64 = Console_6 |
604 | control alt keycode 64 = Console_6 |
605 | -keycode 65 = F7 F17 Console_19 |
606 | +keycode 65 = F7 F17 seven |
607 | control keycode 65 = F7 |
608 | alt keycode 65 = Console_7 |
609 | control alt keycode 65 = Console_7 |
610 | -keycode 66 = F8 F18 Console_20 |
611 | +keycode 66 = F8 F18 eight |
612 | control keycode 66 = F8 |
613 | alt keycode 66 = Console_8 |
614 | control alt keycode 66 = Console_8 |
615 | @@ -204,11 +234,11 @@ keycode 84 = Last_Console |
616 | keycode 85 = |
617 | keycode 86 = less greater bar |
618 | alt keycode 86 = Meta_less |
619 | -keycode 87 = F11 F11 Console_23 |
620 | +keycode 87 = F11 Scroll_Backward Console_23 |
621 | control keycode 87 = F11 |
622 | alt keycode 87 = Console_11 |
623 | control alt keycode 87 = Console_11 |
624 | -keycode 88 = F12 F12 Console_24 |
625 | +keycode 88 = F12 Scroll_Forward Console_24 |
626 | control keycode 88 = F12 |
627 | alt keycode 88 = Console_12 |
628 | control alt keycode 88 = Console_12 |
629 | @@ -220,7 +250,7 @@ keycode 93 = |
630 | keycode 94 = |
631 | keycode 95 = |
632 | keycode 96 = KP_Enter |
633 | -keycode 97 = Control |
634 | +keycode 97 = Control |
635 | keycode 98 = KP_Divide |
636 | keycode 99 = Control_backslash |
637 | control keycode 99 = Control_backslash |
638 | @@ -245,8 +275,14 @@ keycode 111 = Remove |
639 | control alt keycode 111 = Boot |
640 | keycode 112 = Macro |
641 | keycode 113 = F13 |
642 | -keycode 114 = F14 |
643 | -keycode 115 = Help |
644 | +keycode 114 = F12 Scroll_Forward Console_24 |
645 | + control keycode 114 = F12 |
646 | + alt keycode 114 = Console_12 |
647 | + control alt keycode 114 = Console_12 |
648 | +keycode 115 = F11 Scroll_Backward Console_23 |
649 | + control keycode 115 = F11 |
650 | + alt keycode 115 = Console_11 |
651 | + control alt keycode 115 = Console_11 |
652 | keycode 116 = Do |
653 | keycode 117 = F17 |
654 | keycode 118 = KP_MinPlus |
655 | -- |
656 | 1.7.4.1 |
657 | |
658 |