]>
Commit | Line | Data |
---|---|---|
9b0ff0a0 MT |
1 | Submitted By: Alexander E. Patrakov |
2 | Date: 2005-05-16 | |
3 | Initial Package Version: 1.12 | |
4 | Upstream Status: Not submitted, possibly incomplete | |
5 | Description: Makes Backspace and Delete keys consistent in all i386 keymaps. | |
6 | Obsoletes the /etc/kbd/bs-sends-del file for i386. | |
7 | ||
8 | diff -urN kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.12/data/keymaps/i386/dvorak/dvorak-l.map | |
9 | --- kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-l.map 2002-10-11 17:08:51.000000000 +0600 | |
10 | +++ kbd-1.12/data/keymaps/i386/dvorak/dvorak-l.map 2005-05-16 19:54:48.000000000 +0600 | |
11 | @@ -43,7 +43,7 @@ | |
12 | keycode 11 = three numbersign | |
13 | keycode 12 = two at | |
14 | keycode 13 = one exclam | |
15 | - keycode 14 = BackSpace Delete | |
16 | + keycode 14 = Delete Delete | |
17 | ! -------------------------------------------------------------------------- | |
18 | ! Row 3 | |
19 | ! -------------------------------------------------------------------------- | |
20 | diff -urN kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.12/data/keymaps/i386/dvorak/dvorak-r.map | |
21 | --- kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-r.map 2002-10-11 17:08:51.000000000 +0600 | |
22 | +++ kbd-1.12/data/keymaps/i386/dvorak/dvorak-r.map 2005-05-16 19:54:48.000000000 +0600 | |
23 | @@ -43,7 +43,7 @@ | |
24 | keycode 11 = slash question | |
25 | keycode 12 = bracketleft braceleft | |
26 | keycode 13 = bracketright braceright | |
27 | - keycode 14 = BackSpace Delete | |
28 | + keycode 14 = Delete Delete | |
29 | ! -------------------------------------------------------------------------- | |
30 | ! Row 3 | |
31 | ! -------------------------------------------------------------------------- | |
32 | diff -urN kbd-1.12.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.12/data/keymaps/i386/fgGIod/tr_f-latin5.map | |
33 | --- kbd-1.12.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2002-10-13 06:21:12.000000000 +0600 | |
34 | +++ kbd-1.12/data/keymaps/i386/fgGIod/tr_f-latin5.map 2005-05-16 19:54:48.000000000 +0600 | |
35 | @@ -51,7 +51,7 @@ | |
36 | alt keycode 12 = Meta_minus | |
37 | keycode 13 = minus underscore | |
38 | alt keycode 13 = Meta_equal | |
39 | -keycode 14 = BackSpace Delete | |
40 | +keycode 14 = Delete Delete | |
41 | alt keycode 14 = Meta_Delete | |
42 | keycode 15 = Tab Tab | |
43 | alt keycode 15 = Meta_Tab | |
44 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.12/data/keymaps/i386/qwerty/lt.l4.map | |
45 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/lt.l4.map 2002-10-13 05:59:51.000000000 +0600 | |
46 | +++ kbd-1.12/data/keymaps/i386/qwerty/lt.l4.map 2005-05-16 19:54:48.000000000 +0600 | |
47 | @@ -205,7 +205,7 @@ | |
48 | # edit this if you want the key above <Enter> to delete symbols above | |
49 | # cursor, not before. | |
50 | keycode 14 = \ | |
51 | - BackSpace BackSpace BackSpace BackSpace \ | |
52 | + Delete Delete Delete Delete \ | |
53 | Delete Delete Delete Delete \ | |
54 | Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ | |
55 | Meta_Delete Meta_Delete Meta_Delete Meta_Delete | |
56 | @@ -506,7 +506,7 @@ | |
57 | ||
58 | # Edit this if you want strict VT100 emulation. | |
59 | string F111 = "\033[3$" | |
60 | -keycode 111 = Delete F111 Delete F111 \ | |
61 | +keycode 111 = Remove F111 Remove F111 \ | |
62 | Remove Remove Remove Remove \ | |
63 | Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ | |
64 | Boot Boot Boot Boot | |
65 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/lt.map kbd-1.12/data/keymaps/i386/qwerty/lt.map | |
66 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/lt.map 2002-10-13 06:00:25.000000000 +0600 | |
67 | +++ kbd-1.12/data/keymaps/i386/qwerty/lt.map 2005-05-16 19:54:48.000000000 +0600 | |
68 | @@ -204,7 +204,7 @@ | |
69 | # edit this if you want the key above <Enter> to delete symbols above | |
70 | # cursor, not before. | |
71 | keycode 14 = \ | |
72 | - BackSpace BackSpace BackSpace BackSpace \ | |
73 | + Delete Delete Delete Delete \ | |
74 | Delete Delete Delete Delete \ | |
75 | Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ | |
76 | Meta_Delete Meta_Delete Meta_Delete Meta_Delete | |
77 | @@ -505,7 +505,7 @@ | |
78 | ||
79 | # Edit this if you want strict VT100 emulation. | |
80 | string F111 = "\033[3$" | |
81 | -keycode 111 = Delete F111 Delete F111 \ | |
82 | +keycode 111 = Remove F111 Remove F111 \ | |
83 | Remove Remove Remove Remove \ | |
84 | Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ | |
85 | Boot Boot Boot Boot | |
86 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.12/data/keymaps/i386/qwerty/no-latin1.map | |
87 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/no-latin1.map 2002-10-11 17:08:49.000000000 +0600 | |
88 | +++ kbd-1.12/data/keymaps/i386/qwerty/no-latin1.map 2005-05-16 19:54:48.000000000 +0600 | |
89 | @@ -3,7 +3,7 @@ | |
90 | # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no> | |
91 | include "linux-with-alt-and-altgr" | |
92 | plain keycode 83 = KP_Comma | |
93 | - plain keycode 111 = Delete # "Remove" originally, weird... | |
94 | + plain keycode 111 = Remove | |
95 | strings as usual | |
96 | ||
97 | keycode 1 = Escape | |
98 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.12/data/keymaps/i386/qwerty/ru-ms.map | |
99 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ru-ms.map 2002-10-13 06:07:05.000000000 +0600 | |
100 | +++ kbd-1.12/data/keymaps/i386/qwerty/ru-ms.map 2005-05-16 19:54:48.000000000 +0600 | |
101 | @@ -89,8 +89,8 @@ | |
102 | altgr alt keycode 13 = Meta_equal | |
103 | shift alt keycode 13 = Meta_plus | |
104 | altgr shift alt keycode 13 = Meta_plus | |
105 | - keycode 14 = BackSpace BackSpace BackSpace BackSpace | |
106 | -# keycode 14 = Delete Delete Delete Delete | |
107 | +# keycode 14 = BackSpace BackSpace BackSpace BackSpace | |
108 | + keycode 14 = Delete Delete Delete Delete | |
109 | alt keycode 14 = Meta_Delete | |
110 | altgr alt keycode 14 = Meta_Delete | |
111 | keycode 15 = Tab Tab Tab Tab | |
112 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru.map kbd-1.12/data/keymaps/i386/qwerty/ru.map | |
113 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ru.map 2002-10-13 06:02:19.000000000 +0600 | |
114 | +++ kbd-1.12/data/keymaps/i386/qwerty/ru.map 2005-05-16 19:56:08.000000000 +0600 | |
115 | @@ -37,7 +37,7 @@ | |
116 | alt keycode 12 = Meta_minus | |
117 | keycode 13 = equal plus equal plus | |
118 | alt keycode 13 = Meta_equal | |
119 | - keycode 14 = BackSpace BackSpace BackSpace BackSpace | |
120 | + keycode 14 = Delete Delete Delete Delete | |
121 | alt keycode 14 = Meta_Delete | |
122 | keycode 15 = Tab Tab Tab Tab | |
123 | alt keycode 15 = Meta_Tab | |
124 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.12/data/keymaps/i386/qwerty/ru1.map | |
125 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ru1.map 2002-10-13 06:02:30.000000000 +0600 | |
126 | +++ kbd-1.12/data/keymaps/i386/qwerty/ru1.map 2005-05-16 19:55:32.000000000 +0600 | |
127 | @@ -143,8 +143,8 @@ | |
128 | ||
129 | # The keycode "0xFF" is too dangerous for many programs (including emacs). | |
130 | # So let it be bracket instead of Hard Sign. | |
131 | -# altgr keycode 27 = +0xDF | |
132 | -# altgr shift keycode 27 = +0xFF | |
133 | +altgr keycode 27 = +0xDF | |
134 | +altgr shift keycode 27 = +0xFF | |
135 | control keycode 27 = Control_bracketright | |
136 | altgr control keycode 27 = Control_bracketright | |
137 | alt keycode 27 = Meta_bracketright | |
138 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.12/data/keymaps/i386/qwerty/ru2.map | |
139 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ru2.map 2002-10-13 06:05:47.000000000 +0600 | |
140 | +++ kbd-1.12/data/keymaps/i386/qwerty/ru2.map 2005-05-16 19:56:52.000000000 +0600 | |
141 | @@ -46,7 +46,7 @@ | |
142 | alt keycode 12 = Meta_minus | |
143 | keycode 13 = equal plus equal plus | |
144 | alt keycode 13 = Meta_equal | |
145 | - keycode 14 = BackSpace BackSpace BackSpace BackSpace | |
146 | + keycode 14 = Delete Delete Delete Delete | |
147 | alt keycode 14 = Meta_Delete | |
148 | keycode 15 = Tab Tab Tab Tab | |
149 | alt keycode 15 = Meta_Tab | |
150 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.12/data/keymaps/i386/qwerty/se-ir209.map | |
151 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/se-ir209.map 2002-10-13 06:12:48.000000000 +0600 | |
152 | +++ kbd-1.12/data/keymaps/i386/qwerty/se-ir209.map 2005-05-16 19:54:48.000000000 +0600 | |
153 | @@ -345,7 +345,7 @@ | |
154 | keycode 109 = Next Scroll_Forward | |
155 | keycode 110 = Insert | |
156 | ||
157 | - keycode 111 = Delete # "Remove" originally, weird... | |
158 | + keycode 111 = Remove | |
159 | control alt keycode 111 = Boot | |
160 | control altgr keycode 111 = Boot | |
161 | ||
162 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.12/data/keymaps/i386/qwerty/se-lat6.map | |
163 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/se-lat6.map 2002-10-13 06:13:01.000000000 +0600 | |
164 | +++ kbd-1.12/data/keymaps/i386/qwerty/se-lat6.map 2005-05-16 19:54:48.000000000 +0600 | |
165 | @@ -374,6 +374,6 @@ | |
166 | keycode 109 = Next Scroll_Forward | |
167 | keycode 110 = Insert | |
168 | ||
169 | - keycode 111 = Delete # "Remove" originally, weird... | |
170 | + keycode 111 = Remove | |
171 | control alt keycode 111 = Boot | |
172 | control altgr keycode 111 = Boot | |
173 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.12/data/keymaps/i386/qwerty/tr_q-latin5.map | |
174 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2002-10-11 17:08:49.000000000 +0600 | |
175 | +++ kbd-1.12/data/keymaps/i386/qwerty/tr_q-latin5.map 2005-05-16 19:54:48.000000000 +0600 | |
176 | @@ -49,7 +49,7 @@ | |
177 | alt keycode 12 = Meta_minus | |
178 | keycode 13 = minus underscore | |
179 | alt keycode 13 = Meta_equal | |
180 | -keycode 14 = BackSpace Delete | |
181 | +keycode 14 = Delete Delete | |
182 | alt keycode 14 = Meta_Delete | |
183 | keycode 15 = Tab Tab | |
184 | alt keycode 15 = Meta_Tab | |
185 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.12/data/keymaps/i386/qwerty/ua-utf-ws.map | |
186 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2002-10-13 06:07:56.000000000 +0600 | |
187 | +++ kbd-1.12/data/keymaps/i386/qwerty/ua-utf-ws.map 2005-05-16 19:54:48.000000000 +0600 | |
188 | @@ -260,7 +260,7 @@ | |
189 | shift ctrll ctrlr keycode 13 = plus | |
190 | alt ctrll ctrlr keycode 13 = Meta_equal | |
191 | shift alt ctrll ctrlr keycode 13 = Meta_plus | |
192 | -keycode 14 = BackSpace Delete | |
193 | +keycode 14 = Delete Delete | |
194 | control keycode 14 = BackSpace | |
195 | alt keycode 14 = Meta_Delete | |
196 | ctrlr keycode 14 = BackSpace | |
197 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.12/data/keymaps/i386/qwerty/ua-utf.map | |
198 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf.map 2002-10-13 06:08:07.000000000 +0600 | |
199 | +++ kbd-1.12/data/keymaps/i386/qwerty/ua-utf.map 2005-05-16 19:54:48.000000000 +0600 | |
200 | @@ -250,7 +250,7 @@ | |
201 | shift ctrll ctrlr keycode 13 = plus | |
202 | alt ctrll ctrlr keycode 13 = Meta_equal | |
203 | shift alt ctrll ctrlr keycode 13 = Meta_plus | |
204 | -keycode 14 = BackSpace Delete | |
205 | +keycode 14 = Delete Delete | |
206 | control keycode 14 = BackSpace | |
207 | alt keycode 14 = Meta_Delete | |
208 | ctrlr keycode 14 = BackSpace | |
209 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.12/data/keymaps/i386/qwerty/ua-ws.map | |
210 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ua-ws.map 2002-10-13 06:08:19.000000000 +0600 | |
211 | +++ kbd-1.12/data/keymaps/i386/qwerty/ua-ws.map 2005-05-16 19:54:48.000000000 +0600 | |
212 | @@ -260,7 +260,7 @@ | |
213 | shift ctrll ctrlr keycode 13 = plus | |
214 | alt ctrll ctrlr keycode 13 = Meta_equal | |
215 | shift alt ctrll ctrlr keycode 13 = Meta_plus | |
216 | -keycode 14 = BackSpace Delete | |
217 | +keycode 14 = Delete Delete | |
218 | control keycode 14 = BackSpace | |
219 | alt keycode 14 = Meta_Delete | |
220 | ctrlr keycode 14 = BackSpace | |
221 | diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua.map kbd-1.12/data/keymaps/i386/qwerty/ua.map | |
222 | --- kbd-1.12.orig/data/keymaps/i386/qwerty/ua.map 2002-10-13 06:08:31.000000000 +0600 | |
223 | +++ kbd-1.12/data/keymaps/i386/qwerty/ua.map 2005-05-16 19:54:48.000000000 +0600 | |
224 | @@ -249,7 +249,7 @@ | |
225 | shift ctrll ctrlr keycode 13 = plus | |
226 | alt ctrll ctrlr keycode 13 = Meta_equal | |
227 | shift alt ctrll ctrlr keycode 13 = Meta_plus | |
228 | -keycode 14 = BackSpace Delete | |
229 | +keycode 14 = Delete Delete | |
230 | control keycode 14 = BackSpace | |
231 | alt keycode 14 = Meta_Delete | |
232 | ctrlr keycode 14 = BackSpace |