svn commit: r271095 - in stable/10: etc/defaults etc/rc.d sbin/conscontrol share/man/man4 share/man/man5 share/man/man7 share/man/man8 tools/tools/vt/keymaps usr.bin/lock usr.sbin/bsdconfig usr.sbi...
Stefan Esser
se at FreeBSD.org
Thu Sep 4 13:45:21 UTC 2014
Author: se
Date: Thu Sep 4 13:45:16 2014
New Revision: 271095
URL: http://svnweb.freebsd.org/changeset/base/271095
Log:
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
Modified:
stable/10/etc/defaults/rc.conf
stable/10/etc/rc.d/syscons
stable/10/sbin/conscontrol/conscontrol.8
stable/10/share/man/man4/atkbd.4
stable/10/share/man/man4/kbdmux.4
stable/10/share/man/man4/ukbd.4
stable/10/share/man/man4/vkbd.4
stable/10/share/man/man4/vt.4
stable/10/share/man/man5/rc.conf.5
stable/10/share/man/man7/hier.7
stable/10/share/man/man8/nanobsd.8
stable/10/tools/tools/vt/keymaps/KBDFILES.map
stable/10/tools/tools/vt/keymaps/convert-keymap.pl
stable/10/usr.bin/lock/lock.1
stable/10/usr.sbin/bsdconfig/bsdconfig.8
stable/10/usr.sbin/bsdinstall/bsdinstall.8
stable/10/usr.sbin/kbdcontrol/kbdcontrol.1
stable/10/usr.sbin/kbdcontrol/kbdmap.5
stable/10/usr.sbin/kbdmap/kbdmap.1
stable/10/usr.sbin/vidcontrol/vidcontrol.1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/defaults/rc.conf
==============================================================================
--- stable/10/etc/defaults/rc.conf Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/etc/defaults/rc.conf Thu Sep 4 13:45:16 2014 (r271095)
@@ -524,15 +524,15 @@ ip6addrctl_policy="AUTO" # A pre-defined
##############################################################
keyboard="" # keyboard device to use (default /dev/kbd0).
-keymap="NO" # keymap in /usr/share/syscons/keymaps/* (or NO).
+keymap="NO" # keymap in /usr/share/{syscons,vt}/keymaps/* (or NO).
keyrate="NO" # keyboard rate to: slow, normal, fast (or NO).
keybell="NO" # See kbdcontrol(1) for options. Use "off" to disable.
keychange="NO" # function keys default values (or NO).
cursor="NO" # cursor type {normal|blink|destructive} (or NO).
scrnmap="NO" # screen map in /usr/share/syscons/scrnmaps/* (or NO).
-font8x16="NO" # font 8x16 from /usr/share/syscons/fonts/* (or NO).
-font8x14="NO" # font 8x14 from /usr/share/syscons/fonts/* (or NO).
-font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO).
+font8x16="NO" # font 8x16 from /usr/share/{syscons,vt}/fonts/* (or NO).
+font8x14="NO" # font 8x14 from /usr/share/{syscons,vt}/fonts/* (or NO).
+font8x8="NO" # font 8x8 from /usr/share/{syscons,vt}/fonts/* (or NO).
blanktime="300" # blank time (in seconds) or "NO" to turn it off.
saver="NO" # screen saver: Uses /boot/kernel/${saver}_saver.ko
moused_nondefault_enable="YES" # Treat non-default mice as enabled unless
Modified: stable/10/etc/rc.d/syscons
==============================================================================
--- stable/10/etc/rc.d/syscons Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/etc/rc.d/syscons Thu Sep 4 13:45:16 2014 (r271095)
@@ -45,16 +45,122 @@ stop_cmd=":"
kbddev=/dev/ttyv0
viddev=/dev/ttyv0
-_sc_config="syscons"
+_sc_config=
+_sc_console=
_sc_initdone=
+_sc_keymap_msg=
sc_init()
{
if [ -z "${_sc_initdone}" ]; then
+ if [ -z "${_sc_console}" ]; then
+ if [ x`sysctl -n kern.vty` = x"vt" ]; then
+ _sc_console="vt"
+ else
+ _sc_console="syscons"
+ fi
+ _sc_config="${_sc_console}"
+ fi
echo -n "Configuring ${_sc_config}:"
_sc_initdone=yes
fi
}
+# syscons to vt migration helper
+lookup_keymap_for_vt()
+{
+ keymap=`basename $1 .kbd`
+ case $keymap in
+hy.armscii-8) echo am;;
+be.iso.acc) echo be.acc;;
+be.iso) echo be;;
+bg.bds.ctrlcaps) echo bg.bds;;
+bg.phonetic.ctrlcaps) echo bg.phonetic;;
+br275.iso.acc) echo br;;
+br275.*) echo br.noacc;;
+by.*) echo by;;
+fr_CA.iso.acc) echo ca-fr;;
+swissgerman.macbook.acc) echo ch.macbook.acc;;
+swissgerman.iso.acc) echo ch.acc;;
+swissgerman.*) echo ch;;
+swissfrench.iso.acc) echo ch-fr.acc;;
+swissfrench.*) echo ch-fr;;
+ce.iso2) echo centraleuropean.qwerty;;
+colemak.iso15.acc) echo colemak.acc;;
+cs.*|cz.*) echo cz;;
+german.iso.acc) echo de.acc;;
+german.*) echo de;;
+danish.iso.acc) echo dk.acc;;
+danish.iso.macbook) echo dk.macbook;;
+danish.*) echo dk;;
+estonian.*) echo ee;;
+spanish.dvorak) echo es.dvorak;;
+spanish.iso*.acc) echo es.acc;;
+spanish.iso) echo es;;
+finnish.*) echo fi;;
+fr.macbook.acc) echo fr.macbook;;
+fr.iso.acc) echo fr.acc;;
+fr.iso) echo fr;;
+el.iso07) echo gr;;
+gr.us101.acc) echo gr.101.acc;;
+hr.iso) echo hr;;
+hu.iso2.101keys) echo hu.101;;
+hu.iso2.102keys) echo hu.102;;
+iw.iso8) echo il;;
+icelandic.iso.acc) echo is.acc;;
+icelandic.iso) echo is;;
+it.iso) echo it;;
+jp.106x) echo jp.capsctrl;;
+jp.106) echo jp;;
+#?? jp.pc98.iso) echo jp.pc98;;
+kk.pt154.io) echo kz.io;;
+kk.pt154.kst) echo kz.kst;;
+latinamerican.iso.acc) echo latinamerican.acc;;
+lt.iso4) echo lt;;
+norwegian.iso) echo no;;
+norwegian.dvorak) echo no.dvorak;;
+dutch.iso.acc) echo nl;;
+eee_nordic) echo nordic.asus-eee;;
+pl_PL.dvorak) echo pl.dvorak;;
+pl_PL.ISO8859-2) echo pl;;
+pt.iso.acc) echo pt.acc;;
+pt.iso) echo pt;;
+ru.koi8-r.shift) echo ru.shift;;
+ru.koi8-r.win) echo ru.win;;
+ru.*) echo ru;;
+swedish.*) echo se;;
+si.iso) echo si;;
+sk.iso2) echo sk;;
+tr.iso9.q) echo tr;;
+ua.koi8-u.shift.alt) echo ua.shift.alt;;
+ua.*) echo ua;;
+uk.*-ctrl) echo uk.capsctrl;;
+uk.dvorak) echo uk.dvorak;;
+uk.*) echo uk;;
+us.iso.acc) echo us.acc;;
+us.pc-ctrl) echo us.ctrl;;
+us.iso) echo us;;
+ esac
+}
+
+kbdcontrol_load_keymap()
+{
+ errmsg=`kbdcontrol < ${kbddev} -l ${keymap} 2>&1`
+ if [ -n "${errmsg}" -a "${_sc_console}" = "vt" ]; then
+ _sc_keymap_msg="${errmsg}"
+ keymap_vt=`lookup_keymap_for_vt ${keymap}`
+ if [ -n "${keymap_vt}" ]; then
+ errmsg=`kbdcontrol < ${kbddev} -l ${keymap_vt} 2>&1`
+ if [ -z "${errmsg}" ]; then
+ _sc_keymap_msg="New keymap: In /etc/rc.conf replace 'keymap=${keymap}' by 'keymap=${keymap_vt}'"
+ fi
+ else
+ _sc_keymap_msg="No replacement found for keymap '${keymap}'.
+You may try to convert your keymap file using 'convert-keymap.pl', which is
+part of the system sources and located in /usr/src/tools/tools/vt/keymaps/"
+ fi
+ fi
+}
+
# helper
syscons_configure_keyboard()
{
@@ -65,7 +171,7 @@ syscons_configure_keyboard()
;;
*)
sc_init
- echo -n ' keymap'; kbdcontrol < ${kbddev} -l ${keymap}
+ echo -n ' keymap'; kbdcontrol_load_keymap
;;
esac
@@ -139,10 +245,9 @@ syscons_setkeyboard()
#
if [ -n "${_sc_initdone}" ]; then
echo '.'
- _sc_config="syscons"
+ _sc_config="${_sc_console}"
_sc_initdone=
fi
-
}
syscons_precmd()
@@ -256,6 +361,12 @@ syscons_start()
fi
[ -n "${_sc_initdone}" ] && echo '.'
+ if [ -n "${_sc_keymap_msg}" ]; then
+ echo
+ echo "WARNING:"
+ echo "${_sc_keymap_msg}."
+ echo
+ fi
}
load_rc_config $name
Modified: stable/10/sbin/conscontrol/conscontrol.8
==============================================================================
--- stable/10/sbin/conscontrol/conscontrol.8 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/sbin/conscontrol/conscontrol.8 Thu Sep 4 13:45:16 2014 (r271095)
@@ -104,6 +104,7 @@ This is an interface to the tty ioctl
.Xr sio 4 ,
.Xr syscons 4 ,
.Xr tty 4 ,
+.Xr vt 4 ,
.Xr boot 8 ,
.Xr loader 8
.Sh HISTORY
Modified: stable/10/share/man/man4/atkbd.4
==============================================================================
--- stable/10/share/man/man4/atkbd.4 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man4/atkbd.4 Thu Sep 4 13:45:16 2014 (r271095)
@@ -51,7 +51,9 @@ driver, provides access to the AT 84 key
which is connected to the AT keyboard controller.
.Pp
This driver is required for the console driver
-.Xr syscons 4 .
+.Xr syscons 4
+or
+.Xr vt 4 .
.Pp
There can be only one
.Nm
@@ -211,6 +213,7 @@ In both cases, you also need to have fol
.Xr atkbdc 4 ,
.Xr psm 4 ,
.Xr syscons 4 ,
+.Xr vt 4 ,
.Xr kbdmap 5 ,
.Xr loader 8
.Sh HISTORY
Modified: stable/10/share/man/man4/kbdmux.4
==============================================================================
--- stable/10/share/man/man4/kbdmux.4 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man4/kbdmux.4 Thu Sep 4 13:45:16 2014 (r271095)
@@ -34,7 +34,8 @@ utility.
.Xr kbdcontrol 1 ,
.Xr atkbd 4 ,
.Xr syscons 4 ,
-.Xr ukbd 4
+.Xr ukbd 4 ,
+.Xr vt 4
.Sh HISTORY
The
.Nm
Modified: stable/10/share/man/man4/ukbd.4
==============================================================================
--- stable/10/share/man/man4/ukbd.4 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man4/ukbd.4 Thu Sep 4 13:45:16 2014 (r271095)
@@ -127,7 +127,9 @@ Make the keyboards available through a c
The above lines will put the French ISO keymap in the ukbd driver.
You can specify any keymap in
.Pa /usr/share/syscons/keymaps
-with this option.
+or
+.Pa /usr/share/vt/keymaps
+(depending on the console driver being used) with this option.
.Pp
.D1 Cd "options KBD_DISABLE_KEYMAP_LOADING"
.Pp
@@ -151,6 +153,7 @@ driver to the kernel.
.Xr syscons 4 ,
.Xr uhci 4 ,
.Xr usb 4 ,
+.Xr vt 4 ,
.Xr config 8
.Sh AUTHORS
.An -nosplit
Modified: stable/10/share/man/man4/vkbd.4
==============================================================================
--- stable/10/share/man/man4/vkbd.4 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man4/vkbd.4 Thu Sep 4 13:45:16 2014 (r271095)
@@ -129,7 +129,8 @@ All queued scan codes are thrown away.
.Xr kbdcontrol 1 ,
.Xr atkbdc 4 ,
.Xr psm 4 ,
-.Xr syscons 4
+.Xr syscons 4 ,
+.Xr vt 4
.Sh HISTORY
The
.Nm
Modified: stable/10/share/man/man4/vt.4
==============================================================================
--- stable/10/share/man/man4/vt.4 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man4/vt.4 Thu Sep 4 13:45:16 2014 (r271095)
@@ -197,13 +197,17 @@ If this value is not set,
is used.
.El
.Sh FILES
-.Bl -tag -width /usr/share/syscons/keymaps/* -compact
+.Bl -tag -width /usr/share/vt/keymaps/* -compact
.It Pa /dev/console
.It Pa /dev/consolectl
.It Pa /dev/ttyv*
virtual terminals
.It Pa /etc/ttys
terminal initialization information
+.It Pa /usr/share/vt/fonts/*.fnt
+console fonts
+.It Pa /usr/share/vt/keymaps/*.kbd
+keyboard layouts
.El
.Sh EXAMPLES
This example changes the default color of normal text to green on a
@@ -229,7 +233,6 @@ on a black background, or black on a bri
.Xr splash 4 ,
.Xr syscons 4 ,
.Xr ukbd 4 ,
-.Xr vga 4 ,
.Xr kbdmap 5 ,
.Xr rc.conf 5 ,
.Xr ttys 5 ,
Modified: stable/10/share/man/man5/rc.conf.5
==============================================================================
--- stable/10/share/man/man5/rc.conf.5 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man5/rc.conf.5 Thu Sep 4 13:45:16 2014 (r271095)
@@ -3120,8 +3120,13 @@ set to this device.
If set to
.Dq Li NO ,
no keymap is installed, otherwise the value is used to install
-the keymap file in
-.Pa /usr/share/syscons/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd .
+the keymap file found in
+.Pa /usr/share/syscons/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd
+(if using
+.Xr syscons 4 ) or
+.Pa /usr/share/vt/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd
+(if using
+.Xr vt 4 ) .
.It Va keyrate
.Pq Vt str
The keyboard repeat speed.
@@ -3156,6 +3161,9 @@ If set to
no screen map is installed, otherwise the value is used to install
the screen map file in
.Pa /usr/share/syscons/scrnmaps/ Ns Aq Ar value .
+This parameter is ignored when using
+.Xr vt 4
+as the console driver.
.It Va font8x16
.Pq Vt str
If set to
@@ -3163,7 +3171,9 @@ If set to
the default 8x16 font value is used for screen size requests, otherwise
the value in
.Pa /usr/share/syscons/fonts/ Ns Aq Ar value
-is used.
+or
+.Pa /usr/share/vt/fonts/ Ns Aq Ar value
+is used (depending on the console driver being used).
.It Va font8x14
.Pq Vt str
If set to
@@ -3171,7 +3181,9 @@ If set to
the default 8x14 font value is used for screen size requests, otherwise
the value in
.Pa /usr/share/syscons/fonts/ Ns Aq Ar value
-is used.
+or
+.Pa /usr/share/vt/fonts/ Ns Aq Ar value
+is used (depending on the console driver being used).
.It Va font8x8
.Pq Vt str
If set to
@@ -3179,7 +3191,9 @@ If set to
the default 8x8 font value is used for screen size requests, otherwise
the value in
.Pa /usr/share/syscons/fonts/ Ns Aq Ar value
-is used.
+or
+.Pa /usr/share/vt/fonts/ Ns Aq Ar value
+is used (depending on the console driver being used).
.It Va blanktime
.Pq Vt int
If set to
@@ -3386,6 +3400,8 @@ For example,
.Dq Fl h Li 200
will set the
.Xr syscons 4
+or
+.Xr vt 4
scrollback (history) buffer to 200 lines.
.It Va cron_enable
.Pq Vt bool
Modified: stable/10/share/man/man7/hier.7
==============================================================================
--- stable/10/share/man/man7/hier.7 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man7/hier.7 Thu Sep 4 13:45:16 2014 (r271095)
@@ -640,6 +640,26 @@ timezone configuration information;
see
.Xr tzfile 5
.El
+.It Pa vt/
+files used by vt;
+see
+.Xr vt 4
+.Bl -tag -width ".Pa scrnmaps/" -compact
+.It Pa fonts/
+console fonts;
+see
+.Xr vidcontrol 1
+and
+.Xr vidfont 1
+.It Pa keymaps/
+console keyboard maps;
+see
+.Xr kbdcontrol 1
+and
+.Xr kbdmap 1
+.\" .It Pa scrnmaps/
+.\" console screen maps
+.El
.It Pa src/
.Bx ,
third-party, and/or local source files
Modified: stable/10/share/man/man8/nanobsd.8
==============================================================================
--- stable/10/share/man/man8/nanobsd.8 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/share/man/man8/nanobsd.8 Thu Sep 4 13:45:16 2014 (r271095)
@@ -277,6 +277,8 @@ Disables
.Xr getty 8
on the virtual
.Xr syscons 4
+or
+.Xr vt 4
terminals
.Pq Pa /dev/ttyv*
and enables the use of the first serial port as the system
Modified: stable/10/tools/tools/vt/keymaps/KBDFILES.map
==============================================================================
--- stable/10/tools/tools/vt/keymaps/KBDFILES.map Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/tools/tools/vt/keymaps/KBDFILES.map Thu Sep 4 13:45:16 2014 (r271095)
@@ -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
Modified: stable/10/tools/tools/vt/keymaps/convert-keymap.pl
==============================================================================
--- stable/10/tools/tools/vt/keymaps/convert-keymap.pl Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/tools/tools/vt/keymaps/convert-keymap.pl Thu Sep 4 13:45:16 2014 (r271095)
@@ -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);
}
Modified: stable/10/usr.bin/lock/lock.1
==============================================================================
--- stable/10/usr.bin/lock/lock.1 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.bin/lock/lock.1 Thu Sep 4 13:45:16 2014 (r271095)
@@ -69,11 +69,14 @@ option of
and thus has the same restrictions.
It is only available if the terminal in question is a
.Xr syscons 4
+or
+.Xr vt 4
virtual terminal.
.El
.Sh SEE ALSO
.Xr vidcontrol 1 ,
-.Xr syscons 4
+.Xr syscons 4 ,
+.Xr vt 4
.Sh HISTORY
The
.Nm
Modified: stable/10/usr.sbin/bsdconfig/bsdconfig.8
==============================================================================
--- stable/10/usr.sbin/bsdconfig/bsdconfig.8 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.sbin/bsdconfig/bsdconfig.8 Thu Sep 4 13:45:16 2014 (r271095)
@@ -172,16 +172,27 @@ Shortcut to the Delete menu under the Vi
(startup_rcconf) of startup.
.It Cm startup_rcvar
Shortcut to the Toggle Startup Services menu under startup.
+.\" use neutral name, e.g. console_keymap instead of syscons_keymap?
+.\" font (encoding) selection not applicable to vt(4)!
.It Cm syscons_font
Shortcut to the Font menu under console.
+.\" .It Cm console_keymap
+.\" Shortcut to the Keymap menu under console.
.It Cm syscons_keymap
Shortcut to the Keymap menu under console.
+.\" .It Cm vt_repeat
+.\" Shortcut to the Repeat menu under console.
.It Cm syscons_repeat
Shortcut to the Repeat menu under console.
+.\" .It Cm vt_saver
+.\" Shortcut to the Saver menu under console.
.It Cm syscons_saver
Shortcut to the Saver menu under console.
+.\" screenmap (encoding) selection not applicable to vt(4)!
.It Cm syscons_screenmap
Shortcut to the Screenmap menu under console.
+.\" .It Cm vt_syscons_ttys
+.\" Shortcut to the Ttys menu under console.
.It Cm syscons_ttys
Shortcut to the Ttys menu under console.
.It Cm timezone
Modified: stable/10/usr.sbin/bsdinstall/bsdinstall.8
==============================================================================
--- stable/10/usr.sbin/bsdinstall/bsdinstall.8 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.sbin/bsdinstall/bsdinstall.8 Thu Sep 4 13:45:16 2014 (r271095)
@@ -95,6 +95,8 @@ for more information on this target.
.It Cm keymap
If the current controlling TTY is a
.Xr syscons 4
+or
+.Xr vt 4
console, asks the user to set the current keymap, and saves the result to the
new system's
.Pa rc.conf .
Modified: stable/10/usr.sbin/kbdcontrol/kbdcontrol.1
==============================================================================
--- stable/10/usr.sbin/kbdcontrol/kbdcontrol.1 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.sbin/kbdcontrol/kbdcontrol.1 Thu Sep 4 13:45:16 2014 (r271095)
@@ -1,5 +1,5 @@
.\"
-.\" kbdcontrol - a utility for manipulating the syscons keyboard driver section
+.\" kbdcontrol - a utility for manipulating the syscons or vt keyboard driver section
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -41,6 +41,8 @@ The
.Nm
command is used to set various keyboard related options for the
.Xr syscons 4
+or
+.Xr vt 4
console driver and the keyboard drivers,
such as key map, keyboard repeat and delay rates, bell
characteristics etc.
@@ -213,7 +215,9 @@ for details.
.Sh FILES
.Bl -tag -width /usr/share/syscons/keymaps/foo_bar -compact
.It Pa /usr/share/syscons/keymaps/*
-keyboard map files
+keyboard map files for syscons
+.It Pa /usr/share/vt/keymaps/*
+keyboard map files for vt
.El
.Sh EXAMPLES
The following command will load the keyboard map file
@@ -222,9 +226,19 @@ The following command will load the keyb
.Dl kbdcontrol -l /usr/share/syscons/keymaps/ru.koi8-r.kbd
.Pp
So long as the keyboard map file resides in
-.Pa /usr/share/syscons/keymaps ,
+.Pa /usr/share/syscons/keymaps
+(if using
+.Xr syscons 4 ) or
+.Pa /usr/share/vt/keymaps
+(if using
+.Xr vt 4 ) ,
you may abbreviate the file name as
.Pa ru.koi8-r .
+Since
+.Xr vt 4
+uses Unicode, the corresponding keyboard file names omit the encoding
+and typically are just a country code, e.g.\&
+.Pa ru .
.Pp
.Dl kbdcontrol -l ru.koi8-r
.Pp
@@ -268,6 +282,7 @@ kbdcontrol -k /dev/kbdmux0 < /dev/consol
.Xr screen 4 ,
.Xr syscons 4 ,
.Xr ukbd 4 ,
+.Xr vt 4 ,
.Xr kbdmap 5 ,
.Xr rc.conf 5
.Sh AUTHORS
Modified: stable/10/usr.sbin/kbdcontrol/kbdmap.5
==============================================================================
--- stable/10/usr.sbin/kbdcontrol/kbdmap.5 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.sbin/kbdcontrol/kbdmap.5 Thu Sep 4 13:45:16 2014 (r271095)
@@ -313,13 +313,16 @@ for that vowel with a grave accent.
.Sh FILES
.Bl -tag -width /usr/share/syscons/keymaps/* -compact
.It Pa /usr/share/syscons/keymaps/*
-standard keyboard map files
+standard keyboard map files for syscons
+.It Pa /usr/share/vt/keymaps/*
+standard keyboard map files for vt
.El
.Sh SEE ALSO
.Xr kbdcontrol 1 ,
.Xr kbdmap 1 ,
.Xr keyboard 4 ,
.Xr syscons 4 ,
+.Xr vt 4 ,
.Xr ascii 7
.Sh HISTORY
This manual page first appeared in
Modified: stable/10/usr.sbin/kbdmap/kbdmap.1
==============================================================================
--- stable/10/usr.sbin/kbdmap/kbdmap.1 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.sbin/kbdmap/kbdmap.1 Thu Sep 4 13:45:16 2014 (r271095)
@@ -29,7 +29,7 @@
.Sh NAME
.Nm kbdmap ,
.Nm vidfont
-.Nd front end for syscons
+.Nd front end for syscons and vt
.Sh SYNOPSIS
.Nm
.Op Fl K
@@ -106,8 +106,10 @@ preferred language
.Sh FILES
.Bl -tag -width ".Pa /usr/share/syscons/keymaps/INDEX.keymaps" -compact
.It Pa /usr/share/syscons/keymaps/INDEX.keymaps
+.It Pa /usr/share/vt/keymaps/INDEX.keymaps
database for keymaps
.It Pa /usr/share/syscons/fonts/INDEX.fonts
+.It Pa /usr/share/vt/fonts/INDEX.fonts
database for fonts
.It Pa /etc/rc.conf
default font
@@ -120,6 +122,8 @@ values
.Xr dialog 1 ,
.Xr kbdcontrol 1 ,
.Xr vidcontrol 1 ,
+.Xr syscons 4 ,
+.Xr vt 4 ,
.Xr kbdmap 5 ,
.Xr rc.conf 5
.Sh HISTORY
Modified: stable/10/usr.sbin/vidcontrol/vidcontrol.1
==============================================================================
--- stable/10/usr.sbin/vidcontrol/vidcontrol.1 Thu Sep 4 13:13:42 2014 (r271094)
+++ stable/10/usr.sbin/vidcontrol/vidcontrol.1 Thu Sep 4 13:45:16 2014 (r271095)
@@ -1,5 +1,5 @@
.\"
-.\" vidcontrol - a utility for manipulating the syscons video driver
+.\" vidcontrol - a utility for manipulating the syscons or vt video driver
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -48,9 +48,15 @@ The
.Nm
utility is used to set various options for the
.Xr syscons 4
+or
+.Xr vt 4
console driver,
such as video mode, colors, cursor shape, screen output map, font and screen
saver timeout.
+Only a small subset of options is supported by
+.Xr vt 4 .
+Unsupported options lead to error messages, typically including
+the text "Inappropriate ioctl for device".
.Pp
The following command line options are supported:
.Bl -tag -width indent
@@ -158,8 +164,11 @@ See also
.Sx Video Mode Support
and
.Sx EXAMPLES
-below and the man page for
-.Xr syscons 4 .
+below and the man page for either
+.Xr syscons 4
+or
+.Xr vt 4
+(depending on which driver you use).
.It Fl g Ar geometry
Set the
.Ar geometry
@@ -185,7 +194,10 @@ Shows the possible video modes with the
Install screen output map file from
.Ar screen_map .
See also
-.Xr syscons 4 .
+.Xr syscons 4
+or
+.Xr vt 4
+(depending on which driver you use).
.It Fl L
Install default screen output map.
.It Fl M Ar char
@@ -307,12 +319,18 @@ kernel with the
option.
See
.Xr syscons 4
+or
+.Xr vt 4
+(depending on which driver you use)
for more details on this kernel option.
.Ss Format of Video Buffer Dump
The
.Nm
utility uses the
.Xr syscons 4
+.\" is it supported on vt(4)???
+or
+.Xr vt 4
.Dv CONS_SCRSHOT
.Xr ioctl 2
to capture the current contents of the video buffer.
@@ -453,9 +471,12 @@ for details.
.Sh FILES
.Bl -tag -width /usr/share/syscons/scrnmaps/foo-bar -compact
.It Pa /usr/share/syscons/fonts/*
+.It Pa /usr/share/vt/fonts/*
font files.
.It Pa /usr/share/syscons/scrnmaps/*
-screen output map files.
+screen output map files (relevant for
+.Xr syscons 4
+only).
.El
.Sh EXAMPLES
If you want to load
@@ -467,7 +488,10 @@ as:
.Dl vidcontrol -f 8x16 /usr/share/syscons/fonts/iso-8x16.fnt
.Pp
So long as the font file is in
-.Pa /usr/share/syscons/fonts ,
+.Pa /usr/share/syscons/fonts
+(if using syscons) or
+.Pa /usr/share/vt/fonts
+(if using vt),
you may abbreviate the file name as
.Pa iso-8x16 :
.Pp
@@ -521,6 +545,7 @@ to the standard output in the human read
.Xr screen 4 ,
.Xr syscons 4 ,
.Xr vga 4 ,
+.Xr vt 4 ,
.Xr rc.conf 5 ,
.Xr kldload 8 ,
.Xr moused 8 ,
More information about the svn-src-all
mailing list