Update to kbd-1.15

This commit is contained in:
vcrhonek 2009-01-08 14:46:00 +00:00
parent 3c53437073
commit a975bce23e
21 changed files with 215 additions and 1533 deletions

View File

@ -8,3 +8,4 @@ kbd-latarcyrheb-16-fixed.tar.bz2
ro_maps.tar.bz2 ro_maps.tar.bz2
terminus.tar.bz2 terminus.tar.bz2
kbd-1.13wip.tar.gz kbd-1.13wip.tar.gz
kbd-1.15.tar.gz

View File

@ -1,52 +0,0 @@
diff -up /dev/null kbd-1.12/data/keymaps/i386/include/compose.inc
--- /dev/null 2008-08-23 19:55:25.045687917 +0200
+++ kbd-1.12/data/keymaps/i386/include/compose.inc 2008-09-08 17:23:50.000000000 +0200
@@ -0,0 +1,8 @@
+# We map the PrintScreen key (useless) and Alt+AltGr to the Compose key...
+# A really useful thing not found on normal keyboards. :/
+#
+# (c) 2001 Bernhard Rosenkränzer <bero@arklinux.org>
+
+keycode 99 = Compose # SysRq/PrintScrn
+keycode 100 = AltGr
+alt keycode 100 = Compose
diff -up kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc.compose kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc
--- kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc.compose 2002-10-11 13:08:50.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/include/qwertz-layout.inc 2008-09-08 17:23:50.000000000 +0200
@@ -28,3 +28,4 @@ keycode 48 = b
keycode 49 = n
keycode 50 = m
#
+include "compose"
diff -up kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc.compose kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc
--- kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc.compose 2002-10-11 13:08:50.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/include/qwerty-layout.inc 2008-09-08 17:23:50.000000000 +0200
@@ -28,3 +28,4 @@ keycode 48 = b
keycode 49 = n
keycode 50 = m
#
+include "compose"
diff -up kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc.compose kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc
--- kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc.compose 2002-10-13 02:14:06.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/include/linux-keys-bare.inc 2008-09-08 17:23:50.000000000 +0200
@@ -148,7 +148,8 @@ control alt keycode 111 = Boot
# The three system keys
#
keycode 84 = Last_Console # Alt+SysRq/PrintScrn
-keycode 99 = VoidSymbol # SysRq/PrintScrn
+#keycode 99 = VoidSymbol # SysRq/PrintScrn
+keycode 99 = Compose # SysRq/PrintScrn
alt keycode 99 = Control_backslash
control keycode 99 = Control_backslash
diff -up kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc.compose kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
--- kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc.compose 2002-10-11 13:08:50.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/include/linux-with-alt-and-altgr.inc 2008-09-08 17:23:50.000000000 +0200
@@ -1,6 +1,7 @@
include "linux-keys-bare"
keycode 100 = AltGr
+alt keycode 100 = Compose
altgr keycode 70 = Show_Registers
alt keycode 70 = Scroll_Lock

View File

