From 234213e7f9039149f75194caba628035fe45d1a9860af4d4e31014b3aede0341 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 21 Aug 2008 21:56:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=20 --- bnc147581_jp106.diff | 11 - kbd-1.12-Meta-Tab.diff | 1025 ------------ kbd-1.12-be-nice-to-kdm.diff | 54 - kbd-1.12-cz-us-qwertz.diff | 21 - kbd-1.12-dumpkeys-full.diff | 34 - kbd-1.12-el-locale-update.diff | 14 - kbd-1.12-handle-small-table.diff | 39 - kbd-1.12-happy-abuild.diff | 146 -- kbd-1.12-kbd_mode.diff | 99 -- kbd-1.12-loadkeys-C-opt.diff | 154 -- kbd-1.12-loadkeys-repstdout.diff | 23 - kbd-1.12-mac-de.diff | 99 -- kbd-1.12-mac-dk.diff | 26 - kbd-1.12-noclaudio.diff | 24 - kbd-1.12-nohang-kbdrate2.diff | 44 - kbd-1.12-nounicode-nontty.diff | 40 - kbd-1.12-prtscr_no_sigquit.diff | 274 ---- kbd-1.12-setfont-fpclose.diff | 29 - kbd-1.12-setfont-no-cruft.diff | 44 - kbd-1.12-showconsolefont-info.diff | 146 -- kbd-1.12-strip.diff | 48 - kbd-1.12-swiss.diff | 73 - kbd-1.12-unicode_scripts.diff | 79 - kbd-1.12.diff | 399 ----- kbd-1.12.lsm | 15 - kbd-1.12.tar.bz2 | 3 - kbd-1.14.1-2d01989f.patch | 1459 +++++++++++++++++ kbd-1.14.1-Makefile.patch | 58 + kbd-1.14.1-defkeymap.patch | 20 + ...g.diff => kbd-1.14.1-docu-X11R6-xorg.patch | 0 ...pt.diff => kbd-1.14.1-dumpkeys-C-opt.patch | 0 ...-ppc.diff => kbd-1.14.1-dumpkeys-ppc.patch | 33 +- kbd-1.14.1-no-strip.patch | 15 + kbd-1.14.1-prtscr_no_sigquit.patch | 278 ++++ kbd-1.14.1-setfont-no-cruft.patch | 32 + ...ff => kbd-1.14.1-sv-latin1-keycode10.patch | 0 kbd-1.14.1-unicode_scripts.patch | 47 + kbd-1.14.1.tar.bz2 | 3 + kbd.changes | 54 + kbd.spec | 162 +- piofont_debug.diff | 18 - repack_kbd.sh | 25 +- 42 files changed, 2079 insertions(+), 3088 deletions(-) delete mode 100644 bnc147581_jp106.diff delete mode 100644 kbd-1.12-Meta-Tab.diff delete mode 100644 kbd-1.12-be-nice-to-kdm.diff delete mode 100644 kbd-1.12-cz-us-qwertz.diff delete mode 100644 kbd-1.12-dumpkeys-full.diff delete mode 100644 kbd-1.12-el-locale-update.diff delete mode 100644 kbd-1.12-handle-small-table.diff delete mode 100644 kbd-1.12-happy-abuild.diff delete mode 100644 kbd-1.12-kbd_mode.diff delete mode 100644 kbd-1.12-loadkeys-C-opt.diff delete mode 100644 kbd-1.12-loadkeys-repstdout.diff delete mode 100644 kbd-1.12-mac-de.diff delete mode 100644 kbd-1.12-mac-dk.diff delete mode 100644 kbd-1.12-noclaudio.diff delete mode 100644 kbd-1.12-nohang-kbdrate2.diff delete mode 100644 kbd-1.12-nounicode-nontty.diff delete mode 100644 kbd-1.12-prtscr_no_sigquit.diff delete mode 100644 kbd-1.12-setfont-fpclose.diff delete mode 100644 kbd-1.12-setfont-no-cruft.diff delete mode 100644 kbd-1.12-showconsolefont-info.diff delete mode 100644 kbd-1.12-strip.diff delete mode 100644 kbd-1.12-swiss.diff delete mode 100644 kbd-1.12-unicode_scripts.diff delete mode 100644 kbd-1.12.diff delete mode 100644 kbd-1.12.lsm delete mode 100644 kbd-1.12.tar.bz2 create mode 100644 kbd-1.14.1-2d01989f.patch create mode 100644 kbd-1.14.1-Makefile.patch create mode 100644 kbd-1.14.1-defkeymap.patch rename kbd-1.12-docu-X11R6-xorg.diff => kbd-1.14.1-docu-X11R6-xorg.patch (100%) rename kbd-1.12-dumpkeys-C-opt.diff => kbd-1.14.1-dumpkeys-C-opt.patch (100%) rename kbd-1.12-dumpkeys-ppc.diff => kbd-1.14.1-dumpkeys-ppc.patch (61%) create mode 100644 kbd-1.14.1-no-strip.patch create mode 100644 kbd-1.14.1-prtscr_no_sigquit.patch create mode 100644 kbd-1.14.1-setfont-no-cruft.patch rename sv-latin1-keycode10.diff => kbd-1.14.1-sv-latin1-keycode10.patch (100%) create mode 100644 kbd-1.14.1-unicode_scripts.patch create mode 100644 kbd-1.14.1.tar.bz2 delete mode 100644 piofont_debug.diff diff --git a/bnc147581_jp106.diff b/bnc147581_jp106.diff deleted file mode 100644 index f0dc83a..0000000 --- a/bnc147581_jp106.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kbd-1.12/data/keymaps/i386/qwerty/jp106.map.orig 2008-04-25 11:58:38.000000000 +0200 -+++ kbd-1.12/data/keymaps/i386/qwerty/jp106.map 2008-04-25 12:00:26.504126000 +0200 -@@ -24,7 +24,7 @@ - keycode 8 = seven apostrophe - keycode 9 = eight parenleft - keycode 10 = nine parenright --keycode 11 = zero asciitilde -+keycode 11 = zero underscore - control keycode 11 = nul - keycode 12 = minus equal - keycode 13 = asciicircum asciitilde diff --git a/kbd-1.12-Meta-Tab.diff b/kbd-1.12-Meta-Tab.diff deleted file mode 100644 index 076b7f1..0000000 --- a/kbd-1.12-Meta-Tab.diff +++ /dev/null @@ -1,1025 +0,0 @@ -diff -Nur kbd-1.12-2/data/keymaps/amiga/amiga-de.map kbd-1.12-3/data/keymaps/amiga/amiga-de.map ---- kbd-1.12-2/data/keymaps/amiga/amiga-de.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/amiga/amiga-de.map 2004-02-26 22:39:53.000000000 +0100 -@@ -212,7 +212,7 @@ - control keycode 64 = nul - alt keycode 64 = Meta_space - keycode 65 = BackSpace --keycode 66 = Tab Tab -+keycode 66 = Tab Meta_Tab - alt keycode 66 = Meta_Tab - keycode 67 = Return - keycode 68 = Return -diff -Nur kbd-1.12-2/data/keymaps/amiga/amiga-us.map kbd-1.12-3/data/keymaps/amiga/amiga-us.map ---- kbd-1.12-2/data/keymaps/amiga/amiga-us.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/amiga/amiga-us.map 2004-02-26 22:39:53.000000000 +0100 -@@ -159,7 +159,7 @@ - control keycode 64 = nul - alt keycode 64 = Meta_space - keycode 65 = Delete Delete Delete Delete Delete Meta_Delete Delete --keycode 66 = Tab Tab -+keycode 66 = Tab Meta_Tab - alt keycode 66 = Meta_Tab - keycode 67 = KP_Enter - keycode 68 = Return -diff -Nur kbd-1.12-2/data/keymaps/atari/atari-se.map kbd-1.12-3/data/keymaps/atari/atari-se.map ---- kbd-1.12-2/data/keymaps/atari/atari-se.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/atari/atari-se.map 2004-02-26 22:39:53.000000000 +0100 -@@ -67,7 +67,7 @@ - alt keycode 13 = Meta_equal - shift alt keycode 13 = Meta_plus - keycode 14 = Delete Delete Delete Delete Delete Delete Delete Delete Meta_Delete Meta_Delete Delete Delete Meta_Delete Meta_Delete Delete Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - shift alt keycode 15 = Meta_Tab - keycode 16 = +q +Q -diff -Nur kbd-1.12-2/data/keymaps/atari/atari-uk-falcon.map kbd-1.12-3/data/keymaps/atari/atari-uk-falcon.map ---- kbd-1.12-2/data/keymaps/atari/atari-uk-falcon.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/atari/atari-uk-falcon.map 2004-02-26 22:39:53.000000000 +0100 -@@ -60,7 +60,7 @@ - alt keycode 13 = Meta_equal - shift alt keycode 13 = Meta_plus - keycode 14 = BackSpace BackSpace BackSpace BackSpace BackSpace BackSpace BackSpace BackSpace Meta_BackSpace Meta_BackSpace BackSpace BackSpace Meta_BackSpace Meta_BackSpace BackSpace BackSpace --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - shift alt keycode 15 = Meta_Tab - keycode 16 = +q +Q -diff -Nur kbd-1.12-2/data/keymaps/atari/atari-us.map kbd-1.12-3/data/keymaps/atari/atari-us.map ---- kbd-1.12-2/data/keymaps/atari/atari-us.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/atari/atari-us.map 2004-02-26 22:39:53.000000000 +0100 -@@ -60,7 +60,7 @@ - shift alt keycode 14 = Meta_BackSpace - control alt keycode 14 = Meta_BackSpace - shift control alt keycode 14 = Meta_BackSpace --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - shift alt keycode 15 = Meta_Tab - keycode 16 = +q +Q +q Control_q -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/azerty.map kbd-1.12-3/data/keymaps/i386/azerty/azerty.map ---- kbd-1.12-2/data/keymaps/i386/azerty/azerty.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/azerty.map 2004-02-26 22:39:53.000000000 +0100 -@@ -32,7 +32,7 @@ - control keycode 13 = Control_underscore - control shift keycode 13 = Control_underscore - keycode 14 = Delete Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - keycode 26 = dead_circumflex dead_diaeresis bracketleft - control keycode 26 = Escape - alt keycode 26 = bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/be-latin1.map kbd-1.12-3/data/keymaps/i386/azerty/be-latin1.map ---- kbd-1.12-2/data/keymaps/i386/azerty/be-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/be-latin1.map 2004-02-26 22:39:53.000000000 +0100 -@@ -39,6 +39,7 @@ - keycode 13 = minus underscore - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = dead_circumflex dead_diaeresis bracketleft - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/fr-latin1.map kbd-1.12-3/data/keymaps/i386/azerty/fr-latin1.map ---- kbd-1.12-2/data/keymaps/i386/azerty/fr-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/fr-latin1.map 2004-02-26 22:39:53.000000000 +0100 -@@ -39,7 +39,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = dead_circumflex dead_diaeresis - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/fr-latin9.map kbd-1.12-3/data/keymaps/i386/azerty/fr-latin9.map ---- kbd-1.12-2/data/keymaps/i386/azerty/fr-latin9.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/fr-latin9.map 2004-02-26 22:39:53.000000000 +0100 -@@ -169,6 +169,7 @@ - altgr control keycode 14 = KeyboardSignal - - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - control keycode 15 = Meta_Tab - alt keycode 15 = Last_Console - -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/fr-pc.map kbd-1.12-3/data/keymaps/i386/azerty/fr-pc.map ---- kbd-1.12-2/data/keymaps/i386/azerty/fr-pc.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/fr-pc.map 2004-02-26 22:39:53.000000000 +0100 -@@ -44,7 +44,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = dead_circumflex dead_diaeresis - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/fr.map kbd-1.12-3/data/keymaps/i386/azerty/fr.map ---- kbd-1.12-2/data/keymaps/i386/azerty/fr.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/fr.map 2004-02-26 22:39:53.000000000 +0100 -@@ -39,7 +39,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = asciicircum less - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/azerty/wangbe2.map kbd-1.12-3/data/keymaps/i386/azerty/wangbe2.map ---- kbd-1.12-2/data/keymaps/i386/azerty/wangbe2.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/azerty/wangbe2.map 2004-02-26 22:39:53.000000000 +0100 -@@ -81,7 +81,7 @@ - Meta_minus Meta_underscore Meta_backslash - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = dead_circumflex dead_diaeresis bracketleft Escape - Control AltGr keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/dvorak/dvorak.map kbd-1.12-3/data/keymaps/i386/dvorak/dvorak.map ---- kbd-1.12-2/data/keymaps/i386/dvorak/dvorak.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/dvorak/dvorak.map 2004-02-26 22:39:53.000000000 +0100 -@@ -22,6 +22,7 @@ - keycode 13 = bracketright braceright asciitilde Control_bracketright - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 16 = apostrophe quotedbl - control keycode 16 = Control_g - keycode 17 = comma less -diff -Nur kbd-1.12-2/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.12-3/data/keymaps/i386/fgGIod/tr_f-latin5.map ---- kbd-1.12-2/data/keymaps/i386/fgGIod/tr_f-latin5.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/fgGIod/tr_f-latin5.map 2004-02-26 22:39:53.000000000 +0100 -@@ -53,7 +53,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = BackSpace Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = +f +F +q +Q - keycode 17 = +g +G +w +W -diff -Nur kbd-1.12-2/data/keymaps/i386/fgGIod/trf.map kbd-1.12-3/data/keymaps/i386/fgGIod/trf.map ---- kbd-1.12-2/data/keymaps/i386/fgGIod/trf.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/fgGIod/trf.map 2004-02-26 22:39:53.000000000 +0100 -@@ -48,6 +48,7 @@ - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = f - keycode 17 = g -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/bg-cp1251.map kbd-1.12-3/data/keymaps/i386/qwerty/bg-cp1251.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/bg-cp1251.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/bg-cp1251.map 2004-02-26 22:42:59.000000000 +0100 -@@ -53,6 +53,7 @@ - altgr control keycode 14 = BackSpace - altgr alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - altgr alt keycode 15 = Meta_Tab - keycode 16 = q Q +255 +223 \ -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/bg_bds-cp1251.map kbd-1.12-3/data/keymaps/i386/qwerty/bg_bds-cp1251.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/bg_bds-cp1251.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/bg_bds-cp1251.map 2004-02-26 22:43:29.000000000 +0100 -@@ -88,6 +88,8 @@ - altgr control keycode 14 = BackSpace - shift altgr control keycode 14 = BackSpace - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab -+ alt keycode 15 = Meta_Tab - keycode 16 = +q - shift keycode 16 = +Q - altgr keycode 16 = comma -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/br-abnt.map kbd-1.12-3/data/keymaps/i386/qwerty/br-abnt.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/br-abnt.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/br-abnt.map 2004-02-26 22:39:53.000000000 +0100 -@@ -43,7 +43,7 @@ - keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/br-abnt2.map kbd-1.12-3/data/keymaps/i386/qwerty/br-abnt2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/br-abnt2.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/br-abnt2.map 2004-02-26 22:39:53.000000000 +0100 -@@ -35,6 +35,7 @@ - keycode 14 = Delete - control keycode 14 = BackSpace - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = dead_acute dead_grave - control keycode 26 = Escape - keycode 27 = bracketleft braceleft ordfeminine -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/br-latin1-abnt2.map kbd-1.12-3/data/keymaps/i386/qwerty/br-latin1-abnt2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/br-latin1-abnt2.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/br-latin1-abnt2.map 2004-02-26 22:39:53.000000000 +0100 -@@ -39,6 +39,7 @@ - keycode 13 = equal plus section - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = dead_acute dead_grave - control keycode 26 = Escape - keycode 27 = bracketleft braceleft ordfeminine -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/br-latin1-us.map kbd-1.12-3/data/keymaps/i386/qwerty/br-latin1-us.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/br-latin1-us.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/br-latin1-us.map 2004-02-26 22:39:53.000000000 +0100 -@@ -36,6 +36,7 @@ - keycode 13 = equal plus section - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = bracketleft braceleft - control keycode 26 = Escape - keycode 27 = bracketright braceright asciitilde Control_bracketright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/by.map kbd-1.12-3/data/keymaps/i386/qwerty/by.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/by.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/by.map 2004-02-26 22:39:53.000000000 +0100 -@@ -92,7 +92,7 @@ - Meta_Delete Meta_Delete Meta_Delete \ - Delete Delete Delete \ - Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab \ -+keycode 15 = Tab Meta_Tab Tab \ - Meta_Tab Meta_Tab Meta_Tab \ - Tab Tab Tab \ - Meta_Tab Meta_Tab Meta_Tab \ -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/cf.map kbd-1.12-3/data/keymaps/i386/qwerty/cf.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/cf.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/cf.map 2004-02-26 22:39:53.000000000 +0100 -@@ -58,7 +58,7 @@ - keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = dead_circumflex dead_circumflex bracketleft - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/cz-cp1250.map kbd-1.12-3/data/keymaps/i386/qwerty/cz-cp1250.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/cz-cp1250.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/cz-cp1250.map 2004-02-26 22:39:53.000000000 +0100 -@@ -30,7 +30,7 @@ - keycode 12 = minus underscore equal percent Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = equal plus dead_acute dead_circumflex VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 16 = q - keycode 17 = w - keycode 18 = e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/cz-lat2-prog.map kbd-1.12-3/data/keymaps/i386/qwerty/cz-lat2-prog.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/cz-lat2-prog.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/cz-lat2-prog.map 2004-02-26 22:39:53.000000000 +0100 -@@ -35,7 +35,7 @@ - keycode 12 = minus underscore minus underscore Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = equal plus dead_acute dead_circumflex VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 16 = q - keycode 17 = w - keycode 18 = e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/cz-lat2.map kbd-1.12-3/data/keymaps/i386/qwerty/cz-lat2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/cz-lat2.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/cz-lat2.map 2004-02-26 22:39:53.000000000 +0100 -@@ -32,7 +32,7 @@ - keycode 12 = minus underscore equal percent Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = equal plus dead_acute dead_circumflex VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 16 = q - keycode 17 = w - keycode 18 = e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/cz.map kbd-1.12-3/data/keymaps/i386/qwerty/cz.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/cz.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/cz.map 2004-02-26 22:39:53.000000000 +0100 -@@ -323,7 +323,7 @@ - Meta_Delete VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol --keycode 15 = Tab Tab VoidSymbol VoidSymbol VoidSymbol \ -+keycode 15 = Tab Meta_Tab VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/defkeymap.map kbd-1.12-3/data/keymaps/i386/qwerty/defkeymap.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/defkeymap.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/defkeymap.map 2004-02-26 22:39:53.000000000 +0100 -@@ -44,7 +44,7 @@ - keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/defkeymap_V1.0.map kbd-1.12-3/data/keymaps/i386/qwerty/defkeymap_V1.0.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/defkeymap_V1.0.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/defkeymap_V1.0.map 2004-02-26 22:39:53.000000000 +0100 -@@ -37,7 +37,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/dk-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/dk-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/dk-latin1.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/dk-latin1.map 2004-02-26 22:39:53.000000000 +0100 -@@ -45,7 +45,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = +aring +Aring - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/dk.map kbd-1.12-3/data/keymaps/i386/qwerty/dk.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/dk.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/dk.map 2004-02-26 22:39:53.000000000 +0100 -@@ -45,7 +45,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = +aring +Aring - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/emacs.map kbd-1.12-3/data/keymaps/i386/qwerty/emacs.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/emacs.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/emacs.map 2004-02-26 22:39:53.000000000 +0100 -@@ -42,6 +42,7 @@ - keycode 13 = equal plus - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = bracketleft braceleft - control keycode 26 = Escape - keycode 27 = bracketright braceright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/emacs2.map kbd-1.12-3/data/keymaps/i386/qwerty/emacs2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/emacs2.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/emacs2.map 2004-02-26 22:39:53.000000000 +0100 -@@ -31,6 +31,7 @@ - keycode 13 = equal plus - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = bracketleft braceleft - control keycode 26 = Escape - keycode 27 = bracketright braceright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/es-cp850.map kbd-1.12-3/data/keymaps/i386/qwerty/es-cp850.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/es-cp850.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/es-cp850.map 2004-02-26 22:39:53.000000000 +0100 -@@ -34,6 +34,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete Delete Control_underscore Delete Meta_Delete Delete Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = dead_grave dead_circumflex bracketleft Escape VoidSymbol Meta_bracketleft - keycode 27 = plus asterisk bracketright Control_bracketright VoidSymbol Meta_bracketright - keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/es.map kbd-1.12-3/data/keymaps/i386/qwerty/es.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/es.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/es.map 2004-02-26 22:39:54.000000000 +0100 -@@ -50,6 +50,7 @@ - control keycode 14 = Control_underscore - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - !keycode 26 = dead_grave asciicircum bracketleft - keycode 26 = dead_grave dead_circumflex bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/et.map kbd-1.12-3/data/keymaps/i386/qwerty/et.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/et.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/et.map 2004-02-26 22:39:54.000000000 +0100 -@@ -36,7 +36,7 @@ - keycode 13 = dead_acute dead_grave dead_acute dead_grave - keycode 14 = Delete Delete - control keycode 14 = BackSpace --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - keycode 18 = +e +E euro euro Control_e Control_e - keycode 26 = +udiaeresis +Udiaeresis +udiaeresis +Udiaeresis Escape - keycode 27 = +otilde +Otilde section section Control_bracketright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/fi-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/fi-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/fi-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/fi-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -65,6 +65,7 @@ - alt shift keycode 13 = Meta_grave - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = +aring +Aring - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/fi-latin9.map kbd-1.12-3/data/keymaps/i386/qwerty/fi-latin9.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/fi-latin9.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/fi-latin9.map 2004-02-26 22:39:54.000000000 +0100 -@@ -69,6 +69,7 @@ - alt shift keycode 13 = Meta_grave - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = +aring +Aring +oe - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/fi.map kbd-1.12-3/data/keymaps/i386/qwerty/fi.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/fi.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/fi.map 2004-02-26 22:39:54.000000000 +0100 -@@ -41,6 +41,7 @@ - keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = braceright bracketright - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/gr-pc.map kbd-1.12-3/data/keymaps/i386/qwerty/gr-pc.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/gr-pc.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/gr-pc.map 2004-02-26 22:39:54.000000000 +0100 -@@ -96,7 +96,7 @@ - altgr keycode 14 = Delete - shift altgr keycode 14 = Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - altgr keycode 15 = Tab - shift altgr keycode 15 = Tab - alt keycode 15 = Meta_Tab -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/gr.map kbd-1.12-3/data/keymaps/i386/qwerty/gr.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/gr.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/gr.map 2004-02-26 22:39:54.000000000 +0100 -@@ -77,7 +77,7 @@ - keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/il-heb.map kbd-1.12-3/data/keymaps/i386/qwerty/il-heb.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/il-heb.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/il-heb.map 2004-02-26 22:39:54.000000000 +0100 -@@ -37,7 +37,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab Tab Tab -+keycode 15 = Tab Meta_Tab Tab Tab - alt keycode 15 = Meta_Tab - keycode 16 = +q +Q slash slash Control_q Control_q Control_q Control_q - keycode 17 = +w +W apostrophe apostrophe Control_w Control_w Control_w Control_w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/il-phonetic.map kbd-1.12-3/data/keymaps/i386/qwerty/il-phonetic.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/il-phonetic.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/il-phonetic.map 2004-02-26 22:39:54.000000000 +0100 -@@ -36,7 +36,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = +q +Q qof qof Control_q - keycode 17 = +w +W vav vav Control_w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/is-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/is-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/is-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/is-latin1.map 2004-02-26 22:41:14.000000000 +0100 -@@ -45,6 +45,8 @@ - keycode 13 = minus underscore hyphen - keycode 14 = Delete Delete Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab -+ alt keycode 15 = Meta_Tab - keycode 16 = +q +Q at - control keycode 16 = Control_q - # alt keycode 16 = at -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/it.map kbd-1.12-3/data/keymaps/i386/qwerty/it.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/it.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/it.map 2004-02-26 22:39:54.000000000 +0100 -@@ -82,7 +82,7 @@ - keycode 14 = Delete Delete - control keycode 14 = Control_underscore - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/it2.map kbd-1.12-3/data/keymaps/i386/qwerty/it2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/it2.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/it2.map 2004-02-26 22:39:54.000000000 +0100 -@@ -85,7 +85,7 @@ - alt shift keycode 13 = Meta_asciicircum - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q Q - control keycode 16 = Control_q -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/jp106.map kbd-1.12-3/data/keymaps/i386/qwerty/jp106.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/jp106.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/jp106.map 2004-02-26 22:39:54.000000000 +0100 -@@ -32,6 +32,7 @@ - keycode 14 = Delete - control keycode 14 = BackSpace - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = at grave - control keycode 26 = nul - keycode 27 = bracketleft braceleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/la-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/la-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/la-latin1.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/la-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -36,6 +36,7 @@ - control keycode 14 = BackSpace - alt keycode 14 = Meta_BackSpace - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = dead_acute dead_diaeresis - keycode 27 = plus asterisk asciitilde - keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/lt.baltic.map kbd-1.12-3/data/keymaps/i386/qwerty/lt.baltic.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/lt.baltic.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/lt.baltic.map 2004-02-26 22:39:54.000000000 +0100 -@@ -38,7 +38,7 @@ - keycode 12 = minus underscore underscore nul nul nul minus - keycode 13 = +0xFE +0xDE plus nul nul nul equal - keycode 14 = Delete Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - keycode 16 = q - keycode 17 = w - keycode 18 = e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/mk0.map kbd-1.12-3/data/keymaps/i386/qwerty/mk0.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/mk0.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/mk0.map 2004-02-26 22:39:54.000000000 +0100 -@@ -53,6 +53,7 @@ - keycode 13 = equal plus equal plus - keycode 14 = Delete Delete Delete Delete BackSpace - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 16 = +q +Q U+0459 U+0409 Control_q Control_q Control_q Control_q - keycode 17 = +w +W U+045a U+040a Control_w Control_w Control_w Control_w - keycode 18 = +e +E U+0435 U+0415 Control_e Control_e Control_e Control_e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/nl.map kbd-1.12-3/data/keymaps/i386/qwerty/nl.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/nl.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/nl.map 2004-02-26 22:39:54.000000000 +0100 -@@ -50,6 +50,7 @@ - keycode 14 = Delete - control keycode 14 = BackSpace - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = dead_diaeresis dead_circumflex circumflex - control keycode 26 = Escape - keycode 27 = asterisk bar -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/nl2.map kbd-1.12-3/data/keymaps/i386/qwerty/nl2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/nl2.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/nl2.map 2004-02-26 22:39:54.000000000 +0100 -@@ -38,6 +38,7 @@ - keycode 13 = degree asciitilde dead_cedilla - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 18 = e E euro - keycode 19 = r R paragraph - keycode 26 = dead_diaeresis dead_circumflex -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/no.map kbd-1.12-3/data/keymaps/i386/qwerty/no.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/no.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/no.map 2004-02-26 22:39:54.000000000 +0100 -@@ -41,6 +41,7 @@ - keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = braceright bracketright - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/pl.map kbd-1.12-3/data/keymaps/i386/qwerty/pl.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/pl.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/pl.map 2004-02-26 22:39:54.000000000 +0100 -@@ -48,6 +48,7 @@ - keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/pl2.map kbd-1.12-3/data/keymaps/i386/qwerty/pl2.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/pl2.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/pl2.map 2004-02-26 22:39:54.000000000 +0100 -@@ -60,7 +60,7 @@ - alt keycode 14 = Meta_Delete - alt shift keycode 14 = Meta_Delete - control keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - alt shift keycode 15 = Meta_Tab - AltGr keycode 15 = Meta_Tab -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/pt-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/pt-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/pt-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/pt-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -38,6 +38,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = plus asterisk dead_diaeresis - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/pt-latin9.map kbd-1.12-3/data/keymaps/i386/qwerty/pt-latin9.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/pt-latin9.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/pt-latin9.map 2004-02-26 22:39:54.000000000 +0100 -@@ -34,6 +34,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 18 = e E euro cent - keycode 26 = plus asterisk dead_diaeresis - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/ro_win.map kbd-1.12-3/data/keymaps/i386/qwerty/ro_win.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/ro_win.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/ro_win.map 2004-02-26 22:39:54.000000000 +0100 -@@ -26,7 +26,7 @@ - keycode 12 = minus underscore backslash backslash Control_underscore Control_underscore - keycode 13 = equal plus - keycode 14 = Delete Delete Delete --keycode 15 = Tab Tab Tab -+keycode 15 = Tab Meta_Tab Tab - keycode 26 = bracketleft braceleft - control keycode 26 = Escape - keycode 27 = bracketright braceright asciitilde asciitilde Control_bracketright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/sk-prog-qwerty.map kbd-1.12-3/data/keymaps/i386/qwerty/sk-prog-qwerty.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/sk-prog-qwerty.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/sk-prog-qwerty.map 2004-02-26 22:39:54.000000000 +0100 -@@ -40,7 +40,7 @@ - keycode 12 = minus underscore minus underscore Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = equal plus dead_acute dead_circumflex VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 26 = bracketleft braceleft bracketleft braceleft Escape VoidSymbol Escape VoidSymbol Meta_bracketleft Meta_bracketleft Meta_bracketleft Meta_bracketleft - keycode 27 = bracketright braceright bracketright braceright Control_bracketright VoidSymbol Control_bracketright VoidSymbol Meta_bracketright Meta_bracketright Meta_bracketright Meta_bracketright - keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/sv-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/sv-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/sv-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/sv-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -52,6 +52,7 @@ - keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = +aring +Aring - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.12-3/data/keymaps/i386/qwerty/tr_q-latin5.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/tr_q-latin5.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/tr_q-latin5.map 2004-02-26 22:39:54.000000000 +0100 -@@ -51,7 +51,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = BackSpace Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/tralt.map kbd-1.12-3/data/keymaps/i386/qwerty/tralt.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/tralt.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/tralt.map 2004-02-26 22:39:54.000000000 +0100 -@@ -49,6 +49,7 @@ - keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/trq.map kbd-1.12-3/data/keymaps/i386/qwerty/trq.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/trq.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/trq.map 2004-02-26 22:39:54.000000000 +0100 -@@ -54,6 +54,7 @@ - keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - alt keycode 15 = Meta_Tab - keycode 16 = q - altgr keycode 16 = at -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.12-3/data/keymaps/i386/qwerty/ua-utf-ws.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/ua-utf-ws.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/ua-utf-ws.map 2004-02-26 22:39:54.000000000 +0100 -@@ -281,7 +281,7 @@ - shift control ctrll ctrlr keycode 14 = BackSpace - alt ctrll ctrlr keycode 14 = Meta_Delete - shift alt ctrll ctrlr keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - ctrlr keycode 15 = Tab - shift ctrlr keycode 15 = Tab -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/ua-utf.map kbd-1.12-3/data/keymaps/i386/qwerty/ua-utf.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/ua-utf.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/ua-utf.map 2004-02-26 22:39:54.000000000 +0100 -@@ -271,7 +271,7 @@ - shift control ctrll ctrlr keycode 14 = BackSpace - alt ctrll ctrlr keycode 14 = Meta_Delete - shift alt ctrll ctrlr keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - ctrlr keycode 15 = Tab - shift ctrlr keycode 15 = Tab -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/ua-ws.map kbd-1.12-3/data/keymaps/i386/qwerty/ua-ws.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/ua-ws.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/ua-ws.map 2004-02-26 22:39:54.000000000 +0100 -@@ -281,7 +281,7 @@ - shift control ctrll ctrlr keycode 14 = BackSpace - alt ctrll ctrlr keycode 14 = Meta_Delete - shift alt ctrll ctrlr keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - ctrlr keycode 15 = Tab - shift ctrlr keycode 15 = Tab -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/ua.map kbd-1.12-3/data/keymaps/i386/qwerty/ua.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/ua.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/ua.map 2004-02-26 22:39:54.000000000 +0100 -@@ -270,7 +270,7 @@ - shift control ctrll ctrlr keycode 14 = BackSpace - alt ctrll ctrlr keycode 14 = Meta_Delete - shift alt ctrll ctrlr keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - ctrlr keycode 15 = Tab - shift ctrlr keycode 15 = Tab -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/uk.map kbd-1.12-3/data/keymaps/i386/qwerty/uk.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/uk.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/uk.map 2004-02-26 22:39:54.000000000 +0100 -@@ -31,6 +31,7 @@ - keycode 14 = Delete - control keycode 14 = Control_underscore - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = bracketleft braceleft - control keycode 26 = Escape - keycode 27 = bracketright braceright asciitilde Control_bracketright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/us-acentos.map kbd-1.12-3/data/keymaps/i386/qwerty/us-acentos.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/us-acentos.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/us-acentos.map 2004-02-26 22:39:54.000000000 +0100 -@@ -44,6 +44,7 @@ - alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab - alt keycode 15 = Meta_Tab -+ shift keycode 15 = Meta_Tab - keycode 16 = q - keycode 17 = w - keycode 18 = e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/us.map kbd-1.12-3/data/keymaps/i386/qwerty/us.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/us.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/us.map 2004-02-26 22:39:54.000000000 +0100 -@@ -25,6 +25,7 @@ - keycode 13 = equal plus - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = bracketleft braceleft - control keycode 26 = Escape - keycode 27 = bracketright braceright asciitilde Control_bracketright -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/cz-us-qwertz.map kbd-1.12-3/data/keymaps/i386/qwertz/cz-us-qwertz.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-26 22:39:54.000000000 +0100 -@@ -29,7 +29,7 @@ - keycode 12 = equal percent minus underscore Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = dead_acute dead_circumflex equal plus VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 16 = q - keycode 17 = w - keycode 18 = e -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/de-latin1.map kbd-1.12-3/data/keymaps/i386/qwertz/de-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/de-latin1.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/de-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -35,7 +35,7 @@ - shift alt keycode 13 = Meta_grave - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - keycode 26 = +udiaeresis +Udiaeresis - keycode 27 = plus asterisk dead_tilde - keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/de.map kbd-1.12-3/data/keymaps/i386/qwertz/de.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/de.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/de.map 2004-02-26 22:39:54.000000000 +0100 -@@ -33,7 +33,7 @@ - keycode 13 = apostrophe grave - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - keycode 26 = at backslash - keycode 27 = plus asterisk asciitilde - keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH-latin1.map kbd-1.12-3/data/keymaps/i386/qwertz/fr_CH-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 22:37:52.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -41,7 +41,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = egrave udiaeresis bracketleft - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH.map kbd-1.12-3/data/keymaps/i386/qwertz/fr_CH.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/fr_CH.map 2004-02-26 22:39:54.000000000 +0100 -@@ -41,7 +41,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = - altgr keycode 26 = bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1-lk450.map kbd-1.12-3/data/keymaps/i386/qwertz/sg-latin1-lk450.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1-lk450.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/sg-latin1-lk450.map 2004-02-26 22:39:54.000000000 +0100 -@@ -40,7 +40,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = udiaeresis egrave bracketleft - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1.map kbd-1.12-3/data/keymaps/i386/qwertz/sg-latin1.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1.map 2004-02-26 22:37:52.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/sg-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -39,7 +39,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = udiaeresis egrave bracketleft - control keycode 26 = Escape -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/sg.map kbd-1.12-3/data/keymaps/i386/qwertz/sg.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/sg.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/sg.map 2004-02-26 22:39:54.000000000 +0100 -@@ -40,7 +40,7 @@ - alt keycode 13 = Meta_equal - keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete --keycode 15 = Tab Tab -+keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab - keycode 26 = - altgr keycode 26 = bracketleft -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/sk-prog-qwertz.map kbd-1.12-3/data/keymaps/i386/qwertz/sk-prog-qwertz.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/sk-prog-qwertz.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/sk-prog-qwertz.map 2004-02-26 22:39:54.000000000 +0100 -@@ -40,7 +40,7 @@ - keycode 12 = minus underscore minus underscore Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = equal plus dead_acute dead_circumflex VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 26 = bracketleft braceleft bracketleft braceleft Escape VoidSymbol Escape VoidSymbol Meta_bracketleft Meta_bracketleft Meta_bracketleft Meta_bracketleft - keycode 27 = bracketright braceright bracketright braceright Control_bracketright VoidSymbol Control_bracketright VoidSymbol Meta_bracketright Meta_bracketright Meta_bracketright Meta_bracketright - keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/mac/include/mac-linux-keys-bare.inc kbd-1.12-3/data/keymaps/mac/include/mac-linux-keys-bare.inc ---- kbd-1.12-2/data/keymaps/mac/include/mac-linux-keys-bare.inc 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/mac/include/mac-linux-keys-bare.inc 2004-02-26 22:39:54.000000000 +0100 -@@ -166,6 +166,7 @@ - keycode 36 = Return - alt keycode 36 = Meta_Control_m - keycode 48 = Tab -+ shift keycode 48 = Meta_Tab - alt keycode 48 = Meta_Tab - keycode 49 = space space space nul - keycode 51 = Delete Remove -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt4-es.map kbd-1.12-3/data/keymaps/sun/sunt4-es.map ---- kbd-1.12-2/data/keymaps/sun/sunt4-es.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt4-es.map 2004-02-26 22:39:54.000000000 +0100 -@@ -137,7 +137,7 @@ - control alt keycode 50 = Boot - keycode 51 = - keycode 52 = Find --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = q - keycode 55 = w -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt4-fi-latin1.map kbd-1.12-3/data/keymaps/sun/sunt4-fi-latin1.map ---- kbd-1.12-2/data/keymaps/sun/sunt4-fi-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt4-fi-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -131,7 +131,7 @@ - control alt keycode 50 = Boot - keycode 51 = - keycode 52 = --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = q - keycode 55 = w -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt4-no-latin1.map kbd-1.12-3/data/keymaps/sun/sunt4-no-latin1.map ---- kbd-1.12-2/data/keymaps/sun/sunt4-no-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt4-no-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -134,7 +134,7 @@ - control alt keycode 50 = Boot - keycode 51 = - keycode 52 = Find --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = q - keycode 55 = w -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt5-de-latin1.map kbd-1.12-3/data/keymaps/sun/sunt5-de-latin1.map ---- kbd-1.12-2/data/keymaps/sun/sunt5-de-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt5-de-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -131,7 +131,7 @@ - control alt keycode 50 = Boot - keycode 51 = - keycode 52 = Find --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = +q +Q at - keycode 55 = w -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt5-es.map kbd-1.12-3/data/keymaps/sun/sunt5-es.map ---- kbd-1.12-2/data/keymaps/sun/sunt5-es.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt5-es.map 2004-02-26 22:39:54.000000000 +0100 -@@ -143,7 +143,7 @@ - control alt keycode 50 = Boot - keycode 51 = - keycode 52 = Find --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = q - keycode 55 = w -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt5-fi-latin1.map kbd-1.12-3/data/keymaps/sun/sunt5-fi-latin1.map ---- kbd-1.12-2/data/keymaps/sun/sunt5-fi-latin1.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt5-fi-latin1.map 2004-02-26 22:39:54.000000000 +0100 -@@ -134,7 +134,7 @@ - control alt keycode 50 = Boot - keycode 51 = - keycode 52 = Find --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = q - keycode 55 = w -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt5-ru.map kbd-1.12-3/data/keymaps/sun/sunt5-ru.map ---- kbd-1.12-2/data/keymaps/sun/sunt5-ru.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt5-ru.map 2004-02-26 22:39:54.000000000 +0100 -@@ -181,7 +181,7 @@ - altgr control alt keycode 50 = Boot - keycode 51 = - keycode 52 = Find --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - altgr alt keycode 53 = Meta_Tab - keycode 54 = q -diff -Nur kbd-1.12-2/data/keymaps/sun/sunt5-uk.map kbd-1.12-3/data/keymaps/sun/sunt5-uk.map ---- kbd-1.12-2/data/keymaps/sun/sunt5-uk.map 2004-02-26 22:36:33.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/sun/sunt5-uk.map 2004-02-26 22:39:54.000000000 +0100 -@@ -54,7 +54,7 @@ - keycode 43 = Delete Delete - control keycode 43 = Control_underscore - alt keycode 43 = Meta_Delete --keycode 53 = Tab Tab -+keycode 53 = Tab Meta_Tab - alt keycode 53 = Meta_Tab - keycode 54 = q - keycode 55 = w diff --git a/kbd-1.12-be-nice-to-kdm.diff b/kbd-1.12-be-nice-to-kdm.diff deleted file mode 100644 index 0c91243..0000000 --- a/kbd-1.12-be-nice-to-kdm.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- kbd-1.12/src/setfont.c.orig 2005-03-03 19:17:42.000000000 +0000 -+++ kbd-1.12/src/setfont.c 2005-03-04 15:19:13.000000000 +0000 -@@ -189,6 +189,20 @@ - - fd = getfd(console); - -+ int kd_mode = -1; -+ if (!ioctl(fd, KDGETMODE, &kd_mode) && (kd_mode == KD_GRAPHICS)) -+ { -+ /* -+ * PIO_FONT will fail on a console which is in foreground and in KD_GRAPHICS mode. -+ * 2005-03-03, jw@suse.de. -+ */ -+ if (verbose) -+ printf("setfont: graphics console %s skipped\n", console?console:""); -+ close(fd); -+ return 0; -+ } -+ -+ - if (!ifilct && !mfil && !ufil && - !Ofil && !ofil && !omfil && !oufil && !restore) - /* reset to some default */ ---- kbd-1.12/src/kdfontop.c.orig 2005-03-03 19:14:27.000000000 +0000 -+++ kbd-1.12/src/kdfontop.c 2005-03-03 19:42:28.000000000 +0000 -@@ -7,6 +7,7 @@ - #include - #include - #include /* free() */ -+#include /* usleep() */ - #include - #include - #include "kdfontop.h" -@@ -275,7 +276,19 @@ - - /* Third attempt: PIO_FONT */ - /* This will load precisely 256 chars, independent of count */ -- i = ioctl(fd, PIO_FONT, buf); -+ int loop = 0; -+ -+ /* we allow ourselves to hang here for ca 5 seconds, xdm may be playing tricks on us. */ -+ while ((loop++ < 20) && (i = ioctl(fd, PIO_FONT, buf))) -+ { -+ if (loop <= 1) -+ fprintf(stderr, "putfont: PIO_FONT trying ...\n"); -+ else -+ fprintf(stderr, "."); -+ usleep(250000); -+ } -+ fprintf(stderr, "\n"); -+ - if (i) { - fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i); - perror("putfont: PIO_FONT"); diff --git a/kbd-1.12-cz-us-qwertz.diff b/kbd-1.12-cz-us-qwertz.diff deleted file mode 100644 index 487bb77..0000000 --- a/kbd-1.12-cz-us-qwertz.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur kbd-1.12-12/data/keymaps/i386/qwertz/cz-us-qwertz.map kbd-1.12-13/data/keymaps/i386/qwertz/cz-us-qwertz.map ---- kbd-1.12-12/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-27 17:19:23.000000000 +0100 -+++ kbd-1.12-13/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-27 17:23:00.000000000 +0100 -@@ -35,7 +35,7 @@ - keycode 18 = e - keycode 19 = r - keycode 20 = t --keycode 21 = z -+keycode 21 = z Z y Y - keycode 22 = u - keycode 23 = i - keycode 24 = o -@@ -61,7 +61,7 @@ - keycode 41 = grave semicolon grave asciitilde nul VoidSymbol nul VoidSymbol Meta_grave VoidSymbol Meta_grave VoidSymbol - keycode 42 = Shift - keycode 43 = backslash bar backslash bar Control_backslash VoidSymbol Control_backslash VoidSymbol Meta_backslash VoidSymbol Meta_backslash VoidSymbol --keycode 44 = y -+keycode 44 = y Y z Z - keycode 45 = x - keycode 46 = c - keycode 47 = v diff --git a/kbd-1.12-dumpkeys-full.diff b/kbd-1.12-dumpkeys-full.diff deleted file mode 100644 index 7998526..0000000 --- a/kbd-1.12-dumpkeys-full.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur kbd-1.12-7/src/dumpkeys.c kbd-1.12-8/src/dumpkeys.c ---- kbd-1.12-7/src/dumpkeys.c 2004-02-26 22:56:09.000000000 +0100 -+++ kbd-1.12-8/src/dumpkeys.c 2004-02-26 23:00:23.000000000 +0100 -@@ -126,6 +126,7 @@ - int t; - int v; - const char *p; -+ int plus; - - printf(" "); - t = KTYP(code); -@@ -138,18 +139,20 @@ - printf("U+%04x ", code); - return; - } -+ plus = 0; - if (t == KT_LETTER) { - t = KT_LATIN; - printf("+"); -+ plus++; - } - if (!numeric && t < syms_size && v < syms[t].size && - (p = syms[t].table[v])[0]) -- printf("%-16s", p); -+ printf("%-*s", 16 - plus, p); - else if (!numeric && t == KT_META && v < 128 && v < syms[0].size && - (p = syms[0].table[v])[0]) - printf("Meta_%-11s", p); - else -- printf("0x%04x ", code); -+ printf("0x%04x %s", code, plus ? "" : " "); - } - - static char diff --git a/kbd-1.12-el-locale-update.diff b/kbd-1.12-el-locale-update.diff deleted file mode 100644 index 5262164..0000000 --- a/kbd-1.12-el-locale-update.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- po/Makefile.in -+++ po/Makefile.in -@@ -34,9 +34,9 @@ - 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 = $(patsubst %.po, %.gmo, $(POFILES)) - - CATALOGS = $(GMOFILES) - CATOBJEXT = .gmo diff --git a/kbd-1.12-handle-small-table.diff b/kbd-1.12-handle-small-table.diff deleted file mode 100644 index 10885ee..0000000 --- a/kbd-1.12-handle-small-table.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur kbd-1.12-10/src/dumpkeys.c kbd-1.12-11/src/dumpkeys.c ---- kbd-1.12-10/src/dumpkeys.c 2004-02-26 23:10:19.000000000 +0100 -+++ kbd-1.12-11/src/dumpkeys.c 2004-02-27 17:18:15.000000000 +0100 -@@ -113,10 +113,13 @@ - ke.kb_index = index; - ke.kb_table = table; - if (ioctl(fd, KDGKBENT, (unsigned long)&ke)) { -- perror("KDGKBENT"); -- fprintf(stderr, _("KDGKBENT error at index %d in table %d\n"), -- index, table); -- exit(1); -+ if (index < 128) { -+ perror("KDGKBENT"); -+ fprintf(stderr, _("KDGKBENT error at index %d in table %d\n"), -+ index, table); -+ exit(1); -+ } else -+ return -1; - } - return ke.kb_value; - } -@@ -375,6 +378,8 @@ - int buf0, buf1, type; - - buf0 = get_bind(i, j); -+ if (buf0 == -1) -+ break; - type = KTYP(buf0); - if ((type == KT_LATIN || type == KT_LETTER) - && KVAL(buf0) < 128) { -@@ -404,6 +409,8 @@ - #endif - for (j = 0; j < keymapnr; j++) - buf[j] = get_bind(i, good_keymap[j]); -+ if (buf[0] == -1) -+ break; - - if (table_shape == FULL_TABLE) { - printf("keycode %3d =", i); diff --git a/kbd-1.12-happy-abuild.diff b/kbd-1.12-happy-abuild.diff deleted file mode 100644 index aa7af39..0000000 --- a/kbd-1.12-happy-abuild.diff +++ /dev/null @@ -1,146 +0,0 @@ ---- kbd-1.12/src/psffontop.c.orig 2005-07-07 15:00:50.547440043 +0200 -+++ kbd-1.12/src/psffontop.c 2005-07-07 15:02:49.642520578 +0200 -@@ -465,7 +465,7 @@ - writepsffontheader(ofil, width, height, fontlen, &psftype, flags); - utf8 = (psftype == 2); - -- fwrite(fontbuf, charsize, fontlen, ofil); -+ (void)fwrite(fontbuf, charsize, fontlen, ofil); - /* unimaps: -1 => do nothing: caller will append map */ - if (uclistheads != NULL && uclistheads != (struct unicode_list*)-1) { - struct unicode_list *ul; ---- kbd-1.12/src/loadkeys.y.orig 2005-07-07 15:00:50.891379623 +0200 -+++ kbd-1.12/src/loadkeys.y 2005-07-07 15:02:19.174871991 +0200 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include /* readlink */ - #include "paths.h" - #include "getfd.h" - #include "findfile.h" -@@ -65,9 +66,9 @@ - static void loadkeys(char *console, int *warned); - static void mktable(void); - static void strings_as_usual(void); --static void keypad_as_usual(char *keyboard); --static void function_keys_as_usual(char *keyboard); --static void consoles_as_usual(char *keyboard); -+/* static void keypad_as_usual(char *keyboard); */ -+/* static void function_keys_as_usual(char *keyboard); */ -+/* static void consoles_as_usual(char *keyboard); */ - static void compose_as_usual(char *charset); - static void lkfatal0(const char *, int); - extern int set_charset(const char *charset); -@@ -559,7 +560,6 @@ - - void - open_include(char *s) { -- char *t, *te; - - if (verbose) - /* start reading include file */ -@@ -713,7 +713,6 @@ - int alttable = table | M_ALT; - int type = KTYP(keycode); - int val = KVAL(keycode); -- char *p; - if (alttable != table && defining[alttable] && - (!keymap_was_set[alttable] || - !(keymap_was_set[alttable])[index]) && -@@ -1021,7 +1020,7 @@ - static void - loadkeys (char *console, int *warned) { - int fd; -- int keyct, funcct, diacct; -+ int keyct, funcct, diacct = 0; - - fd = getfd(console); - keyct = defkeys(fd, console, &warned); -@@ -1156,7 +1155,6 @@ - mktable () { - int i, imax, j; - -- struct kbsentry kbs; - u_char *p; - int maxfunc; - unsigned int keymap_count = 0; ---- kbd-1.12/src/mapscrn.c.orig 2005-07-07 15:00:50.869383487 +0200 -+++ kbd-1.12/src/mapscrn.c 2005-07-07 15:02:19.190869181 +0200 -@@ -126,7 +126,7 @@ - FILE *fp; - struct stat stbuf; - int u = 0; -- int lineno; -+ int lineno = 0; - - if ((fp = findfile(mfil, mapdirpath, mapsuffixes)) == NULL) { - fprintf(stderr, _("mapscrn: cannot open map file _%s_\n"), -@@ -215,18 +215,18 @@ - - if ((strncmp(s,"0x",2) == 0) && - (strspn(s+2,"0123456789abcdefABCDEF") == strlen(s+2))) -- sscanf(s+2,"%x",&i); -+ (void)sscanf(s+2,"%x",&i); - - else if ((*s == '0') && - (strspn(s,"01234567") == strlen(s))) -- sscanf(s,"%o",&i); -+ (void)sscanf(s,"%o",&i); - - else if (strspn(s,"0123456789") == strlen(s)) -- sscanf(s,"%d",&i); -+ (void)sscanf(s,"%d",&i); - - else if ((strncmp(s,"U+",2) == 0) && strlen(s) == 6 && - (strspn(s+2,"0123456789abcdefABCDEF") == 4)) -- sscanf(s+2,"%x",&i); -+ (void)sscanf(s+2,"%x",&i); - - else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\'')) - i=s[1]; ---- kbd-1.12/src/outpsfheader.c.orig 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12/src/outpsfheader.c 2005-07-07 15:02:19.205866546 +0200 -@@ -1,6 +1,7 @@ - /* outpsfheader - auxiliary fn - not to be installed */ - /* assumes a little-endian machine */ - #include -+#include /* exit */ - #include "psf.h" - - void ---- kbd-1.12/src/spawn_console.c.orig 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12/src/spawn_console.c 2005-07-07 15:02:19.220863912 +0200 -@@ -12,6 +12,10 @@ - #include - #include - #include -+#include /* system */ -+#include /* open */ -+#include /* ioctl */ -+#include /* sleep */ - - void - sighup(){ ---- kbd-1.12/src/setleds.c.orig 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12/src/setleds.c 2005-07-07 15:01:56.377876261 +0200 -@@ -149,7 +149,7 @@ - int optL = 0, optD = 0, optF = 0, verbose = 0; - char oleds, nleds, oflags, nflags, odefflags, ndefflags; - char nval, ndef, sign; -- char osunleds, nsunleds, nsunval, nsundef; -+ char osunleds = 0, nsunleds, nsunval, nsundef; - char *ap; - struct led *lp; - ---- kbd-1.12/openvt/Makefile.orig 2004-01-03 15:44:41.000000000 +0100 -+++ kbd-1.12/openvt/Makefile 2005-07-07 15:02:19.235861278 +0200 -@@ -1,6 +1,7 @@ - - CC=gcc --CFLAGS=-O2 -Wall -ansi -+RPM_OPT_FLAGS=-O2 -Wall -ansi -+CFLAGS=$(RPM_OPT_FLAGS) - LDFLAGS=$(CFLAGS) -s - - SRC=openvt.c diff --git a/kbd-1.12-kbd_mode.diff b/kbd-1.12-kbd_mode.diff deleted file mode 100644 index 4f7b7e9..0000000 --- a/kbd-1.12-kbd_mode.diff +++ /dev/null @@ -1,99 +0,0 @@ -diff -ru kbd-1.12.orig/src/kbd_mode.c kbd-1.12/src/kbd_mode.c ---- kbd-1.12.orig/src/kbd_mode.c 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12/src/kbd_mode.c 2004-03-30 18:02:49.976870814 +0200 -@@ -6,6 +6,7 @@ - */ - #include - #include -+#include - #include - #include - #include -@@ -15,13 +16,14 @@ - - static void - usage(void){ -- fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s]\n")); -+ fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [-C device]\n")); - exit(1); - } - - int - main(int argc, char *argv[]){ -- int fd, mode; -+ int fd, mode, c, n = 0; -+ char *console = NULL; - - set_progname(argv[0]); - -@@ -32,9 +34,45 @@ - if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); - -- fd = getfd(NULL); -+ while ((c = getopt(argc, argv, "auskC:")) != EOF) { -+ switch (c) { -+ case 'a': -+ if (n > 0) -+ usage (); -+ mode = K_XLATE; -+ n++; -+ break; -+ case 'u': -+ if (n > 0) -+ usage (); -+ mode = K_UNICODE; -+ n++; -+ break; -+ case 's': -+ if (n > 0) -+ usage (); -+ mode = K_RAW; -+ n++; -+ break; -+ case 'k': -+ if (n > 0) -+ usage (); -+ mode = K_MEDIUMRAW; -+ n++; -+ break; -+ case 'C': -+ if (!optarg || !optarg[0]) -+ usage (); -+ console = optarg; -+ break; -+ default: -+ usage(); -+ } -+ } -+ -+ fd = getfd(console); - -- if (argc == 1) { -+ if (n == 0) { - /* report mode */ - if (ioctl(fd, KDGKBMODE, &mode)) { - perror("KDGKBMODE"); -@@ -57,20 +95,9 @@ - default: - printf(_("The keyboard is in some unknown mode\n")); - } -- exit(1); -+ exit(0); - } -- if (argc != 2) -- usage(); -- if (!strcmp(argv[1], "-a")) -- mode = K_XLATE; -- else if (!strcmp(argv[1], "-u")) -- mode = K_UNICODE; -- else if (!strcmp(argv[1], "-s")) -- mode = K_RAW; -- else if (!strcmp(argv[1], "-k")) -- mode = K_MEDIUMRAW; -- else -- usage(); -+ - if (ioctl(fd, KDSKBMODE, mode)) { - perror("KDSKBMODE"); - fprintf(stderr, _("%s: error setting keyboard mode\n"), progname); diff --git a/kbd-1.12-loadkeys-C-opt.diff b/kbd-1.12-loadkeys-C-opt.diff deleted file mode 100644 index 0b63e69..0000000 --- a/kbd-1.12-loadkeys-C-opt.diff +++ /dev/null @@ -1,154 +0,0 @@ ---- kbd-1.12/man/man1/loadkeys.1.in.orig 2005-03-04 19:10:30.000000000 +0000 -+++ kbd-1.12/man/man1/loadkeys.1.in 2005-03-04 19:11:13.000000000 +0000 -@@ -7,6 +7,10 @@ - [ - .I -c --clearcompose - ] [ -+.I -C '' -+| -+.I --console=cons1,cons2,... -+] [ - .I -d --default - ] [ - .I -h --help -@@ -28,6 +32,11 @@ - reads the file or files specified by - .IR filename... . - Its main purpose is to load the kernel keymap for the console. -+The affected console device or devices can be specified using the -+.I -C -+(or -+.I --console -+) option. This option supports a list of device names - .SH "RESET TO DEFAULT" - If the - .I -d ---- kbd-1.12/src/loadkeys.y.orig 2005-03-08 17:55:08.000000000 +0000 -+++ kbd-1.12/src/loadkeys.y 2005-03-08 17:10:06.000000000 +0000 -@@ -62,7 +62,7 @@ - static void compose(int diacr, int base, int res); - static void do_constant(void); - static void do_constant_key (int, u_short); --static void loadkeys(void); -+static void loadkeys(char *console, int *warned); - static void mktable(void); - static void strings_as_usual(void); - static void keypad_as_usual(char *keyboard); -@@ -250,6 +250,8 @@ - "valid options are:\n" - "\n" - " -c --clearcompose clear kernel compose table\n" -+" -C \n" -+" --console=<...> Indicate console device(s) to be used.\n" - " -d --default load \"" DEFMAP "\"\n" - " -h --help display this help text\n" - " -m --mktable output a \"defkeymap.c\" to stdout\n" -@@ -269,9 +271,10 @@ - - int - main(unsigned int argc, char *argv[]) { -- const char *short_opts = "cdhmsuqvV"; -+ const char *short_opts = "cC:dhmsuqvV"; - const struct option long_opts[] = { - { "clearcompose", no_argument, NULL, 'c' }, -+ { "console", 1, NULL, 'C' }, - { "default", no_argument, NULL, 'd' }, - { "help", no_argument, NULL, 'h' }, - { "mktable", no_argument, NULL, 'm' }, -@@ -283,6 +286,8 @@ - { NULL, 0, NULL, 0 } - }; - int c; -+ char *console = NULL; -+ int warned = 0; - - set_progname(argv[0]); - -@@ -292,6 +297,9 @@ - case 'c': - nocompose = 1; - break; -+ case 'C': -+ console = optarg; -+ break; - case 'd': - optd = 1; - break; -@@ -330,8 +338,26 @@ - do_constant(); - if(optm) - mktable(); -+ else if (console) -+ { -+ char *buf = strdup(console); /* make writable */ -+ char *e, *s = buf; -+ while (*s) -+ { -+ while ( *s == ' ' || *s == '\t' || *s == ',') s++; -+ e = s; -+ while (*e && *e != ' ' && *e != '\t' && *e != ',') e++; -+ char c = *e; -+ *e = '\0'; -+ if (verbose) printf("%s\n", s); -+ loadkeys(s, &warned); -+ *e = c; -+ s = e; -+ } -+ free(buf); -+ } - else -- loadkeys(); -+ loadkeys(NULL, &warned); - exit(0); - } - -@@ -760,7 +786,7 @@ - } - - static int --defkeys(int fd) { -+defkeys(int fd, char *cons, int *warned) { - struct kbentry ke; - int ct = 0; - int i,j,fail; -@@ -845,9 +871,21 @@ - fprintf(stderr, _("%s: failed to restore keyboard mode\n"), - progname); - } -- fprintf(stderr, _("%s: warning: this map uses Unicode symbols\n" -- " (perhaps you want to do `kbd_mode -u'?)\n"), -- progname); -+ -+ if (!warned++) -+ { -+ int kd_mode = -1; -+ if (ioctl(fd, KDGETMODE, &kd_mode) || (kd_mode != KD_GRAPHICS)) -+ { -+ /* -+ * It is okay for the graphics console to have a non-unicode mode. -+ * only talk about other consoles -+ */ -+ fprintf(stderr, _("%s: warning: this map uses Unicode symbols, %s mode=%d\n" -+ " (perhaps you want to do `kbd_mode -u'?)\n"), -+ progname, cons ? cons : "NULL", kd_mode); -+ } -+ } - } - return ct; - } -@@ -981,12 +1019,12 @@ - } - - static void --loadkeys (void) { -+loadkeys (char *console, int *warned) { - int fd; - int keyct, funcct, diacct; - -- fd = getfd(NULL); -- keyct = defkeys(fd); -+ fd = getfd(console); -+ keyct = defkeys(fd, console, &warned); - funcct = deffuncs(fd); - if (accent_table_size > 0 || nocompose) - diacct = defdiacs(fd); diff --git a/kbd-1.12-loadkeys-repstdout.diff b/kbd-1.12-loadkeys-repstdout.diff deleted file mode 100644 index d152694..0000000 --- a/kbd-1.12-loadkeys-repstdout.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur kbd-1.12-5/src/loadkeys.y kbd-1.12-6/src/loadkeys.y ---- kbd-1.12-5/src/loadkeys.y 2004-02-26 22:49:25.000000000 +0100 -+++ kbd-1.12-6/src/loadkeys.y 2004-02-26 22:52:44.000000000 +0100 -@@ -537,7 +537,7 @@ - - if (verbose) - /* start reading include file */ -- fprintf(stderr, _("switching to %s\n"), s); -+ fprintf(stdout, _("switching to %s\n"), s); - - lk_push(); - -@@ -613,8 +613,8 @@ - */ - gotf: - filename = xstrdup(pathname); -- if (!quiet) -- fprintf(stderr, _("Loading %s\n"), pathname); -+ if (!quiet && !optm) -+ fprintf(stdout, _("Loading %s\n"), pathname); - if (first_file) { - yyin = f; - first_file = 0; diff --git a/kbd-1.12-mac-de.diff b/kbd-1.12-mac-de.diff deleted file mode 100644 index 1031d89..0000000 --- a/kbd-1.12-mac-de.diff +++ /dev/null @@ -1,99 +0,0 @@ ---- - data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map | 2 - - data/keymaps/mac/all/mac-de-latin1.map | 38 ++++++++++++---------- - data/keymaps/mac/include/mac-euro2.map | 6 +++ - 3 files changed, 28 insertions(+), 18 deletions(-) - -Index: kbd-1.12/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map -=================================================================== ---- kbd-1.12.orig/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map -+++ kbd-1.12/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map -@@ -7,7 +7,7 @@ include "mac-de-latin1.map" - keycode 24 = apostrophe grave - keycode 30 = plus asterisk asciitilde - keycode 50 = asciicircum degree -- alt keycode 45 = asciitilde -+ altgr keycode 45 = asciitilde - - # corresponding keys in mac-de-latin1.map: - # keycode 24 = dead_acute dead_grave -Index: kbd-1.12/data/keymaps/mac/all/mac-de-latin1.map -=================================================================== ---- kbd-1.12.orig/data/keymaps/mac/all/mac-de-latin1.map -+++ kbd-1.12/data/keymaps/mac/all/mac-de-latin1.map -@@ -11,22 +11,23 @@ include "mac-qwerty-layout" - #include "linux-with-alt-and-altgr" - include "mac-linux-keys-bare.inc" - plain keycode 65 = KP_Comma --include "mac-euro.map" -+include "mac-euro2.map" - compose as usual for "iso-8859-1" - strings as usual - --# Normal Shift AltGr Strg --# Normal Shift AltGr Shift+AltGr Ctrl Shift+Ctrl AltGr+Ctrl Shift+AltGr+Ctrl Alt Shift+Alt AltGr+Alt Shift+AltGr+Alt --keycode 26 = seven slash braceleft a b c d e f g h i j k -+# Normal Shift AltGr Shift+AltGr Ctrl Shift+Ctrl AltGr+Ctrl Shift+AltGr+Ctrl Alt Shift+Alt AltGr+Alt Shift+AltGr+Alt - keycode 18 = one exclam - shift altgr keycode 18 = at --keycode 19 = two quotedbl twosuperior nul --keycode 20 = three section threesuperior Escape -+keycode 19 = two quotedbl twosuperior -+ control keycode 19 = nul -+keycode 20 = three section threesuperior -+ control keycode 29 = Escape - keycode 21 = four dollar --keycode 23 = five percent --keycode 22 = six ampersand --keycode 28 = eight parenleft bracketleft --keycode 25 = nine parenright bracketright -+keycode 23 = five percent bracketleft -+keycode 22 = six ampersand bracketright -+keycode 26 = seven slash bar -+keycode 28 = eight parenleft braceleft -+keycode 25 = nine parenright braceright - control altgr keycode 25 = Control_bracketright - keycode 29 = zero equal braceright - keycode 27 = ssharp question backslash -@@ -38,20 +39,23 @@ keycode 33 = +udiaeresis +Udiaere - keycode 30 = plus asterisk dead_tilde - keycode 41 = +odiaeresis +Odiaeresis - keycode 39 = +adiaeresis +Adiaeresis --keycode 10 = dead_circumflex degree Meta_asciicircum Control_asciicircum -+keycode 50 = dead_circumflex degree -+ alt keycode 50 = Meta_asciicircum -+ control keycode 50 = Control_asciicircum - keycode 42 = numbersign apostrophe - keycode 43 = comma semicolon - keycode 47 = period colon --keycode 44 = minus underscore Meta_minus -+keycode 44 = minus underscore - shift control keycode 44 = Control_underscore --keycode 49 = space space Meta_space nul -+keycode 49 = space space -+ control keycode 49 = nul - keycode 10 = less greater bar - - keycode 16 = z - keycode 6 = y - -- alt keycode 12 = at -- alt keycode 50 = bar -+ altgr keycode 12 = at -+ altgr keycode 37 = at -+ altgr keycode 42 = bar - # altgr keycode 26 = bar -- alt keycode 30 = dead_tilde -- alt keycode 45 = dead_tilde -+ altgr keycode 45 = dead_tilde -Index: kbd-1.12/data/keymaps/mac/include/mac-euro2.map -=================================================================== ---- /dev/null -+++ kbd-1.12/data/keymaps/mac/include/mac-euro2.map -@@ -0,0 +1,6 @@ -+# Euro and cent -+# [Say: "loadkeys mac-euro2" to get Euro and cent with AltGr (Option key) -+# on the positions where many keyboards have E and C. -+# To get it displayed, use a latin0 (i.e., latin9) font.] -+altgr keycode 14 = currency -+altgr keycode 8 = cent diff --git a/kbd-1.12-mac-dk.diff b/kbd-1.12-mac-dk.diff deleted file mode 100644 index fe0e68d..0000000 --- a/kbd-1.12-mac-dk.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur kbd-1.12-6/data/keymaps/mac/all/mac-dk-latin1.map kbd-1.12-7/data/keymaps/mac/all/mac-dk-latin1.map ---- kbd-1.12-6/data/keymaps/mac/all/mac-dk-latin1.map 2004-02-26 22:52:20.000000000 +0100 -+++ kbd-1.12-7/data/keymaps/mac/all/mac-dk-latin1.map 2004-02-26 22:57:47.000000000 +0100 -@@ -23,18 +23,20 @@ - keycode 25 = nine parenright bracketright - keycode 29 = zero equal - keycode 27 = plus question --keycode 24 = acute grave -+keycode 24 = acute grave at - keycode 33 = aring Aring - keycode 30 = diaeresis circumflex asciitilde - keycode 41 = ae AE adiaeresis Adiaeresis - keycode 39 = oslash Oslash odiaeresis Odiaeresis --keycode 42 = apostrophe asterisk -+keycode 42 = apostrophe asterisk at - keycode 43 = comma semicolon - keycode 47 = period colon - keycode 44 = minus underscore Meta_minus - shift control keycode 44 = Control_underscore - keycode 49 = space space Meta_space nul - keycode 10 = less greater bar -+# odd -+keycode 34 = i I bar - - - alt keycode 12 = at diff --git a/kbd-1.12-noclaudio.diff b/kbd-1.12-noclaudio.diff deleted file mode 100644 index 007a641..0000000 --- a/kbd-1.12-noclaudio.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur kbd-1.12-3/data/keymaps/mac/all/mac-de_CH.map kbd-1.12-4/data/keymaps/mac/all/mac-de_CH.map ---- kbd-1.12-3/data/keymaps/mac/all/mac-de_CH.map 2004-02-26 22:39:18.000000000 +0100 -+++ kbd-1.12-4/data/keymaps/mac/all/mac-de_CH.map 2004-02-26 22:48:31.000000000 +0100 -@@ -11,7 +11,7 @@ - ! CtrlR 128 not used - - ! plain,shift,command,control,alt,ctrl-alt --# from http://www.claudio.ch/Etc/pb-sg.kmap -+# from Claudio Nieder - # modified by olh@suse.de - - alt_is_meta -diff -Nur kbd-1.12-3/data/keymaps/mac/all/mac-fr_CH-latin1.map kbd-1.12-4/data/keymaps/mac/all/mac-fr_CH-latin1.map ---- kbd-1.12-3/data/keymaps/mac/all/mac-fr_CH-latin1.map 2004-02-26 22:39:18.000000000 +0100 -+++ kbd-1.12-4/data/keymaps/mac/all/mac-fr_CH-latin1.map 2004-02-26 22:48:31.000000000 +0100 -@@ -11,7 +11,7 @@ - ! CtrlR 128 not used - - ! plain,shift,command,control,alt,ctrl-alt --# from http://www.claudio.ch/Etc/pb-sg.kmap -+# from Claudio Nieder - # modified by olh@suse.de from mac-de_CH - - alt_is_meta diff --git a/kbd-1.12-nohang-kbdrate2.diff b/kbd-1.12-nohang-kbdrate2.diff deleted file mode 100644 index 7f2c6e7..0000000 --- a/kbd-1.12-nohang-kbdrate2.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur kbd-1.12-4/src/kbdrate.c kbd-1.12-5/src/kbdrate.c ---- kbd-1.12-4/src/kbdrate.c 2004-02-26 22:46:55.000000000 +0100 -+++ kbd-1.12-5/src/kbdrate.c 2004-02-26 22:50:19.000000000 +0100 -@@ -90,6 +90,8 @@ - }; - #endif - -+#include -+ - #include "nls.h" - #include "version.h" - -@@ -185,6 +187,12 @@ - #endif /* KIOCSRATE */ - } - -+void -+sigalrmhandler( int sig ) { -+ fprintf( stderr, "kbdrate: Failed waiting for kbd controller!\n" ); -+ raise( SIGINT ); -+} -+ - int - main( int argc, char **argv ) { - #ifdef __sparc__ -@@ -260,6 +268,9 @@ - exit( 1 ); - } - -+ signal( SIGALRM, sigalrmhandler ); -+ alarm( 3 ); -+ - do { - lseek( fd, 0x64, 0 ); - read( fd, &data, 1 ); -@@ -274,6 +285,8 @@ - read( fd, &data, 1 ); - } while ((data & 2) == 2 ); /* wait */ - -+ alarm( 0 ); -+ - lseek( fd, 0x60, 0 ); - sleep( 1 ); - write( fd, &value, 1 ); diff --git a/kbd-1.12-nounicode-nontty.diff b/kbd-1.12-nounicode-nontty.diff deleted file mode 100644 index 9f40b0b..0000000 --- a/kbd-1.12-nounicode-nontty.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur kbd-1.12-13/src/unicode_start kbd-1.12-14/src/unicode_start ---- kbd-1.12-13/src/unicode_start 2004-02-27 17:22:32.000000000 +0100 -+++ kbd-1.12-14/src/unicode_start 2004-02-27 17:24:51.000000000 +0100 -@@ -1,6 +1,17 @@ - #!/bin/sh - # Enables Unicode processing in the current console. --# -+ -+# 0. Check whether we're on a console -+TTY=`/usr/bin/tty` -+case $TTY in -+ /dev/console|/dev/tty[0-9]*) -+ ;; -+ *) -+ echo "unicode_start skipped on $TTY" -+ exit 0 -+ ;; -+esac -+ - # 1. The input side: the keyboard driver. - - # Set the keyboard driver in Unicode mode. (Default is ASCII mode.) -diff -Nur kbd-1.12-13/src/unicode_stop kbd-1.12-14/src/unicode_stop ---- kbd-1.12-13/src/unicode_stop 2004-02-27 17:22:32.000000000 +0100 -+++ kbd-1.12-14/src/unicode_stop 2004-02-27 17:24:51.000000000 +0100 -@@ -1,5 +1,14 @@ - #!/bin/sh - # stop unicode -+TTY=`/usr/bin/tty` -+case $TTY in -+ /dev/console|/dev/tty[0-9]*) -+ ;; -+ *) -+ echo "unicode_stop skipped on $TTY" -+ exit 0 -+ ;; -+esac - kbd_mode -a - echo -n -e '\033%@' - diff --git a/kbd-1.12-prtscr_no_sigquit.diff b/kbd-1.12-prtscr_no_sigquit.diff deleted file mode 100644 index addf5a3..0000000 --- a/kbd-1.12-prtscr_no_sigquit.diff +++ /dev/null @@ -1,274 +0,0 @@ -diff -ur kbd-1.12-0/data/keymaps/i386/azerty/fr-latin9.map kbd-1.12-1/data/keymaps/i386/azerty/fr-latin9.map ---- kbd-1.12-0/data/keymaps/i386/azerty/fr-latin9.map 2002-10-13 01:47:01.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/azerty/fr-latin9.map 2004-02-27 19:04:47.000000000 +0100 -@@ -417,6 +417,7 @@ - # La touche Ctrl+Pause = Attn = 101 a un code pour elle-même - # - keycode 101 = Break -+ control keycode 101 = Control_c - - keycode 102 = Home - -diff -ur kbd-1.12-0/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.12-1/data/keymaps/i386/fgGIod/tr_f-latin5.map ---- kbd-1.12-0/data/keymaps/i386/fgGIod/tr_f-latin5.map 2002-10-13 02:21:12.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/fgGIod/tr_f-latin5.map 2004-02-27 19:04:47.000000000 +0100 -@@ -217,6 +217,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/bg-cp1251.map kbd-1.12-1/data/keymaps/i386/qwerty/bg-cp1251.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/bg-cp1251.map 2004-01-03 18:07:57.000000000 +0100 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/bg-cp1251.map 2004-02-27 19:04:47.000000000 +0100 -@@ -311,6 +311,7 @@ - altgr alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/bg_bds-cp1251.map kbd-1.12-1/data/keymaps/i386/qwerty/bg_bds-cp1251.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/bg_bds-cp1251.map 2002-10-14 01:39:32.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/bg_bds-cp1251.map 2004-02-27 19:04:47.000000000 +0100 -@@ -636,6 +636,7 @@ - keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/br-abnt.map kbd-1.12-1/data/keymaps/i386/qwerty/br-abnt.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/br-abnt.map 2002-10-13 02:10:14.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/br-abnt.map 2004-02-27 19:04:47.000000000 +0100 -@@ -197,6 +197,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/by.map kbd-1.12-1/data/keymaps/i386/qwerty/by.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/by.map 2002-10-13 02:10:31.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/by.map 2004-02-27 19:04:47.000000000 +0100 -@@ -529,6 +529,7 @@ - Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash - keycode 100 = Alt - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up Up Up \ - KeyboardSignal Up Up \ -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz-cp1250.map kbd-1.12-1/data/keymaps/i386/qwerty/cz-cp1250.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/cz-cp1250.map 2002-10-13 02:12:14.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz-cp1250.map 2004-02-27 19:04:47.000000000 +0100 -@@ -138,6 +138,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2-prog.map kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2-prog.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2-prog.map 2002-10-13 02:02:58.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2-prog.map 2004-02-27 19:04:47.000000000 +0100 -@@ -141,6 +141,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2.map kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2.map 2002-10-13 02:03:21.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2.map 2004-02-27 19:04:47.000000000 +0100 -@@ -138,6 +138,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz.map kbd-1.12-1/data/keymaps/i386/qwerty/cz.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/cz.map 2002-10-11 13:08:50.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz.map 2004-02-27 19:04:47.000000000 +0100 -@@ -1083,13 +1083,13 @@ - keycode 100 = AltGr - # - #keycode 101 = Break --keycode 101 = Break Break VoidSymbol VoidSymbol VoidSymbol \ -- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ -+keycode 101 = Break Break VoidSymbol VoidSymbol Control_c \ -+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol \ -- Break Break VoidSymbol VoidSymbol VoidSymbol \ -- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ -+ Break Break VoidSymbol VoidSymbol Control_c \ -+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ - VoidSymbol -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map 2004-02-27 19:03:48.000000000 +0100 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap.map 2004-02-27 19:04:47.000000000 +0100 -@@ -222,6 +222,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap_V1.0.map kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap_V1.0.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap_V1.0.map 2002-10-13 02:05:31.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap_V1.0.map 2004-02-27 19:04:47.000000000 +0100 -@@ -185,6 +185,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/lt.baltic.map kbd-1.12-1/data/keymaps/i386/qwerty/lt.baltic.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/lt.baltic.map 2002-10-13 02:09:50.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/lt.baltic.map 2004-02-27 19:04:47.000000000 +0100 -@@ -171,6 +171,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/lt.l4.map kbd-1.12-1/data/keymaps/i386/qwerty/lt.l4.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/lt.l4.map 2002-10-13 01:59:51.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/lt.l4.map 2004-02-27 19:04:47.000000000 +0100 -@@ -463,6 +463,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break # 101=Control-Pause -+ control keycode 101 = Control_c - string F102 = "\033[7$" - keycode 102 = Find # =Home - shift keycode 102 = F102 -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/lt.map kbd-1.12-1/data/keymaps/i386/qwerty/lt.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/lt.map 2002-10-13 02:00:25.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/lt.map 2004-02-27 19:04:47.000000000 +0100 -@@ -462,6 +462,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break # 101=Control-Pause -+ control keycode 101 = Control_c - string F102 = "\033[7$" - keycode 102 = Find # =Home - shift keycode 102 = F102 -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/pl2.map kbd-1.12-1/data/keymaps/i386/qwerty/pl2.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/pl2.map 2002-10-13 02:06:29.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/pl2.map 2004-02-27 19:04:47.000000000 +0100 -@@ -241,6 +241,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - control keycode 102 = F106 - keycode 103 = Up -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/sk-prog-qwerty.map kbd-1.12-1/data/keymaps/i386/qwerty/sk-prog-qwerty.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/sk-prog-qwerty.map 2002-10-13 02:09:26.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/sk-prog-qwerty.map 2004-02-27 19:04:47.000000000 +0100 -@@ -122,6 +122,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf-ws.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf-ws.map 2002-10-13 02:07:56.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf-ws.map 2004-02-27 19:04:47.000000000 +0100 -@@ -1526,6 +1526,7 @@ - ctrlr keycode 100 = CtrlR_Lock - ctrll ctrlr keycode 100 = CtrlR_Lock - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf.map kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf.map 2002-10-13 02:08:07.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf.map 2004-02-27 19:04:47.000000000 +0100 -@@ -1516,6 +1516,7 @@ - ctrlr keycode 100 = CtrlR_Lock - ctrll ctrlr keycode 100 = CtrlR_Lock - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua-ws.map kbd-1.12-1/data/keymaps/i386/qwerty/ua-ws.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/ua-ws.map 2002-10-13 02:08:19.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua-ws.map 2004-02-27 19:04:47.000000000 +0100 -@@ -1521,6 +1521,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = Alt - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua.map kbd-1.12-1/data/keymaps/i386/qwerty/ua.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/ua.map 2002-10-13 02:08:31.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua.map 2004-02-27 19:04:47.000000000 +0100 -@@ -1515,6 +1515,7 @@ - ctrlr keycode 100 = CtrlR_Lock - ctrll ctrlr keycode 100 = CtrlR_Lock - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/us-acentos.map kbd-1.12-1/data/keymaps/i386/qwerty/us-acentos.map ---- kbd-1.12-0/data/keymaps/i386/qwerty/us-acentos.map 2002-10-13 02:10:02.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwerty/us-acentos.map 2004-02-27 19:04:47.000000000 +0100 -@@ -193,6 +193,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwertz/cz-us-qwertz.map kbd-1.12-1/data/keymaps/i386/qwertz/cz-us-qwertz.map ---- kbd-1.12-0/data/keymaps/i386/qwertz/cz-us-qwertz.map 2002-10-13 01:56:20.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-27 19:04:47.000000000 +0100 -@@ -135,6 +135,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol -diff -ur kbd-1.12-0/data/keymaps/i386/qwertz/sk-prog-qwertz.map kbd-1.12-1/data/keymaps/i386/qwertz/sk-prog-qwertz.map ---- kbd-1.12-0/data/keymaps/i386/qwertz/sk-prog-qwertz.map 2002-10-13 01:57:30.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwertz/sk-prog-qwertz.map 2004-02-27 19:04:47.000000000 +0100 -@@ -122,6 +122,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior diff --git a/kbd-1.12-setfont-fpclose.diff b/kbd-1.12-setfont-fpclose.diff deleted file mode 100644 index a8515ed..0000000 --- a/kbd-1.12-setfont-fpclose.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- kbd-1.12/src/setfont.c.orig 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12/src/setfont.c 2006-06-21 17:28:56.999867425 +0200 -@@ -398,8 +398,10 @@ - fprintf(stderr, _("When loading several fonts, all " - "must be psf fonts - %s isn't\n"), - pathname); -+ fpclose(fpi); - exit(EX_DATAERR); - } -+ fpclose(fpi); // avoid zombies, jw@suse.de (#88501) - bytewidth = (width+7) / 8; - height = fontbuflth / (bytewidth * fontsize); - if (verbose) -@@ -483,6 +485,7 @@ - if(readpsffont(fpi, &inbuf, &inputlth, &fontbuf, &fontbuflth, - &width, &fontsize, 0, - no_u ? NULL : &uclistheads) == 0) { -+ fpclose(fpi); - /* we've got a psf font */ - bytewidth = (width+7) / 8; - height = fontbuflth / (bytewidth * fontsize); -@@ -497,6 +500,7 @@ - #endif - return; - } -+ fpclose(fpi); // avoid zombies, jw@suse.de (#88501) - - /* instructions to combine fonts? */ - { char *combineheader = "# combine partial fonts\n"; diff --git a/kbd-1.12-setfont-no-cruft.diff b/kbd-1.12-setfont-no-cruft.diff deleted file mode 100644 index a9f489f..0000000 --- a/kbd-1.12-setfont-no-cruft.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- kbd-1.12/src/kdfontop.c.orig 2007-08-21 19:28:47.000000000 +0200 -+++ kbd-1.12/src/kdfontop.c 2007-08-21 19:32:50.000000000 +0200 -@@ -268,26 +268,19 @@ - return 0; - } - -- /* Second attempt: PIO_FONTX */ -- cfd.charcount = count; -- cfd.charheight = height; -- cfd.chardata = buf; -- i = ioctl(fd, PIO_FONTX, &cfd); -- if (i == 0) -- return 0; -- if (errno != ENOSYS && errno != EINVAL) { -- fprintf(stderr, "%s: putfont: %d,%dx%d:failed: %d\n", progname, count, width, height, i); -- perror("putfont: PIO_FONTX"); -- return -1; -- } -- -- /* Third attempt: PIO_FONT */ -- /* This will load precisely 256 chars, independent of count */ -- i = ioctl(fd, PIO_FONT, buf); -- if (i) { -- fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i); -- perror("putfont: PIO_FONT"); -- return -1; -- } -- return 0; -+ // We no longer try PIO_FONT* calls. -+ // A former patch even added a possible 5 seconds delay loop here, in an attempt to -+ // gain victory over kdm. We no do this fight, as it can only result in races. -+ // https://bugzilla.novell.com/show_bug.cgi?id=302010 -+ // -+ // Two effects: -+ // a) Without the delay loop, we are fast enough to run early. -+ // Moving setfont calls to an earlier point most likly -+ // avoids the race. -+ // b) Without the old compat calls, it should be easier to -+ // fix this in kernel side. -+ // -+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i); -+ perror("putfont: KDFONTOP"); -+ return -1; - } diff --git a/kbd-1.12-showconsolefont-info.diff b/kbd-1.12-showconsolefont-info.diff deleted file mode 100644 index 29625c3..0000000 --- a/kbd-1.12-showconsolefont-info.diff +++ /dev/null @@ -1,146 +0,0 @@ ---- kbd-1.12/man/man8/showconsolefont.8 -+++ kbd-1.12/man/man8/showconsolefont.8 2008-05-07 18:19:41.000000000 +0200 -@@ -13,15 +13,25 @@ showconsolefont \- Show the current EGA/ - .B \-C - .I console - ] -+[ -+.B \-i -+] -+ - - .SH DESCRIPTION - The - .B showconsolefont - command outputs the current console font to stdout. --The option \-v prints additional information, while --the option \-V prints the program version number. --On Linux 2.6.1 and later, the option \-C allows one -+The option \fB\-v\fR prints additional information, while -+the option \fB\-V\fR prints the program version number. -+On Linux 2.6.1 and later, the option \fB\-C\fR allows one - to indicate the console involved. Its argument is a pathname. -+The option \fB\-i\fR cause -+.B showconsolefont -+not to show the font table but show the value of the -+used ROWS, COLUMNS, and character COUNT of the current -+font with the format -+.BR ROWS x COLUMNS x COUNT . - - .SH "SEE ALSO" - .BR setfont (8) ---- kbd-1.12/src/kdfontop.c -+++ kbd-1.12/src/kdfontop.c 2006-07-26 18:14:55.000000000 +0200 -@@ -142,8 +142,11 @@ font_charheight(char *buf, int count, in - return h; - } - --/* may be called with buf==NULL if we only want info */ --/* must not exit - we may have cleanup to do */ -+/* -+ * May be called with buf==NULL if we only want info. -+ * May be called with width==NULL and height==NULL. -+ * Must not exit - we may have cleanup to do. -+ */ - int - getfont(int fd, char *buf, int *count, int *width, int *height) { - struct consolefontdesc cfd; -@@ -193,6 +196,11 @@ getfont(int fd, char *buf, int *count, i - fprintf(stderr, _("bug: getfont called with count<256\n")); - return -1; - } -+ if (!buf) -+ { -+ fprintf(stderr, _("bug: getfont using GIO_FONT needs buf.\n")); -+ return -1; -+ } - i = ioctl(fd, GIO_FONT, buf); - if (i) { - perror("getfont: GIO_FONT"); -@@ -206,11 +214,11 @@ getfont(int fd, char *buf, int *count, i - - int - getfontsize(int fd) { -- int count, width, height; -+ int count; - int i; - -- count = width = height = 0; -- i = getfont(fd, NULL, &count, &width, &height); -+ count = 0; -+ i = getfont(fd, NULL, &count, NULL, NULL); - return (i == 0) ? count : 256; - } - ---- kbd-1.12/src/showconsolefont.c -+++ kbd-1.12/src/showconsolefont.c 2008-05-07 18:27:36.130879445 +0200 -@@ -101,8 +101,15 @@ setnewunicodemap(int *list, int cnt) { - static void - usage(void) { - fprintf(stderr, -- _("usage: showconsolefont [-v|-V]\n" -- "(probably after loading a font with `setfont font')\n")); -+ _("usage: showconsolefont -V|--version\n" -+ " showconsolefont [-C tty] [-v] [-i]\n" -+ "(probably after loading a font with `setfont font')\n" -+ "\n" -+ "Valid options are:\n" -+ " -C tty Device to read the font from. Default: current tty.\n" -+ " -v Be more verbose.\n" -+ " -i Don't print out the font table, just show\n" -+ " ROWSxCOLSxCOUNT and exit.\n")); - exit(1); - } - -@@ -110,7 +117,7 @@ int - main (int argc, char **argv) { - int c, n, cols, rows, nr, i, j, k; - char *sep, *console = NULL; -- int list[64], lth, verbose = 0; -+ int list[64], lth, info = 0, verbose = 0; - - set_progname(argv[0]); - -@@ -122,8 +129,11 @@ main (int argc, char **argv) { - (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) - print_version_and_exit(); - -- while ((c = getopt(argc, argv, "vC:")) != EOF) { -+ while ((c = getopt(argc, argv, "ivC:")) != EOF) { - switch (c) { -+ case 'i': -+ info = 1; -+ break; - case 'v': - verbose = 1; - break; -@@ -135,11 +145,28 @@ main (int argc, char **argv) { - } - } - -- if (argc != 1) -+ if (optind != argc) - usage(); - - fd = getfd(console); - -+ if (info) -+ { -+ nr = rows = cols = 0; -+ n = getfont(fd, NULL, &nr, &rows, &cols); -+ if (n != 0) -+ leave(1); -+ if (verbose) -+ { -+ printf("Character count: %d\n", nr); -+ printf("Font width : %d\n", rows); -+ printf("Font height : %d\n", cols); -+ } -+ else -+ printf("%dx%dx%d\n", rows, cols, nr); -+ leave(0); -+ } -+ - settrivialscreenmap(); - getoldunicodemap(); - diff --git a/kbd-1.12-strip.diff b/kbd-1.12-strip.diff deleted file mode 100644 index 7dc7423..0000000 --- a/kbd-1.12-strip.diff +++ /dev/null @@ -1,48 +0,0 @@ - openvt/Makefile | 2 +- - src/Makefile.in | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -Index: kbd-1.12/src/Makefile.in -=================================================================== ---- kbd-1.12.orig/src/Makefile.in 2006-01-13 15:03:29.000000000 +0100 -+++ kbd-1.12/src/Makefile.in 2006-01-13 15:04:24.000000000 +0100 -@@ -56,7 +56,7 @@ WARN = -Wall -Wmissing-prototypes -Wstri - DEFS = -DDATADIR=\"$(DATA_DIR)\" - RPM_OPT_FLAGS = -O2 -Wall - CFLAGS = $(RPM_OPT_FLAGS) --LDFLAGS = -s -+LDFLAGS = - - CC = gcc - YACC = bison -y -@@ -73,14 +73,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" - - -Index: kbd-1.12/openvt/Makefile -=================================================================== ---- kbd-1.12.orig/openvt/Makefile 2006-01-13 15:03:29.000000000 +0100 -+++ kbd-1.12/openvt/Makefile 2006-01-13 15:09:53.000000000 +0100 -@@ -2,7 +2,7 @@ - CC=gcc - RPM_OPT_FLAGS=-O2 -Wall -ansi - CFLAGS=$(RPM_OPT_FLAGS) --LDFLAGS=$(CFLAGS) -s -+LDFLAGS=$(CFLAGS) - - SRC=openvt.c - OBJ=openvt.o getfd.o diff --git a/kbd-1.12-swiss.diff b/kbd-1.12-swiss.diff deleted file mode 100644 index a672695..0000000 --- a/kbd-1.12-swiss.diff +++ /dev/null @@ -1,73 +0,0 @@ -diff -Nur kbd-1.12-1/data/keymaps/i386/qwertz/fr_CH-latin1.map kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH-latin1.map ---- kbd-1.12-1/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 22:12:57.000000000 +0100 -+++ kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 22:37:52.000000000 +0100 -@@ -7,7 +7,7 @@ - - keycode 1 = Escape Escape - alt keycode 1 = Meta_Escape --keycode 2 = one plus -+keycode 2 = one plus bar - alt keycode 2 = Meta_one - keycode 3 = two quotedbl at - control keycode 3 = nul -@@ -15,10 +15,10 @@ - keycode 4 = three asterisk numbersign - control keycode 4 = Escape - alt keycode 4 = Meta_three --keycode 5 = four ccedilla -+keycode 5 = four ccedilla degree - control keycode 5 = Control_backslash - alt keycode 5 = Meta_four --keycode 6 = five percent -+keycode 6 = five percent section - control keycode 6 = Control_bracketright - alt keycode 6 = Meta_five - keycode 7 = six ampersand notsign -@@ -81,3 +81,6 @@ - keycode 86 = less greater backslash - alt keycode 86 = Meta_less - keycode 97 = Control -+# adapted to X11 keymap -+altgr keycode 18 = currency -+#altgr keycode 46 = cent -diff -Nur kbd-1.12-1/data/keymaps/i386/qwertz/sg-latin1.map kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1.map ---- kbd-1.12-1/data/keymaps/i386/qwertz/sg-latin1.map 2002-10-12 21:57:22.000000000 +0200 -+++ kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1.map 2004-02-26 22:37:52.000000000 +0100 -@@ -5,7 +5,7 @@ - - keycode 1 = Escape Escape - alt keycode 1 = Meta_Escape --keycode 2 = one plus bar -+keycode 2 = one plus bar - alt keycode 2 = Meta_one - keycode 3 = two quotedbl at - control keycode 3 = nul -@@ -13,10 +13,10 @@ - keycode 4 = three asterisk numbersign - control keycode 4 = Escape - alt keycode 4 = Meta_three --keycode 5 = four ccedilla -+keycode 5 = four ccedilla degree - control keycode 5 = Control_backslash - alt keycode 5 = Meta_four --keycode 6 = five percent -+keycode 6 = five percent section - control keycode 6 = Control_bracketright - alt keycode 6 = Meta_five - keycode 7 = six ampersand notsign -@@ -44,7 +44,7 @@ - keycode 26 = udiaeresis egrave bracketleft - control keycode 26 = Escape - alt keycode 26 = Meta_bracketleft --keycode 27 = dead_diaeresis exclam bracketright -+keycode 27 = dead_diaeresis exclam bracketright - control keycode 27 = Control_bracketright - alt keycode 27 = Meta_bracketright - keycode 28 = Return -@@ -85,3 +85,6 @@ - keycode 86 = less greater backslash - alt keycode 86 = Meta_less - keycode 97 = Control -+# adapted to X11 keymap -+altgr keycode 18 = currency -+#altgr keycode 46 = cent diff --git a/kbd-1.12-unicode_scripts.diff b/kbd-1.12-unicode_scripts.diff deleted file mode 100644 index 3c2fdae..0000000 --- a/kbd-1.12-unicode_scripts.diff +++ /dev/null @@ -1,79 +0,0 @@ -diff -Nur kbd-1.12-11/src/unicode_start kbd-1.12-12/src/unicode_start ---- kbd-1.12-11/src/unicode_start 2004-02-27 17:14:14.000000000 +0100 -+++ kbd-1.12-12/src/unicode_start 2004-02-27 17:21:41.000000000 +0100 -@@ -18,7 +18,19 @@ - # produce UTF-8 encoded multibyte sequences, instead of single bytes - # >= 0x80 in a legacy 8-bit encoding. - --dumpkeys | loadkeys --unicode -+# There is no way of reverting the effect of "dumpkeys | loadkeys --unicode", -+# the memory of the earlier keymap is lost. Therefore, try -+# to save a copy of the original keymap to be able to reload it in unicode_stop. -+# (see also http://mail.nl.linux.org/linux-utf8/2003-08/msg00053.html): -+ -+test -z "$HOME" -o "/" == "$HOME" && HOME=/root -+test -d $HOME/.kbd || mkdir $HOME/.kbd -+dumpkeys > $HOME/.kbd/.keymap_sv -+ -+# redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing -+# "plus before udiaeresis ignored" warnings. -+ -+dumpkeys | loadkeys --unicode > /dev/null 2>&1 - - # 2. The output side: the console screen. - -@@ -35,6 +47,14 @@ - DEFAULT_UNICODE_FONT=LatArCyrHeb-16 - # Also drdos8x16 is a good candidate. - -+# Fonts with 512 glyphs like LatArCyrHeb-16 make it impossible to use bold -+# on the console, which makes YaST2 unusable. To be able to use bold, -+# only fonts with 256 glyphs can be used. Therefore we prefer -+# the font specified in /etc/sysconfig/console. This should be OK because -+# the default font written to /etc/sysconfig/console by YaST2 -+# is currently always a font with 256 glyphs and a Unicode map -+# which is suitable for the language used during the installation. -+ - case $# in - 2) - setfont $1 -u $2 -@@ -43,7 +63,24 @@ - setfont $1 - ;; - 0) -- setfont $DEFAULT_UNICODE_FONT -+ if [ -f /etc/sysconfig/console ] ; then -+ . /etc/sysconfig/console -+ fi -+ if [ -n "$CONSOLE_FONT" ] ; then -+ SETFONT_ARGS="$CONSOLE_FONT" -+ if [ -n "$CONSOLE_UNICODEMAP" ] ; then -+ SETFONT_ARGS="$SETFONT_ARGS -u $CONSOLE_UNICODEMAP" -+ fi -+ if [ -n "$CONSOLE_SCREENMAP" ] ; then -+ SETFONT_ARGS="$SETFONT_ARGS -m $CONSOLE_SCREENMAP" -+ fi -+ setfont $SETFONT_ARGS -+ if [ -n "$CONSOLE_MAGIC" -a "$CONSOLE_MAGIC" != "none" ] ; then -+ echo -en "\033$CONSOLE_MAGIC" -+ fi -+ else -+ setfont $DEFAULT_UNICODE_FONT -+ fi - ;; - *) - echo "usage: unicode_start [font [unicode map]]" -diff -Nur kbd-1.12-11/src/unicode_stop kbd-1.12-12/src/unicode_stop ---- kbd-1.12-11/src/unicode_stop 2004-02-27 17:14:14.000000000 +0100 -+++ kbd-1.12-12/src/unicode_stop 2004-02-27 17:21:41.000000000 +0100 -@@ -2,3 +2,10 @@ - # stop unicode - kbd_mode -a - echo -n -e '\033%@' -+ -+# "dumpkeys | loadkeys --unicode" which is called in "unicode_start" -+# cannot be reverted, therefore we have to load the keyboard mapping again -+# if it could be sucessfully saved in "unicode_start": -+ -+test -r $HOME/.kbd/.keymap_sv && loadkeys $HOME/.kbd/.keymap_sv -+ diff --git a/kbd-1.12.diff b/kbd-1.12.diff deleted file mode 100644 index ad48b8d..0000000 --- a/kbd-1.12.diff +++ /dev/null @@ -1,399 +0,0 @@ -diff -ur kbd-1.12.orig/data/keymaps/i386/include/ctrl.map kbd-1.12-0/data/keymaps/i386/include/ctrl.map ---- kbd-1.12.orig/data/keymaps/i386/include/ctrl.map 2002-10-11 13:08:50.000000000 +0200 -+++ kbd-1.12-0/data/keymaps/i386/include/ctrl.map 2004-02-26 21:55:25.000000000 +0100 -@@ -1,3 +1,6 @@ - keycode 29 = Caps_Lock - keycode 58 = Control - keycode 97 = Compose -+# keycode 97 = Control -+# Shift keycode 97 = Compose is also popular -+# (Right Ctrl + Shift for Compose) -diff -ur kbd-1.12.orig/data/keymaps/i386/qwerty/defkeymap.map kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map ---- kbd-1.12.orig/data/keymaps/i386/qwerty/defkeymap.map 2002-10-13 02:03:56.000000000 +0200 -+++ kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map 2004-02-26 21:55:25.000000000 +0100 -@@ -251,9 +251,9 @@ - keycode 122 = - keycode 123 = - keycode 124 = --keycode 125 = --keycode 126 = --keycode 127 = -+keycode 125 = Decr_Console Last_Console Incr_Console Compose -+keycode 126 = Incr_Console Last_Console Decr_Console Compose -+keycode 127 = Compose Decr_Console Incr_Console Last_Console - string F1 = "\033[[A" - string F2 = "\033[[B" - string F3 = "\033[[C" -diff -ur kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH-latin1.map kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH-latin1.map ---- kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH-latin1.map 2002-10-11 13:08:48.000000000 +0200 -+++ kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 21:55:25.000000000 +0100 -@@ -3,7 +3,6 @@ - keymaps 0-2,4-6,8,12 - include "qwertz-layout" - include "linux-with-alt-and-altgr" -- plain keycode 83 = KP_Comma - strings as usual - - keycode 1 = Escape Escape -diff -ur kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH.map kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH.map ---- kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH.map 2002-10-11 13:08:48.000000000 +0200 -+++ kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH.map 2004-02-26 21:55:25.000000000 +0100 -@@ -3,7 +3,6 @@ - keymaps 0-2,4-6,8,12 - include "qwertz-layout" - include "linux-with-alt-and-altgr" -- plain keycode 83 = KP_Comma - strings as usual - - keycode 1 = Escape Escape -diff -ur kbd-1.12.orig/data/keymaps/mac/all/mac-de_CH.map kbd-1.12-0/data/keymaps/mac/all/mac-de_CH.map ---- kbd-1.12.orig/data/keymaps/mac/all/mac-de_CH.map 2002-10-11 13:08:52.000000000 +0200 -+++ kbd-1.12-0/data/keymaps/mac/all/mac-de_CH.map 2004-02-26 21:55:25.000000000 +0100 -@@ -43,3 +43,5 @@ - keycode 44 = minus underscore backslash Control_underscore Meta_minus Meta_Control_underscore - keycode 47 = period colon - keycode 10 = less greater -+keycode 16 = z -+keycode 6 = y -diff -ur kbd-1.12.orig/data/keymaps/mac/all/mac-dk-latin1.map kbd-1.12-0/data/keymaps/mac/all/mac-dk-latin1.map ---- kbd-1.12.orig/data/keymaps/mac/all/mac-dk-latin1.map 2002-10-11 13:08:52.000000000 +0200 -+++ kbd-1.12-0/data/keymaps/mac/all/mac-dk-latin1.map 2004-02-26 21:55:25.000000000 +0100 -@@ -28,7 +28,7 @@ - keycode 30 = diaeresis circumflex asciitilde - keycode 41 = ae AE adiaeresis Adiaeresis - keycode 39 = oslash Oslash odiaeresis Odiaeresis --keycode 42 = numbersign apostrophe -+keycode 42 = apostrophe asterisk - keycode 43 = comma semicolon - keycode 47 = period colon - keycode 44 = minus underscore Meta_minus -@@ -36,8 +36,6 @@ - keycode 49 = space space Meta_space nul - keycode 10 = less greater bar - --keycode 16 = z --keycode 6 = y - - alt keycode 12 = at - alt keycode 50 = bar -diff -ur kbd-1.12.orig/src/Makefile.in kbd-1.12-0/src/Makefile.in ---- kbd-1.12.orig/src/Makefile.in 2004-01-03 18:53:54.000000000 +0100 -+++ kbd-1.12-0/src/Makefile.in 2004-02-26 21:55:25.000000000 +0100 -@@ -54,7 +54,8 @@ - - WARN = -Wall -Wmissing-prototypes -Wstrict-prototypes - DEFS = -DDATADIR=\"$(DATA_DIR)\" --CFLAGS = -O2 -+RPM_OPT_FLAGS = -O2 -Wall -+CFLAGS = $(RPM_OPT_FLAGS) - LDFLAGS = -s - - CC = gcc -diff -ur kbd-1.12.orig/po/Makefile.in kbd-1.12-0/po/Makefile.in ---- kbd-1.12.orig/po/Makefile.in 2004-03-02 00:04:10.727687162 +0100 -+++ kbd-1.12/po/Makefile.in 2004-03-02 00:04:26.390543066 +0100 -@@ -13,7 +13,7 @@ - FOREIGN= - SHELL = /bin/sh - --prefix = $(DESTDIR)@prefix@ -+prefix = $(DESTDIR)/usr - datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale -diff -ur kbd-1.12.orig/src/kdfontop.c kbd-1.12-0/src/kdfontop.c ---- kbd-1.12.orig/src/kdfontop.c 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12-0/src/kdfontop.c 2004-02-26 21:55:25.000000000 +0100 -@@ -170,6 +170,8 @@ - return -1; - } - -+ /* The other methods do not support width != 8 */ -+ if (width) *width = 8; - /* Second attempt: GIO_FONTX */ - cfd.charcount = *count; - cfd.charheight = 0; -@@ -179,8 +181,6 @@ - *count = cfd.charcount; - if (height) - *height = cfd.charheight; -- if (width) -- *width = 8; - return 0; - } - if (errno != ENOSYS && errno != EINVAL) { -@@ -201,8 +201,6 @@ - *count = 256; - if (height) - *height = 0; /* undefined, at most 32 */ -- if (width) -- *width = 8; - return 0; - } - -diff -ur kbd-1.12.orig/src/loadunimap.c kbd-1.12-0/src/loadunimap.c ---- kbd-1.12.orig/src/loadunimap.c 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12-0/src/loadunimap.c 2004-02-26 21:55:25.000000000 +0100 -@@ -35,6 +35,7 @@ - #include "version.h" - int verbose = 0; - int force = 0; -+int debug = 0; - - static void - usage(void) { -@@ -345,13 +346,29 @@ - descr = getunicodemap(fd); - list = descr.entries; - -+ - for(i=0; i 1) -+ appendseparator(fp, 1, utf8); -+#endif -+ if (debug) printf ("\nchar %03x: ", i); -+ for(j=0; jprev; - -- ul = up->prev; -+ usl = ul->seq; -+ while (usl->next) usl = usl->next; - us = xmalloc(sizeof(struct unicode_seq)); - us->uc = uc; -- us->prev = ul->seq->prev; -- us->prev->next = us; -+ us->prev = usl; - us->next = NULL; -- ul->seq->prev = us; -+ usl->next = us; -+ //ul->seq->prev = us; - } - - static unsigned int -@@ -190,7 +193,7 @@ - * just read the entire file. - */ - if (fontf) { -- inputbuflth = 16384; /* random */ -+ inputbuflth = MAXFONTSIZE/4; /* random */ - inputbuf = xmalloc(inputbuflth); - n = 0; - -@@ -366,6 +369,13 @@ - perror("appendunimap"); - exit(1); - } -+ if (debug) { -+ printf ("("); -+ if (!utf8) -+ printf ("U+"); -+ while (n < 6) printf ("%02x ", out[n++]); -+ printf (")"); -+ } - } - - void -@@ -437,7 +447,7 @@ - } - - --void -+int - writepsffont(FILE *ofil, char *fontbuf, int width, int height, int fontlen, - int psftype, struct unicode_list *uclistheads) { - int bytewidth, charsize, flags, utf8, i; -@@ -456,7 +466,8 @@ - utf8 = (psftype == 2); - - fwrite(fontbuf, charsize, fontlen, ofil); -- if (uclistheads != NULL) { -+ /* unimaps: -1 => do nothing: caller will append map */ -+ if (uclistheads != NULL && uclistheads != (struct unicode_list*)-1) { - struct unicode_list *ul; - struct unicode_seq *us; - -@@ -475,5 +486,6 @@ - appendseparator(ofil, 0, utf8); - } - } -+ return utf8; - } - -diff -ur kbd-1.12.orig/src/psffontop.h kbd-1.12-0/src/psffontop.h ---- kbd-1.12.orig/src/psffontop.h 2000-12-31 15:22:17.000000000 +0100 -+++ kbd-1.12-0/src/psffontop.h 2004-02-26 21:55:25.000000000 +0100 -@@ -1,3 +1,11 @@ -+/* psffontop.h */ -+ -+#ifndef _PSFFONTOP_H -+#define _PSFFONTOP_H -+ -+/* Maximum font size that we try to handle */ -+#define MAXFONTSIZE 65536 -+ - typedef unsigned int unicode; - - struct unicode_seq { -@@ -17,7 +25,7 @@ - int *fontwidthp, int *fontlenp, int fontpos0, - struct unicode_list **uclistheadsp); - --extern void writepsffont(FILE *ofil, char *fontbuf, -+extern int writepsffont(FILE *ofil, char *fontbuf, - int width, int height, int fontlen, int psftype, - struct unicode_list *uclistheads); - -@@ -29,3 +37,5 @@ - - extern void appendunicode(FILE *fp, unsigned int uc, int utf8); - extern void appendseparator(FILE *fp, int seq, int utf8); -+ -+#endif /* _PSFFONTOP_H */ -diff -ur kbd-1.12.orig/src/psfxtable.c kbd-1.12-0/src/psfxtable.c ---- kbd-1.12.orig/src/psfxtable.c 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12-0/src/psfxtable.c 2004-02-26 21:55:25.000000000 +0100 -@@ -225,6 +225,8 @@ - } - } - -+int debug = 0; -+ - int - main(int argc, char **argv) { - char *ifname, *ofname, *itname, *otname; -diff -ur kbd-1.12.orig/src/setfont.c kbd-1.12-0/src/setfont.c ---- kbd-1.12.orig/src/setfont.c 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12-0/src/setfont.c 2004-02-26 21:55:25.000000000 +0100 -@@ -48,6 +48,7 @@ - - int verbose = 0; - int force = 0; -+int debug = 0; - - /* search for the font in these directories (with trailing /) */ - char *fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; -@@ -331,15 +332,28 @@ - up = xmalloc(maxct * sizeof(struct unipair)); - for (i = 0; i < fontsize; i++) { - ul = uclistheads[i].next; -+ if (debug) printf ("char %03x:", i); - while(ul) { - us = ul->seq; - if (us && ! us->next) { - up[ct].unicode = us->uc; - up[ct].fontpos = i; - ct++; -+ if (debug) printf (" %04x", us->uc); - } -+ else -+ if (debug) { -+ printf (" seq: <"); -+ while (us) { -+ printf (" %04x", us->uc); -+ us = us->next; -+ } -+ printf (" >"); -+ } - ul = ul->next; -+ if (debug) printf (","); - } -+ if (debug) printf ("\n"); - } - if (ct != maxct) { - char *u = _("%s: bug in do_loadtable\n"); diff --git a/kbd-1.12.lsm b/kbd-1.12.lsm deleted file mode 100644 index 0997fac..0000000 --- a/kbd-1.12.lsm +++ /dev/null @@ -1,15 +0,0 @@ -Begin3 -Title: Keyboard and console utilities for Linux -Version: 1.12 -Entered-date: 2004-01-16 -Description: loadkeys dumpkeys setfont chvt openvt kbdrate kbd.FAQ A20 etc. -Keywords: keyboard mapping console font unicode -Author: several -Maintained-by: Andries E. Brouwer (aeb@cwi.nl) -Primary-site: ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd - 884827 kbd-1.12.tar.gz -Alternate-site: ftp://ftp.*.kernel.org/pub/linux/utils/kbd -Alternate-site: ftp://sunsite.unc.edu/pub/Linux/system/keyboards -Alternate site: ftp://ftp.cwi.nl/pub/aeb/kbd -Copying-policy: GPL -End diff --git a/kbd-1.12.tar.bz2 b/kbd-1.12.tar.bz2 deleted file mode 100644 index 65dc0fe..0000000 --- a/kbd-1.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22dd61453c6f5feffc2170118edb151c9eda2dee8bdc98d71e5b8f5be671de75 -size 635392 diff --git a/kbd-1.14.1-2d01989f.patch b/kbd-1.14.1-2d01989f.patch new file mode 100644 index 0000000..404ff9d --- /dev/null +++ b/kbd-1.14.1-2d01989f.patch @@ -0,0 +1,1459 @@ +commit 2d01989f2df9d9c8b36d0b5ddf9edef5b8d2f55a +Author: Alexey Gladkov +Date: Mon Mar 31 15:47:56 2008 +0400 + + Add qwerty/cz.map keymap + + kavol@email.cz writes: + I wanted to use the keymap file /usr/share/keymaps/i386/qwerty/cz.map.gz, + but I have found this to be qwertz so I think it should be placed in + /usr/share/keymaps/i386/qwertz/ (or, much better, converted to qwerty - + I don't understand the masochists who use us-qwerty and cz-qwertz together :-) + + http://bugs.gentoo.org/19010 + + Gentoo notes: + We copy the qwerty/cz.map to qwertz/cz.map and then apply this patch ... + that way we end up with both a qwerty and qwertz version of the cz.map + + Signed-off-by: Alexey Gladkov + +diff --git a/data/keymaps/i386/qwerty/cz.map b/data/keymaps/i386/qwerty/cz.map +new file mode 100644 +index 0000000..6426bcb +--- /dev/null ++++ b/data/keymaps/i386/qwerty/cz.map +@@ -0,0 +1,1433 @@ ++# *** toto neni originalni verze souboru: ++# *** upraveno z puvodni QWERTZ na QWERTY + opraveno par preklepu ++# ++# Tato keymapa NENI urcena pro jadro "opatchovane" programem "patch-capslock" ++# ++# klavesova mapa kompatibilni s windows QWERTY ++# ++# Vytvoril: Richard S~puta, Richard.Sputa@os3.os.ds.mfcr.cz ++# ++# verze: 2.0.2 ++# ++# License: GNU GPL 2 ++# ++# Links: ftp://ftp.penguin.cz/pub/cestina/klavesnice/console/ ++# - primary ftp archiv ++# http://www.debian.cz/proj/czkbd/index.php3 ++# - czech keyboard standards ++# ++# ++# POZOR: Tato klavesova mapa obsahuje ve skutecnosti 2 (dve) klavesnice ++# Primarni je CESKA ++# Sekundarni je US ++# Prepinani se provadi pomoci klavesy "Pause" ++# ktera funguje jako "ShiftR_Lock" ++# CESKA: Control-Klavesa, Alt-Klavesa, Alt-Shift-Klavesa ++# => funguje stejne jako v US klavesnici ++# US: AltGr-Klavesa, AltGr-Shift-Klavesa ++# => funguje stejne jako v CESKE klavesnici ++# (i dead klavesy na AltGr-2 az AltGr-9, AltGr-0, AltGr--, AltGr-=) ++# Navic klavesa "PrintScreen" funguje jako carka a hacek ++# ++# ++# Rozsireni oproti standardni_CESKE_unikodove_klavesnici ++# (zde jsou popsany pouze kombinace, jejichz umisteni je diskutabilni) ++# (popis ostatnich rozsireni je v souboru "readme.txt") ++# 1) AltGr-SPACE => znak "nobreakspace" (neoddelitelna mezera kod 0xa0) ++# 2) Ctrl-SPACE => znak "nul" (kod 0x00) ++# 3) AltGr-A => ~ (tilda - pozor AltGr-1 genruje mrtvou tildu) ++# 4) AltGr-H => ` (zpetny apostrof) ++# 5) AltGr-J => ' (apostrof) ++# 6) AltGr-M => ^ (jiz nikdy vice us-klavesnice) ++# 7) AltGr-Z => ° (stupen "degree") ++# ++# ++# Mrtve klavesy (u obou klavesnic - CESKE i US) ++# AltGr-2 => dead_caron (hacek_nad_pismenem) ++# AltGr-3 => dead_circumflex (striska_nad_pismenem) ++# AltGr-4 => dead_breve (obloucek_nad_pismenem) ++# AltGr-5 => (krouzek_nad_pismenem) ++# AltGr-6 => dead_cedilla (ocasek_pod_pismenem_smerujici_zprava_doleva) ++# AltGr-7 => (nedefinovano) ++# AltGr-8 => (tecka_nad_pismenem) ++# AltGr-9 => dead_acute (carka_nad_pismenem) ++# AltGr-0 => dead_doubleacute (dve_carky_nad_pismenem) ++# AltGr-- => dead_diaeresis (dve_tecky_nad_pismenem) ++# AltGr-= => dead_ogonek (ocasek_pod_pismenem_smerujici_zleva_doprava) ++# Mrtve klavesy (pouze u US klavesnice) ++# PrintScreen => dead_acute (carka_nad_pismenem) ++# Shift-PrintScreen => dead_caron (hacek_nad_pismenem) ++# => mozno pouzit i na krouzkovane U ++# Mrtve klavesy (pouze u CESKE klavesnice) ++# = => dead_acute (carka_nad_pismenem) ++# Shift-= => dead_caron (hacek_nad_pismenem) ++# Shift-~ => (krouzek_nad_pismenem) ++# Mrtva klavesa (pouze u ceske - ne vsak slovenske) ++# \ => dead_diaeresis (dve_tecky_nad_pismenem) ++# ++# ++# ++# Prosim zasilejte mi navrhy na zmeny a vylepseni - staci slovne. ++# (prosim piste pred kazdou klavesou slova "fyzicka" "logicka") ++# napr. Fyzicky stisk AltGr-Q generuje logickou klavesu \ ++# ++# ++# Poznamka: Prosim napiste mi jak klavesnice funguje v emacsu ++# (mam na mysli klavesove kombinace jako Alt-Control-"neco") ++# ++# Poznamka: Ponevadz program "loadkeys" nezna keysym-y ++# dead_ring => mrtva klavesa pro krouzek ++# dead_dot => mrtva klavesa pro tecku_nad_pismenem ++# (krouzek je nutny pro U s krouzkem - cesky znak) ++# (tecka_nad_pismenem je nutna pro Z s teckou - polsky znak) ++# Naopak zna "dead_grave" => carka_nad_pismenem ++# v opacnem smeru nez je ceska carka ++# => nevyuzite v ISO-8859-2 ++# pouzil jsem "dead_grave" misto "dead_ring" a "dead_abovedot" ++# KEYSYM-y kterych se to tyka: ++# dead_abovedot => "keysym 9" -> AltGr-8 ++# dead_ring => "keysym 6" -> AltGr-5 ++# "keysym 41" -> klavesa_pod_ESCAPE ++# U "keysym 8" by mnel byt definovan "pravy dead_grave" ++# ale protoze zadny znak v ISO-8859-2 toto nepouziva ++# a take proto, ze "dead_grave" je pouzit na neco jineho ++# tak tam neni nadefinovan ++# U "keysym 2" by mnel byt definovan "pravy dead_tilde" ++# ale protoze zadny znak v ISO-8859-2 toto nepouziva ++# tak tam neni nadefinovan ++# U "keysym 41" by mnel byt definovan "pravy dead_carka_nad_pismenem" ++# ale protoze zadny znak v ISO-8859-2 toto nepouziva ++# tak tam neni nadefinovan ++# navic tato dead klavesa neni ani definovana (v jadru 2.0.3x) ++# ++# ++# ++# ++# ++# znakova sada: Iso Latin 2 ++charset "iso-8859-2" ++# ++# modifikator "ShiftL" byl pouzit pri stisku klaves "Shift" ++# modifikator "Shift" se meni pouze pri stisku klavesy "CapsLock" ++# modifikatory: ++############### ++# Shift 1 ++# AltGr 2 ++# Control 4 ++# Alt 8 ++# ShiftL 16 ++# ShiftR 32 ++# CtrlL 64 ++# CtrlR 128 ++# ++# plain 0 +32=32 ++# Shift 1 +32=33 ++# AltGr 2 +32=34 ++# AltGr+Shift 3 +32=35 ++# Control 4 +32=36 ++# Control+Shift 5 +32=37 ++# Control+AltGr 6 +32=38 ++# Control+AltGr+Shift 7 +32=39 ++# Alt 8 +32=40 ++# Alt+Shift 9 +32=41 ++# Alt+Control 12 +32=44 ++# Alt+Control+Shift 13 +32=45 ++# ShiftL 16 +32=48 ++# ShiftL+Shift 17 +32=49 ++# ShiftL+AltGr 18 +32=50 ++# ShiftL+AltGr+Shift 19 +32=51 ++# ShiftL+Control 20 +32=52 ++# ShiftL+Control+AltGr 22 +32=54 ++# ShiftL+Alt 24 +32=56 ++# ShiftL+Alt+Shift 25 +32=57 ++# ShiftL+Alt+Control 28 +32=60 ++keymaps 0-9,12-13,16-20,22,24-25,28,32-41,44-45,48-52,54,56-57,60 ++# Alt je Meta klavesa ++alt_is_meta ++# ++# synonyma: ++# BackSpace (primarni) => Control_h ++# Tab (primarni) => Control_i ++# Linefeed (primarni) => Control_j ++# ++# vzdalenost mezi zacatky symbolu: ++# 12 znaku (standardne) vyhovuje 80% symbolickych nazvu ++# 25 znaku ma symbolicky nazev Meta_Control_bracketright ++# 123456789012 123456789012 123456789012 123456789012 123456789012 ++keycode 1 = Escape Escape VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Escape Escape VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 2 = plus plus VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_one Meta_one \ ++ VoidSymbol VoidSymbol one one exclam \ ++ exclam VoidSymbol VoidSymbol Meta_exclam Meta_exclam \ ++ VoidSymbol \ ++ one one VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_one Meta_one \ ++ VoidSymbol VoidSymbol exclam exclam VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_exclam Meta_exclam \ ++ VoidSymbol ++keycode 3 = +ecaron Ecaron dead_caron dead_caron nul \ ++ nul VoidSymbol VoidSymbol Meta_two Meta_two \ ++ VoidSymbol VoidSymbol two two at \ ++ at VoidSymbol VoidSymbol Meta_at Meta_at \ ++ VoidSymbol \ ++ two two dead_caron dead_caron nul \ ++ nul VoidSymbol VoidSymbol Meta_two Meta_two \ ++ VoidSymbol VoidSymbol at at VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_at Meta_at \ ++ VoidSymbol ++keycode 4 = +scaron Scaron dead_circumflex \ ++ dead_circumflex Escape Escape VoidSymbol \ ++ VoidSymbol Meta_three Meta_three VoidSymbol VoidSymbol \ ++ three three numbersign numbersign VoidSymbol \ ++ VoidSymbol Meta_numbersign Meta_numbersign \ ++ VoidSymbol \ ++ three three dead_circumflex \ ++ dead_circumflex Escape Escape VoidSymbol \ ++ VoidSymbol Meta_three Meta_three VoidSymbol VoidSymbol \ ++ numbersign numbersign VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_numbersign Meta_numbersign \ ++ VoidSymbol ++keycode 5 = +ccaron Ccaron dead_breve dead_breve \ ++ Control_backslash Control_backslash VoidSymbol \ ++ VoidSymbol Meta_four Meta_four VoidSymbol VoidSymbol \ ++ four four dollar dollar VoidSymbol \ ++ VoidSymbol Meta_dollar Meta_dollar VoidSymbol \ ++ four four dead_breve dead_breve \ ++ Control_backslash Control_backslash VoidSymbol \ ++ VoidSymbol Meta_four Meta_four VoidSymbol VoidSymbol \ ++ dollar dollar VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_dollar Meta_dollar VoidSymbol ++keycode 6 = +rcaron Rcaron dead_grave dead_grave \ ++ Control_bracketright Control_bracketright VoidSymbol \ ++ VoidSymbol Meta_five Meta_five VoidSymbol VoidSymbol \ ++ five five percent percent VoidSymbol \ ++ VoidSymbol Meta_percent Meta_percent VoidSymbol \ ++ five five dead_grave dead_grave \ ++ Control_bracketright Control_bracketright VoidSymbol \ ++ VoidSymbol Meta_five Meta_five VoidSymbol VoidSymbol \ ++ percent percent VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_percent Meta_percent VoidSymbol ++keycode 7 = +zcaron Zcaron dead_ogonek dead_ogonek \ ++ Control_asciicircum Control_asciicircum VoidSymbol \ ++ VoidSymbol Meta_six Meta_six VoidSymbol VoidSymbol \ ++ six six asciicircum asciicircum VoidSymbol \ ++ VoidSymbol Meta_asciicircum Meta_asciicircum \ ++ VoidSymbol \ ++ six six dead_ogonek dead_ogonek \ ++ Control_asciicircum Control_asciicircum VoidSymbol \ ++ VoidSymbol Meta_six Meta_six VoidSymbol VoidSymbol \ ++ asciicircum asciicircum VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_asciicircum Meta_asciicircum \ ++ VoidSymbol ++keycode 8 = +yacute Yacute VoidSymbol VoidSymbol \ ++ Control_underscore Control_underscore VoidSymbol \ ++ VoidSymbol Meta_seven Meta_seven VoidSymbol VoidSymbol \ ++ seven seven ampersand ampersand VoidSymbol \ ++ VoidSymbol Meta_ampersand Meta_ampersand \ ++ VoidSymbol \ ++ seven seven VoidSymbol VoidSymbol \ ++ Control_underscore Control_underscore VoidSymbol \ ++ VoidSymbol Meta_seven Meta_seven VoidSymbol VoidSymbol \ ++ ampersand ampersand VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_ampersand Meta_ampersand \ ++ VoidSymbol ++# ++# ++# "Delete" je znak s kodem 0x7f (127) ++# ++keycode 9 = +aacute Aacute dead_grave dead_grave Delete \ ++ Delete VoidSymbol VoidSymbol Meta_eight Meta_eight \ ++ VoidSymbol VoidSymbol eight eight asterisk \ ++ asterisk VoidSymbol VoidSymbol Meta_asterisk \ ++ Meta_asterisk VoidSymbol \ ++ eight eight dead_grave dead_grave Delete \ ++ Delete VoidSymbol VoidSymbol Meta_eight Meta_eight \ ++ VoidSymbol VoidSymbol asterisk asterisk VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_asterisk \ ++ Meta_asterisk VoidSymbol ++# ++# ++keycode 10 = +iacute Iacute dead_acute dead_acute VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_nine Meta_nine \ ++ VoidSymbol VoidSymbol nine nine parenleft \ ++ parenleft VoidSymbol VoidSymbol Meta_parenleft \ ++ Meta_parenleft VoidSymbol \ ++ nine nine dead_acute dead_acute VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_nine Meta_nine \ ++ VoidSymbol VoidSymbol parenleft parenleft VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_parenleft \ ++ Meta_parenleft VoidSymbol ++keycode 11 = +eacute Eacute dead_doubleacute \ ++ dead_doubleacute VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_zero Meta_zero VoidSymbol VoidSymbol \ ++ zero zero parenright parenright VoidSymbol \ ++ VoidSymbol Meta_parenright Meta_parenright \ ++ VoidSymbol \ ++ zero zero dead_doubleacute \ ++ dead_doubleacute VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_zero Meta_zero VoidSymbol VoidSymbol \ ++ parenright parenright VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_parenright Meta_parenright \ ++ VoidSymbol ++keycode 12 = equal equal dead_diaeresis \ ++ dead_diaeresis Control_underscore \ ++ Control_underscore VoidSymbol VoidSymbol Meta_minus \ ++ Meta_minus VoidSymbol VoidSymbol percent percent \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_underscore Meta_underscore VoidSymbol \ ++ minus minus dead_diaeresis \ ++ dead_diaeresis Control_underscore \ ++ Control_underscore VoidSymbol VoidSymbol Meta_minus \ ++ Meta_minus VoidSymbol VoidSymbol underscore underscore \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_underscore Meta_underscore VoidSymbol ++keycode 13 = dead_acute dead_acute dead_cedilla dead_cedilla VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal \ ++ VoidSymbol VoidSymbol dead_caron dead_caron VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_plus Meta_plus \ ++ VoidSymbol \ ++ equal equal dead_cedilla dead_cedilla VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal \ ++ VoidSymbol VoidSymbol plus plus VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_plus Meta_plus \ ++ VoidSymbol ++# ++# ++# Toto je spatne => linux consola pouziva znak "Delete" (0x7f) ++# misto znaku "BackSpace" (0x08) (Control-H) ++# ++#keycode 14 = BackSpace BackSpace VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol Meta_BackSpace \ ++# Meta_BackSpace VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol \ ++# BackSpace BackSpace VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol Meta_BackSpace \ ++# Meta_BackSpace VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol ++# ++keycode 14 = Delete Delete VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Delete \ ++ Meta_Delete VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol \ ++ Delete Delete VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Delete \ ++ Meta_Delete VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol ++keycode 15 = Tab Meta_Tab VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Tab Tab VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 16 = +q Q backslash backslash Control_q \ ++ Control_q Control_backslash Control_backslash \ ++ Meta_q Meta_Q VoidSymbol VoidSymbol +Q \ ++ q VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_Q Meta_q VoidSymbol \ ++ +q Q backslash backslash Control_q \ ++ Control_q Control_backslash Control_backslash \ ++ Meta_q Meta_Q VoidSymbol VoidSymbol +Q \ ++ q VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_Q Meta_q VoidSymbol ++keycode 17 = +w W bar bar Control_w \ ++ Control_w VoidSymbol VoidSymbol Meta_w Meta_W \ ++ VoidSymbol VoidSymbol +W w VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_W Meta_w \ ++ VoidSymbol \ ++ +w W bar bar Control_w \ ++ Control_w VoidSymbol VoidSymbol Meta_w Meta_W \ ++ VoidSymbol VoidSymbol +W w VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_W Meta_w \ ++ VoidSymbol ++keycode 18 = +e E VoidSymbol VoidSymbol Control_e \ ++ Control_e VoidSymbol VoidSymbol Meta_e Meta_E \ ++ VoidSymbol VoidSymbol +E e VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_E Meta_e \ ++ VoidSymbol \ ++ +e E VoidSymbol VoidSymbol Control_e \ ++ Control_e VoidSymbol VoidSymbol Meta_e Meta_E \ ++ VoidSymbol VoidSymbol +E e VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_E Meta_e \ ++ VoidSymbol ++keycode 19 = +r R VoidSymbol VoidSymbol Control_r \ ++ Control_r VoidSymbol VoidSymbol Meta_r Meta_R \ ++ VoidSymbol VoidSymbol +R r VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_R Meta_r \ ++ VoidSymbol \ ++ +r R VoidSymbol VoidSymbol Control_r \ ++ Control_r VoidSymbol VoidSymbol Meta_r Meta_R \ ++ VoidSymbol VoidSymbol +R r VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_R Meta_r \ ++ VoidSymbol ++keycode 20 = +t T VoidSymbol VoidSymbol Control_t \ ++ Control_t VoidSymbol VoidSymbol Meta_t Meta_T \ ++ VoidSymbol VoidSymbol +T t VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_T Meta_t \ ++ VoidSymbol \ ++ +t T VoidSymbol VoidSymbol Control_t \ ++ Control_t VoidSymbol VoidSymbol Meta_t Meta_T \ ++ VoidSymbol VoidSymbol +T t VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_T Meta_t \ ++ VoidSymbol ++keycode 21 = +y Y VoidSymbol VoidSymbol Control_y \ ++ Control_y VoidSymbol VoidSymbol Meta_y Meta_Y \ ++ VoidSymbol VoidSymbol +Y y VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_y \ ++ VoidSymbol \ ++ +y Y VoidSymbol VoidSymbol Control_y \ ++ Control_y VoidSymbol VoidSymbol Meta_y Meta_Y \ ++ VoidSymbol VoidSymbol +Y y VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Y Meta_y \ ++ VoidSymbol ++keycode 22 = +u U VoidSymbol VoidSymbol Control_u \ ++ Control_u VoidSymbol VoidSymbol Meta_u Meta_U \ ++ VoidSymbol VoidSymbol +U u VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_U Meta_u \ ++ VoidSymbol \ ++ +u U VoidSymbol VoidSymbol Control_u \ ++ Control_u VoidSymbol VoidSymbol Meta_u Meta_U \ ++ VoidSymbol VoidSymbol +U u VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_U Meta_u \ ++ VoidSymbol ++keycode 23 = +i I VoidSymbol VoidSymbol Control_i \ ++ Control_i VoidSymbol VoidSymbol Meta_i Meta_I \ ++ VoidSymbol VoidSymbol +I i VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_I Meta_i \ ++ VoidSymbol \ ++ +i I VoidSymbol VoidSymbol Control_i \ ++ Control_i VoidSymbol VoidSymbol Meta_i Meta_I \ ++ VoidSymbol VoidSymbol +I i VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_I Meta_i \ ++ VoidSymbol ++keycode 24 = +o O VoidSymbol VoidSymbol Control_o \ ++ Control_o VoidSymbol VoidSymbol Meta_o Meta_O \ ++ VoidSymbol VoidSymbol +O o VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_O Meta_o \ ++ VoidSymbol \ ++ +o O VoidSymbol VoidSymbol Control_o \ ++ Control_o VoidSymbol VoidSymbol Meta_o Meta_O \ ++ VoidSymbol VoidSymbol +O o VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_O Meta_o \ ++ VoidSymbol ++keycode 25 = +p P VoidSymbol VoidSymbol Control_p \ ++ Control_p VoidSymbol VoidSymbol Meta_p Meta_P \ ++ VoidSymbol VoidSymbol +P p VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_P Meta_p \ ++ VoidSymbol \ ++ +p P VoidSymbol VoidSymbol Control_p \ ++ Control_p VoidSymbol VoidSymbol Meta_p Meta_P \ ++ VoidSymbol VoidSymbol +P p VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_P Meta_p \ ++ VoidSymbol ++keycode 26 = +uacute Uacute division division Escape \ ++ Escape VoidSymbol VoidSymbol Meta_bracketleft \ ++ Meta_bracketleft VoidSymbol VoidSymbol slash \ ++ slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_braceleft Meta_braceleft VoidSymbol \ ++ bracketleft bracketleft division division Escape \ ++ Escape VoidSymbol VoidSymbol Meta_bracketleft \ ++ Meta_bracketleft VoidSymbol VoidSymbol braceleft \ ++ braceleft VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_braceleft Meta_braceleft VoidSymbol ++keycode 27 = parenright parenright multiply multiply \ ++ Control_bracketright Control_bracketright VoidSymbol \ ++ VoidSymbol Meta_bracketright Meta_bracketright \ ++ VoidSymbol VoidSymbol parenleft parenleft VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_braceright \ ++ Meta_braceright VoidSymbol \ ++ bracketright bracketright multiply multiply \ ++ Control_bracketright Control_bracketright VoidSymbol \ ++ VoidSymbol Meta_bracketright Meta_bracketright \ ++ VoidSymbol VoidSymbol braceright braceright VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_braceright \ ++ Meta_braceright VoidSymbol ++keycode 28 = Return Return VoidSymbol VoidSymbol Control_m \ ++ Control_m VoidSymbol VoidSymbol Meta_Control_m \ ++ Meta_Control_m VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol \ ++ Return Return VoidSymbol VoidSymbol Control_m \ ++ Control_m VoidSymbol VoidSymbol Meta_Control_m \ ++ Meta_Control_m VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol ++keycode 29 = Control ++keycode 30 = +a A asciitilde asciitilde Control_a \ ++ Control_a VoidSymbol VoidSymbol Meta_a Meta_A \ ++ VoidSymbol VoidSymbol +A a VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_A Meta_a \ ++ VoidSymbol \ ++ +a A asciitilde asciitilde Control_a \ ++ Control_a VoidSymbol VoidSymbol Meta_a Meta_A \ ++ VoidSymbol VoidSymbol +A a VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_A Meta_a \ ++ VoidSymbol ++keycode 31 = +s S dstroke dstroke Control_s \ ++ Control_s VoidSymbol VoidSymbol Meta_s Meta_S \ ++ VoidSymbol VoidSymbol +S s VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_S Meta_s \ ++ VoidSymbol \ ++ +s S dstroke dstroke Control_s \ ++ Control_s VoidSymbol VoidSymbol Meta_s Meta_S \ ++ VoidSymbol VoidSymbol +S s VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_S Meta_s \ ++ VoidSymbol ++keycode 32 = +d D Dstroke Dstroke Control_d \ ++ Control_d VoidSymbol VoidSymbol Meta_d Meta_D \ ++ VoidSymbol VoidSymbol +D d VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_D Meta_d \ ++ VoidSymbol \ ++ +d D Dstroke Dstroke Control_d \ ++ Control_d VoidSymbol VoidSymbol Meta_d Meta_D \ ++ VoidSymbol VoidSymbol +D d VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_D Meta_d \ ++ VoidSymbol ++keycode 33 = +f F bracketleft bracketleft Control_f \ ++ Control_f Escape Escape Meta_f Meta_F \ ++ VoidSymbol VoidSymbol +F f VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_F Meta_f \ ++ VoidSymbol \ ++ +f F bracketleft bracketleft Control_f \ ++ Control_f Escape Escape Meta_f Meta_F \ ++ VoidSymbol VoidSymbol +F f VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_F Meta_f \ ++ VoidSymbol ++keycode 34 = +g G bracketright bracketright Control_g \ ++ Control_g Control_bracketright Control_bracketright \ ++ Meta_g Meta_G VoidSymbol VoidSymbol +G \ ++ g VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_G Meta_g VoidSymbol \ ++ +g G bracketright bracketright Control_g \ ++ Control_g Control_bracketright Control_bracketright \ ++ Meta_g Meta_G VoidSymbol VoidSymbol +G \ ++ g VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_G Meta_g VoidSymbol ++keycode 35 = +h H grave grave Control_h \ ++ Control_h VoidSymbol VoidSymbol Meta_h Meta_H \ ++ VoidSymbol VoidSymbol +H h VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_H Meta_h \ ++ VoidSymbol \ ++ +h H grave grave Control_h \ ++ Control_h VoidSymbol VoidSymbol Meta_h Meta_H \ ++ VoidSymbol VoidSymbol +H h VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_H Meta_h \ ++ VoidSymbol ++keycode 36 = +j J apostrophe apostrophe Control_j \ ++ Control_j VoidSymbol VoidSymbol Meta_j Meta_J \ ++ VoidSymbol VoidSymbol +J j VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_J Meta_j \ ++ VoidSymbol \ ++ +j J apostrophe apostrophe Control_j \ ++ Control_j VoidSymbol VoidSymbol Meta_j Meta_J \ ++ VoidSymbol VoidSymbol +J j VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_J Meta_j \ ++ VoidSymbol ++keycode 37 = +k K lstroke lstroke Control_k \ ++ Control_k VoidSymbol VoidSymbol Meta_k Meta_K \ ++ VoidSymbol VoidSymbol +K k VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_K Meta_k \ ++ VoidSymbol \ ++ +k K lstroke lstroke Control_k \ ++ Control_k VoidSymbol VoidSymbol Meta_k Meta_K \ ++ VoidSymbol VoidSymbol +K k VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_K Meta_k \ ++ VoidSymbol ++keycode 38 = +l L Lstroke Lstroke Control_l \ ++ Control_l VoidSymbol VoidSymbol Meta_l Meta_L \ ++ VoidSymbol VoidSymbol +L l VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_L Meta_l \ ++ VoidSymbol \ ++ +l L Lstroke Lstroke Control_l \ ++ Control_l VoidSymbol VoidSymbol Meta_l Meta_L \ ++ VoidSymbol VoidSymbol +L l VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_L Meta_l \ ++ VoidSymbol ++keycode 39 = +uring Uring dollar dollar VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_semicolon \ ++ Meta_semicolon VoidSymbol VoidSymbol quotedbl \ ++ quotedbl VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_colon Meta_colon VoidSymbol \ ++ semicolon semicolon dollar dollar VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_semicolon \ ++ Meta_semicolon VoidSymbol VoidSymbol colon \ ++ colon VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_colon Meta_colon VoidSymbol ++keycode 40 = section section ssharp ssharp VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_apostrophe \ ++ Meta_apostrophe VoidSymbol VoidSymbol exclam \ ++ exclam VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_quotedbl Meta_quotedbl VoidSymbol \ ++ apostrophe apostrophe ssharp ssharp VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_apostrophe \ ++ Meta_apostrophe VoidSymbol VoidSymbol quotedbl \ ++ quotedbl VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_quotedbl Meta_quotedbl VoidSymbol ++keycode 41 = semicolon semicolon VoidSymbol VoidSymbol nul \ ++ nul VoidSymbol VoidSymbol Meta_grave Meta_grave \ ++ VoidSymbol VoidSymbol dead_grave dead_grave VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_asciitilde \ ++ Meta_asciitilde VoidSymbol \ ++ grave grave VoidSymbol VoidSymbol nul \ ++ nul VoidSymbol VoidSymbol Meta_grave Meta_grave \ ++ VoidSymbol VoidSymbol asciitilde asciitilde VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_asciitilde \ ++ Meta_asciitilde VoidSymbol ++keycode 42 = ShiftL ++keycode 43 = dead_diaeresis dead_diaeresis currency \ ++ currency Control_backslash Control_backslash \ ++ VoidSymbol VoidSymbol Meta_backslash \ ++ Meta_backslash Meta_Control_backslash \ ++ Meta_Control_backslash apostrophe apostrophe VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_bar Meta_bar \ ++ VoidSymbol \ ++ backslash backslash currency \ ++ currency Control_backslash Control_backslash \ ++ VoidSymbol VoidSymbol Meta_backslash \ ++ Meta_backslash Meta_Control_backslash \ ++ Meta_Control_backslash bar bar VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_bar Meta_bar \ ++ VoidSymbol ++keycode 44 = +z Z degree degree Control_z \ ++ Control_z VoidSymbol VoidSymbol Meta_z Meta_Z \ ++ VoidSymbol VoidSymbol +Z z VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_z \ ++ VoidSymbol \ ++ +z Z degree degree Control_z \ ++ Control_z VoidSymbol VoidSymbol Meta_z Meta_Z \ ++ VoidSymbol VoidSymbol +Z z VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_z \ ++ VoidSymbol ++keycode 45 = +x X numbersign numbersign Control_x \ ++ Control_x VoidSymbol VoidSymbol Meta_x Meta_X \ ++ VoidSymbol VoidSymbol +X x VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_X Meta_x \ ++ VoidSymbol \ ++ +x X numbersign numbersign Control_x \ ++ Control_x VoidSymbol VoidSymbol Meta_x Meta_X \ ++ VoidSymbol VoidSymbol +X x VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_X Meta_x \ ++ VoidSymbol ++keycode 46 = +c C ampersand ampersand Control_c \ ++ Control_c VoidSymbol VoidSymbol Meta_c Meta_C \ ++ VoidSymbol VoidSymbol +C c VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_C Meta_c \ ++ VoidSymbol \ ++ +c C ampersand ampersand Control_c \ ++ Control_c VoidSymbol VoidSymbol Meta_c Meta_C \ ++ VoidSymbol VoidSymbol +C c VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_C Meta_c \ ++ VoidSymbol ++keycode 47 = +v V at at Control_v \ ++ Control_v VoidSymbol VoidSymbol Meta_v Meta_V \ ++ VoidSymbol VoidSymbol +V v VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_V Meta_v \ ++ VoidSymbol \ ++ +v V at at Control_v \ ++ Control_v VoidSymbol VoidSymbol Meta_v Meta_V \ ++ VoidSymbol VoidSymbol +V v VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_V Meta_v \ ++ VoidSymbol ++keycode 48 = +b B braceleft braceleft Control_b \ ++ Control_b VoidSymbol VoidSymbol Meta_b Meta_B \ ++ VoidSymbol VoidSymbol +B b VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_B Meta_b \ ++ VoidSymbol \ ++ +b B braceleft braceleft Control_b \ ++ Control_b VoidSymbol VoidSymbol Meta_b Meta_B \ ++ VoidSymbol VoidSymbol +B b VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_B Meta_b \ ++ VoidSymbol ++keycode 49 = +n N braceright braceright Control_n \ ++ Control_n VoidSymbol VoidSymbol Meta_n Meta_N \ ++ VoidSymbol VoidSymbol +N n VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_N Meta_n \ ++ VoidSymbol \ ++ +n N braceright braceright Control_n \ ++ Control_n VoidSymbol VoidSymbol Meta_n Meta_N \ ++ VoidSymbol VoidSymbol +N n VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_N Meta_n \ ++ VoidSymbol ++keycode 50 = +m M asciicircum asciicircum Control_m \ ++ Control_m VoidSymbol VoidSymbol Meta_m Meta_M \ ++ VoidSymbol VoidSymbol +M M VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_M Meta_m \ ++ VoidSymbol \ ++ +m M asciicircum asciicircum Control_m \ ++ Control_m VoidSymbol VoidSymbol Meta_m Meta_M \ ++ VoidSymbol VoidSymbol +M M VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_M Meta_m \ ++ VoidSymbol ++keycode 51 = comma comma less less VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_comma Meta_comma \ ++ VoidSymbol VoidSymbol question question less \ ++ less VoidSymbol VoidSymbol Meta_less Meta_less \ ++ VoidSymbol \ ++ comma comma less less VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_comma Meta_comma \ ++ VoidSymbol VoidSymbol less less less \ ++ less VoidSymbol VoidSymbol Meta_less Meta_less \ ++ VoidSymbol ++keycode 52 = period period greater greater VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_period Meta_period \ ++ VoidSymbol VoidSymbol colon colon greater \ ++ greater VoidSymbol VoidSymbol Meta_greater \ ++ Meta_greater VoidSymbol \ ++ period period greater greater VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_period Meta_period \ ++ VoidSymbol VoidSymbol greater greater greater \ ++ greater VoidSymbol VoidSymbol Meta_greater \ ++ Meta_greater VoidSymbol ++keycode 53 = minus minus asterisk asterisk \ ++ Control_underscore Control_underscore VoidSymbol \ ++ VoidSymbol Meta_slash Meta_slash VoidSymbol VoidSymbol \ ++ underscore underscore VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_question Meta_question \ ++ VoidSymbol \ ++ slash slash asterisk asterisk \ ++ Control_underscore Control_underscore VoidSymbol \ ++ VoidSymbol Meta_slash Meta_slash VoidSymbol VoidSymbol \ ++ question question VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_question Meta_question \ ++ VoidSymbol ++keycode 54 = ShiftL ++keycode 55 = KP_Multiply KP_Multiply asterisk asterisk VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Do Do \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_Multiply KP_Multiply asterisk asterisk VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Do Do \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 56 = Alt ++keycode 57 = space space nobreakspace nobreakspace nul \ ++ nul VoidSymbol VoidSymbol Meta_space Meta_space \ ++ Meta_nul Meta_nul space space VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ space space nobreakspace nobreakspace nul \ ++ nul VoidSymbol VoidSymbol Meta_space Meta_space \ ++ Meta_nul Meta_nul space space VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 58 = Caps_Lock ++keycode 59 = F1 F1 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_1 Console_1 Console_1 Console_1 \ ++ Console_1 Console_1 F11 F11 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F1 F1 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_1 Console_1 Console_1 Console_1 \ ++ Console_1 Console_1 F11 F11 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 60 = F2 F2 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_2 Console_2 Console_2 Console_2 \ ++ Console_2 Console_2 F12 F12 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F2 F2 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_2 Console_2 Console_2 Console_2 \ ++ Console_2 Console_2 F12 F12 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 61 = F3 F3 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_3 Console_3 Console_3 Console_3 \ ++ Console_3 Console_3 F13 F13 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F3 F3 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_3 Console_3 Console_3 Console_3 \ ++ Console_3 Console_3 F13 F13 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 62 = F4 F4 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_4 Console_4 Console_4 Console_4 \ ++ Console_4 Console_4 F14 F14 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F4 F4 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_4 Console_4 Console_4 Console_4 \ ++ Console_4 Console_4 F14 F14 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 63 = F5 F5 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_5 Console_5 Console_5 Console_5 \ ++ Console_5 Console_5 F15 F15 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F5 F5 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_5 Console_5 Console_5 Console_5 \ ++ Console_5 Console_5 F15 F15 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 64 = F6 F6 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_6 Console_6 Console_6 Console_6 \ ++ Console_6 Console_6 F16 F16 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F6 F6 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_6 Console_6 Console_6 Console_6 \ ++ Console_6 Console_6 F16 F16 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 65 = F7 F7 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_7 Console_7 Console_7 Console_7 \ ++ Console_7 Console_7 F17 F17 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F7 F7 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_7 Console_7 Console_7 Console_7 \ ++ Console_7 Console_7 F17 F17 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 66 = F8 F8 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_8 Console_8 Console_8 Console_8 \ ++ Console_8 Console_8 F18 F18 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F8 F8 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_8 Console_8 Console_8 Console_8 \ ++ Console_8 Console_8 F18 F18 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 67 = F9 F9 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_9 Console_9 Console_9 Console_9 \ ++ Console_9 Console_9 F19 F19 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F9 F9 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_9 Console_9 Console_9 Console_9 \ ++ Console_9 Console_9 F19 F19 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 68 = F10 F10 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_10 Console_10 Console_10 Console_10 \ ++ Console_10 Console_10 F20 F20 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F10 F10 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_10 Console_10 Console_10 Console_10 \ ++ Console_10 Console_10 F20 F20 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 69 = Num_Lock Num_Lock Bare_Num_Lock \ ++ Bare_Num_Lock VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Bare_Num_Lock Bare_Num_Lock \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Num_Lock Num_Lock Bare_Num_Lock \ ++ Bare_Num_Lock VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Bare_Num_Lock Bare_Num_Lock \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 70 = Scroll_Lock Scroll_Lock VoidSymbol VoidSymbol \ ++ Show_State Show_State VoidSymbol VoidSymbol \ ++ Show_Registers Show_Registers VoidSymbol \ ++ VoidSymbol Show_Memory Show_Memory VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Scroll_Lock Scroll_Lock VoidSymbol VoidSymbol \ ++ Show_State Show_State VoidSymbol VoidSymbol \ ++ Show_Registers Show_Registers VoidSymbol \ ++ VoidSymbol Show_Memory Show_Memory VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol ++keycode 71 = KP_7 KP_7 seven seven Hex_7 \ ++ Hex_7 VoidSymbol VoidSymbol Ascii_7 Ascii_7 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_7 KP_7 seven seven Hex_7 \ ++ Hex_7 VoidSymbol VoidSymbol Ascii_7 Ascii_7 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 72 = KP_8 KP_8 eight eight Hex_8 \ ++ Hex_8 VoidSymbol VoidSymbol Ascii_8 Ascii_8 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_8 KP_8 eight eight Hex_8 \ ++ Hex_8 VoidSymbol VoidSymbol Ascii_8 Ascii_8 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 73 = KP_9 KP_9 nine nine Hex_9 \ ++ Hex_9 VoidSymbol VoidSymbol Ascii_9 Ascii_9 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_9 KP_9 nine nine Hex_9 \ ++ Hex_9 VoidSymbol VoidSymbol Ascii_9 Ascii_9 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 74 = KP_Subtract KP_Subtract minus minus VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_Subtract KP_Subtract minus minus VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 75 = KP_4 KP_4 four four Hex_4 \ ++ Hex_4 VoidSymbol VoidSymbol Ascii_4 Ascii_4 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_4 KP_4 four four Hex_4 \ ++ Hex_4 VoidSymbol VoidSymbol Ascii_4 Ascii_4 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 76 = KP_5 KP_5 five five Hex_5 \ ++ Hex_5 VoidSymbol VoidSymbol Ascii_5 Ascii_5 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_5 KP_5 five five Hex_5 \ ++ Hex_5 VoidSymbol VoidSymbol Ascii_5 Ascii_5 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 77 = KP_6 KP_6 six six Hex_6 \ ++ Hex_6 VoidSymbol VoidSymbol Ascii_6 Ascii_6 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_6 KP_6 six six Hex_6 \ ++ Hex_6 VoidSymbol VoidSymbol Ascii_6 Ascii_6 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 78 = KP_Add KP_Add plus plus VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_Add KP_Add plus plus VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 79 = KP_1 KP_1 one one Hex_1 \ ++ Hex_1 VoidSymbol VoidSymbol Ascii_1 Ascii_1 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_1 KP_1 one one Hex_1 \ ++ Hex_1 VoidSymbol VoidSymbol Ascii_1 Ascii_1 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 80 = KP_2 KP_2 two two Hex_2 \ ++ Hex_2 VoidSymbol VoidSymbol Ascii_2 Ascii_2 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_2 KP_2 two two Hex_2 \ ++ Hex_2 VoidSymbol VoidSymbol Ascii_2 Ascii_2 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 81 = KP_3 KP_3 three three Hex_3 \ ++ Hex_3 VoidSymbol VoidSymbol Ascii_3 Ascii_3 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_3 KP_3 three three Hex_3 \ ++ Hex_3 VoidSymbol VoidSymbol Ascii_3 Ascii_3 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 82 = KP_0 KP_0 zero zero Hex_0 \ ++ Hex_0 VoidSymbol VoidSymbol Ascii_0 Ascii_0 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_0 KP_0 zero zero Hex_0 \ ++ Hex_0 VoidSymbol VoidSymbol Ascii_0 Ascii_0 \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# ++keycode 83 = KP_Period KP_Period period period VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_Period KP_Period period period VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# Desetinna carka na numericke klavesnici ++# ++#keycode 83 = KP_Comma KP_Comma comma comma VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol \ ++# KP_Comma KP_Comma comma comma VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol ++# ++# ++# ++#keycode 84 = Alt PrintScreen => SysRq ++keycode 84 = Spawn_Console Spawn_Console VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol \ ++ Spawn_Console Spawn_Console VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol ++# ++# ++# 102-ha klavesa ++# ++keycode 86 = backslash backslash slash slash \ ++ Control_backslash Control_backslash \ ++ Control_underscore Control_underscore \ ++ Meta_backslash Meta_backslash \ ++ Meta_Control_backslash Meta_Control_backslash \ ++ bar bar VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_bar Meta_bar VoidSymbol \ ++ backslash backslash slash slash \ ++ Control_backslash Control_backslash \ ++ Control_underscore Control_underscore \ ++ Meta_backslash Meta_backslash \ ++ Meta_Control_backslash Meta_Control_backslash \ ++ bar bar VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Meta_bar Meta_bar VoidSymbol ++# ++# ++keycode 87 = F11 F11 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_11 Console_11 Console_11 Console_11 \ ++ Console_11 Console_11 F21 F21 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F11 F11 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_11 Console_11 Console_11 Console_11 \ ++ Console_11 Console_11 F21 F21 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 88 = F12 F12 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_12 Console_12 Console_12 Console_12 \ ++ Console_12 Console_12 F22 F22 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F12 F12 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_12 Console_12 Console_12 Console_12 \ ++ Console_12 Console_12 F22 F22 VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 96 = KP_Enter KP_Enter VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_Enter KP_Enter VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 97 = Control ++keycode 98 = KP_Divide KP_Divide slash slash VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Macro Macro \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ KP_Divide KP_Divide slash slash VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Macro Macro \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++#keycode 99 = PrintScreen => POZOR: Alt PrintScreen = keycode 84 ++keycode 99 = dead_acute dead_acute VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol dead_caron dead_caron VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 100 = AltGr ++# ++#keycode 101 = Break ++keycode 101 = Break Break VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Break Break VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# synonyma: ++# Find (primarni) => Home ++# Select (primarni) => End ++# Prior (primarni) => PageUp ++# Next (primarni) => PageDown ++# ++keycode 102 = Home Home +b B Hex_B \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Home Home +b B Hex_B \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 103 = Up Up Console_1 Console_1 Up \ ++ Up VoidSymbol VoidSymbol Console_1 Console_1 \ ++ VoidSymbol VoidSymbol Up Up VoidSymbol \ ++ VoidSymbol Up VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Up Up Console_1 Console_1 Up \ ++ Up VoidSymbol VoidSymbol Console_1 Console_1 \ ++ VoidSymbol VoidSymbol Up Up VoidSymbol \ ++ VoidSymbol Up VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 104 = PageUp PageUp +c C Hex_C \ ++ Hex_C VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol Scroll_Backward \ ++ Scroll_Backward VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ PageUp PageUp +c C Hex_C \ ++ Hex_C VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol Scroll_Backward \ ++ Scroll_Backward VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol ++keycode 105 = Left Left Decr_Console Decr_Console Left \ ++ Left VoidSymbol VoidSymbol Decr_Console \ ++ Decr_Console VoidSymbol VoidSymbol Left Left \ ++ VoidSymbol VoidSymbol Left VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol \ ++ Left Left Decr_Console Decr_Console Left \ ++ Left VoidSymbol VoidSymbol Decr_Console \ ++ Decr_Console VoidSymbol VoidSymbol Left Left \ ++ VoidSymbol VoidSymbol Left VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol ++keycode 106 = Right Right Incr_Console Incr_Console Right \ ++ Right VoidSymbol VoidSymbol Incr_Console \ ++ Incr_Console VoidSymbol VoidSymbol Right Right \ ++ VoidSymbol VoidSymbol Right VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol \ ++ Right Right Incr_Console Incr_Console Right \ ++ Right VoidSymbol VoidSymbol Incr_Console \ ++ Incr_Console VoidSymbol VoidSymbol Right Right \ ++ VoidSymbol VoidSymbol Right VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol ++keycode 107 = End End +e E Hex_E \ ++ Hex_E VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ End End +e E Hex_E \ ++ Hex_E VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 108 = Down Down Last_Console Last_Console Down \ ++ Down VoidSymbol VoidSymbol Last_Console \ ++ Last_Console VoidSymbol VoidSymbol Down Down \ ++ VoidSymbol VoidSymbol Down VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol \ ++ Down Down Last_Console Last_Console Down \ ++ Down VoidSymbol VoidSymbol Last_Console \ ++ Last_Console VoidSymbol VoidSymbol Down Down \ ++ VoidSymbol VoidSymbol Down VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol ++keycode 109 = PageDown PageDown +f F Hex_F \ ++ Hex_F VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol Scroll_Forward \ ++ Scroll_Forward VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ PageDown PageDown +f F Hex_F \ ++ Hex_F VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol Scroll_Forward \ ++ Scroll_Forward VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol ++keycode 110 = Insert Insert +a A Hex_A \ ++ Hex_A VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Insert Insert +a A Hex_A \ ++ Hex_A VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# ++# Keysym Delete reprezentuje znak s kodem 0x7f (127) ++# - je pouzit pro klavesu BackSpace (viz keycode 14) ++# ++#keycode 111 = Delete Delete +d D Hex_D \ ++# Hex_D VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# Boot Boot VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol \ ++# Delete Delete +d D Hex_D \ ++# Hex_D VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# Boot Boot VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol ++# ++keycode 111 = Remove Remove +d D Hex_D \ ++ Hex_D VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Boot Boot VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ Remove Remove +d D Hex_D \ ++ Hex_D VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Boot Boot VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# ++# ++#keycode 119 = Pause => POZOR: Control Pause = keycode 101 ++#keycode 119 = Pause Pause VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol \ ++# Pause Pause VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++# VoidSymbol ++# ++# Pause se pouziva pro prepinani CESKE a ANGLICKE klavesnice ++# - funguje jako ShiftR_Lock ++# ++keycode 119 = ShiftR_Lock ShiftR_Lock VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ ShiftR_Lock ShiftR_Lock VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# ++# ++# ++# keycode 125 => Windows klavesa vlevo (symbol okna) ++# keycode 126 => Windows klavesa vpravo (symbol okna) ++# keycode 127 => Windows klavesa nejvice vpravo (symbol menu) ++keycode 125 = F13 F13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_13 Console_13 Console_13 Console_13 \ ++ Console_13 Console_13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F13 F13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_13 Console_13 Console_13 Console_13 \ ++ Console_13 Console_13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 126 = F13 F13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_13 Console_13 Console_13 Console_13 \ ++ Console_13 Console_13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F13 F13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_13 Console_13 Console_13 Console_13 \ ++ Console_13 Console_13 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++keycode 127 = F14 F14 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_14 Console_14 Console_14 Console_14 \ ++ Console_14 Console_14 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol \ ++ F14 F14 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol Console_14 Console_14 Console_14 Console_14 \ ++ Console_14 Console_14 VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ VoidSymbol ++# ++# ++# ++# string: kdyz je jedne klavese prirazeno vice znaku (napr. funkcni klavesy) ++# ++# Vite-li nekdo co maji generovat klavesy F21 a F22 prosim reknete mi to ++# ++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 F21 = "" ++string F22 = "" ++# ++# compose: jak se pomoci mrtvych klaves generuji znaky s diakritikou ++# transformace dead klavesy na prvni znak za compose: ++# (v zavorce jsou synonyma -> proto maji stejne oznaceni dead klavesy) ++# dead_grave ======================================> '`' ++# dead_acute --------------------------------------> '\'' ++# dead_diaeresis ==================================> '"' (:) ++# dead_circumflex (dead_caron) --------------------> '^' ++# dead_tilde (dead_breve) (dead_doubleacute) => '~' ++# dead_cedilla (dead_ogonek) -------------------> ',' ++# -- ++# dead_grave => pouzito misto nedefinovanych "dead_ring" a "dead_dot" ++# dead_acute => carka_nad_pismenem (pozivaji take cesi) ++# dead_diaeresis => dve_tecky_nad_pismenem - pouzivaji napr. nemci ++# dead_circumflex => striska_nad_pismenem ++# dead_caron => hacek_nad_pismenem ++# dead_tilde => vlnovka_nad_pismenem (neni v ISO-8859-2) ++# dead_breve => obloucek_nad_pismenem ++# dead_doubleacute => dve_carky_nad_pismenem (myslim ze je to madarsky prehlas) ++# dead_cedilla => ocasek_pod_pismenem_smerujici_zprava_doleva ++# dead_ogonek => ocasek_pod_pismenem_smerujici_zleva_doprava ++# -- ++# ++# dead_grave => pouzito pro krouzek a tecku_nad_pismenem (a znak stupne) ++compose '`' 'u' to 'ù' ++compose '`' 'U' to 'Ù' ++compose '`' 'z' to '¿' ++compose '`' 'Z' to '¯' ++# dead_acute (pouze ceske) ++compose '\'' 'a' to 'á' ++compose '\'' 'A' to 'Á' ++compose '\'' 'e' to 'é' ++compose '\'' 'E' to 'É' ++compose '\'' 'i' to 'í' ++compose '\'' 'I' to 'Í' ++compose '\'' 'o' to 'ó' ++compose '\'' 'O' to 'Ó' ++compose '\'' 'u' to 'ú' ++compose '\'' 'U' to 'Ú' ++compose '\'' 'y' to 'ý' ++compose '\'' 'Y' to 'Ý' ++# dead_caron (pouze ceske) ++compose '^' 'u' to 'ù' ++compose '^' 'U' to 'Ù' ++compose '^' 'c' to 'è' ++compose '^' 'C' to 'È' ++compose '^' 'd' to 'ï' ++compose '^' 'D' to 'Ï' ++compose '^' 'e' to 'ì' ++compose '^' 'E' to 'Ì' ++compose '^' 'n' to 'ò' ++compose '^' 'N' to 'Ò' ++compose '^' 'r' to 'ø' ++compose '^' 'R' to 'Ø' ++compose '^' 's' to '¹' ++compose '^' 'S' to '©' ++compose '^' 't' to '»' ++compose '^' 'T' to '«' ++compose '^' 'z' to '¾' ++compose '^' 'Z' to '®' ++# ++# Zde je misto pro neceske znaky generovane pres mrtvou klavesu ++# ++# dead_acute (neceske znaky) ++compose '\'' 'c' to 'æ' ++compose '\'' 'C' to 'Æ' ++compose '\'' 'l' to 'å' ++compose '\'' 'L' to 'Å' ++compose '\'' 'n' to 'ñ' ++compose '\'' 'N' to 'Ñ' ++compose '\'' 'r' to 'à' ++compose '\'' 'R' to 'À' ++compose '\'' 's' to '¶' ++compose '\'' 'S' to '¦' ++compose '\'' 'z' to '¼' ++compose '\'' 'Z' to '¬' ++# dead_caron (neceske znaky) ++compose '^' 'l' to 'µ' ++compose '^' 'L' to '¥' ++# dead_circumflex (neceske znaky) ++compose '^' 'a' to 'â' ++compose '^' 'A' to 'Â' ++compose '^' 'i' to 'î' ++compose '^' 'I' to 'Î' ++compose '^' 'o' to 'ô' ++compose '^' 'O' to 'Ô' ++# dead_tilde (neceske znaky) => nedefinovan znak v ISO-8859-2 ++# ++# dead_breve (neceske_znaky) ++compose '~' 'a' to 'ã' ++compose '~' 'A' to 'Ã' ++# dead_doubleacute (neceske znaky) ++compose '~' 'o' to 'õ' ++compose '~' 'O' to 'Õ' ++compose '~' 'u' to 'û' ++compose '~' 'U' to 'Û' ++# dead_diaeresis (neceske znaky) ++compose '"' 'a' to 'ä' ++compose '"' 'A' to 'Ä' ++compose '"' 'e' to 'ë' ++compose '"' 'E' to 'Ë' ++compose '"' 'o' to 'ö' ++compose '"' 'O' to 'Ö' ++compose '"' 'u' to 'ü' ++compose '"' 'U' to 'Ü' ++# dead_cedilla (neceske znaky) ++compose ',' 'c' to 'ç' ++compose ',' 'C' to 'Ç' ++compose ',' 's' to 'º' ++compose ',' 'S' to 'ª' ++compose ',' 't' to 'þ' ++compose ',' 'T' to 'Þ' ++# dead_ogonek (neceske znaky) ++compose ',' 'a' to '±' ++compose ',' 'A' to '¡' ++compose ',' 'e' to 'ê' ++compose ',' 'E' to 'Ê' ++ diff --git a/kbd-1.14.1-Makefile.patch b/kbd-1.14.1-Makefile.patch new file mode 100644 index 0000000..3d0c385 --- /dev/null +++ b/kbd-1.14.1-Makefile.patch @@ -0,0 +1,58 @@ +temporary fix for 1.14.1, upstream switched to automake meanwhile +--- + po/Makefile.in | 12 ++++++------ + src/Makefile.in | 6 +++--- + 2 files changed, 9 insertions(+), 9 deletions(-) + +--- kbd-1.14.1.orig/src/Makefile.in ++++ kbd-1.14.1/src/Makefile.in +@@ -14,16 +14,16 @@ PROGS = dumpkeys loadkeys showkey setf + + # probably also getkeycodes and setkeycodes are arch-specific; + # they will work on an alpha, though, and perhaps be dummy on a sun +-ifeq ($(KEYCODES_PROGS),yes) ++ifeq (@KEYCODES_PROGS@,yes) + PROGS += getkeycodes setkeycodes + endif + +-ifeq ($(RESIZECONS_PROGS),yes) ++ifeq (@RESIZECONS_PROGS@,yes) + PROGS += resizecons + endif + + # Not installed by default +-ifeq ($(OPTIONAL_PROGS),yes) ++ifeq (@OPTIONAL_PROGS@,yes) + PROGS += screendump setlogcons setvesablank spawn_console spawn_login \ + getunimap clrunimap outpsfheader setpalette + endif +--- kbd-1.14.1.orig/po/Makefile.in ++++ kbd-1.14.1/po/Makefile.in +@@ -2,10 +2,10 @@ PACKAGE_NAME = @PACKAGE_NAME@ + + 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@ +@@ -34,10 +34,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) diff --git a/kbd-1.14.1-defkeymap.patch b/kbd-1.14.1-defkeymap.patch new file mode 100644 index 0000000..493c1c9 --- /dev/null +++ b/kbd-1.14.1-defkeymap.patch @@ -0,0 +1,20 @@ +Revert commit 743cbc3ca11301598ad7da503b2238041082bb75 +--- + src/paths.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- kbd-1.14.1.orig/src/paths.h ++++ kbd-1.14.1/src/paths.h +@@ -16,10 +16,10 @@ + * Default keymap, and where the kernel copy of it lives. + */ + #ifdef __sparc__ +-# define DEFMAP "sunkeymap.kmap" ++# define DEFMAP "sunkeymap.map" + # define KERNDIR "/usr/src/linux/drivers/sbus/char" + #else +-# define DEFMAP "defkeymap.kmap" ++# define DEFMAP "defkeymap.map" + # define KERNDIR "/usr/src/linux/drivers/char" + #endif + diff --git a/kbd-1.12-docu-X11R6-xorg.diff b/kbd-1.14.1-docu-X11R6-xorg.patch similarity index 100% rename from kbd-1.12-docu-X11R6-xorg.diff rename to kbd-1.14.1-docu-X11R6-xorg.patch diff --git a/kbd-1.12-dumpkeys-C-opt.diff b/kbd-1.14.1-dumpkeys-C-opt.patch similarity index 100% rename from kbd-1.12-dumpkeys-C-opt.diff rename to kbd-1.14.1-dumpkeys-C-opt.patch diff --git a/kbd-1.12-dumpkeys-ppc.diff b/kbd-1.14.1-dumpkeys-ppc.patch similarity index 61% rename from kbd-1.12-dumpkeys-ppc.diff rename to kbd-1.14.1-dumpkeys-ppc.patch index 97984a6..7681b70 100644 --- a/kbd-1.12-dumpkeys-ppc.diff +++ b/kbd-1.14.1-dumpkeys-ppc.patch @@ -1,7 +1,24 @@ -diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c ---- kbd-1.12-8/src/dumpkeys.c 2004-02-26 23:00:23.000000000 +0100 -+++ kbd-1.12-9/src/dumpkeys.c 2004-02-26 23:07:51.000000000 +0100 -@@ -163,6 +163,10 @@ +XXX: this has been reverted upstream with the comment: + + Revert "[SYSTEM] Apply patch from SUSE." + + This is an old mistake. No, 0 is not a valid keycode. + It is used by the kernel for bookkeeping purposes. + It must not be used as keycode. + + Andries + + This reverts commit 49ce531d1c70017113540318b24b9d645d170773. + + Signed-off-by: Andries Brouwer + Signed-off-by: Alexey Gladkov +--- + src/dumpkeys.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +--- kbd-1.14.1.orig/src/dumpkeys.c ++++ kbd-1.14.1/src/dumpkeys.c +@@ -166,6 +166,10 @@ valid_type(int t) { ke.kb_index = 0; ke.kb_table = 0; ke.kb_value = K(t, 0); @@ -12,7 +29,7 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c status = (ioctl(fd, KDSKBENT, (unsigned long)&ke) == 0); return status; } -@@ -245,8 +249,13 @@ +@@ -248,8 +252,13 @@ static void show_short_info(void) { int i; @@ -26,7 +43,7 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c printf(_("max number of actions bindable to a key: %d\n"), MAX_NR_KEYMAPS); get_keymaps(); -@@ -358,7 +367,11 @@ +@@ -361,7 +370,11 @@ dump_keys(char table_shape, char numeric for (j = 0; j < MAX_NR_KEYMAPS; j++) { int ja = (j | M_ALT); if (j != ja && keymap_index[j] >= 0 && keymap_index[ja] >= 0) @@ -38,7 +55,7 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c int buf0, buf1, type; buf0 = get_bind(i, j); -@@ -384,7 +397,11 @@ +@@ -389,7 +402,11 @@ dump_keys(char table_shape, char numeric not_alt_is_meta: no_shorthands: @@ -49,4 +66,4 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c +#endif for (j = 0; j < keymapnr; j++) buf[j] = get_bind(i, good_keymap[j]); - + if (buf[0] == -1) diff --git a/kbd-1.14.1-no-strip.patch b/kbd-1.14.1-no-strip.patch new file mode 100644 index 0000000..444c816 --- /dev/null +++ b/kbd-1.14.1-no-strip.patch @@ -0,0 +1,15 @@ +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- kbd-1.14.1.orig/src/Makefile.in ++++ kbd-1.14.1/src/Makefile.in +@@ -50,7 +50,7 @@ setuid: + + install: all + install -d -m 0755 $(bindir) +- install -s -m 0755 $(PROGS) $(OLDPROGS) $(bindir) ++ install -m 0755 $(PROGS) $(OLDPROGS) $(bindir) + install -m 0755 $(SHCMDS) $(bindir) + for i in psfaddtable psfgettable psfstriptable; do \ + rm -f $(bindir)/$$i; ln -s psfxtable $(bindir)/$$i; \ diff --git a/kbd-1.14.1-prtscr_no_sigquit.patch b/kbd-1.14.1-prtscr_no_sigquit.patch new file mode 100644 index 0000000..8d3c496 --- /dev/null +++ b/kbd-1.14.1-prtscr_no_sigquit.patch @@ -0,0 +1,278 @@ +XXX: reverted upstream +--- + data/keymaps/i386/azerty/fr-latin9.map | 1 + + data/keymaps/i386/fgGIod/tr_f-latin5.map | 1 + + data/keymaps/i386/qwerty/bg-cp1251.map | 1 + + data/keymaps/i386/qwerty/bg_bds-cp1251.map | 1 + + data/keymaps/i386/qwerty/br-abnt.map | 1 + + data/keymaps/i386/qwerty/by.map | 1 + + data/keymaps/i386/qwerty/cz-cp1250.map | 1 + + data/keymaps/i386/qwerty/cz-lat2-prog.map | 1 + + data/keymaps/i386/qwerty/cz-lat2.map | 1 + + data/keymaps/i386/qwerty/cz.map | 8 ++++---- + data/keymaps/i386/qwerty/defkeymap.map | 1 + + data/keymaps/i386/qwerty/defkeymap_V1.0.map | 1 + + data/keymaps/i386/qwerty/lt.baltic.map | 1 + + data/keymaps/i386/qwerty/lt.l4.map | 1 + + data/keymaps/i386/qwerty/lt.map | 1 + + data/keymaps/i386/qwerty/pl2.map | 1 + + data/keymaps/i386/qwerty/sk-prog-qwerty.map | 1 + + data/keymaps/i386/qwerty/ua-utf-ws.map | 1 + + data/keymaps/i386/qwerty/ua-utf.map | 1 + + data/keymaps/i386/qwerty/ua-ws.map | 1 + + data/keymaps/i386/qwerty/ua.map | 1 + + data/keymaps/i386/qwerty/us-acentos.map | 1 + + data/keymaps/i386/qwertz/cz-us-qwertz.map | 1 + + data/keymaps/i386/qwertz/sk-prog-qwertz.map | 1 + + 24 files changed, 27 insertions(+), 4 deletions(-) + +--- kbd-1.14.1.orig/data/keymaps/i386/azerty/fr-latin9.map ++++ kbd-1.14.1/data/keymaps/i386/azerty/fr-latin9.map +@@ -418,6 +418,7 @@ keycode 100 = AltGr + # La touche Ctrl+Pause = Attn = 101 a un code pour elle-même + # + keycode 101 = Break ++ control keycode 101 = Control_c + + keycode 102 = Home + +--- kbd-1.14.1.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map ++++ kbd-1.14.1/data/keymaps/i386/fgGIod/tr_f-latin5.map +@@ -217,6 +217,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/bg-cp1251.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/bg-cp1251.map +@@ -312,6 +312,7 @@ keycode 99 = Control_backslash + altgr alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/bg_bds-cp1251.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/bg_bds-cp1251.map +@@ -638,6 +638,7 @@ keycode 98 = KP_Divide + keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/br-abnt.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/br-abnt.map +@@ -197,6 +197,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/by.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/by.map +@@ -529,6 +529,7 @@ keycode 99 = VoidSymbol Control_backsl + Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash + keycode 100 = Alt + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up Up Up \ + KeyboardSignal Up Up \ +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-cp1250.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-cp1250.map +@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-lat2-prog.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-lat2-prog.map +@@ -141,6 +141,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-lat2.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-lat2.map +@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/cz.map +@@ -1086,13 +1086,13 @@ keycode 99 = dead_acute dead_acute + keycode 100 = AltGr + # + #keycode 101 = Break +-keycode 101 = Break Break VoidSymbol VoidSymbol VoidSymbol \ +- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++keycode 101 = Break Break VoidSymbol VoidSymbol Control_c \ ++ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ + VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ + VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ + VoidSymbol \ +- Break Break VoidSymbol VoidSymbol VoidSymbol \ +- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Break Break VoidSymbol VoidSymbol Control_c \ ++ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ + VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ + VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ + VoidSymbol +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/defkeymap.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/defkeymap.map +@@ -222,6 +222,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/defkeymap_V1.0.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/defkeymap_V1.0.map +@@ -185,6 +185,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.baltic.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.baltic.map +@@ -171,6 +171,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.l4.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.l4.map +@@ -463,6 +463,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break # 101=Control-Pause ++ control keycode 101 = Control_c + string F102 = "\033[7$" + keycode 102 = Find # =Home + shift keycode 102 = F102 +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.map +@@ -462,6 +462,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break # 101=Control-Pause ++ control keycode 101 = Control_c + string F102 = "\033[7$" + keycode 102 = Find # =Home + shift keycode 102 = F102 +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/pl2.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/pl2.map +@@ -242,6 +242,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/sk-prog-qwerty.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/sk-prog-qwerty.map +@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-utf-ws.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-utf-ws.map +@@ -1526,6 +1526,7 @@ ctrll keycode 100 = CtrlR_Lock + ctrlr keycode 100 = CtrlR_Lock + ctrll ctrlr keycode 100 = CtrlR_Lock + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-utf.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-utf.map +@@ -1516,6 +1516,7 @@ ctrll keycode 100 = CtrlR_Lock + ctrlr keycode 100 = CtrlR_Lock + ctrll ctrlr keycode 100 = CtrlR_Lock + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-ws.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-ws.map +@@ -1521,6 +1521,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = Alt + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/ua.map +@@ -1515,6 +1515,7 @@ ctrll keycode 100 = CtrlR_Lock + ctrlr keycode 100 = CtrlR_Lock + ctrll ctrlr keycode 100 = CtrlR_Lock + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/us-acentos.map ++++ kbd-1.14.1/data/keymaps/i386/qwerty/us-acentos.map +@@ -194,6 +194,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior +--- kbd-1.14.1.orig/data/keymaps/i386/qwertz/cz-us-qwertz.map ++++ kbd-1.14.1/data/keymaps/i386/qwertz/cz-us-qwertz.map +@@ -135,6 +135,7 @@ control keycode 99 = Control_backslash + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +--- kbd-1.14.1.orig/data/keymaps/i386/qwertz/sk-prog-qwertz.map ++++ kbd-1.14.1/data/keymaps/i386/qwertz/sk-prog-qwertz.map +@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol + alt keycode 99 = Control_backslash + keycode 100 = AltGr + keycode 101 = Break ++ control keycode 101 = Control_c + keycode 102 = Find + keycode 103 = Up + keycode 104 = Prior diff --git a/kbd-1.14.1-setfont-no-cruft.patch b/kbd-1.14.1-setfont-no-cruft.patch new file mode 100644 index 0000000..7830544 --- /dev/null +++ b/kbd-1.14.1-setfont-no-cruft.patch @@ -0,0 +1,32 @@ +--- kbd-1.14.1wip/src/kdfontop.c.orig 2008-03-03 23:47:18.160420000 +0100 ++++ kbd-1.14.1wip/src/kdfontop.c 2008-03-03 23:52:32.918345000 +0100 +@@ -268,6 +268,23 @@ + return 0; + } + ++#if 1 ++ // We no longer try PIO_FONT* calls. ++ // A former patch even added a possible 5 seconds delay loop here, in an attempt to ++ // gain victory over kdm. We no do this fight, as it can only result in races. ++ // https://bugzilla.novell.com/show_bug.cgi?id=302010 ++ // ++ // Two effects: ++ // a) Without the delay loop, we are fast enough to run early. ++ // Moving setfont calls to an earlier point most likly ++ // avoids the race. ++ // b) Without the old compat calls, it should be easier to ++ // fix this in kernel side. ++ // ++ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i); ++ perror("putfont: KDFONTOP"); ++ return -1; ++#else + /* Second attempt: PIO_FONTX */ + cfd.charcount = count; + cfd.charheight = height; +@@ -302,4 +319,5 @@ + return -1; + } + return 0; ++#endif + } diff --git a/sv-latin1-keycode10.diff b/kbd-1.14.1-sv-latin1-keycode10.patch similarity index 100% rename from sv-latin1-keycode10.diff rename to kbd-1.14.1-sv-latin1-keycode10.patch diff --git a/kbd-1.14.1-unicode_scripts.patch b/kbd-1.14.1-unicode_scripts.patch new file mode 100644 index 0000000..a518504 --- /dev/null +++ b/kbd-1.14.1-unicode_scripts.patch @@ -0,0 +1,47 @@ +--- + src/unicode_start | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +--- kbd-1.14.1.orig/src/unicode_start ++++ kbd-1.14.1/src/unicode_start +@@ -74,6 +74,14 @@ stty iutf8 + + DEFAULT_UNICODE_FONT='LatArCyrHeb-16' + # Also drdos8x16 is a good candidate. ++ ++# Fonts with 512 glyphs like LatArCyrHeb-16 make it impossible to use bold ++# on the console, which makes YaST2 unusable. To be able to use bold, ++# only fonts with 256 glyphs can be used. Therefore we prefer ++# the font specified in /etc/sysconfig/console. This should be OK because ++# the default font written to /etc/sysconfig/console by YaST2 ++# is currently always a font with 256 glyphs and a Unicode map ++# which is suitable for the language used during the installation. + + case "$#" in + 2) +@@ -83,7 +91,24 @@ case "$#" in + setfont "$1" + ;; + 0) +- setfont "$DEFAULT_UNICODE_FONT" ++ if [ -f /etc/sysconfig/console ] ; then ++ . /etc/sysconfig/console ++ fi ++ if [ -n "$CONSOLE_FONT" ] ; then ++ SETFONT_ARGS="$CONSOLE_FONT" ++ if [ -n "$CONSOLE_UNICODEMAP" ] ; then ++ SETFONT_ARGS="$SETFONT_ARGS -u $CONSOLE_UNICODEMAP" ++ fi ++ if [ -n "$CONSOLE_SCREENMAP" ] ; then ++ SETFONT_ARGS="$SETFONT_ARGS -m $CONSOLE_SCREENMAP" ++ fi ++ setfont $SETFONT_ARGS ++ if [ -n "$CONSOLE_MAGIC" -a "$CONSOLE_MAGIC" != "none" ] ; then ++ echo -en "\033$CONSOLE_MAGIC" ++ fi ++ else ++ setfont $DEFAULT_UNICODE_FONT ++ fi + ;; + *) + echo "usage: unicode_start [font [unicode map]]" diff --git a/kbd-1.14.1.tar.bz2 b/kbd-1.14.1.tar.bz2 new file mode 100644 index 0000000..9abe604 --- /dev/null +++ b/kbd-1.14.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93cbc8521404932e3db6a687b1e1a5580426aa4c28a92712fb585f5414a5a9c4 +size 777427 diff --git a/kbd.changes b/kbd.changes index f0dee51..b781cef 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Wed Aug 20 19:38:44 CEST 2008 - mmarek@suse.cz + +- updated to 1.14.1 + * Programs + - unicode_{start,stop}: To run loadkeys is allowed only to + root. + - mapscrn: Add '.acm' suffix for compatibility with + console-tools + - fix findfile so that it does not find directories + - kbdrate: fix for sparc + * Keymaps: + - Add Norwegian dvorak keymap. + - Add turkish F (trf) keyboard map. + - Fix turkish Q (trq) keyboard map (Ozgur Murat Homurlu). + - Move qwerty/cz.map -> qwertz/cz.map. + - include/*euro.map: Change 'currency' to 'euro' symbol. + - Add OLPC (One Laptop Per Child) keymaps + - Add more romanian keymaps (Vitezslav Crhonek) + - Add another ukrainian keymap + - Add Belarusian (Belarus) keymaps + - Add Kazakh keymap + - Add Kyrgyz keymap + - Add Bashkir (Russia) keymap + - Add Tatar keymaps + - Add more russian keymaps + * Fonts: + - Add unicode fonts (UniCyrExt_8x16.psf, UniCyr_8x14.psf, + UniCyr_8x16.psf, UniCyr_8x8.psf) + - Add Lat2-Terminus16 font + - Fix sun12x22 font unicode mapping table (Vitezslav Crhonek) + * translation updates +- dropped upstreamed patches: + kbd-1.12-Meta-Tab.diff + kbd-1.12-be-nice-to-kdm.diff + kbd-1.12-cz-us-qwertz.diff + kbd-1.12-dumpkeys-full.diff + kbd-1.12-handle-small-table.diff + kbd-1.12-happy-abuild.diff + kbd-1.12-kbd_mode.diff + kbd-1.12-loadkeys-C-opt.diff + kbd-1.12-loadkeys-repstdout.diff + kbd-1.12-mac-de.diff + kbd-1.12-mac-dk.diff + kbd-1.12-nohang-kbdrate2.diff + kbd-1.12-nounicode-nontty.diff + kbd-1.12-setfont-fpclose.diff + kbd-1.12-showconsolefont-info.diff + kbd-1.12-swiss.diff + kbd-1.12.diff + piofont_debug.diff +- dropped bnc147581_jp106.diff because it was not needed + (bnc#147581) + ------------------------------------------------------------------- Mon Aug 18 18:08:29 CEST 2008 - mrueckert@suse.de diff --git a/kbd.spec b/kbd.spec index b4cc227..308cfcf 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,5 +1,5 @@ # -# spec file for package kbd (Version 1.12) +# spec file for package kbd (Version 1.14.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,10 +23,10 @@ Url: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd License: GPL v2 or later Group: System/Console AutoReqProv: on -Version: 1.12 -Release: 201 +Version: 1.14.1 +Release: 1 Summary: Keyboard and Font Utilities -Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2 +Source: kbd-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 Source2: suse-add.tar.bz2 Source3: README.SuSE @@ -40,35 +40,17 @@ Source11: fbtest.c Source12: fbtest.8 Source42: convert-kbd-mac.sed Source43: repack_kbd.sh -Patch: kbd-%{version}.diff -Patch2: kbd-%{version}-prtscr_no_sigquit.diff -Patch3: kbd-%{version}-swiss.diff -Patch4: kbd-%{version}-Meta-Tab.diff -Patch5: kbd-%{version}-noclaudio.diff -Patch6: kbd-%{version}-nohang-kbdrate2.diff -Patch7: kbd-%{version}-loadkeys-repstdout.diff -Patch8: kbd-%{version}-mac-dk.diff -Patch9: kbd-%{version}-dumpkeys-full.diff -Patch10: kbd-%{version}-dumpkeys-ppc.diff -Patch11: kbd-%{version}-mac-de.diff -Patch12: kbd-%{version}-handle-small-table.diff -Patch13: kbd-%{version}-unicode_scripts.diff -Patch14: kbd-%{version}-cz-us-qwertz.diff -Patch15: kbd-%{version}-nounicode-nontty.diff -Patch16: kbd-%{version}-kbd_mode.diff -Patch17: piofont_debug.diff -Patch18: kbd-%{version}-loadkeys-C-opt.diff -Patch19: kbd-%{version}-happy-abuild.diff -Patch20: kbd-%{version}-strip.diff -Patch21: kbd-%{version}-setfont-fpclose.diff -Patch22: kbd-%{version}-showconsolefont-info.diff -Patch23: kbd-%{version}-docu-X11R6-xorg.diff -Patch24: kbd-%{version}-el-locale-update.diff -Patch25: sv-latin1-keycode10.diff -Patch26: kbd-%{version}-setfont-no-cruft.diff -Patch27: kbd-%{version}-be-nice-to-kdm.diff -Patch28: bnc147581_jp106.diff -Patch29: kbd-%{version}-dumpkeys-C-opt.diff +Patch1: kbd-1.14.1-2d01989f.patch +Patch2: kbd-1.14.1-Makefile.patch +Patch3: kbd-1.14.1-prtscr_no_sigquit.patch +Patch4: kbd-1.14.1-dumpkeys-ppc.patch +Patch5: kbd-1.14.1-unicode_scripts.patch +Patch6: kbd-1.14.1-no-strip.patch +Patch7: kbd-1.14.1-docu-X11R6-xorg.patch +Patch8: kbd-1.14.1-sv-latin1-keycode10.patch +Patch9: kbd-1.14.1-setfont-no-cruft.patch +Patch10: kbd-1.14.1-dumpkeys-C-opt.patch +Patch11: kbd-1.14.1-defkeymap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq BuildRequires: bison flex @@ -88,16 +70,11 @@ Authors: -------- Andries Brouwer -%define kbdrate_in_util %(rpm -ql util 2>/dev/null | grep -s /sbin/kbdrate && echo "1" || echo "0"; exit 0) %define kbd /usr/share/kbd %prep -%if %{kbdrate_in_util} - echo "kbdrate is in util" -%endif %setup -q -a 1 -a 2 -n kbd-%{version} -%patch -p1 -E -# choose-tty.diff went upstream, 27.2.2004, jw +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -106,26 +83,8 @@ Authors: %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 +%patch10 %patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -%patch25 -p1 -%patch26 -p1 -# %patch27 -p1 # obsoleted. #302010 -%patch28 -p1 -%patch29 -p0 %build for i in `find data/keymaps/mac -type f` ; do @@ -133,7 +92,12 @@ sed -i -f %{S:42} $i done # bugzilla #33301, but noclobber. (cd data/keymaps/i386/qwerty; test -f se-latin1.map || cp sv-latin1.map se-latin1.map) -./configure --prefix=/ --datadir=%{kbd} --mandir=%{_mandir} +./configure \ + --prefix=/ \ + --datadir=%{kbd} \ + --mandir=%{_mandir} \ + --enable-nls \ + --localedir=/usr/share/locale make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Os" gcc $RPM_OPT_FLAGS -o testutf8 $RPM_SOURCE_DIR/testutf8.c gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c @@ -272,7 +236,6 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/ %config /etc/init.d/kbd /var/adm/fillup-templates/sysconfig.console /var/adm/fillup-templates/sysconfig.keyboard -%dir %{kbd} %{kbd} /sbin/rckbd /sbin/fbtest @@ -303,24 +266,9 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/ /bin/showkey /bin/unicode_start /bin/unicode_stop -%if ! %{kbdrate_in_util} /bin/kbdrate -%doc %{_mandir}/man8/kbdrate.8.gz -%endif /bin/testutf8 -%doc %{_mandir}/man1/chvt.1.gz -%doc %{_mandir}/man1/deallocvt.1.gz -%doc %{_mandir}/man1/dumpkeys.1.gz -%doc %{_mandir}/man1/kbd_mode.1.gz -%doc %{_mandir}/man1/loadkeys.1.gz -%doc %{_mandir}/man1/psfaddtable.1.gz -%doc %{_mandir}/man1/psfgettable.1.gz -%doc %{_mandir}/man1/psfstriptable.1.gz -%doc %{_mandir}/man1/psfxtable.1.gz -%doc %{_mandir}/man1/setleds.1.gz -%doc %{_mandir}/man1/setmetamode.1.gz -%doc %{_mandir}/man1/showkey.1.gz -%doc %{_mandir}/man1/fgconsole.1.gz +%doc %{_mandir}/man1/* %doc %{_mandir}/man5/keymaps.5.gz %ifnarch sparc m68k %doc %{_mandir}/man8/getkeycodes.8.gz @@ -334,15 +282,69 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/ %endif %doc %{_mandir}/man8/setfont.8.gz %doc %{_mandir}/man8/fbtest.8.gz -%doc %{_mandir}/man1/openvt.1.gz -%doc %{_mandir}/man1/unicode_start.1.gz -%doc %{_mandir}/man1/unicode_stop.1.gz +%doc %{_mandir}/man8/kbdrate.8.gz +%doc %{_mandir}/man8/clrunimap.8.gz +%doc %{_mandir}/man8/getunimap.8.gz +%doc %{_mandir}/man8/mk_modmap.8.gz +%doc %{_mandir}/man8/setlogcons.8.gz +%doc %{_mandir}/man8/setvesablank.8.gz +%doc %{_mandir}/man8/vcstime.8.gz %clean rm -rf $RPM_BUILD_ROOT -#rm -rf $RPM_BUILD_DIR/kbd-%{version} %changelog +* Wed Aug 20 2008 mmarek@suse.cz +- updated to 1.14.1 + * Programs + - unicode_{start,stop}: To run loadkeys is allowed only to + root. + - mapscrn: Add '.acm' suffix for compatibility with + console-tools + - fix findfile so that it does not find directories + - kbdrate: fix for sparc + * Keymaps: + - Add Norwegian dvorak keymap. + - Add turkish F (trf) keyboard map. + - Fix turkish Q (trq) keyboard map (Ozgur Murat Homurlu). + - Move qwerty/cz.map -> qwertz/cz.map. + - include/*euro.map: Change 'currency' to 'euro' symbol. + - Add OLPC (One Laptop Per Child) keymaps + - Add more romanian keymaps (Vitezslav Crhonek) + - Add another ukrainian keymap + - Add Belarusian (Belarus) keymaps + - Add Kazakh keymap + - Add Kyrgyz keymap + - Add Bashkir (Russia) keymap + - Add Tatar keymaps + - Add more russian keymaps + * Fonts: + - Add unicode fonts (UniCyrExt_8x16.psf, UniCyr_8x14.psf, + UniCyr_8x16.psf, UniCyr_8x8.psf) + - Add Lat2-Terminus16 font + - Fix sun12x22 font unicode mapping table (Vitezslav Crhonek) + * translation updates +- dropped upstreamed patches: + kbd-1.12-Meta-Tab.diff + kbd-1.12-be-nice-to-kdm.diff + kbd-1.12-cz-us-qwertz.diff + kbd-1.12-dumpkeys-full.diff + kbd-1.12-handle-small-table.diff + kbd-1.12-happy-abuild.diff + kbd-1.12-kbd_mode.diff + kbd-1.12-loadkeys-C-opt.diff + kbd-1.12-loadkeys-repstdout.diff + kbd-1.12-mac-de.diff + kbd-1.12-mac-dk.diff + kbd-1.12-nohang-kbdrate2.diff + kbd-1.12-nounicode-nontty.diff + kbd-1.12-setfont-fpclose.diff + kbd-1.12-showconsolefont-info.diff + kbd-1.12-swiss.diff + kbd-1.12.diff + piofont_debug.diff +- dropped bnc147581_jp106.diff because it was not needed + (bnc#147581) * Mon Aug 18 2008 mrueckert@suse.de - remove outdated options in the fillup_and_insserv call * Mon Aug 18 2008 werner@suse.de diff --git a/piofont_debug.diff b/piofont_debug.diff deleted file mode 100644 index 101b11f..0000000 --- a/piofont_debug.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- kbd-1.12/src/kdfontop.c.orig 2004-10-01 13:44:47.788404680 +0000 -+++ kbd-1.12/src/kdfontop.c 2004-10-01 13:46:09.349005584 +0000 -@@ -268,6 +268,7 @@ - if (i == 0) - return 0; - if (errno != ENOSYS && errno != EINVAL) { -+ fprintf(stderr, "%s: putfont: %d,%dx%d:failed: %d\n", progname, count, width, height, i); - perror("putfont: PIO_FONTX"); - return -1; - } -@@ -276,6 +277,7 @@ - /* This will load precisely 256 chars, independent of count */ - i = ioctl(fd, PIO_FONT, buf); - if (i) { -+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i); - perror("putfont: PIO_FONT"); - return -1; - } diff --git a/repack_kbd.sh b/repack_kbd.sh index 1c97f08..1513a72 100644 --- a/repack_kbd.sh +++ b/repack_kbd.sh @@ -7,26 +7,13 @@ tmpdir=`mktemp -d` -in=$1 +in="$1" -case "$in" in - *.tar.gz) - tar zxf $in -C $tmpdir - ;; - *.tgz) - tar zxf $in -C $tmpdir - ;; - *.tar.bz2) - tar jxf $in -C $tmpdir - ;; - *.tar) - tar xf $in -C $tmpdir - ;; - *) - echo "hmm, '$in' is not a tar ball?" - rmdir $tmpdir - exit 1 -esac +# recent gnu tar can autodetect gzip / bzip2 +if ! tar xf "$in" -C $tmpdir; then + rm -rf $tmpdir + exit 1 +fi echo removing files... find $tmpdir -iname \*agafari\* | tee /dev/tty | xargs rm