Plan 9 from Bell Labs 2005-11-01

dist/replica/_plan9.db

@@ -39,7 +39,7 @@
 386/bin/ape/uname - 775 sys sys 1127360563 132691
 386/bin/aquarela - 775 sys sys 1064598027 319170
 386/bin/ar - 775 sys sys 1130594693 110870
-386/bin/archfs - 775 sys sys 1130594693 140915
+386/bin/archfs - 775 sys sys 1130731906 141206
 386/bin/ascii - 775 sys sys 1130594693 64691
 386/bin/astro - 775 sys sys 1130384233 138837
 386/bin/auth - 20000000775 sys sys 1016920815 0
@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1130594696 101087
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1130594696 312687
+386/bin/auth/factotum - 775 sys sys 1130731907 312978
 386/bin/auth/fgui - 775 sys sys 1130594697 217937
 386/bin/auth/guard.srv - 775 sys sys 1130594697 142873
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -85,7 +85,7 @@
 386/bin/aux/accupoint - 775 sys sys 1130384245 40077
 386/bin/aux/acidleak - 775 sys sys 1130594703 69468
 386/bin/aux/antiword - 775 sys sys 1070288096 511478
-386/bin/aux/apm - 775 sys sys 1130594703 174307
+386/bin/aux/apm - 775 sys sys 1130731908 174598
 386/bin/aux/astarld - 775 sys sys 1130594704 64715
 386/bin/aux/cddb - 775 sys sys 1130594704 72250
 386/bin/aux/clog - 775 sys sys 1130594704 66473
@@ -94,15 +94,15 @@
 386/bin/aux/cropmarks - 775 sys sys 1020319062 1808
 386/bin/aux/data2s - 775 sys sys 1130594704 60560
 386/bin/aux/depend - 775 sys sys 1130594705 145541
-386/bin/aux/disksim - 775 sys sys 1130594705 144493
+386/bin/aux/disksim - 775 sys sys 1130731908 144784
 386/bin/aux/download - 775 sys sys 1087442506 176016
 386/bin/aux/faxreceive - 775 sys sys 1130594706 83959
 386/bin/aux/faxsend - 775 sys sys 1130594707 89471
-386/bin/aux/flashfs - 775 sys sys 1130594707 160431
+386/bin/aux/flashfs - 775 sys sys 1130731909 160722
 386/bin/aux/g3p9bit - 775 sys sys 1104121976 67278
 386/bin/aux/getflags - 775 sys sys 1130384250 43835
 386/bin/aux/gpsevermore - 775 sys sys 1130594707 71449
-386/bin/aux/gpsfs - 775 sys sys 1130594707 176257
+386/bin/aux/gpsfs - 775 sys sys 1130731909 176548
 386/bin/aux/grabit - 775 sys sys 1020319063 1244
 386/bin/aux/hardcopy - 775 sys sys 1020319063 1699
 386/bin/aux/isvmware - 775 sys sys 1032486791 23997
@@ -123,7 +123,7 @@
 386/bin/aux/na - 775 sys sys 1130594710 154218
 386/bin/aux/nfsmount - 775 sys sys 1130594711 234124
 386/bin/aux/nfsserver - 775 sys sys 1130594711 185436
-386/bin/aux/olefs - 775 sys sys 1130594712 143395
+386/bin/aux/olefs - 775 sys sys 1130731910 143686
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1130384255 46923
 386/bin/aux/pcnfsd - 775 sys sys 1130594712 129362
@@ -140,7 +140,7 @@
 386/bin/aux/sprog - 775 sys sys 1130594714 79372
 386/bin/aux/ssh_genkey - 775 sys sys 1045537957 194629
 386/bin/aux/sshserve - 775 sys sys 1130594715 252742
-386/bin/aux/stub - 775 sys sys 1130594715 135207
+386/bin/aux/stub - 775 sys sys 1130731910 135498
 386/bin/aux/tcpostio - 775 sys sys 1094040084 200808
 386/bin/aux/text2post - 775 sys sys 1104121986 78336
 386/bin/aux/timesync - 775 sys sys 1130594715 128304
@@ -171,8 +171,8 @@
 386/bin/cal - 775 sys sys 1130594720 67909
 386/bin/calendar - 775 sys sys 1130594720 80244
 386/bin/cat - 775 sys sys 1130384267 37465
-386/bin/cb - 775 sys sys 1130594721 77621
-386/bin/cdfs - 775 sys sys 1130594721 161209
+386/bin/cb - 775 sys sys 1130731911 77419
+386/bin/cdfs - 775 sys sys 1130731911 161500
 386/bin/cfs - 775 sys sys 1130594721 128099
 386/bin/chgrp - 775 sys sys 1130594722 59317
 386/bin/chmod - 775 sys sys 1130594722 62313
@@ -218,9 +218,9 @@
 386/bin/echo - 775 sys sys 1130594730 57387
 386/bin/ed - 775 sys sys 1130594731 93057
 386/bin/eqn - 775 sys sys 1127360572 243030
-386/bin/execnet - 775 sys sys 1130594731 172041
+386/bin/execnet - 775 sys sys 1130731912 172332
 386/bin/exportfs - 775 sys sys 1130594732 162273
-386/bin/ext2srv - 775 sys sys 1130594732 174030
+386/bin/ext2srv - 775 sys sys 1130731912 174321
 386/bin/faces - 775 sys sys 1130594732 193420
 386/bin/factor - 775 sys sys 1130594733 61498
 386/bin/fcp - 775 sys sys 1130594733 82194
@@ -323,7 +323,7 @@
 386/bin/mk - 775 sys sys 1130594761 144071
 386/bin/mkdir - 775 sys sys 1130594761 60996
 386/bin/mkpaqfs - 775 sys sys 1130594762 94532
-386/bin/mntgen - 775 sys sys 1130594762 139338
+386/bin/mntgen - 775 sys sys 1130731913 139629
 386/bin/mount - 775 sys sys 1130594762 73043
 386/bin/ms2html - 775 sys sys 1130594762 103608
 386/bin/mtime - 775 sys sys 1130594763 59171
@@ -343,9 +343,9 @@
 386/bin/netkey - 775 sys sys 1130594767 72339
 386/bin/netstat - 775 sys sys 1130594767 84696
 386/bin/news - 775 sys sys 1130594767 71692
-386/bin/nfs - 775 sys sys 1130594768 315541
+386/bin/nfs - 775 sys sys 1130731913 315832
 386/bin/nm - 775 sys sys 1130594769 121826
-386/bin/nntpfs - 775 sys sys 1130594769 161050
+386/bin/nntpfs - 775 sys sys 1130731914 161341
 386/bin/ns - 775 sys sys 1130594769 65283
 386/bin/p - 775 sys sys 1130594769 65013
 386/bin/page - 775 sys sys 1130594770 232798
@@ -368,7 +368,7 @@
 386/bin/pwd - 775 sys sys 1130384323 36915
 386/bin/ramfs - 775 sys sys 1130594775 89854
 386/bin/rc - 775 sys sys 1130594775 143258
-386/bin/rdbfs - 775 sys sys 1130594775 168532
+386/bin/rdbfs - 775 sys sys 1130731914 168823
 386/bin/read - 775 sys sys 1130594776 58078
 386/bin/replica - 20000000775 sys sys 1018321168 0
 386/bin/replica/applychanges - 775 sys sys 1130594776 98585
@@ -394,7 +394,7 @@
 386/bin/size - 775 sys sys 1130594782 77006
 386/bin/sleep - 775 sys sys 1085077097 3413
 386/bin/snap - 775 sys sys 1130594783 303743
-386/bin/snapfs - 775 sys sys 1130594784 372710
+386/bin/snapfs - 775 sys sys 1130731915 373001
 386/bin/sniffer - 775 sys sys 1038443185 99028
 386/bin/snoopy - 775 sys sys 1130594784 168241
 386/bin/sort - 775 sys sys 1130594784 82308
@@ -404,7 +404,7 @@
 386/bin/srvfs - 775 sys sys 1130384335 40083
 386/bin/srvold9p - 775 sys sys 1130594785 130225
 386/bin/ssh - 775 sys sys 1130594786 211205
-386/bin/sshnet - 775 sys sys 1130594786 283017
+386/bin/sshnet - 775 sys sys 1130731916 283308
 386/bin/stats - 775 sys sys 1130594787 190301
 386/bin/strings - 775 sys sys 1130594787 62147
 386/bin/strip - 775 sys sys 1130594787 62013
@@ -500,10 +500,10 @@
 386/bin/vt - 775 sys sys 1130594815 173692
 386/bin/vtdump - 775 sys sys 1130594815 159490
 386/bin/wc - 775 sys sys 1130384372 41174
-386/bin/webcookies - 775 sys sys 1130594816 161657
-386/bin/webfs - 775 sys sys 1130594816 353919
+386/bin/webcookies - 775 sys sys 1130731916 161948
+386/bin/webfs - 775 sys sys 1130731917 354210
 386/bin/webfsget - 775 sys sys 1130384374 39161
-386/bin/wikifs - 775 sys sys 1130594817 202502
+386/bin/wikifs - 775 sys sys 1130731918 202793
 386/bin/winwatch - 775 sys sys 1130594817 154587
 386/bin/xd - 775 sys sys 1130594817 64076
 386/bin/xmr - 775 sys sys 1130384375 40175
@@ -533,7 +533,7 @@
 386/lib/ape/libregexp.a - 664 sys sys 1122001337 47670
 386/lib/ape/libutf.a - 664 sys sys 1122001338 81266
 386/lib/ape/libv.a - 664 sys sys 1122001338 19668
-386/lib/lib9p.a - 664 sys sys 1124939608 79582
+386/lib/lib9p.a - 664 sys sys 1130731919 80404
 386/lib/libString.a - 664 sys sys 1115950150 22184
 386/lib/libauth.a - 664 sys sys 1128568181 58648
 386/lib/libauthsrv.a - 664 sys sys 1117249746 34098
@@ -625,7 +625,7 @@ acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1130384395 38977
 acme/bin/386/spout - 775 sys sys 1130594819 61640
-acme/bin/386/win - 775 sys sys 1130594820 178990
+acme/bin/386/win - 775 sys sys 1130731918 179281
 acme/bin/Battery - 775 sys sys 1017457907 451
 acme/bin/Isspam - 775 sys sys 1063951165 235
 acme/bin/Mail - 775 sys sys 1114697798 201
@@ -6471,23 +6471,25 @@ sys/lib/ghostscript/zeroline.ps - 664 sys sys 1032057362 2643
 sys/lib/grap.defines - 664 sys sys 944956052 375
 sys/lib/httpd.rewrite - 664 sys sys 954262980 825
 sys/lib/kbmap - 20000000775 sys sys 1079535430 0
-sys/lib/kbmap/ascii - 664 sys sys 1082221421 6248
-sys/lib/kbmap/azerty - 664 sys sys 1079473812 735
+sys/lib/kbmap/ascii - 664 sys sys 1130763837 5181
+sys/lib/kbmap/azerty - 664 sys sys 1130763837 619
 sys/lib/kbmap/bg - 664 sys sys 1106924292 561
-sys/lib/kbmap/de - 664 sys sys 1100894012 6265
-sys/lib/kbmap/dvorak - 664 sys sys 1124117871 1588
-sys/lib/kbmap/dvorakl - 664 sys sys 1124117871 1945
-sys/lib/kbmap/dvorakr - 664 sys sys 1124117871 1869
-sys/lib/kbmap/ee - 664 sys sys 1080222237 429
-sys/lib/kbmap/es - 664 sys sys 1079535430 1360
-sys/lib/kbmap/fi - 664 sys sys 1079617317 369
-sys/lib/kbmap/jp - 664 sys sys 1106107712 317
-sys/lib/kbmap/n97 - 664 sys sys 1109430112 561
-sys/lib/kbmap/no - 664 sys sys 1110991440 367
-sys/lib/kbmap/ru - 664 sys sys 1110991440 6380
-sys/lib/kbmap/ua - 664 sys sys 1110991440 6380
-sys/lib/kbmap/uk - 664 sys sys 1079473812 55
-sys/lib/kbmap/us - 664 sys sys 1082221421 6248
+sys/lib/kbmap/de - 664 sys sys 1130763837 5209
+sys/lib/kbmap/dvorak - 664 sys sys 1130763838 1276
+sys/lib/kbmap/dvorakl - 664 sys sys 1130763838 1552
+sys/lib/kbmap/dvorakr - 664 sys sys 1130763838 1497
+sys/lib/kbmap/ee - 664 sys sys 1130763838 422
+sys/lib/kbmap/es - 664 sys sys 1130763838 670
+sys/lib/kbmap/fi - 664 sys sys 1130763838 369
+sys/lib/kbmap/jp - 664 sys sys 1130763838 315
+sys/lib/kbmap/mouse-csa - 664 sys sys 1130778761 88
+sys/lib/kbmap/mouse-fn - 664 sys sys 1130778761 102
+sys/lib/kbmap/n97 - 664 sys sys 1130763839 555
+sys/lib/kbmap/no - 664 sys sys 1130763839 367
+sys/lib/kbmap/ru - 664 sys sys 1130763839 5247
+sys/lib/kbmap/ua - 664 sys sys 1130763839 5247
+sys/lib/kbmap/uk - 664 sys sys 1130763839 55
+sys/lib/kbmap/us - 664 sys sys 1130763839 5181
 sys/lib/lex - 20000000775 sys sys 945136651 0
 sys/lib/lex/ncform - 664 sys sys 945136651 4060
 sys/lib/lp - 20000000775 sys sys 954037460 0
@@ -7545,7 +7547,7 @@ sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1055701106 2706
 sys/man/3/i82365 - 664 sys sys 954378906 884
 sys/man/3/ip - 664 sys sys 1103554774 21677
-sys/man/3/kbmap - 664 sys sys 1079463778 1331
+sys/man/3/kbmap - 664 sys sys 1130788502 1666
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
 sys/man/3/lpt - 664 sys sys 944959698 893
@@ -7964,7 +7966,7 @@ sys/src/9/pc/i8259.c - 664 sys sys 1015014519 4423
 sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
 sys/src/9/pc/io.h - 664 sys sys 1099761152 8095
-sys/src/9/pc/kbd.c - 664 sys sys 1079617269 11655
+sys/src/9/pc/kbd.c - 664 sys sys 1130788367 12382
 sys/src/9/pc/l.s - 664 sys sys 1115566067 23833
 sys/src/9/pc/main.c - 664 sys sys 1126586232 14691
 sys/src/9/pc/mem.h - 664 sys sys 1018553448 4573
@@ -8047,17 +8049,17 @@ sys/src/9/port/dev.c - 664 sys sys 1126586172 8246
 sys/src/9/port/devaudio.c - 664 sys sys 1067722761 21130
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1048644215 4113
-sys/src/9/port/devcons.c - 664 sys sys 1130616537 22567
+sys/src/9/port/devcons.c - 664 sys sys 1130759309 22495
 sys/src/9/port/devdraw.c - 664 sys sys 1091733670 41996
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1048644225 6992
 sys/src/9/port/devfs.c - 664 sys sys 1105799131 10783
-sys/src/9/port/devkbmap.c - 664 sys sys 1079463756 2774
+sys/src/9/port/devkbmap.c - 664 sys sys 1130763846 3064
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1076612248 14573
 sys/src/9/port/devmnt.c - 664 sys sys 1126586197 21545
 sys/src/9/port/devmntstats.c - 664 sys sys 1014931173 4039
-sys/src/9/port/devmouse.c - 664 sys sys 1127360658 12976
+sys/src/9/port/devmouse.c - 664 sys sys 1130780334 13327
 sys/src/9/port/devpipe.c - 664 sys sys 1077055016 5825
 sys/src/9/port/devpnp.c - 664 sys sys 1088560907 13624
 sys/src/9/port/devproc.c - 664 sys sys 1126586197 28465
@@ -14967,26 +14969,3 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/archfs - 775 sys sys 1130731906 141206
-386/bin/cdfs - 775 sys sys 1130731911 161500
-386/bin/nntpfs - 775 sys sys 1130731914 161341
-386/bin/snapfs - 775 sys sys 1130731915 373001
-386/bin/webcookies - 775 sys sys 1130731916 161948
-386/bin/wikifs - 775 sys sys 1130731918 202793
-386/bin/rdbfs - 775 sys sys 1130731914 168823
-386/bin/webfs - 775 sys sys 1130731917 354210
-386/bin/auth/factotum - 775 sys sys 1130731907 312978
-386/bin/aux/apm - 775 sys sys 1130731908 174598
-386/bin/aux/disksim - 775 sys sys 1130731908 144784
-386/bin/aux/flashfs - 775 sys sys 1130731909 160722
-386/bin/aux/gpsfs - 775 sys sys 1130731909 176548
-386/bin/aux/olefs - 775 sys sys 1130731910 143686
-386/bin/aux/stub - 775 sys sys 1130731910 135498
-386/bin/cb - 775 sys sys 1130731911 77419
-386/bin/execnet - 775 sys sys 1130731912 172332
-386/bin/ext2srv - 775 sys sys 1130731912 174321
-386/bin/mntgen - 775 sys sys 1130731913 139629
-386/bin/nfs - 775 sys sys 1130731913 315832
-386/bin/sshnet - 775 sys sys 1130731916 283308
-386/lib/lib9p.a - 664 sys sys 1130731919 80404
-acme/bin/386/win - 775 sys sys 1130731918 179281

dist/replica/plan9.db

@@ -6471,23 +6471,25 @@ sys/lib/ghostscript/zeroline.ps - 664 sys sys 1032057362 2643
 sys/lib/grap.defines - 664 sys sys 944956052 375
 sys/lib/httpd.rewrite - 664 sys sys 954262980 825
 sys/lib/kbmap - 20000000775 sys sys 1079535430 0
-sys/lib/kbmap/ascii - 664 sys sys 1082221421 6248
-sys/lib/kbmap/azerty - 664 sys sys 1079473812 735
+sys/lib/kbmap/ascii - 664 sys sys 1130763837 5181
+sys/lib/kbmap/azerty - 664 sys sys 1130763837 619
 sys/lib/kbmap/bg - 664 sys sys 1106924292 561
-sys/lib/kbmap/de - 664 sys sys 1100894012 6265
-sys/lib/kbmap/dvorak - 664 sys sys 1124117871 1588
-sys/lib/kbmap/dvorakl - 664 sys sys 1124117871 1945
-sys/lib/kbmap/dvorakr - 664 sys sys 1124117871 1869
-sys/lib/kbmap/ee - 664 sys sys 1080222237 429
-sys/lib/kbmap/es - 664 sys sys 1079535430 1360
-sys/lib/kbmap/fi - 664 sys sys 1079617317 369
-sys/lib/kbmap/jp - 664 sys sys 1106107712 317
-sys/lib/kbmap/n97 - 664 sys sys 1109430112 561
-sys/lib/kbmap/no - 664 sys sys 1110991440 367
-sys/lib/kbmap/ru - 664 sys sys 1110991440 6380
-sys/lib/kbmap/ua - 664 sys sys 1110991440 6380
-sys/lib/kbmap/uk - 664 sys sys 1079473812 55
-sys/lib/kbmap/us - 664 sys sys 1082221421 6248
+sys/lib/kbmap/de - 664 sys sys 1130763837 5209
+sys/lib/kbmap/dvorak - 664 sys sys 1130763838 1276
+sys/lib/kbmap/dvorakl - 664 sys sys 1130763838 1552
+sys/lib/kbmap/dvorakr - 664 sys sys 1130763838 1497
+sys/lib/kbmap/ee - 664 sys sys 1130763838 422
+sys/lib/kbmap/es - 664 sys sys 1130763838 670
+sys/lib/kbmap/fi - 664 sys sys 1130763838 369
+sys/lib/kbmap/jp - 664 sys sys 1130763838 315
+sys/lib/kbmap/mouse-csa - 664 sys sys 1130778761 88
+sys/lib/kbmap/mouse-fn - 664 sys sys 1130778761 102
+sys/lib/kbmap/n97 - 664 sys sys 1130763839 555
+sys/lib/kbmap/no - 664 sys sys 1130763839 367
+sys/lib/kbmap/ru - 664 sys sys 1130763839 5247
+sys/lib/kbmap/ua - 664 sys sys 1130763839 5247
+sys/lib/kbmap/uk - 664 sys sys 1130763839 55
+sys/lib/kbmap/us - 664 sys sys 1130763839 5181
 sys/lib/lex - 20000000775 sys sys 945136651 0
 sys/lib/lex/ncform - 664 sys sys 945136651 4060
 sys/lib/lp - 20000000775 sys sys 954037460 0
@@ -7545,7 +7547,7 @@ sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1055701106 2706
 sys/man/3/i82365 - 664 sys sys 954378906 884
 sys/man/3/ip - 664 sys sys 1103554774 21677
-sys/man/3/kbmap - 664 sys sys 1079463778 1331
+sys/man/3/kbmap - 664 sys sys 1130788502 1666
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
 sys/man/3/lpt - 664 sys sys 944959698 893
@@ -7964,7 +7966,7 @@ sys/src/9/pc/i8259.c - 664 sys sys 1015014519 4423
 sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
 sys/src/9/pc/io.h - 664 sys sys 1099761152 8095
-sys/src/9/pc/kbd.c - 664 sys sys 1079617269 11655
+sys/src/9/pc/kbd.c - 664 sys sys 1130788367 12382
 sys/src/9/pc/l.s - 664 sys sys 1115566067 23833
 sys/src/9/pc/main.c - 664 sys sys 1126586232 14691
 sys/src/9/pc/mem.h - 664 sys sys 1018553448 4573
@@ -8047,17 +8049,17 @@ sys/src/9/port/dev.c - 664 sys sys 1126586172 8246
 sys/src/9/port/devaudio.c - 664 sys sys 1067722761 21130
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1048644215 4113
-sys/src/9/port/devcons.c - 664 sys sys 1130616537 22567
+sys/src/9/port/devcons.c - 664 sys sys 1130759309 22495
 sys/src/9/port/devdraw.c - 664 sys sys 1091733670 41996
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1048644225 6992
 sys/src/9/port/devfs.c - 664 sys sys 1105799131 10783
-sys/src/9/port/devkbmap.c - 664 sys sys 1079463756 2774
+sys/src/9/port/devkbmap.c - 664 sys sys 1130763846 3064
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1076612248 14573
 sys/src/9/port/devmnt.c - 664 sys sys 1126586197 21545
 sys/src/9/port/devmntstats.c - 664 sys sys 1014931173 4039
-sys/src/9/port/devmouse.c - 664 sys sys 1127360658 12976
+sys/src/9/port/devmouse.c - 664 sys sys 1130780334 13327
 sys/src/9/port/devpipe.c - 664 sys sys 1077055016 5825
 sys/src/9/port/devpnp.c - 664 sys sys 1088560907 13624
 sys/src/9/port/devproc.c - 664 sys sys 1126586197 28465

dist/replica/plan9.log

@@ -22468,3 +22468,28 @@
 1130733080 20 c 386/bin/sshnet - 775 sys sys 1130731916 283308
 1130733080 21 c 386/lib/lib9p.a - 664 sys sys 1130731919 80404
 1130733080 22 c acme/bin/386/win - 775 sys sys 1130731918 179281
+1130760087 0 c sys/src/9/port/devcons.c - 664 sys sys 1130759309 22495
+1130765489 0 c sys/lib/kbmap/ascii - 664 sys sys 1130763837 5181
+1130765489 1 c sys/lib/kbmap/azerty - 664 sys sys 1130763837 619
+1130765489 2 c sys/lib/kbmap/de - 664 sys sys 1130763837 5209
+1130765489 3 c sys/lib/kbmap/dvorak - 664 sys sys 1130763838 1276
+1130765489 4 c sys/lib/kbmap/dvorakl - 664 sys sys 1130763838 1552
+1130765489 5 c sys/lib/kbmap/dvorakr - 664 sys sys 1130763838 1497
+1130765489 6 c sys/lib/kbmap/ee - 664 sys sys 1130763838 422
+1130765489 7 c sys/lib/kbmap/es - 664 sys sys 1130763838 670
+1130765489 8 c sys/lib/kbmap/fi - 664 sys sys 1130763838 369
+1130765489 9 c sys/lib/kbmap/jp - 664 sys sys 1130763838 315
+1130765489 10 a sys/lib/kbmap/mouse-fn - 664 sys sys 1130764168 40
+1130765489 11 c sys/lib/kbmap/n97 - 664 sys sys 1130763839 555
+1130765489 12 c sys/lib/kbmap/no - 664 sys sys 1130763839 367
+1130765489 13 c sys/lib/kbmap/ru - 664 sys sys 1130763839 5247
+1130765489 14 c sys/lib/kbmap/ua - 664 sys sys 1130763839 5247
+1130765489 15 c sys/lib/kbmap/uk - 664 sys sys 1130763839 55
+1130765489 16 c sys/lib/kbmap/us - 664 sys sys 1130763839 5181
+1130765489 17 c sys/src/9/pc/kbd.c - 664 sys sys 1130763869 12381
+1130765489 18 c sys/src/9/port/devkbmap.c - 664 sys sys 1130763846 3064
+1130779892 0 a sys/lib/kbmap/mouse-csa - 664 sys sys 1130778761 88
+1130779892 1 c sys/lib/kbmap/mouse-fn - 664 sys sys 1130778761 102
+1130781693 0 c sys/src/9/port/devmouse.c - 664 sys sys 1130780334 13327
+1130788894 0 c sys/man/3/kbmap - 664 sys sys 1130788502 1666
+1130788894 1 c sys/src/9/pc/kbd.c - 664 sys sys 1130788367 12382