@ -1,899 +0,0 @@
diff -up kbd-1.12/data/keymaps/i386/qwerty/ru.map.rukbd kbd-1.12/data/keymaps/i386/qwerty/ru.map
--- kbd-1.12/data/keymaps/i386/qwerty/ru.map.rukbd 2002-10-13 02:02:19.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/qwerty/ru.map 2008-09-18 12:18:06.000000000 +0200
@@ -1,287 +1,609 @@
-! Russian Cyrillic keyboard.map. "Cyrillic" mode is toggled by
-! Right_Ctrl key and shifted by AltGr key.
-keymaps 0-4,6,8,10,12
-strings as usual
+# ru-uni_ct_sh.kmap is a Russian UTF-8 keymap for a 102 key keyboard.
+#
+# WARNING: This keymap contain only Russian characters (GOST 19768-74).
+#
+# Both Ctrl+Shift is used to change rus/lat
+#
+# Made by Sergey A. Sukiyazov <corwin@micom.don.ru>
+# Engenering Center Micom Ltd., Russia, Rostov-on-Don
+#
+#-------------------------------------------------------------------------------
+ keycode 0 =
+ keycode 1 = Escape
+ shift keycode 1 = Escape
+ alt keycode 1 = Meta_Escape
+altgr keycode 1 = Escape
+altgr shift keycode 1 = Escape
+altgr alt keycode 1 = Meta_Escape
+ keycode 2 = one
+ shift keycode 2 = exclam
+ alt keycode 2 = Meta_one
+ shift alt keycode 2 = Meta_exclam
+altgr keycode 2 = one
+altgr shift keycode 2 = exclam
+altgr alt keycode 2 = Meta_one
+altgr shift alt keycode 2 = Meta_exclam
+ keycode 3 = two
+ shift keycode 3 = at
+ alt keycode 3 = Meta_two
+ shift alt keycode 3 = Meta_at
+ control keycode 3 = nul
+altgr keycode 3 = two
+altgr shift keycode 3 = quotedbl
+altgr alt keycode 3 = Meta_two
+altgr shift alt keycode 3 = Meta_at
+altgr control keycode 3 = nul
+ keycode 4 = three
+ shift keycode 4 = numbersign
+ alt keycode 4 = Meta_three
+ shift alt keycode 4 = Meta_numbersign
+ control keycode 4 = Escape
+altgr keycode 4 = three
+altgr shift keycode 4 = numbersign
+altgr alt keycode 4 = Meta_three
+altgr shift alt keycode 4 = Meta_numbersign
+altgr control keycode 4 = Escape
+ keycode 5 = four
+ shift keycode 5 = dollar
+ alt keycode 5 = Meta_four
+ shift alt keycode 5 = Meta_dollar
+ control keycode 5 = Control_backslash
+altgr keycode 5 = four
+altgr shift keycode 5 = semicolon
+altgr alt keycode 5 = Meta_four
+altgr shift alt keycode 5 = Meta_dollar
+altgr control keycode 5 = Control_backslash
+ keycode 6 = five
+ shift keycode 6 = percent
+ alt keycode 6 = Meta_five
+ shift alt keycode 6 = Meta_percent
+ control keycode 6 = Control_bracketright
+altgr keycode 6 = five
+altgr shift keycode 6 = percent
+altgr alt keycode 6 = Meta_five
+altgr shift alt keycode 6 = Meta_percent
+altgr control keycode 6 = Control_bracketright
+ keycode 7 = six
+ shift keycode 7 = asciicircum
+ alt keycode 7 = Meta_six
+ shift alt keycode 7 = Meta_asciicircum
+ control keycode 7 = Control_asciicircum
+altgr keycode 7 = six
+altgr shift keycode 7 = colon
+altgr alt keycode 7 = Meta_six
+altgr shift alt keycode 7 = Meta_asciicircum
+altgr control keycode 7 = Control_asciicircum
+ keycode 8 = seven
+ shift keycode 8 = ampersand
+ alt keycode 8 = Meta_seven
+ shift alt keycode 8 = Meta_ampersand
+ control keycode 8 = Control_underscore
+altgr keycode 8 = seven
+altgr shift keycode 8 = question
+altgr alt keycode 8 = Meta_seven
+altgr shift alt keycode 8 = Meta_ampersand
+altgr control keycode 8 = Control_underscore
+ keycode 9 = eight
+ shift keycode 9 = asterisk
+ alt keycode 9 = Meta_eight
+ shift alt keycode 9 = Meta_asterisk
+ control keycode 9 = Delete
+altgr keycode 9 = eight
+altgr shift keycode 9 = asterisk
+altgr alt keycode 9 = Meta_eight
+altgr shift alt keycode 9 = Meta_asterisk
+altgr control keycode 9 = Delete
+ keycode 10 = nine
+ shift keycode 10 = parenleft
+ alt keycode 10 = Meta_nine
+ shift alt keycode 10 = Meta_parenleft
+altgr keycode 10 = nine
+altgr shift keycode 10 = parenleft
+altgr alt keycode 10 = Meta_nine
+altgr shift alt keycode 10 = Meta_parenleft
+ keycode 11 = zero
+ shift keycode 11 = parenright
+ alt keycode 11 = Meta_zero
+ shift alt keycode 11 = Meta_parenright
+altgr keycode 11 = zero
+altgr shift keycode 11 = parenright
+altgr alt keycode 11 = Meta_zero
+altgr shift alt keycode 11 = Meta_parenright
+ keycode 12 = minus
+ shift keycode 12 = underscore
+ alt keycode 12 = Meta_minus
+ shift alt keycode 12 = Meta_underscore
+ control keycode 12 = Control_underscore
+altgr keycode 12 = minus
+altgr shift keycode 12 = underscore
+altgr alt keycode 12 = Meta_minus
+altgr shift alt keycode 12 = Meta_underscore
+altgr control keycode 12 = Control_underscore
+ keycode 13 = equal
+ shift keycode 13 = plus
+ alt keycode 13 = Meta_equal
+ shift alt keycode 13 = Meta_plus
+altgr keycode 13 = equal
+altgr shift keycode 13 = plus
+altgr alt keycode 13 = Meta_equal
+altgr shift alt keycode 13 = Meta_plus
+ keycode 14 = Delete
+ shift keycode 14 = Delete
+ alt keycode 14 = Meta_Delete
+altgr keycode 14 = Delete
+altgr shift keycode 14 = Delete
+altgr alt keycode 14 = Meta_Delete
+ keycode 15 = Tab
+ shift keycode 15 = Tab
+ alt keycode 15 = Meta_Tab
+altgr keycode 15 = Tab
+altgr shift keycode 15 = Tab
+altgr alt keycode 15 = Meta_Tab
+ keycode 16 = +q
+ shift keycode 16 = +Q
+altgr keycode 16 = U+0439 # CYRILLIC SMALL LETTER SHORT I
+altgr shift keycode 16 = U+0419 # CYRILLIC CAPITAL LETTER SHORT I
+ keycode 17 = +w
+ shift keycode 17 = +W
+altgr keycode 17 = U+0446 # CYRILLIC SMALL LETTER TSE
+altgr shift keycode 17 = U+0426 # CYRILLIC CAPITAL LETTER TSE
+ keycode 18 = +e
+ shift keycode 18 = +E
+altgr keycode 18 = U+0443 # CYRILLIC SMALL LETTER U
+altgr shift keycode 18 = U+0423 # CYRILLIC CAPITAL LETTER U
+ keycode 19 = +r
+ shift keycode 19 = +R
+altgr keycode 19 = U+043A # CYRILLIC SMALL LETTER KA
+altgr shift keycode 19 = U+041A # CYRILLIC CAPITAL LETTER KA
+ keycode 20 = +t
+ shift keycode 20 = +T
+altgr keycode 20 = U+0435 # CYRILLIC SMALL LETTER IE
+altgr shift keycode 20 = U+0415 # CYRILLIC CAPITAL LETTER IE
+ keycode 21 = +y
+ shift keycode 21 = +Y
+altgr keycode 21 = U+043D # CYRILLIC SMALL LETTER EN
+altgr shift keycode 21 = U+041D # CYRILLIC CAPITAL LETTER EN
+ keycode 22 = +u
+ shift keycode 22 = +U
+altgr keycode 22 = U+0433 # CYRILLIC SMALL LETTER GHE
+altgr shift keycode 22 = U+0413 # CYRILLIC CAPITAL LETTER GHE
+ keycode 23 = +i
+ shift keycode 23 = +I
+altgr keycode 23 = U+0448 # CYRILLIC SMALL LETTER SHA
+altgr shift keycode 23 = U+0428 # CYRILLIC CAPITAL LETTER SHA
+ keycode 24 = +o
+ shift keycode 24 = +O
+altgr keycode 24 = U+0449 # CYRILLIC SMALL LETTER SHCHA
+altgr shift keycode 24 = U+0429 # CYRILLIC CAPITAL LETTER SHCHA
+ keycode 25 = +p
+ shift keycode 25 = +P
+altgr keycode 25 = U+0437 # CYRILLIC SMALL LETTER ZE
+altgr shift keycode 25 = U+0417 # CYRILLIC CAPITAL LETTER ZE
+ keycode 26 = bracketleft
+ shift keycode 26 = braceleft
+ alt keycode 26 = Meta_bracketleft
+ control keycode 26 = Escape
+altgr keycode 26 = U+0445 # CYRILLIC SMALL LETTER HA
+altgr shift keycode 26 = U+0425 # CYRILLIC CAPITAL LETTER HA
+altgr alt keycode 26 = Meta_bracketleft
+altgr control keycode 26 = Escape
+ keycode 27 = bracketright
+ shift keycode 27 = braceright
+ alt keycode 27 = Meta_bracketright
+ control keycode 27 = Control_bracketright
+altgr keycode 27 = U+044A # CYRILLIC SMALL LETTER HARD SIGN
+altgr shift keycode 27 = U+042A # CYRILLIC CAPITAL LETTER HARD SIGN
+altgr alt keycode 27 = Meta_bracketright
+altgr control keycode 27 = Control_bracketright
+ keycode 28 = Return
+ shift keycode 28 = Return
+ alt keycode 28 = 0x080d
+ control keycode 28 = Linefeed
+altgr keycode 28 = Return
+altgr shift keycode 28 = Return
+altgr alt keycode 28 = 0x080d
+altgr control keycode 28 = Linefeed
+ keycode 29 = Control
+ shift keycode 29 = AltGr_Lock
+altgr shift keycode 29 = AltGr_Lock
+ keycode 30 = +a
+ shift keycode 30 = +A
+altgr keycode 30 = U+0444 # CYRILLIC SMALL LETTER EF
+altgr shift keycode 30 = U+0424 # CYRILLIC CAPITAL LETTER EF
+ keycode 31 = +s
+ shift keycode 31 = +S
+altgr keycode 31 = U+044B # CYRILLIC SMALL LETTER YERU
+altgr shift keycode 31 = U+042B # CYRILLIC CAPITAL LETTER YERU
+ keycode 32 = +d
+ shift keycode 32 = +D
+altgr keycode 32 = U+0432 # CYRILLIC SMALL LETTER VE
+altgr shift keycode 32 = U+0412 # CYRILLIC CAPITAL LETTER VE
+ keycode 33 = +f
+ shift keycode 33 = +F
+altgr keycode 33 = U+0430 # CYRILLIC SMALL LETTER A
+altgr shift keycode 33 = U+0410 # CYRILLIC CAPITAL LETTER A
+ keycode 34 = +g
+ shift keycode 34 = +G
+altgr keycode 34 = U+043F # CYRILLIC SMALL LETTER PE
+altgr shift keycode 34 = U+041F # CYRILLIC CAPITAL LETTER PE
+ keycode 35 = +h
+ shift keycode 35 = +H
+altgr keycode 35 = U+0440 # CYRILLIC SMALL LETTER ER
+altgr shift keycode 35 = U+0420 # CYRILLIC CAPITAL LETTER ER
+ keycode 36 = +j
+ shift keycode 36 = +J
+altgr keycode 36 = U+043E # CYRILLIC SMALL LETTER O
+altgr shift keycode 36 = U+041E # CYRILLIC CAPITAL LETTER O
+ keycode 37 = +k
+ shift keycode 37 = +K
+altgr keycode 37 = U+043B # CYRILLIC SMALL LETTER EL
+altgr shift keycode 37 = U+041B # CYRILLIC CAPITAL LETTER EL
+ keycode 38 = +l
+ shift keycode 38 = +L
+altgr keycode 38 = U+0434 # CYRILLIC SMALL LETTER DE
+altgr shift keycode 38 = U+0414 # CYRILLIC CAPITAL LETTER DE
+ keycode 39 = semicolon
+ shift keycode 39 = colon
+ alt keycode 39 = Meta_semicolon
+altgr keycode 39 = U+0436 # CYRILLIC SMALL LETTER ZHE
+altgr shift keycode 39 = U+0416 # CYRILLIC CAPITAL LETTER ZHE
+altgr alt keycode 39 = Meta_semicolon
+ keycode 40 = apostrophe
+ shift keycode 40 = quotedbl
+ alt keycode 40 = Meta_apostrophe
+ control keycode 40 = Control_g
+altgr keycode 40 = U+044D # CYRILLIC SMALL LETTER E
+altgr shift keycode 40 = U+042D # CYRILLIC CAPITAL LETTER E
+altgr alt keycode 40 = Meta_apostrophe
+altgr control keycode 40 = Control_g
+ keycode 41 = grave
+ shift keycode 41 = asciitilde
+ alt keycode 41 = Meta_grave
+ control keycode 41 = nul
+altgr keycode 41 = U+0451 # CYRILLIC SMALL LETTER IO
+altgr shift keycode 41 = U+0401 # CYRILLIC CAPITAL LETTER IO
+altgr alt keycode 41 = Meta_grave
+ keycode 42 = Shift
+ control keycode 42 = AltGr_Lock
+altgr control keycode 42 = AltGr_Lock
+ keycode 43 = backslash
+ shift keycode 43 = bar
+ alt keycode 43 = Meta_backslash
+ shift alt keycode 43 = Meta_bar
+ control keycode 43 = Control_backslash
+altgr keycode 43 = backslash
+altgr shift keycode 43 = bar
+altgr alt keycode 43 = Meta_backslash
+altgr shift alt keycode 43 = Meta_bar
+altgr control keycode 43 = Control_backslash
+ keycode 44 = +z
+ shift keycode 44 = +Z
+altgr keycode 44 = U+044F # CYRILLIC SMALL LETTER YA
+altgr shift keycode 44 = U+042F # CYRILLIC CAPITAL LETTER YA
+ keycode 45 = +x
+ shift keycode 45 = +X
+altgr keycode 45 = U+0447 # CYRILLIC SMALL LETTER CHE
+altgr shift keycode 45 = U+0427 # CYRILLIC CAPITAL LETTER CHE
+ keycode 46 = +c
+ shift keycode 46 = +C
+altgr keycode 46 = U+0441 # CYRILLIC SMALL LETTER ES
+altgr shift keycode 46 = U+0421 # CYRILLIC CAPITAL LETTER ES
+ keycode 47 = +v
+ shift keycode 47 = +V
+altgr keycode 47 = U+043C # CYRILLIC SMALL LETTER EM
+altgr shift keycode 47 = U+041C # CYRILLIC CAPITAL LETTER EM
+ keycode 48 = +b
+ shift keycode 48 = +B
+altgr keycode 48 = U+0438 # CYRILLIC SMALL LETTER I
+altgr shift keycode 48 = U+0418 # CYRILLIC CAPITAL LETTER I
+ keycode 49 = +n
+ shift keycode 49 = +N
+altgr keycode 49 = U+0442 # CYRILLIC SMALL LETTER TE
+altgr shift keycode 49 = U+0422 # CYRILLIC CAPITAL LETTER TE
+ keycode 50 = +m
+ shift keycode 50 = +M
+altgr keycode 50 = U+044C # CYRILLIC SMALL LETTER SOFT SIGN
+altgr shift keycode 50 = U+042C # CYRILLIC CAPITAL LETTER SOFT SIGN
+ keycode 51 = comma
+ shift keycode 51 = less
+ alt keycode 51 = Meta_comma
+ shift alt keycode 51 = Meta_less
+altgr keycode 51 = U+0431 # CYRILLIC SMALL LETTER BE
+altgr shift keycode 51 = U+0411 # CYRILLIC CAPITAL LETTER BE
+altgr alt keycode 51 = Meta_comma
+altgr shift alt keycode 51 = Meta_less
+ keycode 52 = period
+ shift keycode 52 = greater
+ alt keycode 52 = Meta_period
+ shift alt keycode 52 = Meta_greater
+altgr keycode 52 = U+044E # CYRILLIC SMALL LETTER YU
+altgr shift keycode 52 = U+042E # CYRILLIC CAPITAL LETTER YU
+altgr alt keycode 52 = Meta_period
+altgr shift alt keycode 52 = Meta_greater
+ keycode 53 = slash
+ shift keycode 53 = question
+ alt keycode 53 = Meta_slash
+ shift alt keycode 53 = Meta_question
+ control keycode 53 = Delete
+altgr keycode 53 = period
+altgr shift keycode 53 = comma
+altgr alt keycode 53 = Meta_slash
+altgr shift alt keycode 53 = Meta_question
+altgr control keycode 53 = Delete
+ keycode 54 = Shift
+ control keycode 54 = AltGr_Lock
+altgr control keycode 54 = AltGr_Lock
+ keycode 55 = KP_Multiply
+ keycode 56 = Alt
+ keycode 57 = space
+ shift keycode 57 = space
+ alt keycode 57 = Meta_space
+ control keycode 57 = nul
+altgr keycode 57 = space
+altgr shift keycode 57 = space
+altgr alt keycode 57 = Meta_space
+altgr control keycode 57 = nul
+ keycode 58 = Caps_Lock
+ keycode 59 = F1
+ shift keycode 59 = F11
+ alt keycode 59 = Console_1
+ control keycode 59 = F1
+ control alt keycode 59 = Console_1
+altgr keycode 59 = F1
+altgr shift keycode 59 = F11
+altgr alt keycode 59 = Console_1
+altgr control keycode 59 = F1
+altgr control alt keycode 59 = Console_1
+ keycode 60 = F2
+ shift keycode 60 = F12
+ alt keycode 60 = Console_2
+ control keycode 60 = F2
+ control alt keycode 60 = Console_2
+altgr keycode 60 = F2
+altgr shift keycode 60 = F12
+altgr alt keycode 60 = Console_2
+altgr control keycode 60 = F2
+altgr control alt keycode 60 = Console_2
+ keycode 61 = F3
+ shift keycode 61 = F13
+ alt keycode 61 = Console_3
+ control keycode 61 = F3
+ control alt keycode 61 = Console_3
+altgr keycode 61 = F3
+altgr shift keycode 61 = F13
+altgr alt keycode 61 = Console_3
+altgr control keycode 61 = F3
+altgr control alt keycode 61 = Console_3
+ keycode 62 = F4
+ shift keycode 62 = F14
+ alt keycode 62 = Console_4
+ control keycode 62 = F4
+ control alt keycode 62 = Console_4
+altgr keycode 62 = F4
+altgr shift keycode 62 = F14
+altgr alt keycode 62 = Console_4
+altgr control keycode 62 = F4
+altgr control alt keycode 62 = Console_4
+ keycode 63 = F5
+ shift keycode 63 = F15
+ alt keycode 63 = Console_5
+ control keycode 63 = F5
+ control alt keycode 63 = Console_5
+altgr keycode 63 = F5
+altgr shift keycode 63 = F15
+altgr alt keycode 63 = Console_5
+altgr control keycode 63 = F5
+altgr control alt keycode 63 = Console_5
+ keycode 64 = F6
+ shift keycode 64 = F16
+ alt keycode 64 = Console_6
+ control keycode 64 = F6
+ control alt keycode 64 = Console_6
+altgr keycode 64 = F6
+altgr shift keycode 64 = F16
+altgr alt keycode 64 = Console_6
+altgr control keycode 64 = F6
+altgr control alt keycode 64 = Console_6
+ keycode 65 = F7
+ shift keycode 65 = F17
+ alt keycode 65 = Console_7
+ control keycode 65 = F7
+ control alt keycode 65 = Console_7
+altgr keycode 65 = F7
+altgr shift keycode 65 = F17
+altgr alt keycode 65 = Console_7
+altgr control keycode 65 = F7
+altgr control alt keycode 65 = Console_7
+ keycode 66 = F8
+ shift keycode 66 = F18
+ alt keycode 66 = Console_8
+ control keycode 66 = F8
+ control alt keycode 66 = Console_8
+altgr keycode 66 = F8
+altgr shift keycode 66 = F18
+altgr alt keycode 66 = Console_8
+altgr control keycode 66 = F8
+altgr control alt keycode 66 = Console_8
+ keycode 67 = F9
+ shift keycode 67 = F19
+ alt keycode 67 = Console_9
+ control keycode 67 = F9
+ control alt keycode 67 = Console_9
+altgr keycode 67 = F9
+altgr shift keycode 67 = F19
+altgr alt keycode 67 = Console_9
+altgr control keycode 67 = F9
+altgr control alt keycode 67 = Console_9
+ keycode 68 = F10
+ shift keycode 68 = F20
+ alt keycode 68 = Console_10
+ control keycode 68 = F10
+ control alt keycode 68 = Console_10
+altgr keycode 68 = F10
+altgr shift keycode 68 = F20
+altgr alt keycode 68 = Console_10
+altgr control keycode 68 = F10
+altgr control alt keycode 68 = Console_10
+ keycode 69 = Num_Lock
+ keycode 70 = Scroll_Lock
+ shift keycode 70 = Show_Memory
+ alt keycode 70 = Show_Registers
+ control keycode 70 = Show_State
+altgr keycode 70 = Scroll_Lock
+altgr shift keycode 70 = Show_Memory
+altgr alt keycode 70 = Show_Registers
+altgr control keycode 70 = Show_State
+ keycode 71 = KP_7
+ alt keycode 71 = Ascii_7
+altgr alt keycode 71 = Ascii_7
+ keycode 72 = KP_8
+ alt keycode 72 = Ascii_8
+altgr alt keycode 72 = Ascii_8
+ keycode 73 = KP_9
+ alt keycode 73 = Ascii_9
+altgr alt keycode 73 = Ascii_9
+ keycode 74 = KP_Subtract
+ keycode 75 = KP_4
+ alt keycode 75 = Ascii_4
+altgr alt keycode 75 = Ascii_4
+ keycode 76 = KP_5
+ alt keycode 76 = Ascii_5
+altgr alt keycode 76 = Ascii_5
+ keycode 77 = KP_6
+ alt keycode 77 = Ascii_6
+altgr alt keycode 77 = Ascii_6
+ keycode 78 = KP_Add
+ keycode 79 = KP_1
+ alt keycode 79 = Ascii_1
+altgr alt keycode 79 = Ascii_1
+ keycode 80 = KP_2
+ alt keycode 80 = Ascii_2
+altgr alt keycode 80 = Ascii_2
+ keycode 81 = KP_3
+ alt keycode 81 = Ascii_3
+altgr alt keycode 81 = Ascii_3
+ keycode 82 = KP_0
+ alt keycode 82 = Ascii_0
+altgr alt keycode 82 = Ascii_0
+ keycode 83 = KP_Period
+ control alt keycode 83 = Boot
+altgr control keycode 83 = Boot
+altgr control alt keycode 83 = Boot
+ keycode 84 = Last_Console
+ keycode 85 =
+ keycode 86 = less
+ shift keycode 86 = greater
+ alt keycode 86 = Meta_less
+altgr keycode 86 = bar
+altgr shift keycode 86 = greater
+altgr alt keycode 86 = Meta_less
+ keycode 87 = F11
+ shift keycode 87 = F11
+ alt keycode 87 = Console_11
+ control keycode 87 = F11
+ control alt keycode 87 = Console_11
+altgr keycode 87 = F11
+altgr shift keycode 87 = F11
+altgr alt keycode 87 = Console_11
+altgr control keycode 87 = F11
+altgr control alt keycode 87 = Console_11
+ keycode 88 = F12
+ shift keycode 88 = F12
+ alt keycode 88 = Console_12
+ control keycode 88 = F12
+ control alt keycode 88 = Console_12
+altgr keycode 88 = F12
+altgr shift keycode 88 = F12
+altgr alt keycode 88 = Console_12
+altgr control keycode 88 = F12
+altgr control alt keycode 88 = Console_12
+ keycode 89 =
+ keycode 90 =
+ keycode 91 =
+ keycode 92 =
+ keycode 93 =
+ keycode 94 =
+ keycode 95 =
+ keycode 96 = KP_Enter
+ keycode 97 = Control
+ shift keycode 97 = AltGr_Lock
+altgr shift keycode 97 = AltGr_Lock
+ keycode 98 = KP_Divide
+ keycode 99 = Control_backslash
+ alt keycode 99 = Control_backslash
+ control keycode 99 = Control_backslash
+altgr keycode 99 = Control_backslash
+altgr alt keycode 99 = Control_backslash
+altgr control keycode 99 = Control_backslash
+ keycode 100 = AltGr
+ keycode 101 = Break
+ keycode 102 = Find
+ keycode 103 = Up
+ keycode 104 = Prior
+ shift keycode 104 = Scroll_Backward
+altgr shift keycode 104 = Scroll_Backward
+ keycode 105 = Left
+ alt keycode 105 = Decr_Console
+altgr alt keycode 105 = Decr_Console
+ keycode 106 = Right
+ alt keycode 106 = Incr_Console
+altgr alt keycode 106 = Incr_Console
+ keycode 107 = Select
+ keycode 108 = Down
+ keycode 109 = Next
+ shift keycode 109 = Scroll_Forward
+altgr shift keycode 109 = Scroll_Forward
+ keycode 110 = Insert
+ keycode 111 = Remove
+ control alt keycode 111 = Boot
+altgr control keycode 111 = Boot
+altgr control alt keycode 111 = Boot
+ keycode 112 =
+ keycode 113 =
+ keycode 114 =
+ keycode 115 =
+ keycode 116 =
+ keycode 117 =
+ keycode 118 =
+ keycode 119 =
+ keycode 120 =
+ keycode 121 =
+ keycode 122 =
+ keycode 123 =
+ keycode 124 =
+ keycode 125 =
+ keycode 126 =
+ keycode 127 =
- keycode 1 = Escape Escape Escape Escape
- alt keycode 1 = Meta_Escape
- keycode 2 = one exclam one exclam
- alt keycode 2 = Meta_one
- keycode 3 = two at two quotedbl
- control keycode 3 = nul
- alt keycode 3 = Meta_two
- keycode 4 = three numbersign three question
- control keycode 4 = Escape
- alt keycode 4 = Meta_three
- keycode 5 = four dollar four semicolon
- control keycode 5 = Control_backslash
- alt keycode 5 = Meta_four
- keycode 6 = five percent five colon
- control keycode 6 = Control_bracketright
- alt keycode 6 = Meta_five
- keycode 7 = six asciicircum six comma
- control keycode 7 = Control_asciicircum
- alt keycode 7 = Meta_six
- keycode 8 = seven ampersand seven period
- control keycode 8 = Control_underscore
- alt keycode 8 = Meta_seven
- keycode 9 = eight asterisk eight asterisk
- control keycode 9 = Delete
- alt keycode 9 = Meta_eight
- keycode 10 = nine parenleft nine parenleft
- alt keycode 10 = Meta_nine
- keycode 11 = zero parenright zero parenright
- alt keycode 11 = Meta_zero
- keycode 12 = minus underscore minus underscore
- control keycode 12 = Control_underscore
- alt keycode 12 = Meta_minus
- keycode 13 = equal plus equal plus
- alt keycode 13 = Meta_equal
- keycode 14 = BackSpace BackSpace BackSpace BackSpace
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
- alt keycode 15 = Meta_Tab
- keycode 16 = +q +Q +202 +234
- control keycode 16 = Control_q
-altgr control keycode 16 = Control_q
- keycode 17 = +w +W +195 +227
- control keycode 17 = Control_w
-altgr control keycode 17 = Control_w
- keycode 18 = +e +E +213 +245
- control keycode 18 = Control_e
-altgr control keycode 18 = Control_e
- keycode 19 = +r +R +203 +235
- control keycode 19 = Control_r
-altgr control keycode 19 = Control_r
- keycode 20 = +t +T +197 +229
- control keycode 20 = Control_t
-altgr control keycode 20 = Control_t
- keycode 21 = +y +Y +206 +238
- control keycode 21 = Control_y
-altgr control keycode 21 = Control_y
- keycode 22 = +u +U +199 +231
- control keycode 22 = Control_u
-altgr control keycode 22 = Control_u
- keycode 23 = +i +I +219 +251
- control keycode 23 = Tab
-altgr control keycode 23 = Tab
- keycode 24 = +o +O +221 +253
- control keycode 24 = Control_o
-altgr control keycode 24 = Control_o
- keycode 25 = +p +P +218 +250
- control keycode 25 = Control_p
-altgr control keycode 25 = Control_p
- keycode 26 = bracketleft braceleft +200 +232
- control keycode 26 = Escape
-altgr control keycode 26 = Escape
- alt keycode 26 = Meta_bracketleft
- keycode 27 = bracketright braceright bracketleft bracketright
- control keycode 27 = Control_bracketright
-altgr control keycode 27 = Control_bracketright
- alt keycode 27 = Meta_bracketright
- keycode 28 = Return
- alt keycode 28 = Meta_Control_m
- keycode 29 = Control
- keycode 30 = +a +A +198 +230
- control keycode 30 = Control_a
-altgr control keycode 30 = Control_a
- keycode 31 = +s +S +217 +249
- control keycode 31 = Control_s
-altgr control keycode 31 = Control_s
- keycode 32 = +d +D +215 +247
- control keycode 32 = Control_d
-altgr control keycode 32 = Control_d
- keycode 33 = +f +F +193 +225
- control keycode 33 = Control_f
-altgr control keycode 33 = Control_f
- keycode 34 = +g +G +208 +240
- control keycode 34 = Control_g
-altgr control keycode 34 = Control_g
- keycode 35 = +h +H +210 +242
- control keycode 35 = BackSpace
-altgr control keycode 35 = BackSpace
- keycode 36 = +j +J +207 +239
- control keycode 36 = Linefeed
-altgr control keycode 36 = Linefeed
- keycode 37 = +k +K +204 +236
- control keycode 37 = Control_k
-altgr control keycode 37 = Control_k
- keycode 38 = +l +L +196 +228
- control keycode 38 = Control_l
-altgr control keycode 38 = Control_l
- keycode 39 = semicolon colon +214 +246
- alt keycode 39 = Meta_semicolon
- keycode 40 = apostrophe quotedbl +220 +252
- control keycode 40 = Control_g
-altgr control keycode 40 = Control_g
- alt keycode 40 = Meta_apostrophe
- keycode 41 = grave asciitilde +223 +255
- control keycode 41 = nul
- alt keycode 41 = Meta_grave
- keycode 42 = Shift
- keycode 43 = backslash bar backslash bar
- control keycode 43 = Control_backslash
- alt keycode 43 = Meta_backslash
- keycode 44 = +z +Z +209 +241
- control keycode 44 = Control_z
-altgr control keycode 44 = Control_z
- keycode 45 = +x +X +222 +254
- control keycode 45 = Control_x
-altgr control keycode 45 = Control_x
- keycode 46 = +c +C +211 +243
- control keycode 46 = Control_c
-altgr control keycode 46 = Control_c
- keycode 47 = +v +V +205 +237
- control keycode 47 = Control_v
-altgr control keycode 47 = Control_v
- keycode 48 = +b +B +201 +233
- control keycode 48 = Control_b
-altgr control keycode 48 = Control_b
- keycode 49 = +n +N +212 +244
- control keycode 49 = Control_n
-altgr control keycode 49 = Control_n
- keycode 50 = +m +M +216 +248
- control keycode 50 = Control_m
-altgr control keycode 50 = Control_m
- keycode 51 = comma less +194 +226
- alt keycode 51 = Meta_comma
- keycode 52 = period greater +192 +224
- alt keycode 52 = Meta_period
- keycode 53 = slash question +163 +179
- control keycode 53 = Delete
- alt keycode 53 = Meta_slash
- keycode 54 = Shift
- keycode 55 = KP_Multiply
- keycode 56 = Alt
- keycode 57 = space space space space
- control keycode 57 = nul
- alt keycode 57 = Meta_space
- keycode 58 = Caps_Lock
- keycode 59 = F1 F11 F1 F11
- control keycode 59 = F1
- alt keycode 59 = Console_1
-altgr alt keycode 59 = Console_1
- keycode 60 = F2 F12 F2 F12
- control keycode 60 = F2
- alt keycode 60 = Console_2
-altgr alt keycode 60 = Console_2
- keycode 61 = F3 F13 F3 F13
- control keycode 61 = F3
- alt keycode 61 = Console_3
-altgr alt keycode 61 = Console_3
- keycode 62 = F4 F14 F4 F14
- control keycode 62 = F4
- alt keycode 62 = Console_4
-altgr alt keycode 62 = Console_4
- keycode 63 = F5 F15 F5 F15
- control keycode 63 = F5
- alt keycode 63 = Console_5
-altgr alt keycode 63 = Console_5
- keycode 64 = F6 F16 F6 F16
- control keycode 64 = F6
- alt keycode 64 = Console_6
-altgr alt keycode 64 = Console_6
- keycode 65 = F7 F17 F7 F17
- control keycode 65 = F7
- alt keycode 65 = Console_7
-altgr alt keycode 65 = Console_7
- keycode 66 = F8 F18 F8 F18
- control keycode 66 = F8
- alt keycode 66 = Console_8
-altgr alt keycode 66 = Console_8
- keycode 67 = F9 F19 F9 F19
- control keycode 67 = F9
- alt keycode 67 = Console_9
-altgr alt keycode 67 = Console_9
- keycode 68 = F10 F20 F10 F20
- control keycode 68 = F10
- alt keycode 68 = Console_10
-altgr alt keycode 68 = Console_10
- keycode 69 = Num_Lock
- keycode 70 = Scroll_Lock Show_Memory Show_Registers
- control keycode 70 = Show_State
- alt keycode 70 = Scroll_Lock
- keycode 71 = KP_7
- alt keycode 71 = Ascii_7
- keycode 72 = KP_8
- alt keycode 72 = Ascii_8
- keycode 73 = KP_9
- alt keycode 73 = Ascii_9
- keycode 74 = KP_Subtract
- keycode 75 = KP_4
- alt keycode 75 = Ascii_4
- keycode 76 = KP_5
- alt keycode 76 = Ascii_5
- keycode 77 = KP_6
- alt keycode 77 = Ascii_6
- keycode 78 = KP_Add
- keycode 79 = KP_1
- alt keycode 79 = Ascii_1
- keycode 80 = KP_2
- alt keycode 80 = Ascii_2
- keycode 81 = KP_3
- alt keycode 81 = Ascii_3
- keycode 82 = KP_0
- alt keycode 82 = Ascii_0
- keycode 83 = KP_Period
-altgr control keycode 83 = Boot
-control alt keycode 83 = Boot
- keycode 84 = Last_Console
- keycode 85 =
- keycode 86 = less greater bar
- alt keycode 86 = Meta_less
- keycode 87 = F11 F11 F11 F11
- control keycode 87 = F11
- alt keycode 87 = Console_11
-altgr alt keycode 87 = Console_11
- keycode 88 = F12 F12 F12 F12
- control keycode 88 = F12
- alt keycode 88 = Console_12
-altgr alt keycode 88 = Console_12
- keycode 89 =
- keycode 90 =
- keycode 91 =
- keycode 92 =
- keycode 93 =
- keycode 94 =
- keycode 95 =
- keycode 96 = KP_Enter
- keycode 97 = AltGr_Lock
- keycode 98 = KP_Divide
- keycode 99 = VoidSymbol
- control keycode 99 = Control_backslash
- alt keycode 99 = Control_backslash
- keycode 100 = AltGr
- keycode 101 = Break
- keycode 102 = Find
- keycode 103 = Up
- keycode 104 = Prior
- shift keycode 104 = Scroll_Backward
- keycode 105 = Left
- alt keycode 105 = Decr_Console
- keycode 106 = Right
- alt keycode 106 = Incr_Console
- keycode 107 = Select
- keycode 108 = Down
- keycode 109 = Next
- shift keycode 109 = Scroll_Forward
- keycode 110 = Insert
- keycode 111 = Remove
-altgr control keycode 111 = Boot
-control alt keycode 111 = Boot
- keycode 112 =
- keycode 113 =
- keycode 114 =
- keycode 115 =
- keycode 116 =
- keycode 117 =
- keycode 118 =
- keycode 119 =
- keycode 120 =
- keycode 121 =
- keycode 122 =
- keycode 123 =
- keycode 124 =
- keycode 125 =
- keycode 126 =
- keycode 127 =
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string F21 = ""
+string F22 = ""
+string F23 = ""
+string F24 = ""
+string F25 = ""
+string F26 = ""

