kbd-2.2.0-backspace-1.patch 12 KB

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