sys/lib/kbmap/ascii

@@ -1,59 +1,59 @@
-0	0	0x0
-0	1	0x1b
-0	2	0x31
-0	3	0x32
-0	4	0x33
-0	5	0x34
-0	6	0x35
-0	7	0x36
-0	8	0x37
-0	9	0x38
-0	10	0x39
-0	11	0x30
-0	12	0x2d
-0	13	0x3d
-0	14	0x8
-0	15	0x9
-0	16	0x71
-0	17	0x77
-0	18	0x65
-0	19	0x72
-0	20	0x74
-0	21	0x79
-0	22	0x75
-0	23	0x69
-0	24	0x6f
-0	25	0x70
-0	26	0x5b
-0	27	0x5d
-0	28	0xa
+0	0	0
+0	1	^[
+0	2	'1
+0	3	'2
+0	4	'3
+0	5	'4
+0	6	'5
+0	7	'6
+0	8	'7
+0	9	'8
+0	10	'9
+0	11	'0
+0	12	'-
+0	13	'=
+0	14	^H
+0	15	^I
+0	16	'q
+0	17	'w
+0	18	'e
+0	19	'r
+0	20	't
+0	21	'y
+0	22	'u
+0	23	'i
+0	24	'o
+0	25	'p
+0	26	'[
+0	27	']
+0	28	^J
 0	29	0xf862
-0	30	0x61
-0	31	0x73
-0	32	0x64
-0	33	0x66
-0	34	0x67
-0	35	0x68
-0	36	0x6a
-0	37	0x6b
-0	38	0x6c
-0	39	0x3b
-0	40	0x27
-0	41	0x60
+0	30	'a
+0	31	's
+0	32	'd
+0	33	'f
+0	34	'g
+0	35	'h
+0	36	'j
+0	37	'k
+0	38	'l
+0	39	';
+0	40	''
+0	41	'`
 0	42	0xf860
-0	43	0x5c
-0	44	0x7a
-0	45	0x78
-0	46	0x63
-0	47	0x76
-0	48	0x62
-0	49	0x6e
-0	50	0x6d
-0	51	0x2c
-0	52	0x2e
-0	53	0x2f
+0	43	'\
+0	44	'z
+0	45	'x
+0	46	'c
+0	47	'v
+0	48	'b
+0	49	'n
+0	50	'm
+0	51	',
+0	52	'.
+0	53	'/
 0	54	0xf860
-0	55	0x2a
+0	55	'*
 0	56	0xf863
 0	57	0x20
 0	58	0xf862
@@ -69,119 +69,119 @@
 0	68	0xf00a
 0	69	0xf865
 0	70	0xf015
-0	71	0x37
-0	72	0x38
-0	73	0x39
-0	74	0x2d
-0	75	0x34
-0	76	0x35
-0	77	0x36
-0	78	0x2b
-0	79	0x31
-0	80	0x32
-0	81	0x33
-0	82	0x30
-0	83	0x2e
-0	84	0x0
-0	85	0x0
-0	86	0x0
+0	71	'7
+0	72	'8
+0	73	'9
+0	74	'-
+0	75	'4
+0	76	'5
+0	77	'6
+0	78	'+
+0	79	'1
+0	80	'2
+0	81	'3
+0	82	'0
+0	83	'.
+0	84	0
+0	85	0
+0	86	0
 0	87	0xf00b
 0	88	0xf00c
-0	89	0x0
-0	90	0x0
-0	91	0x0
-0	92	0x0
-0	93	0x0
-0	94	0x0
-0	95	0x0
-0	96	0x0
-0	97	0x0
-0	98	0x0
-0	99	0x0
-0	100	0x0
-0	101	0x0
-0	102	0x0
-0	103	0x0
-0	104	0x0
-0	105	0x0
-0	106	0x0
-0	107	0x0
-0	108	0x0
-0	109	0x0
-0	110	0x0
-0	111	0x0
-0	112	0x0
-0	113	0x0
-0	114	0x0
-0	115	0x0
-0	116	0x0
-0	117	0x0
-0	118	0x0
-0	119	0x0
-0	120	0x0
+0	89	0
+0	90	0
+0	91	0
+0	92	0
+0	93	0
+0	94	0
+0	95	0
+0	96	0
+0	97	0
+0	98	0
+0	99	0
+0	100	0
+0	101	0
+0	102	0
+0	103	0
+0	104	0
+0	105	0
+0	106	0
+0	107	0
+0	108	0
+0	109	0
+0	110	0
+0	111	0
+0	112	0
+0	113	0
+0	114	0
+0	115	0
+0	116	0
+0	117	0
+0	118	0
+0	119	0
+0	120	0
 0	121	0xf800
-0	122	0x0
+0	122	0
 0	123	0xf00e
-0	124	0x0
-0	125	0x0
-0	126	0x0
-0	127	0x0
-1	0	0x0
-1	1	0x1b
-1	2	0x21
-1	3	0x40
-1	4	0x23
-1	5	0x24
-1	6	0x25
-1	7	0x5e
-1	8	0x26
-1	9	0x2a
-1	10	0x28
-1	11	0x29
-1	12	0x5f
-1	13	0x2b
-1	14	0x8
-1	15	0x9
-1	16	0x51
-1	17	0x57
-1	18	0x45
-1	19	0x52
-1	20	0x54
-1	21	0x59
-1	22	0x55
-1	23	0x49
-1	24	0x4f
-1	25	0x50
-1	26	0x7b
-1	27	0x7d
-1	28	0xa
+0	124	0
+0	125	0
+0	126	0
+0	127	0
+1	0	0
+1	1	^[
+1	2	'!
+1	3	'@
+1	4	'#
+1	5	'$
+1	6	'%
+1	7	'^
+1	8	'&
+1	9	'*
+1	10	'(
+1	11	')
+1	12	'_
+1	13	'+
+1	14	^H
+1	15	^I
+1	16	'Q
+1	17	'W
+1	18	'E
+1	19	'R
+1	20	'T
+1	21	'Y
+1	22	'U
+1	23	'I
+1	24	'O
+1	25	'P
+1	26	'{
+1	27	'}
+1	28	^J
 1	29	0xf862
-1	30	0x41
-1	31	0x53
-1	32	0x44
-1	33	0x46
-1	34	0x47
-1	35	0x48
-1	36	0x4a
-1	37	0x4b
-1	38	0x4c
-1	39	0x3a
-1	40	0x22
-1	41	0x7e
+1	30	'A
+1	31	'S
+1	32	'D
+1	33	'F
+1	34	'G
+1	35	'H
+1	36	'J
+1	37	'K
+1	38	'L
+1	39	':
+1	40	'"
+1	41	'~
 1	42	0xf860
-1	43	0x7c
-1	44	0x5a
-1	45	0x58
-1	46	0x43
-1	47	0x56
-1	48	0x42
-1	49	0x4e
-1	50	0x4d
-1	51	0x3c
-1	52	0x3e
-1	53	0x3f
+1	43	'|
+1	44	'Z
+1	45	'X
+1	46	'C
+1	47	'V
+1	48	'B
+1	49	'N
+1	50	'M
+1	51	'<
+1	52	'>
+1	53	'?
 1	54	0xf860
-1	55	0x2a
+1	55	'*
 1	56	0xf863
 1	57	0x20
 1	58	0xf862
@@ -197,444 +197,444 @@
 1	68	0xf00a
 1	69	0xf865
 1	70	0xf015
-1	71	0x37
-1	72	0x38
-1	73	0x39
-1	74	0x2d
-1	75	0x34
-1	76	0x35
-1	77	0x36
-1	78	0x2b
-1	79	0x31
-1	80	0x32
-1	81	0x33
-1	82	0x30
-1	83	0x2e
-1	84	0x0
-1	85	0x0
-1	86	0x0
+1	71	'7
+1	72	'8
+1	73	'9
+1	74	'-
+1	75	'4
+1	76	'5
+1	77	'6
+1	78	'+
+1	79	'1
+1	80	'2
+1	81	'3
+1	82	'0
+1	83	'.
+1	84	0
+1	85	0
+1	86	0
 1	87	0xf00b
 1	88	0xf00c
-1	89	0x0
-1	90	0x0
-1	91	0x0
-1	92	0x0
-1	93	0x0
-1	94	0x0
-1	95	0x0
-1	96	0x0
-1	97	0x0
-1	98	0x0
-1	99	0x0
-1	100	0x0
-1	101	0x0
-1	102	0x0
-1	103	0x0
-1	104	0x0
-1	105	0x0
-1	106	0x0
-1	107	0x0
-1	108	0x0
-1	109	0x0
-1	110	0x0
-1	111	0x0
-1	112	0x0
-1	113	0x0
-1	114	0x0
-1	115	0x0
-1	116	0x0
-1	117	0x0
-1	118	0x0
-1	119	0x0
-1	120	0x0
+1	89	0
+1	90	0
+1	91	0
+1	92	0
+1	93	0
+1	94	0
+1	95	0
+1	96	0
+1	97	0
+1	98	0
+1	99	0
+1	100	0
+1	101	0
+1	102	0
+1	103	0
+1	104	0
+1	105	0
+1	106	0
+1	107	0
+1	108	0
+1	109	0
+1	110	0
+1	111	0
+1	112	0
+1	113	0
+1	114	0
+1	115	0
+1	116	0
+1	117	0
+1	118	0
+1	119	0
+1	120	0
 1	121	0xf00e
-1	122	0x0
+1	122	0
 1	123	0xf00e
-1	124	0x0
-1	125	0x0
-1	126	0x0
-1	127	0x0
-2	0	0x0
-2	1	0x0
-2	2	0x0
-2	3	0x0
-2	4	0x0
-2	5	0x0
-2	6	0x0
-2	7	0x0
-2	8	0x0
-2	9	0x0
-2	10	0x0
-2	11	0x0
-2	12	0x0
-2	13	0x0
-2	14	0x0
-2	15	0x0
-2	16	0x0
-2	17	0x0
-2	18	0x0
-2	19	0x0
-2	20	0x0
-2	21	0x0
-2	22	0x0
-2	23	0x0
-2	24	0x0
-2	25	0x0
-2	26	0x0
-2	27	0x0
-2	28	0xa
+1	124	0
+1	125	0
+1	126	0
+1	127	0
+2	0	0
+2	1	0
+2	2	0
+2	3	0
+2	4	0
+2	5	0
+2	6	0
+2	7	0
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+2	12	0
+2	13	0
+2	14	0
+2	15	0
+2	16	0
+2	17	0
+2	18	0
+2	19	0
+2	20	0
+2	21	0
+2	22	0
+2	23	0
+2	24	0
+2	25	0
+2	26	0
+2	27	0
+2	28	^J
 2	29	0xf862
-2	30	0x0
-2	31	0x0
-2	32	0x0
-2	33	0x0
-2	34	0x0
-2	35	0x0
-2	36	0x0
-2	37	0x0
-2	38	0x0
-2	39	0x0
-2	40	0x0
-2	41	0x0
+2	30	0
+2	31	0
+2	32	0
+2	33	0
+2	34	0
+2	35	0
+2	36	0
+2	37	0
+2	38	0
+2	39	0
+2	40	0
+2	41	0
 2	42	0xf860
-2	43	0x0
-2	44	0x0
-2	45	0x0
-2	46	0x0
-2	47	0x0
-2	48	0x0
-2	49	0x0
-2	50	0x0
-2	51	0x0
-2	52	0x0
-2	53	0x2f
-2	54	0x0
+2	43	0
+2	44	0
+2	45	0
+2	46	0
+2	47	0
+2	48	0
+2	49	0
+2	50	0
+2	51	0
+2	52	0
+2	53	'/
+2	54	0
 2	55	0xf010
 2	56	0xf867
-2	57	0x0
-2	58	0x0
-2	59	0x0
-2	60	0x0
-2	61	0x0
-2	62	0x0
-2	63	0x0
-2	64	0x0
-2	65	0x0
-2	66	0x0
-2	67	0x0
-2	68	0x0
-2	69	0x0
+2	57	0
+2	58	0
+2	59	0
+2	60	0
+2	61	0
+2	62	0
+2	63	0
+2	64	0
+2	65	0
+2	66	0
+2	67	0
+2	68	0
+2	69	0
 2	70	0xf861
 2	71	0xf00d
 2	72	0xf00e
 2	73	0xf00f
-2	74	0x0
+2	74	0
 2	75	0xf011
-2	76	0x0
+2	76	0
 2	77	0xf012
-2	78	0x0
+2	78	0
 2	79	0xf018
 2	80	0xf800
 2	81	0xf013
 2	82	0xf014
 2	83	0x7f
-2	84	0x0
-2	85	0x0
-2	86	0x0
-2	87	0x0
-2	88	0x0
-2	89	0x0
-2	90	0x0
-2	91	0x0
-2	92	0x0
-2	93	0x0
-2	94	0x0
-2	95	0x0
-2	96	0x0
-2	97	0x0
-2	98	0x0
-2	99	0x0
-2	100	0x0
-2	101	0x0
-2	102	0x0
-2	103	0x0
-2	104	0x0
-2	105	0x0
-2	106	0x0
-2	107	0x0
-2	108	0x0
-2	109	0x0
-2	110	0x0
-2	111	0x0
-2	112	0x0
-2	113	0x0
-2	114	0x0
-2	115	0x0
-2	116	0x0
-2	117	0x0
-2	118	0x0
-2	119	0x0
-2	120	0x0
+2	84	0
+2	85	0
+2	86	0
+2	87	0
+2	88	0
+2	89	0
+2	90	0
+2	91	0
+2	92	0
+2	93	0
+2	94	0
+2	95	0
+2	96	0
+2	97	0
+2	98	0
+2	99	0
+2	100	0
+2	101	0
+2	102	0
+2	103	0
+2	104	0
+2	105	0
+2	106	0
+2	107	0
+2	108	0
+2	109	0
+2	110	0
+2	111	0
+2	112	0
+2	113	0
+2	114	0
+2	115	0
+2	116	0
+2	117	0
+2	118	0
+2	119	0
+2	120	0
 2	121	0xf00e
-2	122	0x0
-2	123	0x0
-2	124	0x0
-2	125	0x0
-2	126	0x0
-2	127	0x0
-3	0	0x0
-3	1	0x0
-3	2	0x0
-3	3	0x0
-3	4	0x0
-3	5	0x0
-3	6	0x0
-3	7	0x0
-3	8	0x0
-3	9	0x0
-3	10	0x0
-3	11	0x0
-3	12	0x0
-3	13	0x0
-3	14	0x0
-3	15	0x0
-3	16	0x0
-3	17	0x0
-3	18	0x0
-3	19	0x0
-3	20	0x0
-3	21	0x0
-3	22	0x0
-3	23	0x0
-3	24	0x0
-3	25	0x0
-3	26	0x0
-3	27	0x0
-3	28	0xa
+2	122	0
+2	123	0
+2	124	0
+2	125	0
+2	126	0
+2	127	0
+3	0	0
+3	1	0
+3	2	0
+3	3	0
+3	4	0
+3	5	0
+3	6	0
+3	7	0
+3	8	0
+3	9	0
+3	10	0
+3	11	0
+3	12	0
+3	13	0
+3	14	0
+3	15	0
+3	16	0
+3	17	0
+3	18	0
+3	19	0
+3	20	0
+3	21	0
+3	22	0
+3	23	0
+3	24	0
+3	25	0
+3	26	0
+3	27	0
+3	28	^J
 3	29	0xf862
-3	30	0x0
-3	31	0x0
-3	32	0x0
-3	33	0x0
-3	34	0x0
-3	35	0x0
-3	36	0x0
-3	37	0x0
-3	38	0x0
-3	39	0x0
-3	40	0x0
-3	41	0x0
+3	30	0
+3	31	0
+3	32	0
+3	33	0
+3	34	0
+3	35	0
+3	36	0
+3	37	0
+3	38	0
+3	39	0
+3	40	0
+3	41	0
 3	42	0xf860
-3	43	0x0
-3	44	0x0
-3	45	0x0
-3	46	0x0
-3	47	0x0
-3	48	0x0
-3	49	0x0
-3	50	0x0
-3	51	0x0
-3	52	0x0
-3	53	0x2f
-3	54	0x0
+3	43	0
+3	44	0
+3	45	0
+3	46	0
+3	47	0
+3	48	0
+3	49	0
+3	50	0
+3	51	0
+3	52	0
+3	53	'/
+3	54	0
 3	55	0xf010
 3	56	0xf867
-3	57	0x0
-3	58	0x0
-3	59	0x0
-3	60	0x0
-3	61	0x0
-3	62	0x0
-3	63	0x0
-3	64	0x0
-3	65	0x0
-3	66	0x0
-3	67	0x0
-3	68	0x0
-3	69	0x0
+3	57	0
+3	58	0
+3	59	0
+3	60	0
+3	61	0
+3	62	0
+3	63	0
+3	64	0
+3	65	0
+3	66	0
+3	67	0
+3	68	0
+3	69	0
 3	70	0xf861
 3	71	0xf00d
 3	72	0xf00e
 3	73	0xf00f
-3	74	0x0
+3	74	0
 3	75	0xf011
-3	76	0x0
+3	76	0
 3	77	0xf012
-3	78	0x0
+3	78	0
 3	79	0xf018
 3	80	0xf800
 3	81	0xf013
 3	82	0xf014
 3	83	0x7f
-3	84	0x0
-3	85	0x0
-3	86	0x0
-3	87	0x0
-3	88	0x0
-3	89	0x0
-3	90	0x0
-3	91	0x0
-3	92	0x0
-3	93	0x0
-3	94	0x0
-3	95	0x0
-3	96	0x0
-3	97	0x0
-3	98	0x0
-3	99	0x0
-3	100	0x0
-3	101	0x0
-3	102	0x0
-3	103	0x0
-3	104	0x0
-3	105	0x0
-3	106	0x0
-3	107	0x0
-3	108	0x0
-3	109	0x0
-3	110	0x0
-3	111	0x0
-3	112	0x0
-3	113	0x0
-3	114	0x0
-3	115	0x0
-3	116	0x0
-3	117	0x0
-3	118	0x0
-3	119	0x0
-3	120	0x0
+3	84	0
+3	85	0
+3	86	0
+3	87	0
+3	88	0
+3	89	0
+3	90	0
+3	91	0
+3	92	0
+3	93	0
+3	94	0
+3	95	0
+3	96	0
+3	97	0
+3	98	0
+3	99	0
+3	100	0
+3	101	0
+3	102	0
+3	103	0
+3	104	0
+3	105	0
+3	106	0
+3	107	0
+3	108	0
+3	109	0
+3	110	0
+3	111	0
+3	112	0
+3	113	0
+3	114	0
+3	115	0
+3	116	0
+3	117	0
+3	118	0
+3	119	0
+3	120	0
 3	121	0xf00e
-3	122	0x0
-3	123	0x0
-3	124	0x0
-3	125	0x0
-3	126	0x0
-3	127	0x0
-4	0	0x0
-4	1	0x1b
-4	2	0x11
-4	3	0x12
-4	4	0x13
-4	5	0x14
-4	6	0x15
-4	7	0x16
-4	8	0x17
-4	9	0x18
-4	10	0x19
-4	11	0x10
-4	12	0xd
-4	13	0x1d
-4	14	0x8
-4	15	0x9
-4	16	0x11
-4	17	0x17
-4	18	0x5
-4	19	0x12
-4	20	0x14
-4	21	0x19
-4	22	0x15
-4	23	0x9
-4	24	0xf
-4	25	0x10
-4	26	0x1b
-4	27	0x1d
-4	28	0xa
+3	122	0
+3	123	0
+3	124	0
+3	125	0
+3	126	0
+3	127	0
+4	0	0
+4	1	^[
+4	2	^Q
+4	3	^R
+4	4	^S
+4	5	^T
+4	6	^U
+4	7	^V
+4	8	^W
+4	9	^X
+4	10	^Y
+4	11	^P
+4	12	^M
+4	13	^]
+4	14	^H
+4	15	^I
+4	16	^Q
+4	17	^W
+4	18	^E
+4	19	^R
+4	20	^T
+4	21	^Y
+4	22	^U
+4	23	^I
+4	24	^O
+4	25	^P
+4	26	^[
+4	27	^]
+4	28	^J
 4	29	0xf862
-4	30	0x1
-4	31	0x13
-4	32	0x4
-4	33	0x6
-4	34	0x7
-4	35	0x8
-4	36	0xa
-4	37	0xb
-4	38	0xc
-4	39	0x1b
-4	40	0x7
-4	41	0x0
+4	30	^A
+4	31	^S
+4	32	^D
+4	33	^F
+4	34	^G
+4	35	^H
+4	36	^J
+4	37	^K
+4	38	^L
+4	39	^[
+4	40	^G
+4	41	0
 4	42	0xf860
-4	43	0x1c
-4	44	0x1a
-4	45	0x18
-4	46	0x3
-4	47	0x16
-4	48	0x2
-4	49	0xe
-4	50	0xd
-4	51	0xc
-4	52	0xe
-4	53	0xf
+4	43	^\
+4	44	^Z
+4	45	^X
+4	46	^C
+4	47	^V
+4	48	^B
+4	49	^N
+4	50	^M
+4	51	^L
+4	52	^N
+4	53	^O
 4	54	0xf860
-4	55	0xa
+4	55	^J
 4	56	0xf863
-4	57	0x0
+4	57	0
 4	58	0xf862
-4	59	0x5
-4	60	0x6
-4	61	0x7
-4	62	0x4
-4	63	0x5
-4	64	0x6
-4	65	0x7
-4	66	0xc
-4	67	0xd
-4	68	0xe
-4	69	0x5
-4	70	0x6
-4	71	0x17
-4	72	0x18
-4	73	0x19
-4	74	0xd
-4	75	0x14
-4	76	0x15
-4	77	0x16
-4	78	0xb
-4	79	0x11
-4	80	0x12
-4	81	0x13
-4	82	0x10
-4	83	0xe
-4	84	0x0
-4	85	0x0
-4	86	0x0
-4	87	0xf
-4	88	0xc
-4	89	0x0
-4	90	0x0
-4	91	0x0
-4	92	0x0
-4	93	0x0
-4	94	0x0
-4	95	0x0
-4	96	0x0
-4	97	0x0
-4	98	0x0
-4	99	0x0
-4	100	0x0
-4	101	0x0
-4	102	0x0
-4	103	0x0
-4	104	0x0
-4	105	0x0
-4	106	0x0
-4	107	0x0
-4	108	0x0
-4	109	0x0
-4	110	0x0
-4	111	0x0
-4	112	0x0
-4	113	0x0
-4	114	0x0
-4	115	0x0
-4	116	0x0
-4	117	0x0
-4	118	0x0
-4	119	0x0
-4	120	0x0
-4	121	0x7
-4	122	0x0
-4	123	0x8
-4	124	0x0
-4	125	0x0
-4	126	0x0
-4	127	0x0
+4	59	^E
+4	60	^F
+4	61	^G
+4	62	^D
+4	63	^E
+4	64	^F
+4	65	^G
+4	66	^L
+4	67	^M
+4	68	^N
+4	69	^E
+4	70	^F
+4	71	^W
+4	72	^X
+4	73	^Y
+4	74	^M
+4	75	^T
+4	76	^U
+4	77	^V
+4	78	^K
+4	79	^Q
+4	80	^R
+4	81	^S
+4	82	^P
+4	83	^N
+4	84	0
+4	85	0
+4	86	0
+4	87	^O
+4	88	^L
+4	89	0
+4	90	0
+4	91	0
+4	92	0
+4	93	0
+4	94	0
+4	95	0
+4	96	0
+4	97	0
+4	98	0
+4	99	0
+4	100	0
+4	101	0
+4	102	0
+4	103	0
+4	104	0
+4	105	0
+4	106	0
+4	107	0
+4	108	0
+4	109	0
+4	110	0
+4	111	0
+4	112	0
+4	113	0
+4	114	0
+4	115	0
+4	116	0
+4	117	0
+4	118	0
+4	119	0
+4	120	0
+4	121	^G
+4	122	0
+4	123	^H
+4	124	0
+4	125	0
+4	126	0
+4	127	0

sys/lib/kbmap/azerty

@@ -1,61 +1,61 @@
-0	0x02	0x26
-0	0x03	0xE9
-0	0x04	0x22
-0	0x05	0x27
-0	0x06	0x28
-0	0x07	0x2D
-0	0x08	0xE8
-0	0x09	0x5F
-0	0x0A	0xE7
-0	0x0B	0xE0
-0	0x0C	0x29
-0	0x10	0x61
-0	0x11	0x7A
-0	0x1A	0x5E
-0	0x1B	0x24
-0	0x1E	0x71
-0	0x27	0x6D
-0	0x29	0x2072
-0	0x2B	0x2A
-0	0x2C	0x77
-0	0x32	0x2C
-0	0x33	0x3B
-0	0x34	0x3A
-0	0x35	0x21
-0	0x56	0x3C
-1	0x02	0x31
-1	0x03	0x32
-1	0x04	0x33
-1	0x05	0x34
-1	0x06	0x35
-1	0x07	0x36
-1	0x08	0x37
-1	0x09	0x38
-1	0x0A	0x39
-1	0x0B	0x30
-1	0x0C	0xB0
-1	0x10	0x41
-1	0x11	0x5A
-1	0x1B	0xA3
-1	0x1E	0x51
-1	0x27	0x4D
-1	0x28	0x25
-1	0x29	0x00
-1	0x2B	0x3BC
-1	0x2C	0x57
-1	0x32	0x3F
-1	0x33	0x2E
-1	0x34	0x2F
-1	0x35	0xA7
-1	0x56	0x3E
-3	0x03	0x7E
-3	0x04	0x23
-3	0x05	0x7B
-3	0x06	0x5B
-3	0x07	0x7c
-3	0x08	0x60
-3	0x09	0x5C
-3	0x0A	0x5E
-3	0x0B	0x40
-3	0x0C	0x5D
-3	0x0D	0x7D
+0	0x02	'&
+0	0x03	'é
+0	0x04	'"
+0	0x05	''
+0	0x06	'(
+0	0x07	'-
+0	0x08	'è
+0	0x09	'_
+0	0x0A	'ç
+0	0x0B	'à
+0	0x0C	')
+0	0x10	'a
+0	0x11	'z
+0	0x1A	'^
+0	0x1B	'$
+0	0x1E	'q
+0	0x27	'm
+0	0x29	'⁲
+0	0x2B	'*
+0	0x2C	'w
+0	0x32	',
+0	0x33	';
+0	0x34	':
+0	0x35	'!
+0	0x56	'<
+1	0x02	'1
+1	0x03	'2
+1	0x04	'3
+1	0x05	'4
+1	0x06	'5
+1	0x07	'6
+1	0x08	'7
+1	0x09	'8
+1	0x0A	'9
+1	0x0B	'0
+1	0x0C	'°
+1	0x10	'A
+1	0x11	'Z
+1	0x1B	'£
+1	0x1E	'Q
+1	0x27	'M
+1	0x28	'%
+1	0x29	0
+1	0x2B	'μ
+1	0x2C	'W
+1	0x32	'?
+1	0x33	'.
+1	0x34	'/
+1	0x35	'§
+1	0x56	'>
+3	0x03	'~
+3	0x04	'#
+3	0x05	'{
+3	0x06	'[
+3	0x07	'|
+3	0x08	'`
+3	0x09	'\
+3	0x0A	'^
+3	0x0B	'@
+3	0x0C	']
+3	0x0D	'}

sys/lib/kbmap/de

@@ -1,59 +1,59 @@
-0	0	0x0
-0	1	0x1b
-0	2	0x31
-0	3	0x32
-0	4	0x33
-0	5	0x34
-0	6	0x35
-0	7	0x36
-0	8	0x37
-0	9	0x38
-0	10	0x39
-0	11	0x30
-0	12	0xdf
-0	13	0x27
-0	14	0x8
-0	15	0x9
-0	16	0x71
-0	17	0x77
-0	18	0x65
-0	19	0x72
-0	20	0x74
-0	21	0x7a
-0	22	0x75
-0	23	0x69
-0	24	0x6f
-0	25	0x70
-0	26	0xfc
-0	27	0x2b
-0	28	0xa
+0	0	0
+0	1	^[
+0	2	'1
+0	3	'2
+0	4	'3
+0	5	'4
+0	6	'5
+0	7	'6
+0	8	'7
+0	9	'8
+0	10	'9
+0	11	'0
+0	12	'ß
+0	13	''
+0	14	^H
+0	15	^I
+0	16	'q
+0	17	'w
+0	18	'e
+0	19	'r
+0	20	't
+0	21	'z
+0	22	'u
+0	23	'i
+0	24	'o
+0	25	'p
+0	26	'ü
+0	27	'+
+0	28	^J
 0	29	0xf862
-0	30	0x61
-0	31	0x73
-0	32	0x64
-0	33	0x66
-0	34	0x67
-0	35	0x68
-0	36	0x6a
-0	37	0x6b
-0	38	0x6c
-0	39	0xf6
-0	40	0xe4
-0	41	0x5e
+0	30	'a
+0	31	's
+0	32	'd
+0	33	'f
+0	34	'g
+0	35	'h
+0	36	'j
+0	37	'k
+0	38	'l
+0	39	'ö
+0	40	'ä
+0	41	'^
 0	42	0xf860
-0	43	0x23
-0	44	0x79
-0	45	0x78
-0	46	0x63
-0	47	0x76
-0	48	0x62
-0	49	0x6e
-0	50	0x6d
-0	51	0x2c
-0	52	0x2e
-0	53	0x2d
+0	43	'#
+0	44	'y
+0	45	'x
+0	46	'c
+0	47	'v
+0	48	'b
+0	49	'n
+0	50	'm
+0	51	',
+0	52	'.
+0	53	'-
 0	54	0xf860
-0	55	0x2a
+0	55	'*
 0	56	0xf863
 0	57	0x20
 0	58	0xf862
@@ -69,119 +69,119 @@
 0	68	0xf00a
 0	69	0xf865
 0	70	0xf015
-0	71	0x37
-0	72	0x38
-0	73	0x39
-0	74	0x2d
-0	75	0x34
-0	76	0x35
-0	77	0x36
-0	78	0x2b
-0	79	0x31
-0	80	0x32
-0	81	0x33
-0	82	0x30
-0	83	0x2e
-0	84	0x0
-0	85	0x0
-0	86	0x3c
+0	71	'7
+0	72	'8
+0	73	'9
+0	74	'-
+0	75	'4
+0	76	'5
+0	77	'6
+0	78	'+
+0	79	'1
+0	80	'2
+0	81	'3
+0	82	'0
+0	83	'.
+0	84	0
+0	85	0
+0	86	'<
 0	87	0xf00b
 0	88	0xf00c
-0	89	0x0
-0	90	0x0
-0	91	0x0
-0	92	0x0
-0	93	0x0
-0	94	0x0
-0	95	0x0
-0	96	0x0
-0	97	0x0
-0	98	0x0
-0	99	0x0
-0	100	0x0
-0	101	0x0
-0	102	0x0
-0	103	0x0
-0	104	0x0
-0	105	0x0
-0	106	0x0
-0	107	0x0
-0	108	0x0
-0	109	0x0
-0	110	0x0
-0	111	0x0
-0	112	0x0
-0	113	0x0
-0	114	0x0
-0	115	0x0
-0	116	0x0
-0	117	0x0
-0	118	0x0
-0	119	0x0
-0	120	0x0
+0	89	0
+0	90	0
+0	91	0
+0	92	0
+0	93	0
+0	94	0
+0	95	0
+0	96	0
+0	97	0
+0	98	0
+0	99	0
+0	100	0
+0	101	0
+0	102	0
+0	103	0
+0	104	0
+0	105	0
+0	106	0
+0	107	0
+0	108	0
+0	109	0
+0	110	0
+0	111	0
+0	112	0
+0	113	0
+0	114	0
+0	115	0
+0	116	0
+0	117	0
+0	118	0
+0	119	0
+0	120	0
 0	121	0xf800
-0	122	0x0
+0	122	0
 0	123	0xf00e
-0	124	0x0
-0	125	0x0
-0	126	0x0
-0	127	0x0
-1	0	0x0
-1	1	0x1b
-1	2	0x21
-1	3	0x22
-1	4	0xa7
-1	5	0x24
-1	6	0x25
-1	7	0x26
-1	8	0x2f
-1	9	0x28
-1	10	0x29
-1	11	0x3d
-1	12	0x3f
-1	13	0x60
-1	14	0x8
-1	15	0x9
-1	16	0x51
-1	17	0x57
-1	18	0x45
-1	19	0x52
-1	20	0x54
-1	21	0x5a
-1	22	0x55
-1	23	0x49
-1	24	0x4f
-1	25	0x50
-1	26	0xdc
-1	27	0x2a
-1	28	0xa
+0	124	0
+0	125	0
+0	126	0
+0	127	0
+1	0	0
+1	1	^[
+1	2	'!
+1	3	'"
+1	4	'§
+1	5	'$
+1	6	'%
+1	7	'&
+1	8	'/
+1	9	'(
+1	10	')
+1	11	'=
+1	12	'?
+1	13	'`
+1	14	^H
+1	15	^I
+1	16	'Q
+1	17	'W
+1	18	'E
+1	19	'R
+1	20	'T
+1	21	'Z
+1	22	'U
+1	23	'I
+1	24	'O
+1	25	'P
+1	26	'Ü
+1	27	'*
+1	28	^J
 1	29	0xf862
-1	30	0x41
-1	31	0x53
-1	32	0x44
-1	33	0x46
-1	34	0x47
-1	35	0x48
-1	36	0x4a
-1	37	0x4b
-1	38	0x4c
-1	39	0xd6
-1	40	0xc4
-1	41	0xb0
+1	30	'A
+1	31	'S
+1	32	'D
+1	33	'F
+1	34	'G
+1	35	'H
+1	36	'J
+1	37	'K
+1	38	'L
+1	39	'Ö
+1	40	'Ä
+1	41	'°
 1	42	0xf860
-1	43	0x27
-1	44	0x59
-1	45	0x58
-1	46	0x43
-1	47	0x56
-1	48	0x42
-1	49	0x4e
-1	50	0x4d
-1	51	0x3b
-1	52	0x3a
-1	53	0x5f
+1	43	''
+1	44	'Y
+1	45	'X
+1	46	'C
+1	47	'V
+1	48	'B
+1	49	'N
+1	50	'M
+1	51	';
+1	52	':
+1	53	'_
 1	54	0xf860
-1	55	0x2a
+1	55	'*
 1	56	0xf863
 1	57	0x20
 1	58	0xf862
@@ -197,444 +197,444 @@
 1	68	0xf00a
 1	69	0xf865
 1	70	0xf015
-1	71	0x37
-1	72	0x38
-1	73	0x39
-1	74	0x2d
-1	75	0x34
-1	76	0x35
-1	77	0x36
-1	78	0x2b
-1	79	0x31
-1	80	0x32
-1	81	0x33
-1	82	0x30
-1	83	0x2e
-1	84	0x0
-1	85	0x0
-1	86	0x3e
+1	71	'7
+1	72	'8
+1	73	'9
+1	74	'-
+1	75	'4
+1	76	'5
+1	77	'6
+1	78	'+
+1	79	'1
+1	80	'2
+1	81	'3
+1	82	'0
+1	83	'.
+1	84	0
+1	85	0
+1	86	'>
 1	87	0xf00b
 1	88	0xf00c
-1	89	0x0
-1	90	0x0
-1	91	0x0
-1	92	0x0
-1	93	0x0
-1	94	0x0
-1	95	0x0
-1	96	0x0
-1	97	0x0
-1	98	0x0
-1	99	0x0
-1	100	0x0
-1	101	0x0
-1	102	0x0
-1	103	0x0
-1	104	0x0
-1	105	0x0
-1	106	0x0
-1	107	0x0
-1	108	0x0
-1	109	0x0
-1	110	0x0
-1	111	0x0
-1	112	0x0
-1	113	0x0
-1	114	0x0
-1	115	0x0
-1	116	0x0
-1	117	0x0
-1	118	0x0
-1	119	0x0
-1	120	0x0
+1	89	0
+1	90	0
+1	91	0
+1	92	0
+1	93	0
+1	94	0
+1	95	0
+1	96	0
+1	97	0
+1	98	0
+1	99	0
+1	100	0
+1	101	0
+1	102	0
+1	103	0
+1	104	0
+1	105	0
+1	106	0
+1	107	0
+1	108	0
+1	109	0
+1	110	0
+1	111	0
+1	112	0
+1	113	0
+1	114	0
+1	115	0
+1	116	0
+1	117	0
+1	118	0
+1	119	0
+1	120	0
 1	121	0xf00e
-1	122	0x0
+1	122	0
 1	123	0xf00e
-1	124	0x0
-1	125	0x0
-1	126	0x0
-1	127	0x0
-2	0	0x0
-2	1	0x0
-2	2	0x0
-2	3	0x0
-2	4	0x0
-2	5	0x0
-2	6	0x0
-2	7	0x0
-2	8	0x0
-2	9	0x0
-2	10	0x0
-2	11	0x0
-2	12	0x0
-2	13	0x0
-2	14	0x0
-2	15	0x0
-2	16	0x0
-2	17	0x0
-2	18	0x0
-2	19	0x0
-2	20	0x0
-2	21	0x0
-2	22	0x0
-2	23	0x0
-2	24	0x0
-2	25	0x0
-2	26	0x0
-2	27	0x0
-2	28	0xa
+1	124	0
+1	125	0
+1	126	0
+1	127	0
+2	0	0
+2	1	0
+2	2	0
+2	3	0
+2	4	0
+2	5	0
+2	6	0
+2	7	0
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+2	12	0
+2	13	0
+2	14	0
+2	15	0
+2	16	0
+2	17	0
+2	18	0
+2	19	0
+2	20	0
+2	21	0
+2	22	0
+2	23	0
+2	24	0
+2	25	0
+2	26	0
+2	27	0
+2	28	^J
 2	29	0xf862
-2	30	0x0
-2	31	0x0
-2	32	0x0
-2	33	0x0
-2	34	0x0
-2	35	0x0
-2	36	0x0
-2	37	0x0
-2	38	0x0
-2	39	0x0
-2	40	0x0
-2	41	0x0
+2	30	0
+2	31	0
+2	32	0
+2	33	0
+2	34	0
+2	35	0
+2	36	0
+2	37	0
+2	38	0
+2	39	0
+2	40	0
+2	41	0
 2	42	0xf860
-2	43	0x0
-2	44	0x0
-2	45	0x0
-2	46	0x0
-2	47	0x0
-2	48	0x0
-2	49	0x0
-2	50	0x0
-2	51	0x0
-2	52	0x0
-2	53	0x2f
-2	54	0x0
+2	43	0
+2	44	0
+2	45	0
+2	46	0
+2	47	0
+2	48	0
+2	49	0
+2	50	0
+2	51	0
+2	52	0
+2	53	'/
+2	54	0
 2	55	0xf010
 2	56	0xf867
-2	57	0x0
-2	58	0x0
-2	59	0x0
-2	60	0x0
-2	61	0x0
-2	62	0x0
-2	63	0x0
-2	64	0x0
-2	65	0x0
-2	66	0x0
-2	67	0x0
-2	68	0x0
-2	69	0x0
+2	57	0
+2	58	0
+2	59	0
+2	60	0
+2	61	0
+2	62	0
+2	63	0
+2	64	0
+2	65	0
+2	66	0
+2	67	0
+2	68	0
+2	69	0
 2	70	0xf861
 2	71	0xf00d
 2	72	0xf00e
 2	73	0xf00f
-2	74	0x0
+2	74	0
 2	75	0xf011
-2	76	0x0
+2	76	0
 2	77	0xf012
-2	78	0x0
+2	78	0
 2	79	0xf018
 2	80	0xf800
 2	81	0xf013
 2	82	0xf014
 2	83	0x7f
-2	84	0x0
-2	85	0x0
-2	86	0x0
-2	87	0x0
-2	88	0x0
-2	89	0x0
-2	90	0x0
-2	91	0x0
-2	92	0x0
-2	93	0x0
-2	94	0x0
-2	95	0x0
-2	96	0x0
-2	97	0x0
-2	98	0x0
-2	99	0x0
-2	100	0x0
-2	101	0x0
-2	102	0x0
-2	103	0x0
-2	104	0x0
-2	105	0x0
-2	106	0x0
-2	107	0x0
-2	108	0x0
-2	109	0x0
-2	110	0x0
-2	111	0x0
-2	112	0x0
-2	113	0x0
-2	114	0x0
-2	115	0x0
-2	116	0x0
-2	117	0x0
-2	118	0x0
-2	119	0x0
-2	120	0x0
+2	84	0
+2	85	0
+2	86	0
+2	87	0
+2	88	0
+2	89	0
+2	90	0
+2	91	0
+2	92	0
+2	93	0
+2	94	0
+2	95	0
+2	96	0
+2	97	0
+2	98	0
+2	99	0
+2	100	0
+2	101	0
+2	102	0
+2	103	0
+2	104	0
+2	105	0
+2	106	0
+2	107	0
+2	108	0
+2	109	0
+2	110	0
+2	111	0
+2	112	0
+2	113	0
+2	114	0
+2	115	0
+2	116	0
+2	117	0
+2	118	0
+2	119	0
+2	120	0
 2	121	0xf00e
-2	122	0x0
-2	123	0x0
-2	124	0x0
-2	125	0x0
-2	126	0x0
-2	127	0x0
-3	0	0x0
-3	1	0x0
-3	2	0x0
-3	3	0xb2
-3	4	0xb3
-3	5	0x0
-3	6	0x0
-3	7	0x0
-3	8	0x7b
-3	9	0x5b
-3	10	0x5d
-3	11	0x7d
-3	12	0x5c
-3	13	0x0
-3	14	0x0
-3	15	0x0
-3	16	0x40
-3	17	0x0
-3	18	0x20ac
-3	19	0x0
-3	20	0x0
-3	21	0x0
-3	22	0x0
-3	23	0x0
-3	24	0x0
-3	25	0x0
-3	26	0x0
-3	27	0x7e
-3	28	0xa
+2	122	0
+2	123	0
+2	124	0
+2	125	0
+2	126	0
+2	127	0
+3	0	0
+3	1	0
+3	2	0
+3	3	'²
+3	4	'³
+3	5	0
+3	6	0
+3	7	0
+3	8	'{
+3	9	'[
+3	10	']
+3	11	'}
+3	12	'\
+3	13	0
+3	14	0
+3	15	0
+3	16	'@
+3	17	0
+3	18	'€
+3	19	0
+3	20	0
+3	21	0
+3	22	0
+3	23	0
+3	24	0
+3	25	0
+3	26	0
+3	27	'~
+3	28	^J
 3	29	0xf862
-3	30	0x0
-3	31	0x0
-3	32	0x0
-3	33	0x0
-3	34	0x0
-3	35	0x0
-3	36	0x0
-3	37	0x0
-3	38	0x0
-3	39	0x0
-3	40	0x0
-3	41	0x0
+3	30	0
+3	31	0
+3	32	0
+3	33	0
+3	34	0
+3	35	0
+3	36	0
+3	37	0
+3	38	0
+3	39	0
+3	40	0
+3	41	0
 3	42	0xf860
-3	43	0x0
-3	44	0x0
-3	45	0x0
-3	46	0x0
-3	47	0x0
-3	48	0x0
-3	49	0x0
-3	50	0x3bc
-3	51	0x0
-3	52	0x0
-3	53	0x2f
-3	54	0x0
+3	43	0
+3	44	0
+3	45	0
+3	46	0
+3	47	0
+3	48	0
+3	49	0
+3	50	'μ
+3	51	0
+3	52	0
+3	53	'/
+3	54	0
 3	55	0xf010
 3	56	0xf867
-3	57	0x0
-3	58	0x0
-3	59	0x0
-3	60	0x0
-3	61	0x0
-3	62	0x0
-3	63	0x0
-3	64	0x0
-3	65	0x0
-3	66	0x0
-3	67	0x0
-3	68	0x0
-3	69	0x0
+3	57	0
+3	58	0
+3	59	0
+3	60	0
+3	61	0
+3	62	0
+3	63	0
+3	64	0
+3	65	0
+3	66	0
+3	67	0
+3	68	0
+3	69	0
 3	70	0xf861
 3	71	0xf00d
 3	72	0xf00e
 3	73	0xf00f
-3	74	0x0
+3	74	0
 3	75	0xf011
-3	76	0x0
+3	76	0
 3	77	0xf012
-3	78	0x0
+3	78	0
 3	79	0xf018
 3	80	0xf800
 3	81	0xf013
 3	82	0xf014
 3	83	0x7f
-3	84	0x0
-3	85	0x0
-3	86	0x7c
-3	87	0x0
-3	88	0x0
-3	89	0x0
-3	90	0x0
-3	91	0x0
-3	92	0x0
-3	93	0x0
-3	94	0x0
-3	95	0x0
-3	96	0x0
-3	97	0x0
-3	98	0x0
-3	99	0x0
-3	100	0x0
-3	101	0x0
-3	102	0x0
-3	103	0x0
-3	104	0x0
-3	105	0x0
-3	106	0x0
-3	107	0x0
-3	108	0x0
-3	109	0x0
-3	110	0x0
-3	111	0x0
-3	112	0x0
-3	113	0x0
-3	114	0x0
-3	115	0x0
-3	116	0x0
-3	117	0x0
-3	118	0x0
-3	119	0x0
-3	120	0x0
+3	84	0
+3	85	0
+3	86	'|
+3	87	0
+3	88	0
+3	89	0
+3	90	0
+3	91	0
+3	92	0
+3	93	0
+3	94	0
+3	95	0
+3	96	0
+3	97	0
+3	98	0
+3	99	0
+3	100	0
+3	101	0
+3	102	0
+3	103	0
+3	104	0
+3	105	0
+3	106	0
+3	107	0
+3	108	0
+3	109	0
+3	110	0
+3	111	0
+3	112	0
+3	113	0
+3	114	0
+3	115	0
+3	116	0
+3	117	0
+3	118	0
+3	119	0
+3	120	0
 3	121	0xf00e
-3	122	0x0
-3	123	0x0
-3	124	0x0
-3	125	0x0
-3	126	0x0
-3	127	0x0
-4	0	0x0
-4	1	0x1b
-4	2	0x11
-4	3	0x12
-4	4	0x13
-4	5	0x14
-4	6	0x15
-4	7	0x16
-4	8	0x17
-4	9	0x18
-4	10	0x19
-4	11	0x10
-4	12	0xd
-4	13	0x1d
-4	14	0x8
-4	15	0x9
-4	16	0x11
-4	17	0x17
-4	18	0x5
-4	19	0x12
-4	20	0x14
-4	21	0x19
-4	22	0x15
-4	23	0x9
-4	24	0xf
-4	25	0x10
-4	26	0x1b
-4	27	0x1d
-4	28	0xa
+3	122	0
+3	123	0
+3	124	0
+3	125	0
+3	126	0
+3	127	0
+4	0	0
+4	1	^[
+4	2	^Q
+4	3	^R
+4	4	^S
+4	5	^T
+4	6	^U
+4	7	^V
+4	8	^W
+4	9	^X
+4	10	^Y
+4	11	^P
+4	12	^M
+4	13	^]
+4	14	^H
+4	15	^I
+4	16	^Q
+4	17	^W
+4	18	^E
+4	19	^R
+4	20	^T
+4	21	^Y
+4	22	^U
+4	23	^I
+4	24	^O
+4	25	^P
+4	26	^[
+4	27	^]
+4	28	^J
 4	29	0xf862
-4	30	0x1
-4	31	0x13
-4	32	0x4
-4	33	0x6
-4	34	0x7
-4	35	0x8
-4	36	0xa
-4	37	0xb
-4	38	0xc
-4	39	0x1b
-4	40	0x7
-4	41	0x0
+4	30	^A
+4	31	^S
+4	32	^D
+4	33	^F
+4	34	^G
+4	35	^H
+4	36	^J
+4	37	^K
+4	38	^L
+4	39	^[
+4	40	^G
+4	41	0
 4	42	0xf860
-4	43	0x1c
-4	44	0x1a
-4	45	0x18
-4	46	0x3
-4	47	0x16
-4	48	0x2
-4	49	0xe
-4	50	0xd
-4	51	0xc
-4	52	0xe
-4	53	0xf
+4	43	^\
+4	44	^Z
+4	45	^X
+4	46	^C
+4	47	^V
+4	48	^B
+4	49	^N
+4	50	^M
+4	51	^L
+4	52	^N
+4	53	^O
 4	54	0xf860
-4	55	0xa
+4	55	^J
 4	56	0xf863
-4	57	0x0
+4	57	0
 4	58	0xf862
-4	59	0x5
-4	60	0x6
-4	61	0x7
-4	62	0x4
-4	63	0x5
-4	64	0x6
-4	65	0x7
-4	66	0xc
-4	67	0xd
-4	68	0xe
-4	69	0x5
-4	70	0x6
-4	71	0x17
-4	72	0x18
-4	73	0x19
-4	74	0xd
-4	75	0x14
-4	76	0x15
-4	77	0x16
-4	78	0xb
-4	79	0x11
-4	80	0x12
-4	81	0x13
-4	82	0x10
-4	83	0xe
-4	84	0x0
-4	85	0x0
-4	86	0x0
-4	87	0xf
-4	88	0xc
-4	89	0x0
-4	90	0x0
-4	91	0x0
-4	92	0x0
-4	93	0x0
-4	94	0x0
-4	95	0x0
-4	96	0x0
-4	97	0x0
-4	98	0x0
-4	99	0x0
-4	100	0x0
-4	101	0x0
-4	102	0x0
-4	103	0x0
-4	104	0x0
-4	105	0x0
-4	106	0x0
-4	107	0x0
-4	108	0x0
-4	109	0x0
-4	110	0x0
-4	111	0x0
-4	112	0x0
-4	113	0x0
-4	114	0x0
-4	115	0x0
-4	116	0x0
-4	117	0x0
-4	118	0x0
-4	119	0x0
-4	120	0x0
-4	121	0x7
-4	122	0x0
-4	123	0x8
-4	124	0x0
-4	125	0x0
-4	126	0x0
-4	127	0x0
+4	59	^E
+4	60	^F
+4	61	^G
+4	62	^D
+4	63	^E
+4	64	^F
+4	65	^G
+4	66	^L
+4	67	^M
+4	68	^N
+4	69	^E
+4	70	^F
+4	71	^W
+4	72	^X
+4	73	^Y
+4	74	^M
+4	75	^T
+4	76	^U
+4	77	^V
+4	78	^K
+4	79	^Q
+4	80	^R
+4	81	^S
+4	82	^P
+4	83	^N
+4	84	0
+4	85	0
+4	86	0
+4	87	^O
+4	88	^L
+4	89	0
+4	90	0
+4	91	0
+4	92	0
+4	93	0
+4	94	0
+4	95	0
+4	96	0
+4	97	0
+4	98	0
+4	99	0
+4	100	0
+4	101	0
+4	102	0
+4	103	0
+4	104	0
+4	105	0
+4	106	0
+4	107	0
+4	108	0
+4	109	0
+4	110	0
+4	111	0
+4	112	0
+4	113	0
+4	114	0
+4	115	0
+4	116	0
+4	117	0
+4	118	0
+4	119	0
+4	120	0
+4	121	^G
+4	122	0
+4	123	^H
+4	124	0
+4	125	0
+4	126	0
+4	127	0

sys/lib/kbmap/dvorak

@@ -1,166 +1,166 @@
 # Dvorak key layout
-0	12	0x5b
-1	12	0x7b
-2	12	0x0
-3	12	0x0
-4	12	0x1b
-0	13	0x5d
-1	13	0x7d
-2	13	0x0
-3	13	0x0
-4	13	0x1d
-0	16	0x27
-1	16	0x22
-2	16	0x0
-3	16	0x0
-4	16	0x7
-0	17	0x2c
-1	17	0x3c
-2	17	0x0
-3	17	0x0
-4	17	0xc
-0	18	0x2e
-1	18	0x3e
-2	18	0x0
-3	18	0x0
-4	18	0xe
-0	19	0x70
-1	19	0x50
-2	19	0x0
-3	19	0x0
-4	19	0x10
-0	20	0x79
-1	20	0x59
-2	20	0x0
-3	20	0x0
-4	20	0x19
-0	21	0x66
-1	21	0x46
-2	21	0x0
-3	21	0x0
-4	21	0x6
-0	22	0x67
-1	22	0x47
-2	22	0x0
-3	22	0x0
-4	22	0x7
-0	23	0x63
-1	23	0x43
-2	23	0x0
-3	23	0x0
-4	23	0x3
-0	24	0x72
-1	24	0x52
-2	24	0x0
-3	24	0x0
-4	24	0x12
-0	25	0x6c
-1	25	0x4c
-2	25	0x0
-3	25	0x0
-4	25	0xc
-0	26	0x2f
-1	26	0x3f
-2	26	0x2f
-3	26	0x2f
-4	26	0xf
-0	27	0x3d
-1	27	0x2b
-2	27	0x0
-3	27	0x0
-4	27	0x1d
-0	31	0x6f
-1	31	0x4f
-2	31	0x0
-3	31	0x0
-4	31	0xf
-0	32	0x65
-1	32	0x45
-2	32	0x0
-3	32	0x0
-4	32	0x5
-0	33	0x75
-1	33	0x55
-2	33	0x0
-3	33	0x0
-4	33	0x15
-0	34	0x69
-1	34	0x49
-2	34	0x0
-3	34	0x0
-4	34	0x9
-0	35	0x64
-1	35	0x44
-2	35	0x0
-3	35	0x0
-4	35	0x4
-0	36	0x68
-1	36	0x48
-2	36	0x0
-3	36	0x0
-4	36	0x8
-0	37	0x74
-1	37	0x54
-2	37	0x0
-3	37	0x0
-4	37	0x14
-0	38	0x6e
-1	38	0x4e
-2	38	0x0
-3	38	0x0
-4	38	0xe
-0	39	0x73
-1	39	0x53
-2	39	0x0
-3	39	0x0
-4	39	0x13
-0	40	0x2d
-1	40	0x5f
-2	40	0x0
-3	40	0x0
-4	40	0xd
-0	44	0x3b
-1	44	0x3a
-2	44	0x0
-3	44	0x0
-4	44	0x1b
-0	45	0x71
-1	45	0x51
-2	45	0x0
-3	45	0x0
-4	45	0x11
-0	46	0x6a
-1	46	0x4a
-2	46	0x0
-3	46	0x0
-4	46	0xa
-0	47	0x6b
-1	47	0x4b
-2	47	0x0
-3	47	0x0
-4	47	0xb
-0	48	0x78
-1	48	0x58
-2	48	0x0
-3	48	0x0
-4	48	0x18
-0	49	0x62
-1	49	0x42
-2	49	0x0
-3	49	0x0
-4	49	0x2
-0	51	0x77
-1	51	0x57
-2	51	0x0
-3	51	0x0
-4	51	0x17
-0	52	0x76
-1	52	0x56
-2	52	0x0
-3	52	0x0
-4	52	0x16
-0	53	0x7a
-1	53	0x5a
-2	53	0x0
-3	53	0x0
-4	53	0x1a
+0	12	'[
+1	12	'{
+2	12	0
+3	12	0
+4	12	^[
+0	13	']
+1	13	'}
+2	13	0
+3	13	0
+4	13	^]
+0	16	''
+1	16	'"
+2	16	0
+3	16	0
+4	16	^G
+0	17	',
+1	17	'<
+2	17	0
+3	17	0
+4	17	^L
+0	18	'.
+1	18	'>
+2	18	0
+3	18	0
+4	18	^N
+0	19	'p
+1	19	'P
+2	19	0
+3	19	0
+4	19	^P
+0	20	'y
+1	20	'Y
+2	20	0
+3	20	0
+4	20	^Y
+0	21	'f
+1	21	'F
+2	21	0
+3	21	0
+4	21	^F
+0	22	'g
+1	22	'G
+2	22	0
+3	22	0
+4	22	^G
+0	23	'c
+1	23	'C
+2	23	0
+3	23	0
+4	23	^C
+0	24	'r
+1	24	'R
+2	24	0
+3	24	0
+4	24	^R
+0	25	'l
+1	25	'L
+2	25	0
+3	25	0
+4	25	^L
+0	26	'/
+1	26	'?
+2	26	'/
+3	26	'/
+4	26	^O
+0	27	'=
+1	27	'+
+2	27	0
+3	27	0
+4	27	^]
+0	31	'o
+1	31	'O
+2	31	0
+3	31	0
+4	31	^O
+0	32	'e
+1	32	'E
+2	32	0
+3	32	0
+4	32	^E
+0	33	'u
+1	33	'U
+2	33	0
+3	33	0
+4	33	^U
+0	34	'i
+1	34	'I
+2	34	0
+3	34	0
+4	34	^I
+0	35	'd
+1	35	'D
+2	35	0
+3	35	0
+4	35	^D
+0	36	'h
+1	36	'H
+2	36	0
+3	36	0
+4	36	^H
+0	37	't
+1	37	'T
+2	37	0
+3	37	0
+4	37	^T
+0	38	'n
+1	38	'N
+2	38	0
+3	38	0
+4	38	^N
+0	39	's
+1	39	'S
+2	39	0
+3	39	0
+4	39	^S
+0	40	'-
+1	40	'_
+2	40	0
+3	40	0
+4	40	^M
+0	44	';
+1	44	':
+2	44	0
+3	44	0
+4	44	^[
+0	45	'q
+1	45	'Q
+2	45	0
+3	45	0
+4	45	^Q
+0	46	'j
+1	46	'J
+2	46	0
+3	46	0
+4	46	^J
+0	47	'k
+1	47	'K
+2	47	0
+3	47	0
+4	47	^K
+0	48	'x
+1	48	'X
+2	48	0
+3	48	0
+4	48	^X
+0	49	'b
+1	49	'B
+2	49	0
+3	49	0
+4	49	^B
+0	51	'w
+1	51	'W
+2	51	0
+3	51	0
+4	51	^W
+0	52	'v
+1	52	'V
+2	52	0
+3	52	0
+4	52	^V
+0	53	'z
+1	53	'Z
+2	53	0
+3	53	0
+4	53	^Z

sys/lib/kbmap/dvorakl

@@ -1,206 +1,206 @@
 # Dvorak left-handed key layout
-0	2	0x5b
-1	2	0x7b
-2	2	0x0
-3	2	0x0
-4	2	0x1b
-0	3	0x5d
-1	3	0x7d
-2	3	0x0
-3	3	0x0
-4	3	0x1d
-0	4	0x2f
-1	4	0x3f
-2	4	0x2f
-3	4	0x2f
-4	4	0xf
-0	5	0x70
-1	5	0x50
-2	5	0x0
-3	5	0x0
-4	5	0x10
-0	6	0x66
-1	6	0x46
-2	6	0x0
-3	6	0x0
-4	6	0x6
-0	7	0x6d
-1	7	0x4d
-2	7	0x0
-3	7	0x0
-4	7	0xd
-0	8	0x6c
-1	8	0x4c
-2	8	0x0
-3	8	0x0
-4	8	0xc
-0	9	0x6a
-1	9	0x4a
-2	9	0x0
-3	9	0x0
-4	9	0xa
-0	10	0x34
-1	10	0x24
-2	10	0x0
-3	10	0x0
-4	10	0x14
-0	11	0x33
-1	11	0x23
-2	11	0x0
-3	11	0x0
-4	11	0x13
-0	12	0x32
-1	12	0x40
-2	12	0x0
-3	12	0x0
-4	12	0x12
-0	13	0x31
-1	13	0x21
-2	13	0x0
-3	13	0x0
-4	13	0x11
-0	16	0x3b
-1	16	0x3a
-2	16	0x0
-3	16	0x0
-4	16	0x1b
-0	17	0x71
-1	17	0x51
-2	17	0x0
-3	17	0x0
-4	17	0x11
-0	18	0x62
-1	18	0x42
-2	18	0x0
-3	18	0x0
-4	18	0x2
-0	19	0x79
-1	19	0x59
-2	19	0x0
-3	19	0x0
-4	19	0x19
-0	20	0x75
-1	20	0x55
-2	20	0x0
-3	20	0x0
-4	20	0x15
-0	21	0x72
-1	21	0x52
-2	21	0x0
-3	21	0x0
-4	21	0x12
-0	22	0x73
-1	22	0x53
-2	22	0x0
-3	22	0x0
-4	22	0x13
-0	23	0x6f
-1	23	0x4f
-2	23	0x0
-3	23	0x0
-4	23	0xf
-0	24	0x2e
-1	24	0x3e
-2	24	0x0
-3	24	0x0
-4	24	0xe
-0	25	0x36
-1	25	0x5e
-2	25	0x0
-3	25	0x0
-4	25	0x16
-0	26	0x35
-1	26	0x25
-2	26	0x0
-3	26	0x0
-4	26	0x15
-0	27	0x3d
-1	27	0x2b
-2	27	0x0
-3	27	0x0
-4	27	0x1d
-0	30	0x2d
-1	30	0x5f
-2	30	0x0
-3	30	0x0
-4	30	0xd
-0	31	0x6b
-1	31	0x4b
-2	31	0x0
-3	31	0x0
-4	31	0xb
-0	32	0x63
-1	32	0x43
-2	32	0x0
-3	32	0x0
-4	32	0x3
-0	33	0x64
-1	33	0x44
-2	33	0x0
-3	33	0x0
-4	33	0x4
-0	34	0x74
-1	34	0x54
-2	34	0x0
-3	34	0x0
-4	34	0x14
-0	36	0x65
-1	36	0x45
-2	36	0x0
-3	36	0x0
-4	36	0x5
-0	37	0x61
-1	37	0x41
-2	37	0x0
-3	37	0x0
-4	37	0x1
-0	38	0x7a
-1	38	0x5a
-2	38	0x0
-3	38	0x0
-4	38	0x1a
-0	39	0x38
-1	39	0x2a
-2	39	0x0
-3	39	0x0
-4	39	0x18
-0	40	0x37
-1	40	0x26
-2	40	0x0
-3	40	0x0
-4	40	0x17
-0	44	0x27
-1	44	0x22
-2	44	0x0
-3	44	0x0
-4	44	0x7
-0	45	0x78
-1	45	0x58
-2	45	0x0
-3	45	0x0
-4	45	0x18
-0	46	0x67
-1	46	0x47
-2	46	0x0
-3	46	0x0
-4	46	0x7
-0	48	0x77
-1	48	0x57
-2	48	0x0
-3	48	0x0
-4	48	0x17
-0	50	0x6c
-1	50	0x4c
-2	50	0x0
-3	50	0x0
-4	50	0xc
-0	52	0x30
-1	52	0x29
-2	52	0x0
-3	52	0x0
-4	52	0x10
-0	53	0x39
-1	53	0x28
-2	53	0x0
-3	53	0x0
-4	53	0x19
+0	2	'[
+1	2	'{
+2	2	0
+3	2	0
+4	2	^[
+0	3	']
+1	3	'}
+2	3	0
+3	3	0
+4	3	^]
+0	4	'/
+1	4	'?
+2	4	'/
+3	4	'/
+4	4	^O
+0	5	'p
+1	5	'P
+2	5	0
+3	5	0
+4	5	^P
+0	6	'f
+1	6	'F
+2	6	0
+3	6	0
+4	6	^F
+0	7	'm
+1	7	'M
+2	7	0
+3	7	0
+4	7	^M
+0	8	'l
+1	8	'L
+2	8	0
+3	8	0
+4	8	^L
+0	9	'j
+1	9	'J
+2	9	0
+3	9	0
+4	9	^J
+0	10	'4
+1	10	'$
+2	10	0
+3	10	0
+4	10	^T
+0	11	'3
+1	11	'#
+2	11	0
+3	11	0
+4	11	^S
+0	12	'2
+1	12	'@
+2	12	0
+3	12	0
+4	12	^R
+0	13	'1
+1	13	'!
+2	13	0
+3	13	0
+4	13	^Q
+0	16	';
+1	16	':
+2	16	0
+3	16	0
+4	16	^[
+0	17	'q
+1	17	'Q
+2	17	0
+3	17	0
+4	17	^Q
+0	18	'b
+1	18	'B
+2	18	0
+3	18	0
+4	18	^B
+0	19	'y
+1	19	'Y
+2	19	0
+3	19	0
+4	19	^Y
+0	20	'u
+1	20	'U
+2	20	0
+3	20	0
+4	20	^U
+0	21	'r
+1	21	'R
+2	21	0
+3	21	0
+4	21	^R
+0	22	's
+1	22	'S
+2	22	0
+3	22	0
+4	22	^S
+0	23	'o
+1	23	'O
+2	23	0
+3	23	0
+4	23	^O
+0	24	'.
+1	24	'>
+2	24	0
+3	24	0
+4	24	^N
+0	25	'6
+1	25	'^
+2	25	0
+3	25	0
+4	25	^V
+0	26	'5
+1	26	'%
+2	26	0
+3	26	0
+4	26	^U
+0	27	'=
+1	27	'+
+2	27	0
+3	27	0
+4	27	^]
+0	30	'-
+1	30	'_
+2	30	0
+3	30	0
+4	30	^M
+0	31	'k
+1	31	'K
+2	31	0
+3	31	0
+4	31	^K
+0	32	'c
+1	32	'C
+2	32	0
+3	32	0
+4	32	^C
+0	33	'd
+1	33	'D
+2	33	0
+3	33	0
+4	33	^D
+0	34	't
+1	34	'T
+2	34	0
+3	34	0
+4	34	^T
+0	36	'e
+1	36	'E
+2	36	0
+3	36	0
+4	36	^E
+0	37	'a
+1	37	'A
+2	37	0
+3	37	0
+4	37	^A
+0	38	'z
+1	38	'Z
+2	38	0
+3	38	0
+4	38	^Z
+0	39	'8
+1	39	'*
+2	39	0
+3	39	0
+4	39	^X
+0	40	'7
+1	40	'&
+2	40	0
+3	40	0
+4	40	^W
+0	44	''
+1	44	'"
+2	44	0
+3	44	0
+4	44	^G
+0	45	'x
+1	45	'X
+2	45	0
+3	45	0
+4	45	^X
+0	46	'g
+1	46	'G
+2	46	0
+3	46	0
+4	46	^G
+0	48	'w
+1	48	'W
+2	48	0
+3	48	0
+4	48	^W
+0	50	'l
+1	50	'L
+2	50	0
+3	50	0
+4	50	^L
+0	52	'0
+1	52	')
+2	52	0
+3	52	0
+4	52	^P
+0	53	'9
+1	53	'(
+2	53	0
+3	53	0
+4	53	^Y

sys/lib/kbmap/dvorakr

@@ -1,196 +1,196 @@
 # Dvorak right-handed key layout
-0	6	0x6a
-1	6	0x4a
-2	6	0x0
-3	6	0x0
-4	6	0xa
-0	7	0x6c
-1	7	0x4c
-2	7	0x0
-3	7	0x0
-4	7	0xc
-0	8	0x6d
-1	8	0x4d
-2	8	0x0
-3	8	0x0
-4	8	0xd
-0	9	0x66
-1	9	0x46
-2	9	0x0
-3	9	0x0
-4	9	0x6
-0	10	0x70
-1	10	0x50
-2	10	0x0
-3	10	0x0
-4	10	0x10
-0	11	0x2f
-1	11	0x3f
-2	11	0x2f
-3	11	0x2f
-4	11	0xf
-0	12	0x5b
-1	12	0x7b
-2	12	0x0
-3	12	0x0
-4	12	0x1b
-0	13	0x5d
-1	13	0x7d
-2	13	0x0
-3	13	0x0
-4	13	0x1d
-0	16	0x35
-1	16	0x25
-2	16	0x0
-3	16	0x0
-4	16	0x15
-0	17	0x36
-1	17	0x5e
-2	17	0x0
-3	17	0x0
-4	17	0x16
-0	18	0x71
-1	18	0x51
-2	18	0x0
-3	18	0x0
-4	18	0x11
-0	19	0x2e
-1	19	0x3e
-2	19	0x0
-3	19	0x0
-4	19	0xe
-0	20	0x6f
-1	20	0x4f
-2	20	0x0
-3	20	0x0
-4	20	0xf
-0	21	0x72
-1	21	0x52
-2	21	0x0
-3	21	0x0
-4	21	0x12
-0	22	0x73
-1	22	0x53
-2	22	0x0
-3	22	0x0
-4	22	0x13
-0	23	0x75
-1	23	0x55
-2	23	0x0
-3	23	0x0
-4	23	0x15
-0	24	0x79
-1	24	0x59
-2	24	0x0
-3	24	0x0
-4	24	0x19
-0	25	0x62
-1	25	0x42
-2	25	0x0
-3	25	0x0
-4	25	0x2
-0	26	0x3b
-1	26	0x3a
-2	26	0x0
-3	26	0x0
-4	26	0x1b
-0	27	0x3d
-1	27	0x2b
-2	27	0x0
-3	27	0x0
-4	27	0x1d
-0	30	0x37
-1	30	0x26
-2	30	0x0
-3	30	0x0
-4	30	0x17
-0	31	0x38
-1	31	0x2a
-2	31	0x0
-3	31	0x0
-4	31	0x18
-0	32	0x7a
-1	32	0x5a
-2	32	0x0
-3	32	0x0
-4	32	0x1a
-0	33	0x61
-1	33	0x41
-2	33	0x0
-3	33	0x0
-4	33	0x1
-0	34	0x65
-1	34	0x45
-2	34	0x0
-3	34	0x0
-4	34	0x5
-0	36	0x74
-1	36	0x54
-2	36	0x0
-3	36	0x0
-4	36	0x14
-0	37	0x64
-1	37	0x44
-2	37	0x0
-3	37	0x0
-4	37	0x4
-0	38	0x63
-1	38	0x43
-2	38	0x0
-3	38	0x0
-4	38	0x3
-0	39	0x6b
-1	39	0x4b
-2	39	0x0
-3	39	0x0
-4	39	0xb
-0	40	0x2d
-1	40	0x5f
-2	40	0x0
-3	40	0x0
-4	40	0xd
-0	44	0x39
-1	44	0x28
-2	44	0x0
-3	44	0x0
-4	44	0x19
-0	45	0x30
-1	45	0x29
-2	45	0x0
-3	45	0x0
-4	45	0x10
-0	46	0x78
-1	46	0x58
-2	46	0x0
-3	46	0x0
-4	46	0x18
-0	47	0x2c
-1	47	0x3c
-2	47	0x0
-3	47	0x0
-4	47	0xc
-0	48	0x6c
-1	48	0x4c
-2	48	0x0
-3	48	0x0
-4	48	0xc
-0	50	0x77
-1	50	0x57
-2	50	0x0
-3	50	0x0
-4	50	0x17
-0	51	0x76
-1	51	0x56
-2	51	0x0
-3	51	0x0
-4	51	0x16
-0	52	0x67
-1	52	0x47
-2	52	0x0
-3	52	0x0
-4	52	0x7
-0	53	0x27
-1	53	0x22
-2	53	0x0
-3	53	0x0
-4	53	0x7
+0	6	'j
+1	6	'J
+2	6	0
+3	6	0
+4	6	^J
+0	7	'l
+1	7	'L
+2	7	0
+3	7	0
+4	7	^L
+0	8	'm
+1	8	'M
+2	8	0
+3	8	0
+4	8	^M
+0	9	'f
+1	9	'F
+2	9	0
+3	9	0
+4	9	^F
+0	10	'p
+1	10	'P
+2	10	0
+3	10	0
+4	10	^P
+0	11	'/
+1	11	'?
+2	11	'/
+3	11	'/
+4	11	^O
+0	12	'[
+1	12	'{
+2	12	0
+3	12	0
+4	12	^[
+0	13	']
+1	13	'}
+2	13	0
+3	13	0
+4	13	^]
+0	16	'5
+1	16	'%
+2	16	0
+3	16	0
+4	16	^U
+0	17	'6
+1	17	'^
+2	17	0
+3	17	0
+4	17	^V
+0	18	'q
+1	18	'Q
+2	18	0
+3	18	0
+4	18	^Q
+0	19	'.
+1	19	'>
+2	19	0
+3	19	0
+4	19	^N
+0	20	'o
+1	20	'O
+2	20	0
+3	20	0
+4	20	^O
+0	21	'r
+1	21	'R
+2	21	0
+3	21	0
+4	21	^R
+0	22	's
+1	22	'S
+2	22	0
+3	22	0
+4	22	^S
+0	23	'u
+1	23	'U
+2	23	0
+3	23	0
+4	23	^U
+0	24	'y
+1	24	'Y
+2	24	0
+3	24	0
+4	24	^Y
+0	25	'b
+1	25	'B
+2	25	0
+3	25	0
+4	25	^B
+0	26	';
+1	26	':
+2	26	0
+3	26	0
+4	26	^[
+0	27	'=
+1	27	'+
+2	27	0
+3	27	0
+4	27	^]
+0	30	'7
+1	30	'&
+2	30	0
+3	30	0
+4	30	^W
+0	31	'8
+1	31	'*
+2	31	0
+3	31	0
+4	31	^X
+0	32	'z
+1	32	'Z
+2	32	0
+3	32	0
+4	32	^Z
+0	33	'a
+1	33	'A
+2	33	0
+3	33	0
+4	33	^A
+0	34	'e
+1	34	'E
+2	34	0
+3	34	0
+4	34	^E
+0	36	't
+1	36	'T
+2	36	0
+3	36	0
+4	36	^T
+0	37	'd
+1	37	'D
+2	37	0
+3	37	0
+4	37	^D
+0	38	'c
+1	38	'C
+2	38	0
+3	38	0
+4	38	^C
+0	39	'k
+1	39	'K
+2	39	0
+3	39	0
+4	39	^K
+0	40	'-
+1	40	'_
+2	40	0
+3	40	0
+4	40	^M
+0	44	'9
+1	44	'(
+2	44	0
+3	44	0
+4	44	^Y
+0	45	'0
+1	45	')
+2	45	0
+3	45	0
+4	45	^P
+0	46	'x
+1	46	'X
+2	46	0
+3	46	0
+4	46	^X
+0	47	',
+1	47	'<
+2	47	0
+3	47	0
+4	47	^L
+0	48	'l
+1	48	'L
+2	48	0
+3	48	0
+4	48	^L
+0	50	'w
+1	50	'W
+2	50	0
+3	50	0
+4	50	^W
+0	51	'v
+1	51	'V
+2	51	0
+3	51	0
+4	51	^V
+0	52	'g
+1	52	'G
+2	52	0
+3	52	0
+4	52	^G
+0	53	''
+1	53	'"
+2	53	0
+3	53	0
+4	53	^G

sys/lib/kbmap/ee

@@ -1,45 +1,44 @@
-0 12 '+
-0 13 '´
-0 26 'ü
-0 27 'õ
-0 39 'ö
-0 40 'ä
-0 41 '^
-0 43 ''
-0 51 ',
-0 52 '.
-0 53 '-
-0 86 '<
-1 2 '!
-1 3 '"
-1 4 '#
-1 5 '¤
-1 6 '%
-1 7 '&
-1 8 '/
-1 9 '(
-1 10 ')
-1 11 '=
-1 12 '?
-1 13 '`
-1 26 'Ü
-1 27 'Õ
-1 39 'Ö
-1 40 'Ä
-1 41 '~
-1 43 '*
-1 51 ';
-1 52 ':
-1 53 '_
-1 86 '>
-3 3 '@
-3 4 '£
-3 5 '$
-3 8 '{
-3 9 '[
-3 10 ']
-3 11 '}
-3 12 '\
-3 27 '§
-3 43 '½
-3 86 '|
+0	12	'+
+0	13	'´
+0	26	'ü
+0	27	'õ
+0	39	'ö
+0	40	'ä
+0	41	'^
+0	43	''
+0	51	',
+0	52	'.
+0	53	'-
+0	86	'<
+1	2	'!
+1	3	'"
+1	4	'#
+1	5	'¤
+1	6	'%
+1	7	'&
+1	8	'/
+1	9	'(
+1	10	')
+1	11	'=
+1	12	'?
+1	13	'`
+1	26	'Ü
+1	27	'Õ
+1	39	'Ö
+1	40	'Ä
+1	41	'~
+1	43	'*
+1	51	';
+1	52	':
+1	53	'_
+1	86	'>
+3	3	'@
+3	4	'£
+3	5	'$
+3	8	'{
+3	9	'[
+3	10	']
+3	11	'}
+3	12	'\
+3	27	'§
+3	43	'½

sys/lib/kbmap/es

@@ -1,40 +1,40 @@
-          0         12         39
-          0         13         33
-          0         26         96
-          0         27         43
-          0         39        241
-          0         41        186
-          0         43        231
-          0         53         45
-          0         86         60
-          1          3         34
-          1          4        183
-          1          7         38
-          1          8         47
-          1          9         40
-          1         10         41
-          1         11         61
-          1         12         63
-          1         13        191
-          1         26         94
-          1         27         42
-          1         39        209
-          1         40        168
-          1         41        170
-          1         43        199
-          1         51         59
-          1         52         58
-          1         53         95
-          1         86         62
-          3          2        124
-          3          3         64
-          3          4         35
-          3          5        126
-          3          7        172
-          3         26         91
-          3         27         93
-          3         28         10
-          3         40        123
-          3         41         92
-          3         43        125
-          3         53         47
+	0	12         39
+	0	13         33
+	0	26         96
+	0	27         43
+	0	39        241
+	0	41        186
+	0	43        231
+	0	53         45
+	0	86         60
+	1	3         34
+	1	4        183
+	1	7         38
+	1	8         47
+	1	9         40
+	1	10         41
+	1	11         61
+	1	12         63
+	1	13        191
+	1	26         94
+	1	27         42
+	1	39        209
+	1	40        168
+	1	41        170
+	1	43        199
+	1	51         59
+	1	52         58
+	1	53         95
+	1	86         62
+	3	2        124
+	3	3         64
+	3	4         35
+	3	5        126
+	3	7        172
+	3	26         91
+	3	27         93
+	3	28         10
+	3	40        123
+	3	41         92
+	3	43        125
+	3	53         47

sys/lib/kbmap/fi

@@ -1,46 +1,46 @@
-0 12 '+
-0 13 '´
-0 26 'å
-0 27 '¨
-0 39 'ö
-0 40 'ä
-0 41 '§
-0 43 ''
-0 51 ',
-0 52 '.
-0 53 '-
-0 86 '<
-1 2 '!
-1 3 '"
-1 4 '#
-1 5 '$
-1 6 '%
-1 7 '&
-1 8 '/
-1 9 '(
-1 10 ')
-1 11 '=
-1 12 '?
-1 13 '`
-1 26 'Å
-1 27 '^
-1 39 'Ö
-1 40 'Ä
-1 41 '½
-1 43 '*
-1 51 ';
-1 52 ':
-1 53 '_
-1 86 '>
-3 3 '@
-3 4 '£
-3 5 '$
-3 8 '{
-3 9 '[
-3 10 ']
-3 11 '}
-3 12 '\
-3 18 '€
-3 27 '~
-3 46 '¢
-3 86 '|
+0	12	'+
+0	13	'´
+0	26	'å
+0	27	'¨
+0	39	'ö
+0	40	'ä
+0	41	'§
+0	43	''
+0	51	',
+0	52	'.
+0	53	'-
+0	86	'<
+1	2	'!
+1	3	'"
+1	4	'#
+1	5	'$
+1	6	'%
+1	7	'&
+1	8	'/
+1	9	'(
+1	10	')
+1	11	'=
+1	12	'?
+1	13	'`
+1	26	'Å
+1	27	'^
+1	39	'Ö
+1	40	'Ä
+1	41	'½
+1	43	'*
+1	51	';
+1	52	':
+1	53	'_
+1	86	'>
+3	3	'@
+3	4	'£
+3	5	'$
+3	8	'{
+3	9	'[
+3	10	']
+3	11	'}
+3	12	'\
+3	18	'€
+3	27	'~
+3	46	'¢
+3	86	'|

sys/lib/kbmap/jp

@@ -16,7 +16,7 @@
 1	0xa	')
 1	0xb	'~
 1	0xc	'=
-1	0xd	0x0
+1	0xd	0
 1	0x1a	'`
 1	0x1b	'{
 1	0x27	'+

sys/lib/kbmap/mouse-csa

@@ -0,0 +1,4 @@
+# Use left Ctl, Start, Alt as mouse buttons (useful on laptops)
+0	29	M1
+2	91	M2
+0	56	M3

sys/lib/kbmap/mouse-fn

@@ -0,0 +1,6 @@
+# Use F1, F2, F3, F4, F5 as mouse buttons (useful on laptops)
+0	59	M1
+0	60	M2
+0	61	M3
+0	62	M4
+0	63	M5

sys/lib/kbmap/n97

@@ -9,32 +9,32 @@
 #4: ctrl
 #
 # backslash
-0 0x75 0x5c
+0	0x75	'\
 # esc
-0 0x64 0x1b
+0	0x64	^[
 # ctrl
-0 0x38 0xf862
-1 0x38 0xf862
-2 0x38 0xf862
-3 0x38 0xf862
-4 0x38 0xf862
+0	0x38	0xf862
+1	0x38	0xf862
+2	0x38	0xf862
+3	0x38	0xf862
+4	0x38	0xf862
 # lalt
-0 0x71 0xf863
-1 0x71 0xf863
-2 0x71 0xf867
-3 0x71 0xf867
-4 0x71 0xf863
+0	0x71	0xf863
+1	0x71	0xf863
+2	0x71	0xf867
+3	0x71	0xf867
+4	0x71	0xf863
 # ralt
-0 0x72 0xf863
-1 0x72 0xf863
-2 0x72 0xf867
-3 0x72 0xf867
-4 0x72 0xf863
+0	0x72	0xf863
+1	0x72	0xf863
+2	0x72	0xf867
+3	0x72	0xf867
+4	0x72	0xf863
 # del
-0 0x79 0x7f
-1 0x79 0x7f
-2 0x79 0x7f
-3 0x79 0x7f
-4 0x79 0x7f
+0	0x79	0x7f
+1	0x79	0x7f
+2	0x79	0x7f
+3	0x79	0x7f
+4	0x79	0x7f
 # pipe
-1 0x75 0x7c
+1	0x75	'|

sys/lib/kbmap/no

@@ -1,46 +1,46 @@
-0 12 '+
-0 13 '\
-0 26 'å
-0 27 '¨
-0 39 'ø
-0 40 'æ
-0 41 '|
-0 43 ''
-0 51 ',
-0 52 '.
-0 53 '-
-0 86 '<
-1 2 '!
-1 3 '"
-1 4 '#
-1 5 '$
-1 6 '%
-1 7 '&
-1 8 '/
-1 9 '(
-1 10 ')
-1 11 '=
-1 12 '?
-1 13 '`
-1 26 'Å
-1 27 '^
-1 39 'Ø
-1 40 'Æ
-1 41 '§
-1 43 '*
-1 51 ';
-1 52 ':
-1 53 '_
-1 86 '>
-3 3 '@
-3 4 '£
-3 5 '$
-3 8 '{
-3 9 '[
-3 10 ']
-3 11 '}
-3 12 '\
-3 18 '€
-3 27 '~
-3 46 '¢
-3 52 '|
+0	12	'+
+0	13	'\
+0	26	'å
+0	27	'¨
+0	39	'ø
+0	40	'æ
+0	41	'|
+0	43	''
+0	51	',
+0	52	'.
+0	53	'-
+0	86	'<
+1	2	'!
+1	3	'"
+1	4	'#
+1	5	'$
+1	6	'%
+1	7	'&
+1	8	'/
+1	9	'(
+1	10	')
+1	11	'=
+1	12	'?
+1	13	'`
+1	26	'Å
+1	27	'^
+1	39	'Ø
+1	40	'Æ
+1	41	'§
+1	43	'*
+1	51	';
+1	52	':
+1	53	'_
+1	86	'>
+3	3	'@
+3	4	'£
+3	5	'$
+3	8	'{
+3	9	'[
+3	10	']
+3	11	'}
+3	12	'\
+3	18	'€
+3	27	'~
+3	46	'¢
+3	52	'|

sys/lib/kbmap/ru

@@ -1,59 +1,59 @@
-0	0	0x0
-0	1	0x1b
-0	2	0x31
-0	3	0x32
-0	4	0x33
-0	5	0x34
-0	6	0x35
-0	7	0x36
-0	8	0x37
-0	9	0x38
-0	10	0x39
-0	11	0x30
-0	12	0x2d
-0	13	0x3d
-0	14	0x8
-0	15	0x9
-0	16	0x0439
-0	17	0x0446
-0	18	0x0443
-0	19	0x043a
-0	20	0x0435
-0	21	0x043d
-0	22	0x0433
-0	23	0x0448
-0	24	0x0449
-0	25	0x0437
-0	26	0x0445
-0	27	0x044a
-0	28	0xa
+0	0	0
+0	1	^[
+0	2	'1
+0	3	'2
+0	4	'3
+0	5	'4
+0	6	'5
+0	7	'6
+0	8	'7
+0	9	'8
+0	10	'9
+0	11	'0
+0	12	'-
+0	13	'=
+0	14	^H
+0	15	^I
+0	16	'й
+0	17	'ц
+0	18	'у
+0	19	'к
+0	20	'е
+0	21	'н
+0	22	'г
+0	23	'ш
+0	24	'щ
+0	25	'з
+0	26	'х
+0	27	'ъ
+0	28	^J
 0	29	0xf862
-0	30	0x0444
-0	31	0x044b
-0	32	0x0432
-0	33	0x0430
-0	34	0x043f
-0	35	0x0440
-0	36	0x043e
-0	37	0x043b
-0	38	0x0434
-0	39	0x0436
-0	40	0x044d
-0	41	0x0451
+0	30	'ф
+0	31	'ы
+0	32	'в
+0	33	'а
+0	34	'п
+0	35	'р
+0	36	'о
+0	37	'л
+0	38	'д
+0	39	'ж
+0	40	'э
+0	41	'ё
 0	42	0xf860
-0	43	0x5c
-0	44	0x044f
-0	45	0x0447
-0	46	0x0441
-0	47	0x043c
-0	48	0x0438
-0	49	0x0442
-0	50	0x044c
-0	51	0x0431
-0	52	0x044e
-0	53	0x2e
+0	43	'\
+0	44	'я
+0	45	'ч
+0	46	'с
+0	47	'м
+0	48	'и
+0	49	'т
+0	50	'ь
+0	51	'б
+0	52	'ю
+0	53	'.
 0	54	0xf860
-0	55	0x2a
+0	55	'*
 0	56	0xf863
 0	57	0x20
 0	58	0xf862
@@ -69,119 +69,119 @@
 0	68	0xf00a
 0	69	0xf865
 0	70	0xf015
-0	71	0x37
-0	72	0x38
-0	73	0x39
-0	74	0x2d
-0	75	0x34
-0	76	0x35
-0	77	0x36
-0	78	0x2b
-0	79	0x31
-0	80	0x32
-0	81	0x33
-0	82	0x30
-0	83	0x2e
-0	84	0x0
-0	85	0x0
-0	86	0x0
+0	71	'7
+0	72	'8
+0	73	'9
+0	74	'-
+0	75	'4
+0	76	'5
+0	77	'6
+0	78	'+
+0	79	'1
+0	80	'2
+0	81	'3
+0	82	'0
+0	83	'.
+0	84	0
+0	85	0
+0	86	0
 0	87	0xf00b
 0	88	0xf00c
-0	89	0x0
-0	90	0x0
-0	91	0x0
-0	92	0x0
-0	93	0x0
-0	94	0x0
-0	95	0x0
-0	96	0x0
-0	97	0x0
-0	98	0x0
-0	99	0x0
-0	100	0x0
-0	101	0x0
-0	102	0x0
-0	103	0x0
-0	104	0x0
-0	105	0x0
-0	106	0x0
-0	107	0x0
-0	108	0x0
-0	109	0x0
-0	110	0x0
-0	111	0x0
-0	112	0x0
-0	113	0x0
-0	114	0x0
-0	115	0x0
-0	116	0x0
-0	117	0x0
-0	118	0x0
-0	119	0x0
-0	120	0x0
+0	89	0
+0	90	0
+0	91	0
+0	92	0
+0	93	0
+0	94	0
+0	95	0
+0	96	0
+0	97	0
+0	98	0
+0	99	0
+0	100	0
+0	101	0
+0	102	0
+0	103	0
+0	104	0
+0	105	0
+0	106	0
+0	107	0
+0	108	0
+0	109	0
+0	110	0
+0	111	0
+0	112	0
+0	113	0
+0	114	0
+0	115	0
+0	116	0
+0	117	0
+0	118	0
+0	119	0
+0	120	0
 0	121	0xf800
-0	122	0x0
+0	122	0
 0	123	0xf00e
-0	124	0x0
-0	125	0x0
-0	126	0x0
-0	127	0x0
-1	0	0x0
-1	1	0x1b
-1	2	0x21
-1	3	0x22
-1	4	0x23
-1	5	0x3b
-1	6	0x25
-1	7	0x3a
-1	8	0x3f
-1	9	0x2a
-1	10	0x28
-1	11	0x29
-1	12	0x5f
-1	13	0x2b
-1	14	0x8
-1	15	0x9
-1	16	0x0419
-1	17	0x0426
-1	18	0x0423
-1	19	0x041a
-1	20	0x0415
-1	21	0x041d
-1	22	0x0413
-1	23	0x0428
-1	24	0x0429
-1	25	0x0417
-1	26	0x0425
-1	27	0x042a
-1	28	0xa
+0	124	0
+0	125	0
+0	126	0
+0	127	0
+1	0	0
+1	1	^[
+1	2	'!
+1	3	'"
+1	4	'#
+1	5	';
+1	6	'%
+1	7	':
+1	8	'?
+1	9	'*
+1	10	'(
+1	11	')
+1	12	'_
+1	13	'+
+1	14	^H
+1	15	^I
+1	16	'Й
+1	17	'Ц
+1	18	'У
+1	19	'К
+1	20	'Е
+1	21	'Н
+1	22	'Г
+1	23	'Ш
+1	24	'Щ
+1	25	'З
+1	26	'Х
+1	27	'Ъ
+1	28	^J
 1	29	0xf862
-1	30	0x0424
-1	31	0x042b
-1	32	0x0412
-1	33	0x0410
-1	34	0x041f
-1	35	0x0420
-1	36	0x041e
-1	37	0x041b
-1	38	0x0414
-1	39	0x0416
-1	40	0x042d
-1	41	0x0401
+1	30	'Ф
+1	31	'Ы
+1	32	'В
+1	33	'А
+1	34	'П
+1	35	'Р
+1	36	'О
+1	37	'Л
+1	38	'Д
+1	39	'Ж
+1	40	'Э
+1	41	'Ё
 1	42	0xf860
-1	43	0x7c
-1	44	0x042f
-1	45	0x0427
-1	46	0x0421
-1	47	0x041c
-1	48	0x0418
-1	49	0x0422
-1	50	0x044c
-1	51	0x0411
-1	52	0x042e
-1	53	0x2c
+1	43	'|
+1	44	'Я
+1	45	'Ч
+1	46	'С
+1	47	'М
+1	48	'И
+1	49	'Т
+1	50	'ь
+1	51	'Б
+1	52	'Ю
+1	53	',
 1	54	0xf860
-1	55	0x2a
+1	55	'*
 1	56	0xf863
 1	57	0x20
 1	58	0xf862
@@ -197,444 +197,444 @@
 1	68	0xf00a
 1	69	0xf865
 1	70	0xf015
-1	71	0x37
-1	72	0x38
-1	73	0x39
-1	74	0x2d
-1	75	0x34
-1	76	0x35
-1	77	0x36
-1	78	0x2b
-1	79	0x31
-1	80	0x32
-1	81	0x33
-1	82	0x30
-1	83	0x2e
-1	84	0x0
-1	85	0x0
-1	86	0x0
+1	71	'7
+1	72	'8
+1	73	'9
+1	74	'-
+1	75	'4
+1	76	'5
+1	77	'6
+1	78	'+
+1	79	'1
+1	80	'2
+1	81	'3
+1	82	'0
+1	83	'.
+1	84	0
+1	85	0
+1	86	0
 1	87	0xf00b
 1	88	0xf00c
-1	89	0x0
-1	90	0x0
-1	91	0x0
-1	92	0x0
-1	93	0x0
-1	94	0x0
-1	95	0x0
-1	96	0x0
-1	97	0x0
-1	98	0x0
-1	99	0x0
-1	100	0x0
-1	101	0x0
-1	102	0x0
-1	103	0x0
-1	104	0x0
-1	105	0x0
-1	106	0x0
-1	107	0x0
-1	108	0x0
-1	109	0x0
-1	110	0x0
-1	111	0x0
-1	112	0x0
-1	113	0x0
-1	114	0x0
-1	115	0x0
-1	116	0x0
-1	117	0x0
-1	118	0x0
-1	119	0x0
-1	120	0x0
+1	89	0
+1	90	0
+1	91	0
+1	92	0
+1	93	0
+1	94	0
+1	95	0
+1	96	0
+1	97	0
+1	98	0
+1	99	0
+1	100	0
+1	101	0
+1	102	0
+1	103	0
+1	104	0
+1	105	0
+1	106	0
+1	107	0
+1	108	0
+1	109	0
+1	110	0
+1	111	0
+1	112	0
+1	113	0
+1	114	0
+1	115	0
+1	116	0
+1	117	0
+1	118	0
+1	119	0
+1	120	0
 1	121	0xf00e
-1	122	0x0
+1	122	0
 1	123	0xf00e
-1	124	0x0
-1	125	0x0
-1	126	0x0
-1	127	0x0
-2	0	0x0
-2	1	0x0
-2	2	0x0
-2	3	0x0
-2	4	0x0
-2	5	0x0
-2	6	0x0
-2	7	0x0
-2	8	0x0
-2	9	0x0
-2	10	0x0
-2	11	0x0
-2	12	0x0
-2	13	0x0
-2	14	0x0
-2	15	0x0
-2	16	0x0
-2	17	0x0
-2	18	0x0
-2	19	0x0
-2	20	0x0
-2	21	0x0
-2	22	0x0
-2	23	0x0
-2	24	0x0
-2	25	0x0
-2	26	0x0
-2	27	0x0
-2	28	0xa
+1	124	0
+1	125	0
+1	126	0
+1	127	0
+2	0	0
+2	1	0
+2	2	0
+2	3	0
+2	4	0
+2	5	0
+2	6	0
+2	7	0
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+2	12	0
+2	13	0
+2	14	0
+2	15	0
+2	16	0
+2	17	0
+2	18	0
+2	19	0
+2	20	0
+2	21	0
+2	22	0
+2	23	0
+2	24	0
+2	25	0
+2	26	0
+2	27	0
+2	28	^J
 2	29	0xf862
-2	30	0x0
-2	31	0x0
-2	32	0x0
-2	33	0x0
-2	34	0x0
-2	35	0x0
-2	36	0x0
-2	37	0x0
-2	38	0x0
-2	39	0x0
-2	40	0x0
-2	41	0x0
+2	30	0
+2	31	0
+2	32	0
+2	33	0
+2	34	0
+2	35	0
+2	36	0
+2	37	0
+2	38	0
+2	39	0
+2	40	0
+2	41	0
 2	42	0xf860
-2	43	0x0
-2	44	0x0
-2	45	0x0
-2	46	0x0
-2	47	0x0
-2	48	0x0
-2	49	0x0
-2	50	0x0
-2	51	0x0
-2	52	0x0
-2	53	0x2f
-2	54	0x0
+2	43	0
+2	44	0
+2	45	0
+2	46	0
+2	47	0
+2	48	0
+2	49	0
+2	50	0
+2	51	0
+2	52	0
+2	53	'/
+2	54	0
 2	55	0xf010
 2	56	0xf867
-2	57	0x0
-2	58	0x0
-2	59	0x0
-2	60	0x0
-2	61	0x0
-2	62	0x0
-2	63	0x0
-2	64	0x0
-2	65	0x0
-2	66	0x0
-2	67	0x0
-2	68	0x0
-2	69	0x0
+2	57	0
+2	58	0
+2	59	0
+2	60	0
+2	61	0
+2	62	0
+2	63	0
+2	64	0
+2	65	0
+2	66	0
+2	67	0
+2	68	0
+2	69	0
 2	70	0xf861
 2	71	0xf00d
 2	72	0xf00e
 2	73	0xf00f
-2	74	0x0
+2	74	0
 2	75	0xf011
-2	76	0x0
+2	76	0
 2	77	0xf012
-2	78	0x0
+2	78	0
 2	79	0xf018
 2	80	0xf800
 2	81	0xf013
 2	82	0xf014
 2	83	0x7f
-2	84	0x0
-2	85	0x0
-2	86	0x0
-2	87	0x0
-2	88	0x0
-2	89	0x0
-2	90	0x0
-2	91	0x0
-2	92	0x0
-2	93	0x0
-2	94	0x0
-2	95	0x0
-2	96	0x0
-2	97	0x0
-2	98	0x0
-2	99	0x0
-2	100	0x0
-2	101	0x0
-2	102	0x0
-2	103	0x0
-2	104	0x0
-2	105	0x0
-2	106	0x0
-2	107	0x0
-2	108	0x0
-2	109	0x0
-2	110	0x0
-2	111	0x0
-2	112	0x0
-2	113	0x0
-2	114	0x0
-2	115	0x0
-2	116	0x0
-2	117	0x0
-2	118	0x0
-2	119	0x0
-2	120	0x0
+2	84	0
+2	85	0
+2	86	0
+2	87	0
+2	88	0
+2	89	0
+2	90	0
+2	91	0
+2	92	0
+2	93	0
+2	94	0
+2	95	0
+2	96	0
+2	97	0
+2	98	0
+2	99	0
+2	100	0
+2	101	0
+2	102	0
+2	103	0
+2	104	0
+2	105	0
+2	106	0
+2	107	0
+2	108	0
+2	109	0
+2	110	0
+2	111	0
+2	112	0
+2	113	0
+2	114	0
+2	115	0
+2	116	0
+2	117	0
+2	118	0
+2	119	0
+2	120	0
 2	121	0xf00e
-2	122	0x0
-2	123	0x0
-2	124	0x0
-2	125	0x0
-2	126	0x0
-2	127	0x0
-3	0	0x0
-3	1	0x0
-3	2	0x0
-3	3	0x0
-3	4	0x0
-3	5	0x0
-3	6	0x0
-3	7	0x0
-3	8	0x0
-3	9	0x0
-3	10	0x0
-3	11	0x0
-3	12	0x0
-3	13	0x0
-3	14	0x0
-3	15	0x0
-3	16	0x0
-3	17	0x0
-3	18	0x0
-3	19	0x0
-3	20	0x0
-3	21	0x0
-3	22	0x0
-3	23	0x0
-3	24	0x0
-3	25	0x0
-3	26	0x0
-3	27	0x0
-3	28	0xa
+2	122	0
+2	123	0
+2	124	0
+2	125	0
+2	126	0
+2	127	0
+3	0	0
+3	1	0
+3	2	0
+3	3	0
+3	4	0
+3	5	0
+3	6	0
+3	7	0
+3	8	0
+3	9	0
+3	10	0
+3	11	0
+3	12	0
+3	13	0
+3	14	0
+3	15	0
+3	16	0
+3	17	0
+3	18	0
+3	19	0
+3	20	0
+3	21	0
+3	22	0
+3	23	0
+3	24	0
+3	25	0
+3	26	0
+3	27	0
+3	28	^J
 3	29	0xf862
-3	30	0x0
-3	31	0x0
-3	32	0x0
-3	33	0x0
-3	34	0x0
-3	35	0x0
-3	36	0x0
-3	37	0x0
-3	38	0x0
-3	39	0x0
-3	40	0x0
-3	41	0x0
+3	30	0
+3	31	0
+3	32	0
+3	33	0
+3	34	0
+3	35	0
+3	36	0
+3	37	0
+3	38	0
+3	39	0
+3	40	0
+3	41	0
 3	42	0xf860
-3	43	0x0
-3	44	0x0
-3	45	0x0
-3	46	0x0
-3	47	0x0
-3	48	0x0
-3	49	0x0
-3	50	0x0
-3	51	0x0
-3	52	0x0
-3	53	0x2f
-3	54	0x0
+3	43	0
+3	44	0
+3	45	0
+3	46	0
+3	47	0
+3	48	0
+3	49	0
+3	50	0
+3	51	0
+3	52	0
+3	53	'/
+3	54	0
 3	55	0xf010
 3	56	0xf867
-3	57	0x0
-3	58	0x0
-3	59	0x0
-3	60	0x0
-3	61	0x0
-3	62	0x0
-3	63	0x0
-3	64	0x0
-3	65	0x0
-3	66	0x0
-3	67	0x0
-3	68	0x0
-3	69	0x0
+3	57	0
+3	58	0
+3	59	0
+3	60	0
+3	61	0
+3	62	0
+3	63	0
+3	64	0
+3	65	0
+3	66	0
+3	67	0
+3	68	0
+3	69	0
 3	70	0xf861
 3	71	0xf00d
 3	72	0xf00e
 3	73	0xf00f
-3	74	0x0
+3	74	0
 3	75	0xf011
-3	76	0x0
+3	76	0
 3	77	0xf012
-3	78	0x0
+3	78	0
 3	79	0xf018
 3	80	0xf800
 3	81	0xf013
 3	82	0xf014
 3	83	0x7f
-3	84	0x0
-3	85	0x0
-3	86	0x0
-3	87	0x0
-3	88	0x0
-3	89	0x0
-3	90	0x0
-3	91	0x0
-3	92	0x0
-3	93	0x0
-3	94	0x0
-3	95	0x0
-3	96	0x0
-3	97	0x0
-3	98	0x0
-3	99	0x0
-3	100	0x0
-3	101	0x0
-3	102	0x0
-3	103	0x0
-3	104	0x0
-3	105	0x0
-3	106	0x0
-3	107	0x0
-3	108	0x0
-3	109	0x0
-3	110	0x0
-3	111	0x0
-3	112	0x0
-3	113	0x0
-3	114	0x0
-3	115	0x0
-3	116	0x0
-3	117	0x0
-3	118	0x0
-3	119	0x0
-3	120	0x0
+3	84	0
+3	85	0
+3	86	0
+3	87	0
+3	88	0
+3	89	0
+3	90	0
+3	91	0
+3	92	0
+3	93	0
+3	94	0
+3	95	0
+3	96	0
+3	97	0
+3	98	0
+3	99	0
+3	100	0
+3	101	0
+3	102	0
+3	103	0
+3	104	0
+3	105	0
+3	106	0
+3	107	0
+3	108	0
+3	109	0
+3	110	0
+3	111	0
+3	112	0
+3	113	0
+3	114	0
+3	115	0
+3	116	0
+3	117	0
+3	118	0
+3	119	0
+3	120	0
 3	121	0xf00e
-3	122	0x0
-3	123	0x0
-3	124	0x0
-3	125	0x0
-3	126	0x0
-3	127	0x0
-4	0	0x0
-4	1	0x1b
-4	2	0x11
-4	3	0x12
-4	4	0x13
-4	5	0x14
-4	6	0x15
-4	7	0x16
-4	8	0x17
-4	9	0x18
-4	10	0x19
-4	11	0x10
-4	12	0xd
-4	13	0x1d
-4	14	0x8
-4	15	0x9
-4	16	0x11
-4	17	0x17
-4	18	0x5
-4	19	0x12
-4	20	0x14
-4	21	0x19
-4	22	0x15
-4	23	0x9
-4	24	0xf
-4	25	0x10
-4	26	0x1b
-4	27	0x1d
-4	28	0xa
+3	122	0
+3	123	0
+3	124	0
+3	125	0
+3	126	0
+3	127	0
+4	0	0
+4	1	^[
+4	2	^Q
+4	3	^R
+4	4	^S
+4	5	^T
+4	6	^U
+4	7	^V
+4	8	^W
+4	9	^X
+4	10	^Y
+4	11	^P
+4	12	^M
+4	13	^]
+4	14	^H
+4	15	^I
+4	16	^Q
+4	17	^W
+4	18	^E
+4	19	^R
+4	20	^T
+4	21	^Y
+4	22	^U
+4	23	^I
+4	24	^O
+4	25	^P
+4	26	^[
+4	27	^]
+4	28	^J
 4	29	0xf862
-4	30	0x1
-4	31	0x13
-4	32	0x4
-4	33	0x6
-4	34	0x7
-4	35	0x8
-4	36	0xa
-4	37	0xb
-4	38	0xc
-4	39	0x1b
-4	40	0x7
-4	41	0x0
+4	30	^A
+4	31	^S
+4	32	^D
+4	33	^F
+4	34	^G
+4	35	^H
+4	36	^J
+4	37	^K
+4	38	^L
+4	39	^[
+4	40	^G
+4	41	0
 4	42	0xf860
-4	43	0x1c
-4	44	0x1a
-4	45	0x18
-4	46	0x3
-4	47	0x16
-4	48	0x2
-4	49	0xe
-4	50	0xd
-4	51	0xc
-4	52	0xe
-4	53	0xf
+4	43	^\
+4	44	^Z
+4	45	^X
+4	46	^C
+4	47	^V
+4	48	^B
+4	49	^N
+4	50	^M
+4	51	^L
+4	52	^N
+4	53	^O
 4	54	0xf860
-4	55	0xa
+4	55	^J
 4	56	0xf863
-4	57	0x0
+4	57	0
 4	58	0xf862
-4	59	0x5
-4	60	0x6
-4	61	0x7
-4	62	0x4
-4	63	0x5
-4	64	0x6
-4	65	0x7
-4	66	0xc
-4	67	0xd
-4	68	0xe
-4	69	0x5
-4	70	0x6
-4	71	0x17
-4	72	0x18
-4	73	0x19
-4	74	0xd
-4	75	0x14
-4	76	0x15
-4	77	0x16
-4	78	0xb
-4	79	0x11
-4	80	0x12
-4	81	0x13
-4	82	0x10
-4	83	0xe
-4	84	0x0
-4	85	0x0
-4	86	0x0
-4	87	0xf
-4	88	0xc
-4	89	0x0
-4	90	0x0
-4	91	0x0
-4	92	0x0
-4	93	0x0
-4	94	0x0
-4	95	0x0
-4	96	0x0
-4	97	0x0
-4	98	0x0
-4	99	0x0
-4	100	0x0
-4	101	0x0
-4	102	0x0
-4	103	0x0
-4	104	0x0
-4	105	0x0
-4	106	0x0
-4	107	0x0
-4	108	0x0
-4	109	0x0
-4	110	0x0
-4	111	0x0
-4	112	0x0
-4	113	0x0
-4	114	0x0
-4	115	0x0
-4	116	0x0
-4	117	0x0
-4	118	0x0
-4	119	0x0
-4	120	0x0
-4	121	0x7
-4	122	0x0
-4	123	0x8
-4	124	0x0
-4	125	0x0
-4	126	0x0
-4	127	0x0
+4	59	^E
+4	60	^F
+4	61	^G
+4	62	^D
+4	63	^E
+4	64	^F
+4	65	^G
+4	66	^L
+4	67	^M
+4	68	^N
+4	69	^E
+4	70	^F
+4	71	^W
+4	72	^X
+4	73	^Y
+4	74	^M
+4	75	^T
+4	76	^U
+4	77	^V
+4	78	^K
+4	79	^Q
+4	80	^R
+4	81	^S
+4	82	^P
+4	83	^N
+4	84	0
+4	85	0
+4	86	0
+4	87	^O
+4	88	^L
+4	89	0
+4	90	0
+4	91	0
+4	92	0
+4	93	0
+4	94	0
+4	95	0
+4	96	0
+4	97	0
+4	98	0
+4	99	0
+4	100	0
+4	101	0
+4	102	0
+4	103	0
+4	104	0
+4	105	0
+4	106	0
+4	107	0
+4	108	0
+4	109	0
+4	110	0
+4	111	0
+4	112	0
+4	113	0
+4	114	0
+4	115	0
+4	116	0
+4	117	0
+4	118	0
+4	119	0
+4	120	0
+4	121	^G
+4	122	0
+4	123	^H
+4	124	0
+4	125	0
+4	126	0
+4	127	0

sys/lib/kbmap/ua

@@ -1,59 +1,59 @@
-0	0	0x0
-0	1	0x1b
-0	2	0x31
-0	3	0x32
-0	4	0x33
-0	5	0x34
-0	6	0x35
-0	7	0x36
-0	8	0x37
-0	9	0x38
-0	10	0x39
-0	11	0x30
-0	12	0x2d
-0	13	0x3d
-0	14	0x8
-0	15	0x9
-0	16	0x0439
-0	17	0x0446
-0	18	0x0443
-0	19	0x043a
-0	20	0x0435
-0	21	0x043d
-0	22	0x0433
-0	23	0x0448
-0	24	0x0449
-0	25	0x0437
-0	26	0x0445
-0	27	0x0457
-0	28	0xa
+0	0	0
+0	1	^[
+0	2	'1
+0	3	'2
+0	4	'3
+0	5	'4
+0	6	'5
+0	7	'6
+0	8	'7
+0	9	'8
+0	10	'9
+0	11	'0
+0	12	'-
+0	13	'=
+0	14	^H
+0	15	^I
+0	16	'й
+0	17	'ц
+0	18	'у
+0	19	'к
+0	20	'е
+0	21	'н
+0	22	'г
+0	23	'ш
+0	24	'щ
+0	25	'з
+0	26	'х
+0	27	'ї
+0	28	^J
 0	29	0xf862
-0	30	0x0444
-0	31	0x0456
-0	32	0x0432
-0	33	0x0430
-0	34	0x043f
-0	35	0x0440
-0	36	0x043e
-0	37	0x043b
-0	38	0x0434
-0	39	0x0436
-0	40	0x0454
-0	41	0x0491
+0	30	'ф
+0	31	'і
+0	32	'в
+0	33	'а
+0	34	'п
+0	35	'р
+0	36	'о
+0	37	'л
+0	38	'д
+0	39	'ж
+0	40	'є
+0	41	'ґ
 0	42	0xf860
-0	43	0x5c
-0	44	0x044f
-0	45	0x0447
-0	46	0x0441
-0	47	0x043c
-0	48	0x0438
-0	49	0x0442
-0	50	0x044c
-0	51	0x0431
-0	52	0x044e
-0	53	0x2e
+0	43	'\
+0	44	'я
+0	45	'ч
+0	46	'с
+0	47	'м
+0	48	'и
+0	49	'т
+0	50	'ь
+0	51	'б
+0	52	'ю
+0	53	'.
 0	54	0xf860
-0	55	0x2a
+0	55	'*
 0	56	0xf863
 0	57	0x20
 0	58	0xf862
@@ -69,119 +69,119 @@
 0	68	0xf00a
 0	69	0xf865
 0	70	0xf015
-0	71	0x37
-0	72	0x38
-0	73	0x39
-0	74	0x2d
-0	75	0x34
-0	76	0x35
-0	77	0x36
-0	78	0x2b
-0	79	0x31
-0	80	0x32
-0	81	0x33
-0	82	0x30
-0	83	0x2e
-0	84	0x0
-0	85	0x0
-0	86	0x0
+0	71	'7
+0	72	'8
+0	73	'9
+0	74	'-
+0	75	'4
+0	76	'5
+0	77	'6
+0	78	'+
+0	79	'1
+0	80	'2
+0	81	'3
+0	82	'0
+0	83	'.
+0	84	0
+0	85	0
+0	86	0
 0	87	0xf00b
 0	88	0xf00c
-0	89	0x0
-0	90	0x0
-0	91	0x0
-0	92	0x0
-0	93	0x0
-0	94	0x0
-0	95	0x0
-0	96	0x0
-0	97	0x0
-0	98	0x0
-0	99	0x0
-0	100	0x0
-0	101	0x0
-0	102	0x0
-0	103	0x0
-0	104	0x0
-0	105	0x0
-0	106	0x0
-0	107	0x0
-0	108	0x0
-0	109	0x0
-0	110	0x0
-0	111	0x0
-0	112	0x0
-0	113	0x0
-0	114	0x0
-0	115	0x0
-0	116	0x0
-0	117	0x0
-0	118	0x0
-0	119	0x0
-0	120	0x0
+0	89	0
+0	90	0
+0	91	0
+0	92	0
+0	93	0
+0	94	0
+0	95	0
+0	96	0
+0	97	0
+0	98	0
+0	99	0
+0	100	0
+0	101	0
+0	102	0
+0	103	0
+0	104	0
+0	105	0
+0	106	0
+0	107	0
+0	108	0
+0	109	0
+0	110	0
+0	111	0
+0	112	0
+0	113	0
+0	114	0
+0	115	0
+0	116	0
+0	117	0
+0	118	0
+0	119	0
+0	120	0
 0	121	0xf800
-0	122	0x0
+0	122	0
 0	123	0xf00e
-0	124	0x0
-0	125	0x0
-0	126	0x0
-0	127	0x0
-1	0	0x0
-1	1	0x1b
-1	2	0x21
-1	3	0x22
-1	4	0x23
-1	5	0x3b
-1	6	0x25
-1	7	0x3a
-1	8	0x3f
-1	9	0x2a
-1	10	0x28
-1	11	0x29
-1	12	0x5f
-1	13	0x2b
-1	14	0x8
-1	15	0x9
-1	16	0x0419
-1	17	0x0426
-1	18	0x0423
-1	19	0x041a
-1	20	0x0415
-1	21	0x041d
-1	22	0x0413
-1	23	0x0428
-1	24	0x0429
-1	25	0x0417
-1	26	0x0425
-1	27	0x0407
-1	28	0xa
+0	124	0
+0	125	0
+0	126	0
+0	127	0
+1	0	0
+1	1	^[
+1	2	'!
+1	3	'"
+1	4	'#
+1	5	';
+1	6	'%
+1	7	':
+1	8	'?
+1	9	'*
+1	10	'(
+1	11	')
+1	12	'_
+1	13	'+
+1	14	^H
+1	15	^I
+1	16	'Й
+1	17	'Ц
+1	18	'У
+1	19	'К
+1	20	'Е
+1	21	'Н
+1	22	'Г
+1	23	'Ш
+1	24	'Щ
+1	25	'З
+1	26	'Х
+1	27	'Ї
+1	28	^J
 1	29	0xf862
-1	30	0x0424
-1	31	0x0406
-1	32	0x0412
-1	33	0x0410
-1	34	0x041f
-1	35	0x0420
-1	36	0x041e
-1	37	0x041b
-1	38	0x0414
-1	39	0x0416
-1	40	0x0404
-1	41	0x0490
+1	30	'Ф
+1	31	'І
+1	32	'В
+1	33	'А
+1	34	'П
+1	35	'Р
+1	36	'О
+1	37	'Л
+1	38	'Д
+1	39	'Ж
+1	40	'Є
+1	41	'Ґ
 1	42	0xf860
-1	43	0x7c
-1	44	0x042f
-1	45	0x0427
-1	46	0x0421
-1	47	0x041c
-1	48	0x0418
-1	49	0x0422
-1	50	0x044c
-1	51	0x0411
-1	52	0x042e
-1	53	0x2c
+1	43	'|
+1	44	'Я
+1	45	'Ч
+1	46	'С
+1	47	'М
+1	48	'И
+1	49	'Т
+1	50	'ь
+1	51	'Б
+1	52	'Ю
+1	53	',
 1	54	0xf860
-1	55	0x2a
+1	55	'*
 1	56	0xf863
 1	57	0x20
 1	58	0xf862
@@ -197,444 +197,444 @@
 1	68	0xf00a
 1	69	0xf865
 1	70	0xf015
-1	71	0x37
-1	72	0x38
-1	73	0x39
-1	74	0x2d
-1	75	0x34
-1	76	0x35
-1	77	0x36
-1	78	0x2b
-1	79	0x31
-1	80	0x32
-1	81	0x33
-1	82	0x30
-1	83	0x2e
-1	84	0x0
-1	85	0x0
-1	86	0x0
+1	71	'7
+1	72	'8
+1	73	'9
+1	74	'-
+1	75	'4
+1	76	'5
+1	77	'6
+1	78	'+
+1	79	'1
+1	80	'2
+1	81	'3
+1	82	'0
+1	83	'.
+1	84	0
+1	85	0
+1	86	0
 1	87	0xf00b
 1	88	0xf00c
-1	89	0x0
-1	90	0x0
-1	91	0x0
-1	92	0x0
-1	93	0x0
-1	94	0x0
-1	95	0x0
-1	96	0x0
-1	97	0x0
-1	98	0x0
-1	99	0x0
-1	100	0x0
-1	101	0x0
-1	102	0x0
-1	103	0x0
-1	104	0x0
-1	105	0x0
-1	106	0x0
-1	107	0x0
-1	108	0x0
-1	109	0x0
-1	110	0x0
-1	111	0x0
-1	112	0x0
-1	113	0x0
-1	114	0x0
-1	115	0x0
-1	116	0x0
-1	117	0x0
-1	118	0x0
-1	119	0x0
-1	120	0x0
+1	89	0
+1	90	0
+1	91	0
+1	92	0
+1	93	0
+1	94	0
+1	95	0
+1	96	0
+1	97	0
+1	98	0
+1	99	0
+1	100	0
+1	101	0
+1	102	0
+1	103	0
+1	104	0
+1	105	0
+1	106	0
+1	107	0
+1	108	0
+1	109	0
+1	110	0
+1	111	0
+1	112	0
+1	113	0
+1	114	0
+1	115	0
+1	116	0
+1	117	0
+1	118	0
+1	119	0
+1	120	0
 1	121	0xf00e
-1	122	0x0
+1	122	0
 1	123	0xf00e
-1	124	0x0
-1	125	0x0
-1	126	0x0
-1	127	0x0
-2	0	0x0
-2	1	0x0
-2	2	0x0
-2	3	0x0
-2	4	0x0
-2	5	0x0
-2	6	0x0
-2	7	0x0
-2	8	0x0
-2	9	0x0
-2	10	0x0
-2	11	0x0
-2	12	0x0
-2	13	0x0
-2	14	0x0
-2	15	0x0
-2	16	0x0
-2	17	0x0
-2	18	0x0
-2	19	0x0
-2	20	0x0
-2	21	0x0
-2	22	0x0
-2	23	0x0
-2	24	0x0
-2	25	0x0
-2	26	0x0
-2	27	0x0
-2	28	0xa
+1	124	0
+1	125	0
+1	126	0
+1	127	0
+2	0	0
+2	1	0
+2	2	0
+2	3	0
+2	4	0
+2	5	0
+2	6	0
+2	7	0
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+2	12	0
+2	13	0
+2	14	0
+2	15	0
+2	16	0
+2	17	0
+2	18	0
+2	19	0
+2	20	0
+2	21	0
+2	22	0
+2	23	0
+2	24	0
+2	25	0
+2	26	0
+2	27	0
+2	28	^J
 2	29	0xf862
-2	30	0x0
-2	31	0x0
-2	32	0x0
-2	33	0x0
-2	34	0x0
-2	35	0x0
-2	36	0x0
-2	37	0x0
-2	38	0x0
-2	39	0x0
-2	40	0x0
-2	41	0x0
+2	30	0
+2	31	0
+2	32	0
+2	33	0
+2	34	0
+2	35	0
+2	36	0
+2	37	0
+2	38	0
+2	39	0
+2	40	0
+2	41	0
 2	42	0xf860
-2	43	0x0
-2	44	0x0
-2	45	0x0
-2	46	0x0
-2	47	0x0
-2	48	0x0
-2	49	0x0
-2	50	0x0
-2	51	0x0
-2	52	0x0
-2	53	0x2f
-2	54	0x0
+2	43	0
+2	44	0
+2	45	0
+2	46	0
+2	47	0
+2	48	0
+2	49	0
+2	50	0
+2	51	0
+2	52	0
+2	53	'/
+2	54	0
 2	55	0xf010
 2	56	0xf867
-2	57	0x0
-2	58	0x0
-2	59	0x0
-2	60	0x0
-2	61	0x0
-2	62	0x0
-2	63	0x0
-2	64	0x0
-2	65	0x0
-2	66	0x0
-2	67	0x0
-2	68	0x0
-2	69	0x0
+2	57	0
+2	58	0
+2	59	0
+2	60	0
+2	61	0
+2	62	0
+2	63	0
+2	64	0
+2	65	0
+2	66	0
+2	67	0
+2	68	0
+2	69	0
 2	70	0xf861
 2	71	0xf00d
 2	72	0xf00e
 2	73	0xf00f
-2	74	0x0
+2	74	0
 2	75	0xf011
-2	76	0x0
+2	76	0
 2	77	0xf012
-2	78	0x0
+2	78	0
 2	79	0xf018
 2	80	0xf800
 2	81	0xf013
 2	82	0xf014
 2	83	0x7f
-2	84	0x0
-2	85	0x0
-2	86	0x0
-2	87	0x0
-2	88	0x0
-2	89	0x0
-2	90	0x0
-2	91	0x0
-2	92	0x0
-2	93	0x0
-2	94	0x0
-2	95	0x0
-2	96	0x0
-2	97	0x0
-2	98	0x0
-2	99	0x0
-2	100	0x0
-2	101	0x0
-2	102	0x0
-2	103	0x0
-2	104	0x0
-2	105	0x0
-2	106	0x0
-2	107	0x0
-2	108	0x0
-2	109	0x0
-2	110	0x0
-2	111	0x0
-2	112	0x0
-2	113	0x0
-2	114	0x0
-2	115	0x0
-2	116	0x0
-2	117	0x0
-2	118	0x0
-2	119	0x0
-2	120	0x0
+2	84	0
+2	85	0
+2	86	0
+2	87	0
+2	88	0
+2	89	0
+2	90	0
+2	91	0
+2	92	0
+2	93	0
+2	94	0
+2	95	0
+2	96	0
+2	97	0
+2	98	0
+2	99	0
+2	100	0
+2	101	0
+2	102	0
+2	103	0
+2	104	0
+2	105	0
+2	106	0
+2	107	0
+2	108	0
+2	109	0
+2	110	0
+2	111	0
+2	112	0
+2	113	0
+2	114	0
+2	115	0
+2	116	0
+2	117	0
+2	118	0
+2	119	0
+2	120	0
 2	121	0xf00e
-2	122	0x0
-2	123	0x0
-2	124	0x0
-2	125	0x0
-2	126	0x0
-2	127	0x0
-3	0	0x0
-3	1	0x0
-3	2	0x0
-3	3	0x0
-3	4	0x0
-3	5	0x0
-3	6	0x0
-3	7	0x0
-3	8	0x0
-3	9	0x0
-3	10	0x0
-3	11	0x0
-3	12	0x0
-3	13	0x0
-3	14	0x0
-3	15	0x0
-3	16	0x0
-3	17	0x0
-3	18	0x0
-3	19	0x0
-3	20	0x0
-3	21	0x0
-3	22	0x0
-3	23	0x0
-3	24	0x0
-3	25	0x0
-3	26	0x0
-3	27	0x0
-3	28	0xa
+2	122	0
+2	123	0
+2	124	0
+2	125	0
+2	126	0
+2	127	0
+3	0	0
+3	1	0
+3	2	0
+3	3	0
+3	4	0
+3	5	0
+3	6	0
+3	7	0
+3	8	0
+3	9	0
+3	10	0
+3	11	0
+3	12	0
+3	13	0
+3	14	0
+3	15	0
+3	16	0
+3	17	0
+3	18	0
+3	19	0
+3	20	0
+3	21	0
+3	22	0
+3	23	0
+3	24	0
+3	25	0
+3	26	0
+3	27	0
+3	28	^J
 3	29	0xf862
-3	30	0x0
-3	31	0x0
-3	32	0x0
-3	33	0x0
-3	34	0x0
-3	35	0x0
-3	36	0x0
-3	37	0x0
-3	38	0x0
-3	39	0x0
-3	40	0x0
-3	41	0x0
+3	30	0
+3	31	0
+3	32	0
+3	33	0
+3	34	0
+3	35	0
+3	36	0
+3	37	0
+3	38	0
+3	39	0
+3	40	0
+3	41	0
 3	42	0xf860
-3	43	0x0
-3	44	0x0
-3	45	0x0
-3	46	0x0
-3	47	0x0
-3	48	0x0
-3	49	0x0
-3	50	0x0
-3	51	0x0
-3	52	0x0
-3	53	0x2f
-3	54	0x0
+3	43	0
+3	44	0
+3	45	0
+3	46	0
+3	47	0
+3	48	0
+3	49	0
+3	50	0
+3	51	0
+3	52	0
+3	53	'/
+3	54	0
 3	55	0xf010
 3	56	0xf867
-3	57	0x0
-3	58	0x0
-3	59	0x0
-3	60	0x0
-3	61	0x0
-3	62	0x0
-3	63	0x0
-3	64	0x0
-3	65	0x0
-3	66	0x0
-3	67	0x0
-3	68	0x0
-3	69	0x0
+3	57	0
+3	58	0
+3	59	0
+3	60	0
+3	61	0
+3	62	0
+3	63	0
+3	64	0
+3	65	0
+3	66	0
+3	67	0
+3	68	0
+3	69	0
 3	70	0xf861
 3	71	0xf00d
 3	72	0xf00e
 3	73	0xf00f
-3	74	0x0
+3	74	0
 3	75	0xf011
-3	76	0x0
+3	76	0
 3	77	0xf012
-3	78	0x0
+3	78	0
 3	79	0xf018
 3	80	0xf800
 3	81	0xf013
 3	82	0xf014
 3	83	0x7f
-3	84	0x0
-3	85	0x0
-3	86	0x0
-3	87	0x0
-3	88	0x0
-3	89	0x0
-3	90	0x0
-3	91	0x0
-3	92	0x0
-3	93	0x0
-3	94	0x0
-3	95	0x0
-3	96	0x0
-3	97	0x0
-3	98	0x0
-3	99	0x0
-3	100	0x0
-3	101	0x0
-3	102	0x0
-3	103	0x0
-3	104	0x0
-3	105	0x0
-3	106	0x0
-3	107	0x0
-3	108	0x0
-3	109	0x0
-3	110	0x0
-3	111	0x0
-3	112	0x0
-3	113	0x0
-3	114	0x0
-3	115	0x0
-3	116	0x0
-3	117	0x0
-3	118	0x0
-3	119	0x0
-3	120	0x0
+3	84	0
+3	85	0
+3	86	0
+3	87	0
+3	88	0
+3	89	0
+3	90	0
+3	91	0
+3	92	0
+3	93	0
+3	94	0
+3	95	0
+3	96	0
+3	97	0
+3	98	0
+3	99	0
+3	100	0
+3	101	0
+3	102	0
+3	103	0
+3	104	0
+3	105	0
+3	106	0
+3	107	0
+3	108	0
+3	109	0
+3	110	0
+3	111	0
+3	112	0
+3	113	0
+3	114	0
+3	115	0
+3	116	0
+3	117	0
+3	118	0
+3	119	0
+3	120	0
 3	121	0xf00e
-3	122	0x0
-3	123	0x0
-3	124	0x0
-3	125	0x0
-3	126	0x0
-3	127	0x0
-4	0	0x0
-4	1	0x1b
-4	2	0x11
-4	3	0x12
-4	4	0x13
-4	5	0x14
-4	6	0x15
-4	7	0x16
-4	8	0x17
-4	9	0x18
-4	10	0x19
-4	11	0x10
-4	12	0xd
-4	13	0x1d
-4	14	0x8
-4	15	0x9
-4	16	0x11
-4	17	0x17
-4	18	0x5
-4	19	0x12
-4	20	0x14
-4	21	0x19
-4	22	0x15
-4	23	0x9
-4	24	0xf
-4	25	0x10
-4	26	0x1b
-4	27	0x1d
-4	28	0xa
+3	122	0
+3	123	0
+3	124	0
+3	125	0
+3	126	0
+3	127	0
+4	0	0
+4	1	^[
+4	2	^Q
+4	3	^R
+4	4	^S
+4	5	^T
+4	6	^U
+4	7	^V
+4	8	^W
+4	9	^X
+4	10	^Y
+4	11	^P
+4	12	^M
+4	13	^]
+4	14	^H
+4	15	^I
+4	16	^Q
+4	17	^W
+4	18	^E
+4	19	^R
+4	20	^T
+4	21	^Y
+4	22	^U
+4	23	^I
+4	24	^O
+4	25	^P
+4	26	^[
+4	27	^]
+4	28	^J
 4	29	0xf862
-4	30	0x1
-4	31	0x13
-4	32	0x4
-4	33	0x6
-4	34	0x7
-4	35	0x8
-4	36	0xa
-4	37	0xb
-4	38	0xc
-4	39	0x1b
-4	40	0x7
-4	41	0x0
+4	30	^A
+4	31	^S
+4	32	^D
+4	33	^F
+4	34	^G
+4	35	^H
+4	36	^J
+4	37	^K
+4	38	^L
+4	39	^[
+4	40	^G
+4	41	0
 4	42	0xf860
-4	43	0x1c
-4	44	0x1a
-4	45	0x18
-4	46	0x3
-4	47	0x16
-4	48	0x2
-4	49	0xe
-4	50	0xd
-4	51	0xc
-4	52	0xe
-4	53	0xf
+4	43	^\
+4	44	^Z
+4	45	^X
+4	46	^C
+4	47	^V
+4	48	^B
+4	49	^N
+4	50	^M
+4	51	^L
+4	52	^N
+4	53	^O
 4	54	0xf860
-4	55	0xa
+4	55	^J
 4	56	0xf863
-4	57	0x0
+4	57	0
 4	58	0xf862
-4	59	0x5
-4	60	0x6
-4	61	0x7
-4	62	0x4
-4	63	0x5
-4	64	0x6
-4	65	0x7
-4	66	0xc
-4	67	0xd
-4	68	0xe
-4	69	0x5
-4	70	0x6
-4	71	0x17
-4	72	0x18
-4	73	0x19
-4	74	0xd
-4	75	0x14
-4	76	0x15
-4	77	0x16
-4	78	0xb
-4	79	0x11
-4	80	0x12
-4	81	0x13
-4	82	0x10
-4	83	0xe
-4	84	0x0
-4	85	0x0
-4	86	0x0
-4	87	0xf
-4	88	0xc
-4	89	0x0
-4	90	0x0
-4	91	0x0
-4	92	0x0
-4	93	0x0
-4	94	0x0
-4	95	0x0
-4	96	0x0
-4	97	0x0
-4	98	0x0
-4	99	0x0
-4	100	0x0
-4	101	0x0
-4	102	0x0
-4	103	0x0
-4	104	0x0
-4	105	0x0
-4	106	0x0
-4	107	0x0
-4	108	0x0
-4	109	0x0
-4	110	0x0
-4	111	0x0
-4	112	0x0
-4	113	0x0
-4	114	0x0
-4	115	0x0
-4	116	0x0
-4	117	0x0
-4	118	0x0
-4	119	0x0
-4	120	0x0
-4	121	0x7
-4	122	0x0
-4	123	0x8
-4	124	0x0
-4	125	0x0
-4	126	0x0
-4	127	0x0
+4	59	^E
+4	60	^F
+4	61	^G
+4	62	^D
+4	63	^E
+4	64	^F
+4	65	^G
+4	66	^L
+4	67	^M
+4	68	^N
+4	69	^E
+4	70	^F
+4	71	^W
+4	72	^X
+4	73	^Y
+4	74	^M
+4	75	^T
+4	76	^U
+4	77	^V
+4	78	^K
+4	79	^Q
+4	80	^R
+4	81	^S
+4	82	^P
+4	83	^N
+4	84	0
+4	85	0
+4	86	0
+4	87	^O
+4	88	^L
+4	89	0
+4	90	0
+4	91	0
+4	92	0
+4	93	0
+4	94	0
+4	95	0
+4	96	0
+4	97	0
+4	98	0
+4	99	0
+4	100	0
+4	101	0
+4	102	0
+4	103	0
+4	104	0
+4	105	0
+4	106	0
+4	107	0
+4	108	0
+4	109	0
+4	110	0
+4	111	0
+4	112	0
+4	113	0
+4	114	0
+4	115	0
+4	116	0
+4	117	0
+4	118	0
+4	119	0
+4	120	0
+4	121	^G
+4	122	0
+4	123	^H
+4	124	0
+4	125	0
+4	126	0
+4	127	0

sys/lib/kbmap/uk

@@ -1,7 +1,7 @@
-0 43 '#
-1 43 '~
-1 3 '"
-1 4 '£
-1 40 '@
-0 86 '\
-1 86 '|
+0	43	'#
+1	43	'~
+1	3	'"
+1	4	'£
+1	40	'@
+0	86	'\
+1	86	'|

sys/lib/kbmap/us

@@ -1,59 +1,59 @@
-0	0	0x0
-0	1	0x1b
-0	2	0x31
-0	3	0x32
-0	4	0x33
-0	5	0x34
-0	6	0x35
-0	7	0x36
-0	8	0x37
-0	9	0x38
-0	10	0x39
-0	11	0x30
-0	12	0x2d
-0	13	0x3d
-0	14	0x8
-0	15	0x9
-0	16	0x71
-0	17	0x77
-0	18	0x65
-0	19	0x72
-0	20	0x74
-0	21	0x79
-0	22	0x75
-0	23	0x69
-0	24	0x6f
-0	25	0x70
-0	26	0x5b
-0	27	0x5d
-0	28	0xa
+0	0	0
+0	1	^[
+0	2	'1
+0	3	'2
+0	4	'3
+0	5	'4
+0	6	'5
+0	7	'6
+0	8	'7
+0	9	'8
+0	10	'9
+0	11	'0
+0	12	'-
+0	13	'=
+0	14	^H
+0	15	^I
+0	16	'q
+0	17	'w
+0	18	'e
+0	19	'r
+0	20	't
+0	21	'y
+0	22	'u
+0	23	'i
+0	24	'o
+0	25	'p
+0	26	'[
+0	27	']
+0	28	^J
 0	29	0xf862
-0	30	0x61
-0	31	0x73
-0	32	0x64
-0	33	0x66
-0	34	0x67
-0	35	0x68
-0	36	0x6a
-0	37	0x6b
-0	38	0x6c
-0	39	0x3b
-0	40	0x27
-0	41	0x60
+0	30	'a
+0	31	's
+0	32	'd
+0	33	'f
+0	34	'g
+0	35	'h
+0	36	'j
+0	37	'k
+0	38	'l
+0	39	';
+0	40	''
+0	41	'`
 0	42	0xf860
-0	43	0x5c
-0	44	0x7a
-0	45	0x78
-0	46	0x63
-0	47	0x76
-0	48	0x62
-0	49	0x6e
-0	50	0x6d
-0	51	0x2c
-0	52	0x2e
-0	53	0x2f
+0	43	'\
+0	44	'z
+0	45	'x
+0	46	'c
+0	47	'v
+0	48	'b
+0	49	'n
+0	50	'm
+0	51	',
+0	52	'.
+0	53	'/
 0	54	0xf860
-0	55	0x2a
+0	55	'*
 0	56	0xf863
 0	57	0x20
 0	58	0xf862
@@ -69,119 +69,119 @@
 0	68	0xf00a
 0	69	0xf865
 0	70	0xf015
-0	71	0x37
-0	72	0x38
-0	73	0x39
-0	74	0x2d
-0	75	0x34
-0	76	0x35
-0	77	0x36
-0	78	0x2b
-0	79	0x31
-0	80	0x32
-0	81	0x33
-0	82	0x30
-0	83	0x2e
-0	84	0x0
-0	85	0x0
-0	86	0x0
+0	71	'7
+0	72	'8
+0	73	'9
+0	74	'-
+0	75	'4
+0	76	'5
+0	77	'6
+0	78	'+
+0	79	'1
+0	80	'2
+0	81	'3
+0	82	'0
+0	83	'.
+0	84	0
+0	85	0
+0	86	0
 0	87	0xf00b
 0	88	0xf00c
-0	89	0x0
-0	90	0x0
-0	91	0x0
-0	92	0x0
-0	93	0x0
-0	94	0x0
-0	95	0x0
-0	96	0x0
-0	97	0x0
-0	98	0x0
-0	99	0x0
-0	100	0x0
-0	101	0x0
-0	102	0x0
-0	103	0x0
-0	104	0x0
-0	105	0x0
-0	106	0x0
-0	107	0x0
-0	108	0x0
-0	109	0x0
-0	110	0x0
-0	111	0x0
-0	112	0x0
-0	113	0x0
-0	114	0x0
-0	115	0x0
-0	116	0x0
-0	117	0x0
-0	118	0x0
-0	119	0x0
-0	120	0x0
+0	89	0
+0	90	0
+0	91	0
+0	92	0
+0	93	0
+0	94	0
+0	95	0
+0	96	0
+0	97	0
+0	98	0
+0	99	0
+0	100	0
+0	101	0
+0	102	0
+0	103	0
+0	104	0
+0	105	0
+0	106	0
+0	107	0
+0	108	0
+0	109	0
+0	110	0
+0	111	0
+0	112	0
+0	113	0
+0	114	0
+0	115	0
+0	116	0
+0	117	0
+0	118	0
+0	119	0
+0	120	0
 0	121	0xf800
-0	122	0x0
+0	122	0
 0	123	0xf00e
-0	124	0x0
-0	125	0x0
-0	126	0x0
-0	127	0x0
-1	0	0x0
-1	1	0x1b
-1	2	0x21
-1	3	0x40
-1	4	0x23
-1	5	0x24
-1	6	0x25
-1	7	0x5e
-1	8	0x26
-1	9	0x2a
-1	10	0x28
-1	11	0x29
-1	12	0x5f
-1	13	0x2b
-1	14	0x8
-1	15	0x9
-1	16	0x51
-1	17	0x57
-1	18	0x45
-1	19	0x52
-1	20	0x54
-1	21	0x59
-1	22	0x55
-1	23	0x49
-1	24	0x4f
-1	25	0x50
-1	26	0x7b
-1	27	0x7d
-1	28	0xa
+0	124	0
+0	125	0
+0	126	0
+0	127	0
+1	0	0
+1	1	^[
+1	2	'!
+1	3	'@
+1	4	'#
+1	5	'$
+1	6	'%
+1	7	'^
+1	8	'&
+1	9	'*
+1	10	'(
+1	11	')
+1	12	'_
+1	13	'+
+1	14	^H
+1	15	^I
+1	16	'Q
+1	17	'W
+1	18	'E
+1	19	'R
+1	20	'T
+1	21	'Y
+1	22	'U
+1	23	'I
+1	24	'O
+1	25	'P
+1	26	'{
+1	27	'}
+1	28	^J
 1	29	0xf862
-1	30	0x41
-1	31	0x53
-1	32	0x44
-1	33	0x46
-1	34	0x47
-1	35	0x48
-1	36	0x4a
-1	37	0x4b
-1	38	0x4c
-1	39	0x3a
-1	40	0x22
-1	41	0x7e
+1	30	'A
+1	31	'S
+1	32	'D
+1	33	'F
+1	34	'G
+1	35	'H
+1	36	'J
+1	37	'K
+1	38	'L
+1	39	':
+1	40	'"
+1	41	'~
 1	42	0xf860
-1	43	0x7c
-1	44	0x5a
-1	45	0x58
-1	46	0x43
-1	47	0x56
-1	48	0x42
-1	49	0x4e
-1	50	0x4d
-1	51	0x3c
-1	52	0x3e
-1	53	0x3f
+1	43	'|
+1	44	'Z
+1	45	'X
+1	46	'C
+1	47	'V
+1	48	'B
+1	49	'N
+1	50	'M
+1	51	'<
+1	52	'>
+1	53	'?
 1	54	0xf860
-1	55	0x2a
+1	55	'*
 1	56	0xf863
 1	57	0x20
 1	58	0xf862
@@ -197,444 +197,444 @@
 1	68	0xf00a
 1	69	0xf865
 1	70	0xf015
-1	71	0x37
-1	72	0x38
-1	73	0x39
-1	74	0x2d
-1	75	0x34
-1	76	0x35
-1	77	0x36
-1	78	0x2b
-1	79	0x31
-1	80	0x32
-1	81	0x33
-1	82	0x30
-1	83	0x2e
-1	84	0x0
-1	85	0x0
-1	86	0x0
+1	71	'7
+1	72	'8
+1	73	'9
+1	74	'-
+1	75	'4
+1	76	'5
+1	77	'6
+1	78	'+
+1	79	'1
+1	80	'2
+1	81	'3
+1	82	'0
+1	83	'.
+1	84	0
+1	85	0
+1	86	0
 1	87	0xf00b
 1	88	0xf00c
-1	89	0x0
-1	90	0x0
-1	91	0x0
-1	92	0x0
-1	93	0x0
-1	94	0x0
-1	95	0x0
-1	96	0x0
-1	97	0x0
-1	98	0x0
-1	99	0x0
-1	100	0x0
-1	101	0x0
-1	102	0x0
-1	103	0x0
-1	104	0x0
-1	105	0x0
-1	106	0x0
-1	107	0x0
-1	108	0x0
-1	109	0x0
-1	110	0x0
-1	111	0x0
-1	112	0x0
-1	113	0x0
-1	114	0x0
-1	115	0x0
-1	116	0x0
-1	117	0x0
-1	118	0x0
-1	119	0x0
-1	120	0x0
+1	89	0
+1	90	0
+1	91	0
+1	92	0
+1	93	0
+1	94	0
+1	95	0
+1	96	0
+1	97	0
+1	98	0
+1	99	0
+1	100	0
+1	101	0
+1	102	0
+1	103	0
+1	104	0
+1	105	0
+1	106	0
+1	107	0
+1	108	0
+1	109	0
+1	110	0
+1	111	0
+1	112	0
+1	113	0
+1	114	0
+1	115	0
+1	116	0
+1	117	0
+1	118	0
+1	119	0
+1	120	0
 1	121	0xf00e
-1	122	0x0
+1	122	0
 1	123	0xf00e
-1	124	0x0
-1	125	0x0
-1	126	0x0
-1	127	0x0
-2	0	0x0
-2	1	0x0
-2	2	0x0
-2	3	0x0
-2	4	0x0
-2	5	0x0
-2	6	0x0
-2	7	0x0
-2	8	0x0
-2	9	0x0
-2	10	0x0
-2	11	0x0
-2	12	0x0
-2	13	0x0
-2	14	0x0
-2	15	0x0
-2	16	0x0
-2	17	0x0
-2	18	0x0
-2	19	0x0
-2	20	0x0
-2	21	0x0
-2	22	0x0
-2	23	0x0
-2	24	0x0
-2	25	0x0
-2	26	0x0
-2	27	0x0
-2	28	0xa
+1	124	0
+1	125	0
+1	126	0
+1	127	0
+2	0	0
+2	1	0
+2	2	0
+2	3	0
+2	4	0
+2	5	0
+2	6	0
+2	7	0
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+2	12	0
+2	13	0
+2	14	0
+2	15	0
+2	16	0
+2	17	0
+2	18	0
+2	19	0
+2	20	0
+2	21	0
+2	22	0
+2	23	0
+2	24	0
+2	25	0
+2	26	0
+2	27	0
+2	28	^J
 2	29	0xf862
-2	30	0x0
-2	31	0x0
-2	32	0x0
-2	33	0x0
-2	34	0x0
-2	35	0x0
-2	36	0x0
-2	37	0x0
-2	38	0x0
-2	39	0x0
-2	40	0x0
-2	41	0x0
+2	30	0
+2	31	0
+2	32	0
+2	33	0
+2	34	0
+2	35	0
+2	36	0
+2	37	0
+2	38	0
+2	39	0
+2	40	0
+2	41	0
 2	42	0xf860
-2	43	0x0
-2	44	0x0
-2	45	0x0
-2	46	0x0
-2	47	0x0
-2	48	0x0
-2	49	0x0
-2	50	0x0
-2	51	0x0
-2	52	0x0
-2	53	0x2f
-2	54	0x0
+2	43	0
+2	44	0
+2	45	0
+2	46	0
+2	47	0
+2	48	0
+2	49	0
+2	50	0
+2	51	0
+2	52	0
+2	53	'/
+2	54	0
 2	55	0xf010
 2	56	0xf867
-2	57	0x0
-2	58	0x0
-2	59	0x0
-2	60	0x0
-2	61	0x0
-2	62	0x0
-2	63	0x0
-2	64	0x0
-2	65	0x0
-2	66	0x0
-2	67	0x0
-2	68	0x0
-2	69	0x0
+2	57	0
+2	58	0
+2	59	0
+2	60	0
+2	61	0
+2	62	0
+2	63	0
+2	64	0
+2	65	0
+2	66	0
+2	67	0
+2	68	0
+2	69	0
 2	70	0xf861
 2	71	0xf00d
 2	72	0xf00e
 2	73	0xf00f
-2	74	0x0
+2	74	0
 2	75	0xf011
-2	76	0x0
+2	76	0
 2	77	0xf012
-2	78	0x0
+2	78	0
 2	79	0xf018
 2	80	0xf800
 2	81	0xf013
 2	82	0xf014
 2	83	0x7f
-2	84	0x0
-2	85	0x0
-2	86	0x0
-2	87	0x0
-2	88	0x0
-2	89	0x0
-2	90	0x0
-2	91	0x0
-2	92	0x0
-2	93	0x0
-2	94	0x0
-2	95	0x0
-2	96	0x0
-2	97	0x0
-2	98	0x0
-2	99	0x0
-2	100	0x0
-2	101	0x0
-2	102	0x0
-2	103	0x0
-2	104	0x0
-2	105	0x0
-2	106	0x0
-2	107	0x0
-2	108	0x0
-2	109	0x0
-2	110	0x0
-2	111	0x0
-2	112	0x0
-2	113	0x0
-2	114	0x0
-2	115	0x0
-2	116	0x0
-2	117	0x0
-2	118	0x0
-2	119	0x0
-2	120	0x0
+2	84	0
+2	85	0
+2	86	0
+2	87	0
+2	88	0
+2	89	0
+2	90	0
+2	91	0
+2	92	0
+2	93	0
+2	94	0
+2	95	0
+2	96	0
+2	97	0
+2	98	0
+2	99	0
+2	100	0
+2	101	0
+2	102	0
+2	103	0
+2	104	0
+2	105	0
+2	106	0
+2	107	0
+2	108	0
+2	109	0
+2	110	0
+2	111	0
+2	112	0
+2	113	0
+2	114	0
+2	115	0
+2	116	0
+2	117	0
+2	118	0
+2	119	0
+2	120	0
 2	121	0xf00e
-2	122	0x0
-2	123	0x0
-2	124	0x0
-2	125	0x0
-2	126	0x0
-2	127	0x0
-3	0	0x0
-3	1	0x0
-3	2	0x0
-3	3	0x0
-3	4	0x0
-3	5	0x0
-3	6	0x0
-3	7	0x0
-3	8	0x0
-3	9	0x0
-3	10	0x0
-3	11	0x0
-3	12	0x0
-3	13	0x0
-3	14	0x0
-3	15	0x0
-3	16	0x0
-3	17	0x0
-3	18	0x0
-3	19	0x0
-3	20	0x0
-3	21	0x0
-3	22	0x0
-3	23	0x0
-3	24	0x0
-3	25	0x0
-3	26	0x0
-3	27	0x0
-3	28	0xa
+2	122	0
+2	123	0
+2	124	0
+2	125	0
+2	126	0
+2	127	0
+3	0	0
+3	1	0
+3	2	0
+3	3	0
+3	4	0
+3	5	0
+3	6	0
+3	7	0
+3	8	0
+3	9	0
+3	10	0
+3	11	0
+3	12	0
+3	13	0
+3	14	0
+3	15	0
+3	16	0
+3	17	0
+3	18	0
+3	19	0
+3	20	0
+3	21	0
+3	22	0
+3	23	0
+3	24	0
+3	25	0
+3	26	0
+3	27	0
+3	28	^J
 3	29	0xf862
-3	30	0x0
-3	31	0x0
-3	32	0x0
-3	33	0x0
-3	34	0x0
-3	35	0x0
-3	36	0x0
-3	37	0x0
-3	38	0x0
-3	39	0x0
-3	40	0x0
-3	41	0x0
+3	30	0
+3	31	0
+3	32	0
+3	33	0
+3	34	0
+3	35	0
+3	36	0
+3	37	0
+3	38	0
+3	39	0
+3	40	0
+3	41	0
 3	42	0xf860
-3	43	0x0
-3	44	0x0
-3	45	0x0
-3	46	0x0
-3	47	0x0
-3	48	0x0
-3	49	0x0
-3	50	0x0
-3	51	0x0
-3	52	0x0
-3	53	0x2f
-3	54	0x0
+3	43	0
+3	44	0
+3	45	0
+3	46	0
+3	47	0
+3	48	0
+3	49	0
+3	50	0
+3	51	0
+3	52	0
+3	53	'/
+3	54	0
 3	55	0xf010
 3	56	0xf867
-3	57	0x0
-3	58	0x0
-3	59	0x0
-3	60	0x0
-3	61	0x0
-3	62	0x0
-3	63	0x0
-3	64	0x0
-3	65	0x0
-3	66	0x0
-3	67	0x0
-3	68	0x0
-3	69	0x0
+3	57	0
+3	58	0
+3	59	0
+3	60	0
+3	61	0
+3	62	0
+3	63	0
+3	64	0
+3	65	0
+3	66	0
+3	67	0
+3	68	0
+3	69	0
 3	70	0xf861
 3	71	0xf00d
 3	72	0xf00e
 3	73	0xf00f
-3	74	0x0
+3	74	0
 3	75	0xf011
-3	76	0x0
+3	76	0
 3	77	0xf012
-3	78	0x0
+3	78	0
 3	79	0xf018
 3	80	0xf800
 3	81	0xf013
 3	82	0xf014
 3	83	0x7f
-3	84	0x0
-3	85	0x0
-3	86	0x0
-3	87	0x0
-3	88	0x0
-3	89	0x0
-3	90	0x0
-3	91	0x0
-3	92	0x0
-3	93	0x0
-3	94	0x0
-3	95	0x0
-3	96	0x0
-3	97	0x0
-3	98	0x0
-3	99	0x0
-3	100	0x0
-3	101	0x0
-3	102	0x0
-3	103	0x0
-3	104	0x0
-3	105	0x0
-3	106	0x0
-3	107	0x0
-3	108	0x0
-3	109	0x0
-3	110	0x0
-3	111	0x0
-3	112	0x0
-3	113	0x0
-3	114	0x0
-3	115	0x0
-3	116	0x0
-3	117	0x0
-3	118	0x0
-3	119	0x0
-3	120	0x0
+3	84	0
+3	85	0
+3	86	0
+3	87	0
+3	88	0
+3	89	0
+3	90	0
+3	91	0
+3	92	0
+3	93	0
+3	94	0
+3	95	0
+3	96	0
+3	97	0
+3	98	0
+3	99	0
+3	100	0
+3	101	0
+3	102	0
+3	103	0
+3	104	0
+3	105	0
+3	106	0
+3	107	0
+3	108	0
+3	109	0
+3	110	0
+3	111	0
+3	112	0
+3	113	0
+3	114	0
+3	115	0
+3	116	0
+3	117	0
+3	118	0
+3	119	0
+3	120	0
 3	121	0xf00e
-3	122	0x0
-3	123	0x0
-3	124	0x0
-3	125	0x0
-3	126	0x0
-3	127	0x0
-4	0	0x0
-4	1	0x1b
-4	2	0x11
-4	3	0x12
-4	4	0x13
-4	5	0x14
-4	6	0x15
-4	7	0x16
-4	8	0x17
-4	9	0x18
-4	10	0x19
-4	11	0x10
-4	12	0xd
-4	13	0x1d
-4	14	0x8
-4	15	0x9
-4	16	0x11
-4	17	0x17
-4	18	0x5
-4	19	0x12
-4	20	0x14
-4	21	0x19
-4	22	0x15
-4	23	0x9
-4	24	0xf
-4	25	0x10
-4	26	0x1b
-4	27	0x1d
-4	28	0xa
+3	122	0
+3	123	0
+3	124	0
+3	125	0
+3	126	0
+3	127	0
+4	0	0
+4	1	^[
+4	2	^Q
+4	3	^R
+4	4	^S
+4	5	^T
+4	6	^U
+4	7	^V
+4	8	^W
+4	9	^X
+4	10	^Y
+4	11	^P
+4	12	^M
+4	13	^]
+4	14	^H
+4	15	^I
+4	16	^Q
+4	17	^W
+4	18	^E
+4	19	^R
+4	20	^T
+4	21	^Y
+4	22	^U
+4	23	^I
+4	24	^O
+4	25	^P
+4	26	^[
+4	27	^]
+4	28	^J
 4	29	0xf862
-4	30	0x1
-4	31	0x13
-4	32	0x4
-4	33	0x6
-4	34	0x7
-4	35	0x8
-4	36	0xa
-4	37	0xb
-4	38	0xc
-4	39	0x1b
-4	40	0x7
-4	41	0x0
+4	30	^A
+4	31	^S
+4	32	^D
+4	33	^F
+4	34	^G
+4	35	^H
+4	36	^J
+4	37	^K
+4	38	^L
+4	39	^[
+4	40	^G
+4	41	0
 4	42	0xf860
-4	43	0x1c
-4	44	0x1a
-4	45	0x18
-4	46	0x3
-4	47	0x16
-4	48	0x2
-4	49	0xe
-4	50	0xd
-4	51	0xc
-4	52	0xe
-4	53	0xf
+4	43	^\
+4	44	^Z
+4	45	^X
+4	46	^C
+4	47	^V
+4	48	^B
+4	49	^N
+4	50	^M
+4	51	^L
+4	52	^N
+4	53	^O
 4	54	0xf860
-4	55	0xa
+4	55	^J
 4	56	0xf863
-4	57	0x0
+4	57	0
 4	58	0xf862
-4	59	0x5
-4	60	0x6
-4	61	0x7
-4	62	0x4
-4	63	0x5
-4	64	0x6
-4	65	0x7
-4	66	0xc
-4	67	0xd
-4	68	0xe
-4	69	0x5
-4	70	0x6
-4	71	0x17
-4	72	0x18
-4	73	0x19
-4	74	0xd
-4	75	0x14
-4	76	0x15
-4	77	0x16
-4	78	0xb
-4	79	0x11
-4	80	0x12
-4	81	0x13
-4	82	0x10
-4	83	0xe
-4	84	0x0
-4	85	0x0
-4	86	0x0
-4	87	0xf
-4	88	0xc
-4	89	0x0
-4	90	0x0
-4	91	0x0
-4	92	0x0
-4	93	0x0
-4	94	0x0
-4	95	0x0
-4	96	0x0
-4	97	0x0
-4	98	0x0
-4	99	0x0
-4	100	0x0
-4	101	0x0
-4	102	0x0
-4	103	0x0
-4	104	0x0
-4	105	0x0
-4	106	0x0
-4	107	0x0
-4	108	0x0
-4	109	0x0
-4	110	0x0
-4	111	0x0
-4	112	0x0
-4	113	0x0
-4	114	0x0
-4	115	0x0
-4	116	0x0
-4	117	0x0
-4	118	0x0
-4	119	0x0
-4	120	0x0
-4	121	0x7
-4	122	0x0
-4	123	0x8
-4	124	0x0
-4	125	0x0
-4	126	0x0
-4	127	0x0
+4	59	^E
+4	60	^F
+4	61	^G
+4	62	^D
+4	63	^E
+4	64	^F
+4	65	^G
+4	66	^L
+4	67	^M
+4	68	^N
+4	69	^E
+4	70	^F
+4	71	^W
+4	72	^X
+4	73	^Y
+4	74	^M
+4	75	^T
+4	76	^U
+4	77	^V
+4	78	^K
+4	79	^Q
+4	80	^R
+4	81	^S
+4	82	^P
+4	83	^N
+4	84	0
+4	85	0
+4	86	0
+4	87	^O
+4	88	^L
+4	89	0
+4	90	0
+4	91	0
+4	92	0
+4	93	0
+4	94	0
+4	95	0
+4	96	0
+4	97	0
+4	98	0
+4	99	0
+4	100	0
+4	101	0
+4	102	0
+4	103	0
+4	104	0
+4	105	0
+4	106	0
+4	107	0
+4	108	0
+4	109	0
+4	110	0
+4	111	0
+4	112	0
+4	113	0
+4	114	0
+4	115	0
+4	116	0
+4	117	0
+4	118	0
+4	119	0
+4	120	0
+4	121	^G
+4	122	0
+4	123	^H
+4	124	0
+4	125	0
+4	126	0
+4	127	0

sys/man/3/kbmap

@@ -30,7 +30,7 @@ The scan code values are hardware dependent and can vary
 from keyboard to keyboard.
 .PP
 Writes to the file change the map.
-Lines written to the file must contain three space-separated numeric fields,
+Lines written to the file must contain three space-separated fields,
 representing the table number, scan code index, and Unicode character.
 Values are taken to be decimal unless they start with
 .B 0x
@@ -43,7 +43,20 @@ where
 .I x
 gives the UTF-8 representation of the character
 (see
-.IR utf (6)).
+.IR utf (6)),
+or as 
+.BI ^ X
+to represent a control character or as
+.BI M n
+to represent a mouse button.
+.PP
+The map
+.B /sys/lib/kbmap/mouse-fn
+maps the F1, F2, and F3 keys to the three mouse buttons.
+Similarly, 
+.B mouse-csa
+maps the left Control, Start, and Alt keys to the three mouse buttons.
+These maps are useful on laptops without three-button mice.
 .SH "SEE ALSO"
 .IR cons (3),
 .IR keyboard (6),

sys/src/9/pc/kbd.c

@@ -6,6 +6,8 @@
 #include	"io.h"
 #include	"../port/error.h"
 
+extern void mousetrack(int, int, int, int);
+
 enum {
 	Data=		0x60,		/* data port */
 
@@ -22,7 +24,6 @@ enum {
 	Cmd=		0x64,		/* command port (write only) */
 
 	Spec=		0xF800,		/* Unicode private space */
-
 	PF=		Spec|0x20,	/* num pad function key */
 	View=		Spec|0x00,	/* view (shift window up) */
 	KF=		0xF000,		/* function key (begin Unicode private space) */
@@ -34,6 +35,7 @@ enum {
 	Num=		Spec|0x65,
 	Middle=		Spec|0x66,
 	Altgr=		Spec|0x67,
+	Kmouse=		Spec|0x100,
 	No=		0x00,		/* peter */
 
 	Home=		KF|13,
@@ -168,6 +170,7 @@ enum
 };
 
 int mouseshifted;
+int kbdbuttons;
 
 static Lock i8042lock;
 static uchar ccc;
@@ -289,6 +292,20 @@ i8042auxcmds(uchar *cmd, int ncmd)
 	return i;
 }
 
+struct {
+	int esc1;
+	int esc2;
+	int alt;
+	int altgr;
+	int caps;
+	int ctl;
+	int num;
+	int shift;
+	int collecting;
+	int nk;
+	Rune kc[5];
+} kbscan;
+
 /*
  *  keyboard interrupt
  */
@@ -296,10 +313,6 @@ static void
 i8042intr(Ureg*, void*)
 {
 	int s, c, i;
-	static int esc1, esc2;
-	static int alt, altgr, caps, ctl, num, shift;
-	static int collecting, nk;
-	static Rune kc[5];
 	int keyup;
 
 	/*
@@ -323,7 +336,7 @@ i8042intr(Ureg*, void*)
 	 */
 	if(s & Minready){
 		if(auxputc != nil)
-			auxputc(c, shift);
+			auxputc(c, kbscan.shift);
 		return;
 	}
 
@@ -332,10 +345,10 @@ i8042intr(Ureg*, void*)
 	 *  of a 3 character sequence (on the safari)
 	 */
 	if(c == 0xe0){
-		esc1 = 1;
+		kbscan.esc1 = 1;
 		return;
 	} else if(c == 0xe1){
-		esc2 = 2;
+		kbscan.esc2 = 2;
 		return;
 	}
 
@@ -348,22 +361,22 @@ i8042intr(Ureg*, void*)
 		return;
 	}
 
-	if(esc1){
+	if(kbscan.esc1){
 		c = kbtabesc1[c];
-		esc1 = 0;
-	} else if(esc2){
-		esc2--;
+		kbscan.esc1 = 0;
+	} else if(kbscan.esc2){
+		kbscan.esc2--;
 		return;
-	} else if(shift)
+	} else if(kbscan.shift)
 		c = kbtabshift[c];
-	else if(altgr)
+	else if(kbscan.altgr)
 		c = kbtabaltgr[c];
-	else if(ctl)
+	else if(kbscan.ctl)
 		c = kbtabctrl[c];
 	else
 		c = kbtab[c];
 
-	if(caps && c<='z' && c>='a')
+	if(kbscan.caps && c<='z' && c>='a')
 		c += 'A' - 'a';
 
 	/*
@@ -372,17 +385,25 @@ i8042intr(Ureg*, void*)
 	if(keyup){
 		switch(c){
 		case Latin:
-			alt = 0;
+			kbscan.alt = 0;
 			break;
 		case Shift:
-			shift = 0;
+			kbscan.shift = 0;
 			mouseshifted = 0;
 			break;
 		case Ctrl:
-			ctl = 0;
+			kbscan.ctl = 0;
 			break;
 		case Altgr:
-			altgr = 0;
+			kbscan.altgr = 0;
+			break;
+		case Kmouse|1:
+		case Kmouse|2:
+		case Kmouse|3:
+		case Kmouse|4:
+		case Kmouse|5:
+			kbdbuttons &= ~(1<<(c-Kmouse-1));
+			mousetrack(0, 0, 0, TK2MS(MACHP(0)->ticks));
 			break;
 		}
 		return;
@@ -392,41 +413,41 @@ i8042intr(Ureg*, void*)
  	 *  normal character
 	 */
 	if(!(c & (Spec|KF))){
-		if(ctl)
-			if(alt && c == Del)
+		if(kbscan.ctl)
+			if(kbscan.alt && c == Del)
 				exit(0);
-		if(!collecting){
+		if(!kbscan.collecting){
 			kbdputc(kbdq, c);
 			return;
 		}
-		kc[nk++] = c;
-		c = latin1(kc, nk);
+		kbscan.kc[kbscan.nk++] = c;
+		c = latin1(kbscan.kc, kbscan.nk);
 		if(c < -1)	/* need more keystrokes */
 			return;
 		if(c != -1)	/* valid sequence */
 			kbdputc(kbdq, c);
 		else	/* dump characters */
-			for(i=0; i<nk; i++)
-				kbdputc(kbdq, kc[i]);
-		nk = 0;
-		collecting = 0;
+			for(i=0; i<kbscan.nk; i++)
+				kbdputc(kbdq, kbscan.kc[i]);
+		kbscan.nk = 0;
+		kbscan.collecting = 0;
 		return;
 	} else {
 		switch(c){
 		case Caps:
-			caps ^= 1;
+			kbscan.caps ^= 1;
 			return;
 		case Num:
-			num ^= 1;
+			kbscan.num ^= 1;
 			return;
 		case Shift:
-			shift = 1;
+			kbscan.shift = 1;
 			mouseshifted = 1;
 			return;
 		case Latin:
-			alt = 1;
+			kbscan.alt = 1;
 			/*
-			 * VMware uses Ctl-Alt as the key combination
+			 * VMware and Qemu use Ctl-Alt as the key combination
 			 * to make the VM give up keyboard and mouse focus.
 			 * This has the unfortunate side effect that when you
 			 * come back into focus, Plan 9 thinks you want to type
@@ -435,17 +456,25 @@ i8042intr(Ureg*, void*)
 			 * As a clumsy hack around this, we look for ctl-alt
 			 * and don't treat it as the start of a compose sequence.
 			 */
-			if(!ctl){
-				collecting = 1;
-				nk = 0;
+			if(!kbscan.ctl){
+				kbscan.collecting = 1;
+				kbscan.nk = 0;
 			}
 			return;
 		case Ctrl:
-			ctl = 1;
+			kbscan.ctl = 1;
 			return;
 		case Altgr:
-			altgr = 1;
-			collecting = 0;
+			kbscan.altgr = 1;
+			kbscan.collecting = 0;
+			return;
+		case Kmouse|1:
+		case Kmouse|2:
+		case Kmouse|3:
+		case Kmouse|4:
+		case Kmouse|5:
+			kbdbuttons |= 1<<(c-Kmouse-1);
+			mousetrack(0, 0, 0, TK2MS(MACHP(0)->ticks));
 			return;
 		}
 	}

sys/src/9/port/devcons.c

@@ -962,16 +962,12 @@ conswrite(Chan *c, void *va, long n, vlong off)
 		buf[n] = 0;
 		for(a = buf; a;){
 			if(strncmp(a, "rawon", 5) == 0){
-				qlock(&kbd);
 				kbd.raw = 1;
 				/* clumsy hack - wake up reader */
 				ch = 0;
 				qwrite(kbdq, &ch, 1);			
-				qunlock(&kbd);
 			} else if(strncmp(a, "rawoff", 6) == 0){
-				qlock(&kbd);
 				kbd.raw = 0;
-				qunlock(&kbd);
 			} else if(strncmp(a, "ctlpon", 6) == 0){
 				kbd.ctlpoff = 0;
 			} else if(strncmp(a, "ctlpoff", 7) == 0){

sys/src/9/port/devkbmap.c

@@ -118,6 +118,9 @@ kbmapwrite(Chan *c, void *a, long n, vlong)
 					lp = line;
 					continue;
 				}
+				lp = line;
+				while(*lp == ' ' || *lp == '\t')
+					lp++;
 				m = strtoul(line, &lp, 0);
 				key = strtoul(lp, &lp, 0);
 				while(*lp == ' ' || *lp == '\t')
@@ -125,6 +128,14 @@ kbmapwrite(Chan *c, void *a, long n, vlong)
 				r = 0;
 				if(*lp == '\'' && lp[1])
 					chartorune(&r, lp+1);
+				else if(*lp == '^' && lp[1]){
+					chartorune(&r, lp+1);
+					if(0x40 <= r && r < 0x60)
+						r -= 0x40;
+					else
+						error(Ebadarg);
+				}else if(*lp == 'M' && ('1' <= lp[1] && lp[1] <= '5'))
+					r = 0xF900+lp[1]-'0';
 				else if(*lp>='0' && *lp<='9') /* includes 0x... */
 					r = strtoul(lp, &lp, 0);
 				else

sys/src/9/port/devmouse.c

@@ -38,6 +38,8 @@ struct Mouseinfo
 	int	track;		/* dx & dy updated */
 	int	redraw;		/* update cursor on screen */
 	ulong	lastcounter;	/* value when /dev/mouse read */
+	ulong	lastresize;
+	ulong	resize;
 	Rendez	r;
 	Ref;
 	QLock;
@@ -70,6 +72,7 @@ static Cmdtab mousectlmsg[] =
 Mouseinfo	mouse;
 Cursorinfo	cursor;
 int		mouseshifted;
+int		kbdbuttons;
 Cursor		curs;
 
 void	Cursortocursor(Cursor*);
@@ -163,6 +166,7 @@ mouseopen(Chan *c, int omode)
 		}
 		mouse.open = 1;
 		mouse.ref++;
+		mouse.lastresize = mouse.resize;
 		unlock(&mouse);
 		break;
 	case Qmousein:
@@ -286,6 +290,10 @@ mouseread(Chan *c, void *va, long n, vlong off)
 		mouse.lastcounter = m.counter;
 		if(n > 1+4*12)
 			n = 1+4*12;
+		if(mouse.lastresize != mouse.resize){
+			mouse.lastresize = mouse.resize;
+			buf[0] = 'r';
+		}
 		memmove(va, buf, n);
 		return n;
 	}
@@ -561,7 +569,7 @@ mousetrack(int dx, int dy, int b, int msec)
 
 	lastb = mouse.buttons;
 	mouse.xy = Pt(x, y);
-	mouse.buttons = b;
+	mouse.buttons = b|kbdbuttons;
 	mouse.redraw = 1;
 	mouse.counter++;
 	mouse.msec = msec;
@@ -719,7 +727,8 @@ mouseputc(Queue*, int c)
 int
 mousechanged(void*)
 {
-	return mouse.lastcounter != mouse.counter;
+	return mouse.lastcounter != mouse.counter || 
+		mouse.lastresize != mouse.resize;
 }
 
 Point
@@ -737,3 +746,14 @@ mouseaccelerate(int x)
 	else
 		mouse.maxacc = mouse.acceleration;
 }
+
+/*
+ * notify reader that screen has been resized
+ */
+void
+mouseresize(void)
+{
+	mouse.resize++;
+	wakeup(&mouse.r);
+}
+