View File

@ -1,39 +0,0 @@
diff -up kbd-1.12/src/unicode_start.terminal kbd-1.12/src/unicode_start
--- kbd-1.12/src/unicode_start.terminal 2001-02-12 17:30:17.000000000 +0100
+++ kbd-1.12/src/unicode_start 2008-09-08 17:24:51.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Enables Unicode processing in the current console.
#
# 1. The input side: the keyboard driver.
@@ -25,14 +25,16 @@ dumpkeys | loadkeys --unicode
# Tell the console output driver that the bytes arriving are UTF-8
# encoded multibyte sequences.
-echo -n -e '\033%G'
+if test -t 1 -a -t 2 ; then
+ echo -n -e '\033%G'
+fi
# Tell the graphics card how to display Unicode characters not
# contained in the IBM 437 character set (on PCs). The font should
# have a Unicode map attached, or explicitly specified, e.g.,
# by giving `def.uni' as a second argument.
-DEFAULT_UNICODE_FONT=LatArCyrHeb-16
+DEFAULT_UNICODE_FONT=latarcyrheb-sun16
# Also drdos8x16 is a good candidate.
case $# in
diff -up kbd-1.12/src/unicode_stop.terminal kbd-1.12/src/unicode_stop
--- kbd-1.12/src/unicode_stop.terminal 1997-11-13 14:22:52.000000000 +0100
+++ kbd-1.12/src/unicode_stop 2008-09-08 17:24:51.000000000 +0200
@@ -1,4 +1,6 @@
#!/bin/sh
# stop unicode
kbd_mode -a
-echo -n -e '\033%@'
+if test -t ; then
+ echo -n -e '\033%@'
+fi

