src/patches/kbd-2.2.0-backspace-1.patch

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