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