View File

@ -1,12 +0,0 @@
diff -up kbd-1.12/src/ksyms.c.Meta_utf8 kbd-1.12/src/ksyms.c
--- kbd-1.12/src/ksyms.c.Meta_utf8 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/ksyms.c 2008-09-18 12:20:02.000000000 +0200
@@ -1710,6 +1710,8 @@ ksymtocode(const char *s) {
keycode = ksymtocode(s+5);
if (KTYP(keycode) == KT_LATIN)
return K(KT_META, KVAL(keycode));
+ else if(prefer_unicode)
+ return (0);
/* fall through to error printf */
}

View File

@ -1,47 +0,0 @@
diff -up kbd-1.12/src/psffontop.c.alias kbd-1.12/src/psffontop.c
--- kbd-1.12/src/psffontop.c.alias 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/psffontop.c 2008-09-18 12:20:55.000000000 +0200
@@ -59,7 +59,6 @@ store_int_le(unsigned char *ip, int num)
static unsigned int
assemble_ucs2(char **inptr, int cnt) {
- unsigned char **in = (unsigned char **) inptr;
unsigned int u1, u2;
if (cnt < 2) {
@@ -68,8 +67,8 @@ assemble_ucs2(char **inptr, int cnt) {
exit(EX_DATAERR);
}
- u1 = *(*in)++;
- u2 = *(*in)++;
+ u1 = (unsigned char)*(*inptr)++;
+ u2 = (unsigned char)*(*inptr)++;
return (u1 | (u2 << 8));
}
@@ -110,7 +109,6 @@ clear_uni_entry(struct unicode_list *up)
*/
static void
get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) {
- unsigned char **in = (unsigned char **) inptr;
unsigned char uc;
unicode unichar;
int inseq = 0;
@@ -126,14 +124,14 @@ get_uni_entry(char **inptr, char **endpt
exit(EX_DATAERR);
}
if (utf8) {
- uc = *(*in)++;
+ uc = *(*inptr)++;
if (uc == PSF2_SEPARATOR)
break;
if (uc == PSF2_STARTSEQ) {
inseq = 1;
continue;
}
- --(*in);
+ --(*inptr);
unichar = assemble_utf8(inptr, *endptr - *inptr);
} else {
unichar = assemble_ucs2(inptr, *endptr - *inptr);

View File

@ -1,57 +0,0 @@
diff -up kbd-1.12/src/findfile.c.dir kbd-1.12/src/findfile.c
--- kbd-1.12/src/findfile.c.dir 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/findfile.c 2008-09-18 12:21:17.000000000 +0200
@@ -92,6 +92,7 @@ findfile_in_dir(char *fnam, char *dir, i
if (d == NULL)
return NULL;
while ((de = readdir(d)) != NULL) {
+ struct stat statbuf;
int okdir;
if (strcmp(de->d_name, ".") == 0 ||
@@ -104,7 +105,6 @@ findfile_in_dir(char *fnam, char *dir, i
okdir = (ff && strcmp(de->d_name, fdir) == 0);
if ((secondpass && recdepth) || okdir) {
- struct stat statbuf;
char *a;
a = xmalloc(strlen(dir) + strlen(de->d_name) + 2);
@@ -136,6 +136,8 @@ findfile_in_dir(char *fnam, char *dir, i
continue;
sprintf(pathname, "%s/%s", dir, de->d_name);
+ if (stat(pathname, &statbuf) != 0 || !S_ISREG(statbuf.st_mode))
+ continue;
/* Does tail consist of a known suffix and possibly
a compression suffix? */
@@ -180,13 +182,16 @@ FILE *findfile(char *fnam, char **dirpat
/* Test for full pathname - opening it failed, so need suffix */
/* (This is just nonsense, for backwards compatibility.) */
if (*fnam == '/') {
+ struct stat statbuf;
+
for (sp = suffixes; *sp; sp++) {
if (strlen(fnam) + strlen(*sp) + 1 > sizeof(pathname))
continue;
if (*sp == 0)
continue; /* we tried it already */
sprintf(pathname, "%s%s", fnam, *sp);
- if((fp = fopen(pathname, "r")) != NULL)
+ if(stat(pathname, &statbuf) == 0 && S_ISREG(statbuf.st_mode)
+ && (fp = fopen(pathname, "r")) != NULL)
return fp;
}
@@ -196,7 +201,9 @@ FILE *findfile(char *fnam, char **dirpat
+ strlen(dc->ext) + 1 > sizeof(pathname))
continue;
sprintf(pathname, "%s%s%s", fnam, *sp, dc->ext);
- if ((fp = fopen(pathname, "r")) != NULL) {
+ if (stat(pathname, &statbuf) == 0
+ && S_ISREG(statbuf.st_mode)
+ && (fp = fopen(pathname, "r")) != NULL) {
fclose(fp);
return pipe_open(dc);
}

View File

@ -1,15 +0,0 @@
diff -up kbd-1.12/po/Makefile.in.gr-el kbd-1.12/po/Makefile.in
--- kbd-1.12/po/Makefile.in.gr-el 2004-01-03 16:46:07.000000000 +0100
+++ kbd-1.12/po/Makefile.in 2008-09-18 12:22:12.000000000 +0200
@@ -34,9 +34,9 @@ INCLUDES = -I.. -I$(INTL)
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
# Enter here all .po files
-POFILES = cs.po da.po de.po es.po fr.po gr.po nl.po pl.po ro.po ru.po sv.po tr.po
+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po ro.po ru.po sv.po tr.po
# the same but with .gmo
-GMOFILES = cs.gmo da.gmo de.gmo es.gmo fr.gmo gr.gmo nl.gmo pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
CATALOGS = $(GMOFILES)
CATOBJEXT = .gmo

View File

@ -1,16 +0,0 @@
diff -up kbd-1.12/src/unicode_start.no-user-map kbd-1.12/src/unicode_start
--- kbd-1.12/src/unicode_start.no-user-map 2008-09-18 12:21:37.000000000 +0200
+++ kbd-1.12/src/unicode_start 2008-09-18 12:21:37.000000000 +0200
@@ -14,12 +14,6 @@
kbd_mode -u
-# Change the keyboard mapping in such a way that the non-ASCII keys
-# produce UTF-8 encoded multibyte sequences, instead of single bytes
-# >= 0x80 in a legacy 8-bit encoding.
-
-dumpkeys | loadkeys --unicode
-
# 2. The output side: the console screen.
# Tell the console output driver that the bytes arriving are UTF-8

View File

@ -1,21 +0,0 @@
diff -up kbd-1.12/src/Makefile.in.nostrip kbd-1.12/src/Makefile.in
--- kbd-1.12/src/Makefile.in.nostrip 2004-01-03 18:53:54.000000000 +0100
+++ kbd-1.12/src/Makefile.in 2008-09-18 12:20:30.000000000 +0200
@@ -72,14 +72,14 @@ old: $(OLDPROGS)
install: all
install -d -m 0755 $(BINDIR) $(LOADKEYS_BINDIR)
- install -s -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
-# install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
+ install -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
+# install -m 0755 $(setowner) $(MISC) $(BINDIR)
install -c -m 0755 $(setowner) $(SHCMDS) $(BINDIR)
for i in psfaddtable psfgettable psfstriptable; do \
rm -f $(BINDIR)/$$i; ln -s psfxtable $(BINDIR)/$$i; \
done
rm -f $(BINDIR)/loadkeys
- install -s -m 0755 $(setowner) loadkeys $(LOADKEYS_BINDIR)
+ install -m 0755 $(setowner) loadkeys $(LOADKEYS_BINDIR)
@echo "You may also want to add psf.magic to /usr/lib/magic"

View File

@ -1,14 +0,0 @@
diff -up kbd-1.12/src/Makefile.in.resizecon-x86 kbd-1.12/src/Makefile.in
--- kbd-1.12/src/Makefile.in.resizecon-x86 2008-09-18 12:23:11.000000000 +0200
+++ kbd-1.12/src/Makefile.in 2008-09-18 12:23:11.000000000 +0200
@@ -43,6 +43,10 @@ ifeq ($(ARCH), i386)
PROGS += resizecons
endif
+ifeq ($(ARCH), x86_64)
+PROGS += resizecons
+endif
+
OLDPROGS= mapscrn loadunimap
# Not installed by default

View File

@ -1,14 +0,0 @@
diff -up kbd-1.12/man/man8/setfont.8.in.man kbd-1.12/man/man8/setfont.8.in
--- kbd-1.12/man/man8/setfont.8.in.man 2004-01-03 05:15:59.000000000 +0100
+++ kbd-1.12/man/man8/setfont.8.in 2008-09-18 12:19:14.000000000 +0200
@@ -50,6 +50,10 @@ and provide one explicitly.
Load a given font (here a 512-glyph font combining several
character sets) and indicate that one's local character set
is ISO 8859-2.
+.LP
+Note: if a font has more than 256 glyphs, only 8 out of 16 colors
+can be used simultaneously. It can make console perception worse
+(loss of intensity and even some colors).
.SH "FONT FORMATS"
The standard Linux font format is the PSF font.

View File

@ -1,165 +0,0 @@
diff -up kbd-1.12/data/keymaps/i386/qwerty/trq.map.trq-map kbd-1.12/data/keymaps/i386/qwerty/trq.map
--- kbd-1.12/data/keymaps/i386/qwerty/trq.map.trq-map 2002-10-11 13:08:49.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/qwerty/trq.map 2008-09-18 12:23:33.000000000 +0200
@@ -1,5 +1,5 @@
charset "iso-8859-9"
-keymaps 0-6,8-9,12
+keymaps 0-6,8-14
include "linux-with-alt-and-altgr"
strings as usual
@@ -8,80 +8,86 @@ keycode 1 = Escape
keycode 2 = one exclam
alt keycode 2 = Meta_one
alt shift keycode 2 = Meta_exclam
-keycode 3 = two apostrophe
- control keycode 3 = nul
- control shift keycode 3 = nul
+keycode 3 = two apostrophe sterling
alt keycode 3 = Meta_two
alt shift keycode 3 = Meta_apostrophe
keycode 4 = three asciicircum numbersign
- control keycode 4 = Escape
+ control shift keycode 4 = Control_asciicircum
alt keycode 4 = Meta_three
alt shift keycode 4 = Meta_asciicircum
+ alt altgr keycode 4 = Meta_numbersign
+ alt control shift keycode 4 = Meta_Control_asciicircum
keycode 5 = four plus dollar
- control keycode 5 = Control_backslash
alt keycode 5 = Meta_four
alt shift keycode 5 = Meta_plus
-keycode 6 = five percent
- control keycode 6 = Control_bracketright
+ alt altgr keycode 5 = Meta_dollar
+keycode 6 = five percent onehalf
alt keycode 6 = Meta_five
alt shift keycode 6 = Meta_percent
keycode 7 = six ampersand
- control keycode 7 = Control_asciicircum
alt keycode 7 = Meta_six
alt shift keycode 7 = Meta_ampersand
keycode 8 = seven slash braceleft
- control keycode 8 = Control_underscore
alt keycode 8 = Meta_seven
alt shift keycode 8 = Meta_slash
+ alt altgr keycode 8 = Meta_braceleft
keycode 9 = eight parenleft bracketleft
- control keycode 9 = Delete
alt keycode 9 = Meta_eight
alt shift keycode 9 = Meta_parenleft
+ alt altgr keycode 9 = Meta_bracketleft
keycode 10 = nine parenright bracketright
+ control altgr keycode 10 = Control_bracketright
alt keycode 10 = Meta_nine
alt shift keycode 10 = Meta_parenright
+ alt altgr keycode 10 = Meta_bracketright
+ alt control altgr keycode 10 = Meta_Control_bracketright
keycode 11 = zero equal braceright
alt keycode 11 = Meta_zero
alt shift keycode 11 = Meta_equal
+ alt altgr keycode 11 = Meta_braceright
keycode 12 = asterisk question backslash
- control keycode 12 = Control_underscore
- control shift keycode 12 = Control_underscore
+ control altgr keycode 12 = Control_backslash
alt keycode 12 = Meta_asterisk
alt shift keycode 12 = Meta_question
+ alt altgr keycode 12 = Meta_backslash
+ alt control altgr keycode 12 = Meta_Control_backslash
keycode 13 = minus underscore
+ control shift keycode 13 = Control_underscore
alt keycode 13 = Meta_minus
alt shift keycode 13 = Meta_underscore
+ alt control shift keycode 13 = Meta_Control_underscore
keycode 14 = Delete
alt keycode 14 = Meta_Delete
keycode 15 = Tab
alt keycode 15 = Meta_Tab
keycode 16 = q
altgr keycode 16 = at
+ alt altgr keycode 16 = Meta_at
keycode 17 = w
keycode 18 = e
+ altgr keycode 18 = euro
keycode 19 = r
keycode 20 = t
keycode 21 = y
keycode 22 = u
- altgr keycode 22 = +0373
- altgr shift keycode 22 = +0333
-keycode 23 = +0375 +I
- altgr keycode 23 = +0356
- altgr shift keycode 23 = +0316
+ altgr keycode 22 = +ucircumflex
+ altgr shift keycode 22 = +Ucircumflex
+keycode 23 = +dotlessi +I
+ altgr keycode 23 = +icircumflex
+ altgr shift keycode 23 = +Icircumflex
keycode 24 = o
- altgr keycode 24 = +0364
- altgr shift keycode 24 = +0324
+ altgr keycode 24 = +ocircumflex
+ altgr shift keycode 24 = +Ocircumflex
keycode 25 = p
-keycode 26 = +0360 +0320
- control keycode 26 = Escape
-keycode 27 = +0374 +0334 asciitilde
- control keycode 27 = Control_bracketright
+keycode 26 = +gbreve +Gbreve diaeresis
+keycode 27 = +udiaeresis +Udiaeresis asciitilde
+ alt altgr keycode 27 = Meta_asciitilde
keycode 28 = Return
alt keycode 28 = 0x080d
keycode 29 = Control
keycode 30 = a
- altgr keycode 30 = +0342
- altgr shift keycode 30 = +0302
+ altgr keycode 30 = +acircumflex
+ altgr shift keycode 30 = +Acircumflex
keycode 31 = s
keycode 32 = d
keycode 33 = f
@@ -90,17 +96,15 @@ keycode 35 = h
keycode 36 = j
keycode 37 = k
keycode 38 = l
-keycode 39 = +0376 +0336
-keycode 40 = +i +0335
- control keycode 40 = Control_g
+keycode 39 = +scedilla +Scedilla acute
+keycode 40 = +i +Idotabove
keycode 41 = quotedbl eacute
- control keycode 41 = nul
alt keycode 41 = Meta_quotedbl
keycode 42 = Shift
keycode 43 = comma semicolon grave
- control keycode 43 = Control_backslash
alt keycode 43 = Meta_comma
alt shift keycode 43 = Meta_semicolon
+ alt altgr keycode 43 = Meta_grave
keycode 44 = z
keycode 45 = x
keycode 46 = c
@@ -108,10 +112,9 @@ keycode 47 = v
keycode 48 = b
keycode 49 = n
keycode 50 = m
-keycode 51 = +0366 +0326
-keycode 52 = +0347 +0307
-keycode 53 = period colon slash
- control keycode 53 = Delete
+keycode 51 = +odiaeresis +Odiaeresis
+keycode 52 = +ccedilla +Ccedilla
+keycode 53 = period colon
alt keycode 53 = Meta_period
alt shift keycode 53 = Meta_colon
keycode 54 = Shift
@@ -119,6 +122,7 @@ keycode 56 = Alt
keycode 57 = space
control keycode 57 = nul
alt keycode 57 = Meta_space
+ alt control keycode 57 = Meta_nul
keycode 58 = Caps_Lock
keycode 86 = less greater bar
alt keycode 86 = Meta_less

View File

@ -1,8 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBACGOYyGugalF9Dw4RAqbqAJ95xI7sjlx8X68Ce4y6Nbrxyg2QywCeNksw
wTrKRbCwt/Ua4hX5ZoJqfvs=
=i6tP
-----END PGP SIGNATURE-----

View File

@ -1,10 +1,10 @@
diff -up kbd-1.12/man/man1/showkey.1.keycodes-man kbd-1.12/man/man1/showkey.1 diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
--- kbd-1.12/man/man1/showkey.1.keycodes-man 2002-10-11 13:08:58.000000000 +0200 --- kbd-1.15/man/man1/showkey.1_old 2008-03-13 17:46:23.000000000 +0100
+++ kbd-1.12/man/man1/showkey.1 2008-09-18 12:22:38.000000000 +0200 +++ kbd-1.15/man/man1/showkey.1 2008-12-10 12:31:38.000000000 +0100
@@ -66,6 +66,19 @@ are present. @@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
Starts to know the scan codes sent by various keys it is better to boot a
.B showkey 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
in `ascii' dump mode. that tells the 2.6 kernel to return the actual scan codes.
+ +
+.SH NOTES +.SH NOTES
+The raw scan codes are available only on AT and PS/2 keyboards, +The raw scan codes are available only on AT and PS/2 keyboards,
@ -21,20 +21,21 @@ diff -up kbd-1.12/man/man1/showkey.1.keycodes-man kbd-1.12/man/man1/showkey.1
.SH "SEE ALSO" .SH "SEE ALSO"
.BR loadkeys (1), .BR loadkeys (1),
.BR dumpkeys (1), .BR dumpkeys (1),
diff -up kbd-1.12/man/man8/setkeycodes.8.keycodes-man kbd-1.12/man/man8/setkeycodes.8 diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
--- kbd-1.12/man/man8/setkeycodes.8.keycodes-man 2002-10-11 13:08:58.000000000 +0200 --- kbd-1.15/man/man8/setkeycodes.8_old 2008-12-10 12:31:56.000000000 +0100
+++ kbd-1.12/man/man8/setkeycodes.8 2008-09-18 12:22:38.000000000 +0200 +++ kbd-1.15/man/man8/setkeycodes.8 2008-12-10 12:37:36.000000000 +0100
@@ -40,11 +40,24 @@ to showkey(1), the command @@ -41,6 +41,10 @@ to showkey(1), the command
.RE
will assign the keycode 112 to it, and then loadkeys(1) can be used will assign the keycode 112 to it, and then loadkeys(1) can be used
to define the function of this key. to define the function of this key.
+
+USB keyboards have standardized keycodes and +USB keyboards have standardized keycodes and
+.B setkeycodes +.B setkeycodes
+doesn't affect them at all. +doesn't affect them at all.
+ +
.SH OPTIONS .SH "2.6 KERNELS"
None. In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
(It might be best to confine oneself to the range 1-239.)
@@ -54,6 +58,14 @@ None.
.SH BUGS .SH BUGS
The keycodes of X have nothing to do with those of Linux. The keycodes of X have nothing to do with those of Linux.
Unusual keys can be made visible under Linux, but not under X. Unusual keys can be made visible under Linux, but not under X.

31
kbd-1.15-po.patch Normal file
View File

@ -0,0 +1,31 @@
diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
--- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200
+++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100
@@ -4,10 +4,10 @@ srcdir = @srcdir@
prefix = @prefix@
datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = $(DESTDIR)$(datadir)/locale
-gnulocaledir = $(DESTDIR)$(datadir)/locale
-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
+datadir = $(DESTDIR)@datadir@
+localedir = $(DESTDIR)@localedir@
+gnulocaledir = $(DESTDIR)@localedir@
+gettextsrcdir = $(datadir)/gettext/po
FOREIGN = @FOREIGN@
HAVE_XGETTEXT = @HAVE_XGETTEXT@
@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
# Enter here all .po files
-POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
ro.po ru.po sv.po tr.po
# the same but with .gmo
-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
CATALOGS = $(GMOFILES)

View File

@ -0,0 +1,15 @@
diff -up kbd-1.15/configure_old kbd-1.15/configure
--- kbd-1.15/configure_old 2009-01-08 15:11:04.000000000 +0100
+++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100
@@ -7637,8 +7637,9 @@ fi
case $host_cpu in
- i?86*) RESIZECONS_PROGS=yes ;;
- *) RESIZECONS_PROGS=no ;;
+ i?86*) RESIZECONS_PROGS=yes ;;
+ x86_64*) RESIZECONS_PROGS=yes ;;
+ *) RESIZECONS_PROGS=no ;;
esac
if test "$RESIZECONS_PROGS" = "yes"; then
RESIZECONS_PROGS_TRUE=

View File

@ -1,82 +1,6 @@
diff -up kbd-1.12/src/setleds.c.sparc kbd-1.12/src/setleds.c diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
--- kbd-1.12/src/setleds.c.sparc 2004-01-16 20:45:31.000000000 +0100 --- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100
+++ kbd-1.12/src/setleds.c 2008-09-08 17:20:46.000000000 +0200 +++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100
@@ -14,10 +14,6 @@
#include "nls.h"
#include "version.h"
-#ifdef __sparc__
-#include <asm/kbio.h>
-#endif
-
static void
usage(void)
{
diff -up kbd-1.12/src/kbdrate.c.sparc kbd-1.12/src/kbdrate.c
--- kbd-1.12/src/kbdrate.c.sparc 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/kbdrate.c 2008-09-08 17:20:46.000000000 +0200
@@ -77,7 +77,6 @@ beats rebuilding the kernel!
#ifdef __sparc__
#include <asm/param.h>
-#include <asm/kbio.h>
#endif
#ifndef KDKBDREP
@@ -104,8 +103,11 @@ static int valid_delays[] = { 250, 500,
static int
KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
+#if defined(KDKBDREP) && !defined(__sparc__)
/* This ioctl is defined in <linux/kd.h> but is not
- implemented anywhere - must be in some m68k patches. */
+ implemented anywhere - must be in some m68k patches.
+ We cannot blindly try unimplemented ioctls on sparc64 -
+ the 32<->64bit transition layer does not like it. */
struct kbd_repeat kbdrep_s;
/* don't change, just test */
@@ -150,6 +152,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
rate, kbdrep_s.delay );
return 1; /* success! */
+#else /* no KDKBDREP or __sparc__ */
+ return 0;
+#endif /* KDKBDREP */
}
static int
@@ -188,7 +193,7 @@ KIOCSRATE_ioctl_ok(double rate, int dela
int
main( int argc, char **argv ) {
#ifdef __sparc__
- double rate = 5.0; /* Default rate */
+ double rate = 20.0; /* Default rate */
int delay = 200; /* Default delay */
#else
double rate = 10.9; /* Default rate */
@@ -238,8 +243,9 @@ main( int argc, char **argv ) {
return 0;
- /* The ioport way */
+ /* The ioport way - will crash on sparc */
+#ifndef __sparc__
for (i = 0; i < RATE_COUNT; i++)
if (rate * 10 >= valid_rates[i]) {
value &= 0x60;
@@ -285,5 +291,7 @@ main( int argc, char **argv ) {
valid_rates[value & 0x1f] / 10.0,
valid_delays[ (value & 0x60) >> 5 ] );
+#endif
+
return 0;
}
diff -up kbd-1.12/man/man8/kbdrate.8.sparc kbd-1.12/man/man8/kbdrate.8
--- kbd-1.12/man/man8/kbdrate.8.sparc 2002-10-11 13:08:58.000000000 +0200
+++ kbd-1.12/man/man8/kbdrate.8 2008-09-08 17:20:46.000000000 +0200
@@ -22,7 +22,7 @@ Using @@ -22,7 +22,7 @@ Using
without any options will reset the repeat rate to 10.9 characters per second (cps) without any options will reset the repeat rate to 10.9 characters per second (cps)
and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
@ -92,3 +16,82 @@ diff -up kbd-1.12/man/man8/kbdrate.8.sparc kbd-1.12/man/man8/kbdrate.8
.I /dev/port .I /dev/port
+.br +.br
+.I /dev/kbd +.I /dev/kbd
diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
--- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100
+++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100
@@ -77,7 +77,6 @@ beats rebuilding the kernel!
#ifdef __sparc__
#include <asm/param.h>
-#include <asm/kbio.h>
#endif
#ifndef KDKBDREP
@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500,
static int
KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
+#if defined(KDKBDREP) && !defined(__sparc__)
/*
* This ioctl is defined in <linux/kd.h> but is not
* implemented anywhere - must be in some m68k patches.
+ * We cannot blindly try unimplemented ioctls on sparc64 -
+ * the 32<->64bit transition layer does not like it.
* Since 2.4.9 also on i386.
- */
+ */
+
struct my_kbd_repeat kbdrep_s;
/* don't change, just test */
@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
rate, kbdrep_s.delay );
return 1; /* success! */
+#else /* no KDKBDREP or __sparc__ */
+ return 0;
+#endif /* KDKBDREP */
}
static int
@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
int
main( int argc, char **argv ) {
#ifdef __sparc__
- double rate = 5.0; /* Default rate */
+ double rate = 20.0; /* Default rate */
int delay = 200; /* Default delay */
#else
double rate = 10.9; /* Default rate */
@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
/* The ioport way */
+ /* The ioport way - will crash on sparc */
+#ifndef __sparc__
for (i = 0; i < RATE_COUNT; i++)
if (rate * 10 >= valid_rates[i]) {
value &= 0x60;
@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
valid_rates[value & 0x1f] / 10.0,
valid_delays[ (value & 0x60) >> 5 ] );
+#endif
+
return 0;
}
diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
--- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100
+++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100
@@ -14,10 +14,6 @@
#include "nls.h"
#include "version.h"
-#ifdef __sparc__
-#include <asm/kbio.h>
-#endif
-
static void
usage(void)
{

View File

@ -0,0 +1,21 @@
diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
--- kbd-1.15/src/unicode_start_old 2009-01-08 13:34:10.000000000 +0100
+++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +0100
@@ -72,6 +72,9 @@ stty iutf8
# have a Unicode map attached, or explicitly specified, e.g.,
# by giving `def.uni' as a second argument.
+DEFAULT_UNICODE_FONT=latarcyrheb-sun16
+# Also drdos8x16 is a good candidate.
+
case "$#" in
2)
setfont "$1" -u "$2"
@@ -80,6 +83,7 @@ case "$#" in
setfont "$1"
;;
0)
+ setfont $DEFAULT_UNICODE_FONT
;;
*)
echo "usage: unicode_start [font [unicode map]]"

103
kbd.spec
View File

@ -1,33 +1,22 @@
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
Name: kbd Name: kbd
Version: 1.12 Version: 1.15
Release: 32%{?dist} Release: 1%{?dist}
# Except possibly for the restrictions mentioned in the directory consolefonts Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
License: GPL+
Group: System Environment/Base Group: System Environment/Base
Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 License: GPLv2+
Source1: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign Source0: http://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz
Source2: kbd-latsun-fonts.tar.bz2 Source1: kbd-latsun-fonts.tar.bz2
Source3: kbd-sun12x22-fixed.tar.bz2 Source2: ro_maps.tar.bz2
Source4: ro_maps.tar.bz2 Source3: kbd-latarcyrheb-16-fixed.tar.bz2
Source5: terminus.tar.bz2
Source6: kbd-latarcyrheb-16-fixed.tar.bz2
BuildRequires: bison, flex, gettext
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: kbd-1.12-sparc.patch Patch0: kbd-1.15-po.patch
Patch1: kbd-1.08-compose.patch Patch1: kbd-1.15-keycodes-man.patch
Patch2: kbd-1.08-terminal.patch Patch2: kbd-1.15-sparc.patch
Patch3: kbd-1.08-rukbd.patch Patch3: kbd-1.15-unicode_start.patch
Patch4: kbd-1.12-setfont-man.patch Patch4: kbd-1.15-resizecon-x86_64.patch
Patch5: kbd-1.12-Meta_utf8.patch
Patch6: kbd-1.12-nostrip.patch BuildRequires: bison, flex, gettext
Patch7: kbd-1.12-alias.patch
Patch8: kbd-1.12-dir.patch
Patch9: kbd-1.12-no-user-map.patch
Patch10: kbd-1.12-gr-el.patch
Patch11: kbd-1.12-keycodes-man.patch
Patch12: kbd-1.12-resizecon-x86.patch
Patch13: kbd-1.12-trq-map.patch
Obsoletes: console-tools open Obsoletes: console-tools open
Provides: console-tools open Provides: console-tools open
Conflicts: util-linux < 2.11r-9 Conflicts: util-linux < 2.11r-9
@ -40,21 +29,12 @@ system's console's behavior, including the keyboard, the screen
fonts, the virtual terminals and font files. fonts, the virtual terminals and font files.
%prep %prep
%setup -q -a 2 -a 3 -a 4 -a 5 -a 6 %setup -q -a 1 -a 2 -a 3
%patch0 -p1 -b .sparc %patch0 -p1 -b .po
%patch1 -p1 -b .compose %patch1 -p1 -b .keycodes-man
%patch2 -p1 -b .terminal %patch2 -p1 -b .sparc
%patch3 -p1 -b .rukbd %patch3 -p1 -b .unicode_start
%patch4 -p1 -b .man %patch4 -p1 -b .resizecon_x86_64
%patch5 -p1 -b .Meta_utf8
%patch6 -p1 -b .nostrip
%patch7 -p1 -b .alias
%patch8 -p1 -b .dir
%patch9 -p1 -b .no-user-map
%patch10 -p1 -b .gr-el
%patch11 -p1 -b .keycodes-man
%patch12 -p1 -b .resizecon-x86
%patch13 -p1 -b .trq-map
# 7-bit maps are obsolete; so are non-euro maps # 7-bit maps are obsolete; so are non-euro maps
pushd data/keymaps/i386 pushd data/keymaps/i386
@ -69,30 +49,17 @@ cp azerty/fr-latin9.map azerty/fr.map
cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
popd popd
# Default to latarcyrheb-sun16 font for unicode
perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
%build %build
export OLD_PO_FILE_INPUT=yes %configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
make %{?_smp_mflags} LDFLAGS="-static"
# We don't use % {configure} because the ./configure included here does not
# understand most of the options.
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-static"
mv src/loadkeys src/loadkeys.static mv src/loadkeys src/loadkeys.static
make clean make clean
./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
# Override CFLAGS because this configure ignores them anyway, and LDFLAGS %configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
# because it defaults to -s, but that's a build policy decision. make %{?_smp_mflags}
make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# Basic install.
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# ro_win.map.gz is useless # ro_win.map.gz is useless
@ -106,8 +73,9 @@ ln -s sr-cy.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/sr-latin.map.gz
ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz
# Move binaries which we use before /usr is mounted from %{_bindir} to /bin. # Move binaries which we use before /usr is mounted from %{_bindir} to /bin.
mkdir -p $RPM_BUILD_ROOT/bin
for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do
mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin/
done done
# Some microoptimization # Some microoptimization
@ -123,20 +91,20 @@ install -c -m755 src/loadkeys.static $RPM_BUILD_ROOT/bin
%find_lang %{name} %find_lang %{name}
%clean %clean
rm -rf ${RPM_BUILD_ROOT} rm -rf $RPM_BUILD_ROOT
%triggerun -- kbd < 1.08-10.2
/sbin/chkconfig --del keytable || :
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root,-)
%doc CHANGES CREDITS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf* %doc ChangeLog AUTHORS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf*
/bin/* /bin/*
%{_bindir}/* %{_bindir}/*
%{_mandir}/*/* %{_mandir}/*/*
/lib/kbd /lib/kbd
%changelog %changelog
* Thu Jan 8 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-1
- Update to kbd-1.15
* Mon Sep 8 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.12-32 * Mon Sep 8 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.12-32
- Rediff all patches to work with patch --fuzz=0 - Rediff all patches to work with patch --fuzz=0
- Add static loadkeys - Add static loadkeys
@ -287,6 +255,9 @@ rm -rf ${RPM_BUILD_ROOT}
* Wed Jan 14 2004 Bill Nottingham <notting@redhat.com> 1.08-12 * Wed Jan 14 2004 Bill Nottingham <notting@redhat.com> 1.08-12
- remove speakup patch at request of author - remove speakup patch at request of author
* Wed Jan 14 2004 Bill Nottingham <notting@redhat.com> 1.08-12
- remove speakup patch at request of author
* Fri Oct 10 2003 Bill Nottingham <notting@redhat.com> 1.08-11 * Fri Oct 10 2003 Bill Nottingham <notting@redhat.com> 1.08-11
- remove keytable init script (#106783) - remove keytable init script (#106783)

View File

@ -1,6 +1,4 @@
069d1175b4891343b107a8ac2b4a39f6 kbd-1.12.tar.bz2
050e1e454e9c01e22f198303d649efb8 kbd-latsun-fonts.tar.bz2 050e1e454e9c01e22f198303d649efb8 kbd-latsun-fonts.tar.bz2
e56c7766760c16d4c7cbc16fc722c7f9 kbd-sun12x22-fixed.tar.bz2
06ac1d4a6c014f6de9a29222497d70c8 ro_maps.tar.bz2 06ac1d4a6c014f6de9a29222497d70c8 ro_maps.tar.bz2
0d894c1c024f531eb6d247ecc2bc4523 terminus.tar.bz2
884fdbb0b952b2e3e8389a0c40a3e301 kbd-latarcyrheb-16-fixed.tar.bz2 884fdbb0b952b2e3e8389a0c40a3e301 kbd-latarcyrheb-16-fixed.tar.bz2
ba3fd20e6c79e58422c3cc6b28718939 kbd-1.15.tar.gz