summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorse <se@FreeBSD.org>2014-09-04 13:45:16 +0000
committerse <se@FreeBSD.org>2014-09-04 13:45:16 +0000
commit395db98c3cd48ed51cc70fcf46eed6bc40d7ff01 (patch)
tree85117772d5902447e7ca72f63e84c664a1e0252c /tools
parentb97bfa455f6b5d7bcba95d6ae11350cc33b05c5e (diff)
downloadFreeBSD-src-395db98c3cd48ed51cc70fcf46eed6bc40d7ff01.zip
FreeBSD-src-395db98c3cd48ed51cc70fcf46eed6bc40d7ff01.tar.gz
MFC r270647: Add references to vt(4) and the configuration files in /usr/sha
MFC r270653: Update man-pages to correctly refer to changed pathes and namin MFC r270657: More man pages that need to know about vt in addition to syscon MFC r270659: (by pluknet@) Missed comma. MFC r270660: Back-out the references to vt(4) from this man-page. It appears MFC r270933: Add references to vt(4) to further man-pages. MFC r270934: Final patches to the tools used to convert syscons keymaps for MFC r270935: Add vt(4) support to the console initialisation script, specifi Second batch of MFCs to add support for Unicode keymaps for use with vt(4). It contains the following changes: - Add references to vt(4) to relevant man-pages. - Update comment in defaults/rc.conf to mention vt - Update rc.d/syscons to warn about syscons keymaps used under vt. An attempt is made to identify the vt keymap to load instead. - Minor changes to the conversion tool based on mail comments on keymaps. Relnotes: yes
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/vt/keymaps/KBDFILES.map2
-rwxr-xr-xtools/tools/vt/keymaps/convert-keymap.pl6
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/tools/vt/keymaps/KBDFILES.map b/tools/tools/vt/keymaps/KBDFILES.map
index 4494b85..24b90a7 100644
--- a/tools/tools/vt/keymaps/KBDFILES.map
+++ b/tools/tools/vt/keymaps/KBDFILES.map
@@ -144,6 +144,6 @@ ISO8859-1 us.emacs.kbd us.emacs.kbd
ISO8859-1 us.pc-ctrl.kbd us.ctrl.kbd
ISO8859-1 us.unix.kbd us.unix.kbd
-ISO8859-5 ua.iso5.kbd ua.kbd.from-iso5
+#ISO8859-5 ua.iso5.kbd ua.kbd.from-iso5
KOI8-U ua.koi8-u.kbd ua.kbd
KOI8-U ua.koi8-u.shift.alt.kbd ua.shift.alt.kbd
diff --git a/tools/tools/vt/keymaps/convert-keymap.pl b/tools/tools/vt/keymaps/convert-keymap.pl
index 778ae10..9c7f3ed 100755
--- a/tools/tools/vt/keymaps/convert-keymap.pl
+++ b/tools/tools/vt/keymaps/convert-keymap.pl
@@ -7,7 +7,7 @@ use strict;
use utf8;
# command line parsing
-die "Usage: $0 filename.kbd CHARSET [EURO]"
+die "Usage: $0 filename.kbd charset [EURO|YEN]\n"
unless ($ARGV[1]);
my $inputfile = shift; # first command argument
@@ -60,8 +60,8 @@ sub local_to_UCS_code
$ucs_char = 0xa5 # replace with Jap. Yen character on PC kbd
if $ucs_char == ord('\\') and $use_yen and $current_scancode == 125;
- $ucs_char = 0xa5 # replace with Jap. Yen character on PC98x1 kbd
- if $ucs_char == ord('\\') and $use_yen and $current_scancode == 13;
+# $ucs_char = 0xa5 # replace with Jap. Yen character on PC98x1 kbd
+# if $ucs_char == ord('\\') and $use_yen and $current_scancode == 13;
return prettyprint_token($ucs_char);
}
OpenPOWER on IntegriCloud