Files
core/system/base/kbd/files/mandriva/kbd-1.15-mandriva.patch
2015-02-24 11:18:35 +02:00

512 lines
19 KiB
Diff

diff -p -up kbd-1.15/data/keymaps/i386/include/azerty-layout.inc.orig kbd-1.15/data/keymaps/i386/include/azerty-layout.inc
--- kbd-1.15/data/keymaps/i386/include/azerty-layout.inc.orig 2008-10-23 17:03:58.000000000 -0200
+++ kbd-1.15/data/keymaps/i386/include/azerty-layout.inc 2009-10-09 15:05:03.000000000 -0300
@@ -28,3 +28,6 @@ keycode 47 = v
keycode 48 = b
keycode 49 = n
#
+include "euro"
+include "windowkeys"
+include "compose"
diff -p -up kbd-1.15/data/keymaps/i386/include/euro.inc.orig kbd-1.15/data/keymaps/i386/include/euro.inc
--- kbd-1.15/data/keymaps/i386/include/euro.inc.orig 2009-10-09 15:05:03.000000000 -0300
+++ kbd-1.15/data/keymaps/i386/include/euro.inc 2009-10-09 15:05:03.000000000 -0300
@@ -0,0 +1,11 @@
+# Euro and cent
+# [Say: "loadkeys euro" to get Euro and cent with Alt on the positions
+# where many keyboards have E and C.
+# To get it displayed, use a latin0 (i.e., latin9) font.]
+
+#
+# keysyms can't be used as they are locale dependent
+#
+
+altgr keycode 18 = 0xa4 # currency
+altgr keycode 46 = 0xa2 # cent
diff -p -up kbd-1.15/data/keymaps/i386/include/linux-with-alt-and-altgr.inc.orig kbd-1.15/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
--- kbd-1.15/data/keymaps/i386/include/linux-with-alt-and-altgr.inc.orig 2008-10-23 17:03:58.000000000 -0200
+++ kbd-1.15/data/keymaps/i386/include/linux-with-alt-and-altgr.inc 2009-10-09 15:05:03.000000000 -0300
@@ -27,3 +27,5 @@ altgr keycode 81 = Hex_3
altgr keycode 82 = Hex_0
altgr keycode 96 = Hex_F
altgr keycode 98 = Hex_B
+
+include "compose"
diff -p -up kbd-1.15/data/keymaps/i386/include/qwerty-layout.inc.orig kbd-1.15/data/keymaps/i386/include/qwerty-layout.inc
--- kbd-1.15/data/keymaps/i386/include/qwerty-layout.inc.orig 2008-10-23 17:03:58.000000000 -0200
+++ kbd-1.15/data/keymaps/i386/include/qwerty-layout.inc 2009-10-09 15:05:03.000000000 -0300
@@ -28,4 +28,6 @@ keycode 48 = b
keycode 49 = n
keycode 50 = m
#
+include "euro"
+include "windowkeys"
include "compose"
diff -p -up kbd-1.15/data/keymaps/i386/include/qwerty-layout-jp.inc.orig kbd-1.15/data/keymaps/i386/include/qwerty-layout-jp.inc
--- kbd-1.15/data/keymaps/i386/include/qwerty-layout-jp.inc.orig 2009-10-09 15:05:25.000000000 -0300
+++ kbd-1.15/data/keymaps/i386/include/qwerty-layout-jp.inc 2009-10-09 15:05:39.000000000 -0300
@@ -0,0 +1,32 @@
+# qwerty-layout
+keycode 16 = q
+keycode 17 = w
+keycode 18 = e
+keycode 19 = r
+keycode 20 = t
+keycode 21 = y
+keycode 22 = u
+keycode 23 = i
+keycode 24 = o
+keycode 25 = p
+#
+keycode 30 = a
+keycode 31 = s
+keycode 32 = d
+keycode 33 = f
+keycode 34 = g
+keycode 35 = h
+keycode 36 = j
+keycode 37 = k
+keycode 38 = l
+#
+keycode 44 = z
+keycode 45 = x
+keycode 46 = c
+keycode 47 = v
+keycode 48 = b
+keycode 49 = n
+keycode 50 = m
+#
+include "windowkeys"
+include "compose"
diff -p -up kbd-1.15/data/keymaps/i386/include/qwertz-layout.inc.orig kbd-1.15/data/keymaps/i386/include/qwertz-layout.inc
--- kbd-1.15/data/keymaps/i386/include/qwertz-layout.inc.orig 2008-10-23 17:03:58.000000000 -0200
+++ kbd-1.15/data/keymaps/i386/include/qwertz-layout.inc 2009-10-09 15:05:03.000000000 -0300
@@ -28,4 +28,6 @@ keycode 48 = b
keycode 49 = n
keycode 50 = m
#
+include "euro"
+include "windowkeys"
include "compose"
diff -p -up kbd-1.15/data/keymaps/i386/include/windowkeys.inc.orig kbd-1.15/data/keymaps/i386/include/windowkeys.inc
--- kbd-1.15/data/keymaps/i386/include/windowkeys.inc.orig 2009-10-09 15:05:03.000000000 -0300
+++ kbd-1.15/data/keymaps/i386/include/windowkeys.inc 2009-10-09 15:05:03.000000000 -0300
@@ -0,0 +1,6 @@
+# Extra 105 windows keys
+
+keycode 125 = Decr_Console
+keycode 126 = Incr_Console
+keycode 127 = Compose
+
diff -p -up kbd-1.15/data/keymaps/i386/qwerty/jp106.map.orig kbd-1.15/data/keymaps/i386/qwerty/jp106.map
--- kbd-1.15/data/keymaps/i386/qwerty/jp106.map.orig 2008-10-23 17:03:59.000000000 -0200
+++ kbd-1.15/data/keymaps/i386/qwerty/jp106.map 2009-10-09 15:06:12.000000000 -0300
@@ -5,7 +5,7 @@
#
keymaps 0-1,4-5,8-9,12
alt_is_meta
-include "qwerty-layout"
+include "qwerty-layout-jp"
include "linux-with-two-alt-keys"
strings as usual
compose as usual for "iso-8859-1"
@@ -64,5 +64,7 @@ keycode 89 = backslash underscor
keycode 92 = space
keycode 94 = space
keycode 97 = Control
+keycode 111 = Remove
+ control alt keycode 111 = Boot
keycode 124 = backslash bar
control keycode 124 = Control_backslash
diff -p -up kbd-1.15/data/keymaps/sun/meta_keys.inc.orig kbd-1.15/data/keymaps/sun/meta_keys.inc
--- kbd-1.15/data/keymaps/sun/meta_keys.inc.orig 2009-10-09 15:05:03.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/meta_keys.inc 2009-10-09 15:05:03.000000000 -0300
@@ -0,0 +1,10 @@
+#
+# defined the Meta keys to be consistent with PC keyboards
+#
+
+# Left Meta-key, unused at this time
+keycode 0x78 = Decr_Console
+# Right Meta-key, again unused
+keycode 0x7a = Incr_Console
+# Compose key
+keycode 0x43 = Compose
diff -p -up kbd-1.15/data/keymaps/sun/sundvorak.map.orig kbd-1.15/data/keymaps/sun/sundvorak.map
--- kbd-1.15/data/keymaps/sun/sundvorak.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sundvorak.map 2009-10-09 15:05:03.000000000 -0300
@@ -1,6 +1,7 @@
# Dvorak keyboard map for the
# Sun Type4/Type5 keyboards found on SparcStations
keymaps 0-2,4-5,8,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
#
@@ -168,9 +169,8 @@ keycode 0x41 = backslash bar
alt keycode 0x41 = Meta_backslash
keycode 0x42 = Delete Delete
control keycode 0x42 = BackSpace
- alt keycode 0x43 = Meta_Delete
+ alt keycode 0x42 = Meta_Delete
control alt keycode 0x42 = Boot
-keycode 0x43 = Compose
keycode 0x44 = KP_7
alt keycode 0x44 = Ascii_7
altgr keycode 0x44 = Hex_7
@@ -262,13 +262,9 @@ keycode 0x74 =
keycode 0x75 =
keycode 0x76 = Help
keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
keycode 0x79 = space space
control keycode 0x79 = nul
alt keycode 0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
keycode 0x7b = Next
shift keycode 0x7b = Scroll_Forward
# No keys produce the following
diff -p -up kbd-1.15/data/keymaps/sun/sunkeymap.map.orig kbd-1.15/data/keymaps/sun/sunkeymap.map
--- kbd-1.15/data/keymaps/sun/sunkeymap.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sunkeymap.map 2009-10-09 15:05:03.000000000 -0300
@@ -1,6 +1,7 @@
# Keyboard map for the Sun Type4/Type5 keyboards
# found on SparcStations
keymaps 0-2,4-5,8,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
#
@@ -164,7 +165,6 @@ keycode 0x42 = Delete Delete
control keycode 0x42 = BackSpace
alt keycode 0x42 = Meta_Delete
control alt keycode 0x42 = Boot
-keycode 0x43 = Compose
keycode 0x44 = KP_7
alt keycode 0x44 = Ascii_7
altgr keycode 0x44 = Hex_7
@@ -262,13 +262,9 @@ keycode 0x74 =
keycode 0x75 =
keycode 0x76 = Help
keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
keycode 0x79 = space space
control keycode 0x79 = nul
alt keycode 0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
keycode 0x7b = Next
shift keycode 0x7b = Scroll_Forward
# No keys produce the following
diff -p -up kbd-1.15/data/keymaps/sun/sun-pl-altgraph.map.orig kbd-1.15/data/keymaps/sun/sun-pl-altgraph.map
--- kbd-1.15/data/keymaps/sun/sun-pl-altgraph.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sun-pl-altgraph.map 2009-10-09 15:05:03.000000000 -0300
@@ -2,6 +2,7 @@
# found on SparcStations
# Polish version - 1998 rzm@icm.edu.pl
keymaps 0-5,8,12
+include "meta_keys"
#
#
# Stop/L1
@@ -165,9 +166,8 @@ keycode 0x41 = bracketright braceright a
alt keycode 0x41 = Meta_bracketright
keycode 0x42 = Delete Delete
control keycode 0x42 = BackSpace
- alt keycode 0x43 = Meta_Delete
+ alt keycode 0x42 = Meta_Delete
control alt keycode 0x42 = Boot
-keycode 0x43 = Compose
keycode 0x44 = KP_7
alt keycode 0x44 = Ascii_7
altgr keycode 0x44 = Hex_7
@@ -279,13 +279,9 @@ keycode 0x74 =
keycode 0x75 =
keycode 0x76 = Help
keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
keycode 0x79 = space space
control keycode 0x79 = nul
alt keycode 0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
keycode 0x7b = Next
shift keycode 0x7b = Scroll_Forward
# No keys produce the following
diff -p -up kbd-1.15/data/keymaps/sun/sun-pl.map.orig kbd-1.15/data/keymaps/sun/sun-pl.map
--- kbd-1.15/data/keymaps/sun/sun-pl.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sun-pl.map 2009-10-09 15:05:03.000000000 -0300
@@ -5,6 +5,7 @@
# 19980221 Meta_R used as CtrlR
#
keymaps 0-5,8,12,128-129
+include "meta_keys"
#
#
# Stop/L1
@@ -172,9 +173,8 @@ keycode 0x41 = bracketright braceright a
alt keycode 0x41 = Meta_bracketright
keycode 0x42 = Delete Delete
control keycode 0x42 = BackSpace
- alt keycode 0x43 = Meta_Delete
+ alt keycode 0x42 = Meta_Delete
control alt keycode 0x42 = Boot
-keycode 0x43 = Compose
keycode 0x44 = KP_7
alt keycode 0x44 = Ascii_7
AltGr keycode 0x44 = Hex_7
@@ -300,8 +300,6 @@ keycode 0x74 =
keycode 0x75 =
keycode 0x76 = Help
keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
keycode 0x79 = space space
control keycode 0x79 = nul
alt keycode 0x79 = Meta_space
diff -p -up kbd-1.15/data/keymaps/sun/sunt4-es.map.orig kbd-1.15/data/keymaps/sun/sunt4-es.map
--- kbd-1.15/data/keymaps/sun/sunt4-es.map.orig 2008-10-23 17:03:59.000000000 -0200
+++ kbd-1.15/data/keymaps/sun/sunt4-es.map 2009-10-09 15:05:03.000000000 -0300
@@ -3,6 +3,7 @@
# Antoni Pàmies Olivé <toni@readysoft.net>
#
keymaps 0-2,4-5,8-9,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
@@ -157,8 +158,7 @@ keycode 65 = plus asterisk as
alt keycode 65 = Meta_bracketright
keycode 66 = Delete Delete
control keycode 66 = BackSpace
-keycode 67 = Compose
- alt keycode 67 = Meta_Delete
+ alt keycode 66 = Meta_Delete
keycode 68 = KP_7
altgr keycode 68 = Hex_7
alt keycode 68 = Ascii_7
@@ -245,11 +245,9 @@ keycode 116 =
keycode 117 =
keycode 118 = Help
keycode 119 = Control
-keycode 120 =
keycode 121 = space space
control keycode 121 = nul
alt keycode 121 = Meta_space
-keycode 122 =
keycode 123 = Next
shift keycode 123 = Scroll_Forward
keycode 124 = less greater
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-cz-us.map.orig kbd-1.15/data/keymaps/sun/sunt5-cz-us.map
--- kbd-1.15/data/keymaps/sun/sunt5-cz-us.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sunt5-cz-us.map 2009-10-09 15:05:03.000000000 -0300
@@ -9,6 +9,7 @@
# Supports Euro: AltGr+E is Euro, AltGr+C is Cent (in US keymap only),
# Compose e = is Euro.
keymaps 0-5,8,12,64-79
+include "meta_keys"
strings as usual
charset "iso-8859-2"
#
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-de-latin1.map.orig kbd-1.15/data/keymaps/sun/sunt5-de-latin1.map
--- kbd-1.15/data/keymaps/sun/sunt5-de-latin1.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sunt5-de-latin1.map 2009-10-09 15:05:03.000000000 -0300
@@ -2,6 +2,7 @@
# Fri Oct 25 1996, Wolfgang Szöcs <wolfi@tfh-berlin.de>
#
keymaps 0-2,4-5,8,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
@@ -150,8 +151,7 @@ keycode 65 = plus asterisk as
alt keycode 65 = Meta_bracketright
keycode 66 = Delete Delete
control keycode 66 = BackSpace
-keycode 67 = Compose
- alt keycode 67 = Meta_Delete
+ alt keycode 66 = Meta_Delete
keycode 68 = KP_7
altgr keycode 68 = Hex_7
alt keycode 68 = Ascii_7
@@ -236,11 +236,9 @@ keycode 116 =
keycode 117 =
keycode 118 = Help
keycode 119 = Caps_Lock
-keycode 120 =
keycode 121 = space space
control keycode 121 = nul
alt keycode 121 = Meta_space
-keycode 122 =
keycode 123 = Next
shift keycode 123 = Scroll_Forward
keycode 124 = less greater bar
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-es.map.orig kbd-1.15/data/keymaps/sun/sunt5-es.map
--- kbd-1.15/data/keymaps/sun/sunt5-es.map.orig 2008-10-23 17:03:59.000000000 -0200
+++ kbd-1.15/data/keymaps/sun/sunt5-es.map 2009-10-09 15:05:03.000000000 -0300
@@ -7,6 +7,7 @@
# Julio Sanchez <jsanchez@gmv.es>
#
keymaps 0-2,4-5,8-9,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
@@ -163,8 +164,7 @@ keycode 65 = plus asterisk br
alt keycode 65 = Meta_bracketright
keycode 66 = Delete Delete
control keycode 66 = BackSpace
-keycode 67 = Compose
- alt keycode 67 = Meta_Delete
+ alt keycode 66 = Meta_Delete
keycode 68 = KP_7
altgr keycode 68 = Hex_7
alt keycode 68 = Ascii_7
@@ -251,11 +251,9 @@ keycode 116 =
keycode 117 =
keycode 118 = Help
keycode 119 = Caps_Lock
-keycode 120 =
keycode 121 = space space
control keycode 121 = nul
alt keycode 121 = Meta_space
-keycode 122 =
keycode 123 = Next
shift keycode 123 = Scroll_Forward
keycode 124 = less greater
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-fi-latin1.map.orig kbd-1.15/data/keymaps/sun/sunt5-fi-latin1.map
--- kbd-1.15/data/keymaps/sun/sunt5-fi-latin1.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sunt5-fi-latin1.map 2009-10-09 15:05:03.000000000 -0300
@@ -5,6 +5,7 @@
# $Id: sun5-fi-latin1.map,v 1.2 1997/01/09 09:03:59 mesrik Exp $
#
keymaps 0-2,4-5,8,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
@@ -153,8 +154,7 @@ keycode 65 = dead_diaeresis dead_ci
alt keycode 65 = Meta_bracketright
keycode 66 = Delete Delete
control keycode 66 = BackSpace
-keycode 67 = Compose
- alt keycode 67 = Meta_Delete
+ alt keycode 66 = Meta_Delete
keycode 68 = KP_7
altgr keycode 68 = Hex_7
alt keycode 68 = Ascii_7
@@ -239,12 +239,9 @@ keycode 116 =
keycode 117 =
keycode 118 = Help
keycode 119 = Caps_Lock
-keycode 120 =
-keycode 120 =
keycode 121 = space space
control keycode 121 = nul
alt keycode 121 = Meta_space
-keycode 122 =
keycode 123 = Next
shift keycode 123 = Scroll_Forward
keycode 124 = less greater bar
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-fr-latin1.map.orig kbd-1.15/data/keymaps/sun/sunt5-fr-latin1.map
--- kbd-1.15/data/keymaps/sun/sunt5-fr-latin1.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sunt5-fr-latin1.map 2009-10-09 15:05:03.000000000 -0300
@@ -1,6 +1,7 @@
# Keyboard map for the Sun Type4/Type5 keyboards
# found on SparcStations
keymaps 0-2,4-5,8,12
+include "meta_keys"
strings as usual
compose as usual for "iso-8859-1"
#
@@ -165,7 +166,6 @@ keycode 0x42 = Delete Delete
control keycode 0x42 = BackSpace
alt keycode 0x43 = Meta_Delete
control alt keycode 0x42 = Boot
-keycode 0x43 = Compose
keycode 0x44 = KP_7
alt keycode 0x44 = Ascii_7
altgr keycode 0x44 = Hex_7
@@ -263,13 +263,9 @@ keycode 0x74 =
keycode 0x75 =
keycode 0x76 = Help
keycode 0x77 = Caps_Lock
-# A True Meta-key, unused at this time
-keycode 0x78 =
keycode 0x79 = space space
control keycode 0x79 = nul
alt keycode 0x79 = Meta_space
-# Another real Meta-key, again unused
-keycode 0x7a =
keycode 0x7b = Next
shift keycode 0x7b = Scroll_Forward
keycode 0x7c = less greater
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-ru.map.orig kbd-1.15/data/keymaps/sun/sunt5-ru.map
--- kbd-1.15/data/keymaps/sun/sunt5-ru.map.orig 2008-10-23 17:03:59.000000000 -0200
+++ kbd-1.15/data/keymaps/sun/sunt5-ru.map 2009-10-09 15:05:03.000000000 -0300
@@ -5,6 +5,7 @@
# Uses KOI8-R coding without 'jo'
#
keymaps 0-6,8,10,12,14
+include "meta_keys"
keycode 1 =
keycode 2 =
keycode 3 =
@@ -231,7 +232,6 @@ keycode 65 = bracketright bracerigh
keycode 66 = Remove
control alt keycode 66 = Boot
altgr control alt keycode 66 = Boot
-keycode 67 =
keycode 68 = KP_7
alt keycode 68 = Ascii_7
altgr alt keycode 68 = Ascii_7
@@ -367,13 +367,11 @@ keycode 116 =
keycode 117 =
keycode 118 = Help
keycode 119 = Caps_Lock
-keycode 120 =
keycode 121 = space
control keycode 121 = nul
alt keycode 121 = Meta_space
altgr control keycode 121 = nul
altgr alt keycode 121 = Meta_space
-keycode 122 =
keycode 123 = Next
shift keycode 123 = Scroll_Forward
altgr shift keycode 123 = Scroll_Forward
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-uk.map.orig kbd-1.15/data/keymaps/sun/sunt5-uk.map
--- kbd-1.15/data/keymaps/sun/sunt5-uk.map.orig 2008-10-23 17:03:59.000000000 -0200
+++ kbd-1.15/data/keymaps/sun/sunt5-uk.map 2009-10-09 15:05:03.000000000 -0300
@@ -17,6 +17,8 @@
!
! Euro support: AltGr+E is Euro, AltGr+C is Cent.
!
+include "meta_keys"
+
keycode 29 = Escape Escape
alt keycode 29 = Meta_Escape
keycode 30 = one exclam
diff -p -up kbd-1.15/data/keymaps/sun/sunt5-us-cz.map.orig kbd-1.15/data/keymaps/sun/sunt5-us-cz.map
--- kbd-1.15/data/keymaps/sun/sunt5-us-cz.map.orig 2008-06-20 08:36:01.000000000 -0300
+++ kbd-1.15/data/keymaps/sun/sunt5-us-cz.map 2009-10-09 15:05:03.000000000 -0300
@@ -9,6 +9,7 @@
# Supports Euro: AltGr+E is Euro, AltGr+C is Cent (in US keymap only),
# Compose e = is Euro.
keymaps 0-5,8,12,64-79
+include "meta_keys"
strings as usual
charset "iso-8859-2"
#
@@ -350,7 +351,6 @@ keycode 0x42 = Delete Delete
CtrlL control keycode 0x42 = BackSpace
CtrlL alt keycode 0x42 = Meta_Delete
CtrlL control alt keycode 0x42 = Boot
-keycode 0x43 = Compose
keycode 0x44 = KP_7
alt keycode 0x44 = Ascii_7
altgr keycode 0x44 = Hex_7