[src/trunk]: src Move description of keyboard layouts to wskbd.4, add newer l...

[nia <nia%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4bc70993e6a9
branches:  trunk
changeset: 973803:4bc70993e6a9
user:      nia <nia%NetBSD.org@localhost>
date:      Mon Jul 13 11:14:12 2020 +0000

description:
Move description of keyboard layouts to wskbd.4, add newer layouts

Previously, the best reference was pckbd.4. This does not make much
sense to read if you are on, say, an evbarm device with only USB.

wsconsctl.8 contained a vaguer description of supported language names,
which isn't very useful because you can't pass full language names
to the command. Point readers to wskbd.4 instead.

Note in the wskbd.4 page that while all layouts are generally supported
by pckbd(4) and ukbd(4), older keyboard interfaces might only support
a subset.

diffstat:

 sbin/wsconsctl/wsconsctl.8 |  15 ++-----
 share/man/man4/pckbd.4     |  88 +--------------------------------------------
 share/man/man4/wskbd.4     |  88 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 98 deletions(-)

diffs (277 lines):

diff -r b57e839dc397 -r 4bc70993e6a9 sbin/wsconsctl/wsconsctl.8
--- a/sbin/wsconsctl/wsconsctl.8        Mon Jul 13 10:46:10 2020 +0000
+++ b/sbin/wsconsctl/wsconsctl.8        Mon Jul 13 11:14:12 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsconsctl.8,v 1.29 2020/07/12 03:37:06 nia Exp $
+.\" $NetBSD: wsconsctl.8,v 1.30 2020/07/13 11:14:12 nia Exp $
 .\"
 .\" Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"/
-.Dd July 12, 2020
+.Dd July 13, 2020
 .Dt WSCONSCTL 8
 .Os
 .Sh NAME
@@ -114,13 +114,6 @@
 There are also definitions relating to video control and cursor
 control, which are not applicable to all display types, and to text
 emulation and graphics (mapped) modes.
-.Pp
-In addition to British, US, and US-Dvorak keyboard encodings,
-support currently exists for the following languages: Belgian,
-Brazilian, Danish, Finnish, French, German, Greek, Hungarian,
-Italian, Japanese, Norwegian, Polish, Portuguese, Russian, Spanish,
-Swedish, Swiss, Turkish, and Ukrainian.
-Additionally, a user-defined encoding is supported.
 .Sh FILES
 .Bl -tag -width /dev/wsmouse
 .It Pa /dev/wskbd
@@ -138,6 +131,8 @@
 .Dl wsconsctl -w encoding=uk
 .Pp
 Set a UK keyboard encoding.
+For a full list of supported keyboard encodings, see
+.Xr wskbd 4 .
 .Pp
 .Dl wsconsctl -w map+="keysym Caps_Lock = Control_L"
 .Pp
@@ -201,8 +196,8 @@
 .Dv Cmd_ScrollSlowUp
 defined in your keyboard map.
 .Sh SEE ALSO
-.Xr pckbd 4 ,
 .Xr wscons 4 ,
+.Xr wskbd 4 ,
 .Xr wscons.conf 5 ,
 .Xr wsconscfg 8 ,
 .Xr wsfontload 8
diff -r b57e839dc397 -r 4bc70993e6a9 share/man/man4/pckbd.4
--- a/share/man/man4/pckbd.4    Mon Jul 13 10:46:10 2020 +0000
+++ b/share/man/man4/pckbd.4    Mon Jul 13 11:14:12 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pckbd.4,v 1.24 2020/07/13 08:59:34 wiz Exp $
+.\" $NetBSD: pckbd.4,v 1.25 2020/07/13 11:14:12 nia Exp $
 .\"
 .\" Copyright (c) 1999
 .\"    Matthias Drochner.  All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 12, 2020
+.Dd July 13, 2020
 .Dt PCKBD 4
 .Os
 .Sh NAME
@@ -56,87 +56,6 @@
 at runtime.
 Other mappings can be used if the whole keymap is replaced by means of
 .Xr wsconsctl 8 .
-The builtin mappings are at this time:
-.Bl -column " KB_US|KB_COLEMAK" "wsconsctl" "language"
-.It Sy "option" Ta Sy "wsconsctl" Ta Sy "language"
-.It Li KB_US Ta us Ta English/US keyboard mapping (default)
-.It Li KB_UK Ta uk Ta English/UK keyboard mapping
-.It Li KB_BE Ta be Ta Belgian
-.It Li KB_BR Ta br Ta Brazilian with
-.Dq dead accents
-.It Li KB_CZ Ta cz Ta Czech (QWERTY)
-.It Li KB_DK Ta dk Ta Danish with
-.Dq dead accents
-.It Li KB_NL Ta nl Ta Dutch
-.It Li KB_FI Ta fi Ta Finnish
-.It Li KB_FR Ta fr Ta French
-.It Li KB_DE Ta de Ta German with
-.Dq dead accents
-.It Li KB_GR Ta gr Ta Greek
-.It Li KB_HU Ta hu Ta Hungarian
-.It Li KB_IT Ta it Ta Italian
-.It Li KB_JP Ta jp Ta Japanese
-.It Li KB_NO Ta no Ta Norwegian with
-.Dq dead accents
-.It Li KB_PL Ta pl Ta Polish
-.It Li KB_PT Ta pt Ta Portuguese
-.It Li KB_RU Ta ru Ta Russian
-.It Li KB_ES Ta es Ta Spanish
-.It Li KB_SV Ta sv Ta Swedish with
-.Dq dead accents
-.It Li KB_SF Ta sf Ta Swiss French
-.It Li KB_SG Ta sg Ta Swiss German
-.It Li KB_TR Ta tr Ta Turkish with
-.Dq dead accents
-.It Li KB_UA Ta ua Ta Ukrainian
-.It Li "KB_US|KB_DECLK" Ta \&us.declk Ta English/US mapping for Tn DEC
-.It Ta Ta LK400-style keyboards with PC keyboard
-.It Ta Ta interface (e.g., LK461)
-.It Li "KB_US|KB_DVORAK" Ta us.dvorak Ta English/US keyboard with
-.It Ta Ta Do Dvorak Dc layout
-.It Li "KB_US|KB_COLEMAK" Ta us.colemak Ta English/US keyboard with
-.It Ta Ta Do Colemak Dc layout
-.El
-.Pp
-The
-.Li KB_BR ,
-.Li KB_DE ,
-.Li KB_DK ,
-.Li KB_NO ,
-.Li KB_NL ,
-.Li KB_SF ,
-.Li KB_SG ,
-.Li KB_SV ,
-and
-.Li KB_TR
-mappings can be used in the
-.Li KB_NODEAD (
-.Dq .nodead )
-variant.
-This switches off the
-.Dq dead accents .
-.Pp
-The
-.Li KB_US ,
-.Li KB_UK ,
-.Li KB_FR ,
-.Li KB_JP
-and
-.Li KB_US|KB_DVORAK
-mappings can be modified
-to swap the left CTRL and the CAPS LOCK keys by the
-.Li KB_SWAPCTRLCAPS
-variant bit or the
-.Dq .swapctrlcaps
-suffix.
-.Pp
-The
-.Li KB_METAESC (
-.Dq .metaesc )
-option can be applied to any layout.
-If set, keys pressed together
-with the ALT modifier are prefixed by an ESC character.
-(Standard behaviour is to add 128 to the ASCII value.)
 .Pp
 Because PC keyboard hardware doesn't contain a beeper, requests for
 .Dq keyboard beeps
@@ -162,6 +81,3 @@
 .Xr pcppi 4 ,
 .Xr wskbd 4 ,
 .Xr wsconsctl 8
-.Sh BUGS
-The list of builtin mappings doesn't follow any logic.
-It grew as people submitted what they needed.
diff -r b57e839dc397 -r 4bc70993e6a9 share/man/man4/wskbd.4
--- a/share/man/man4/wskbd.4    Mon Jul 13 10:46:10 2020 +0000
+++ b/share/man/man4/wskbd.4    Mon Jul 13 11:14:12 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wskbd.4,v 1.17 2019/08/12 11:11:28 nia Exp $
+.\" $NetBSD: wskbd.4,v 1.18 2020/07/13 11:14:12 nia Exp $
 .\"
 .\" Copyright (c) 1999
 .\"    Matthias Drochner.  All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 27, 2012
+.Dd July 13, 2020
 .Dt WSKBD 4
 .Os
 .Sh NAME
@@ -114,6 +114,87 @@
 (The console device selection in early system startup is not influenced.)
 This way, the console device can be connected to a known
 wskbd device instance.
+.Ss Keyboard encodings
+The following encodings are supported.
+Device drivers for legacy keyboard interfaces may only support a subset
+of these.
+However, generally, all encodings are supported by 
+.Xr pckbd 4 and
+.Xr ukbd 4 .
+.Bl -column " us.colemak" " KB_US|KB_COLEMAK" "language"
+.It Sy "wsconsctl" Ta Sy "define" Ta Sy "language"
+.It Li user Ta KB_USER Ta User-defined
+.It Li us Ta KB_US Ta English/US keyboard mapping (default)
+.It Li uk Ta KB_UK Ta English/UK keyboard mapping
+.It Li be Ta KB_BE Ta Belgian
+.It Li br Ta KB_BR Ta Brazilian with
+.Dq dead accents
+.It Li cf Ta KB_CF Ta Canadian French
+.It Li cz Ta KB_CZ Ta Czech (QWERTY)
+.It Li dk Ta KB_DK Ta Danish with
+.Dq dead accents
+.It Li nl Ta KB_NL Ta Dutch
+.It Li ee Ta KB_DK Ta Estonian with
+.Dq dead accents
+.It Li fi Ta KB_FI Ta Finnish
+.It Li fr Ta KB_FR Ta French
+.It Li de Ta KB_DE Ta German with
+.Dq dead accents
+.It Li gr Ta KB_GR Ta Greek
+.It Li hu Ta KB_HU Ta Hungarian
+.It Li is Ta KB_IS Ta Icelandic with
+.Dq dead accents
+.It Li it Ta KB_IT Ta Italian
+.It Li jp Ta KB_JP Ta Japanese
+.It Li no Ta KB_NO Ta Norwegian with
+.Dq dead accents
+.It Li pl Ta KB_PL Ta Polish
+.It Li pt Ta KB_PT Ta Portuguese
+.It Li ru Ta KB_RU Ta Russian
+.It Li es Ta KB_ES Ta Spanish
+.It Li sv Ta KB_SV Ta Swedish with
+.Dq dead accents
+.It Li sf Ta KB_SF Ta Swiss French
+.It Li sg Ta KB_SG Ta Swiss German
+.It Li tr Ta KB_TR Ta Turkish (QWERTY) with
+.Dq dead accents
+.It Li ua Ta KB_UA Ta Ukrainian
+.It Li \&us.declk Ta "KB_US|KB_DECLK" Ta English/US mapping for Tn DEC
+.It Ta Ta LK400-style keyboards with PC keyboard
+.It Ta Ta interface (e.g., LK461)
+.It Li us.dvorak Ta "KB_US|KB_DVORAK" Ta English/US keyboard with
+.It Ta Ta Do Dvorak Dc layout
+.It Li us.colemak Ta "KB_US|KB_COLEMAK" Ta English/US keyboard with
+.It Ta Ta Do Colemak Dc layout
+.El
+.Pp
+.Li KB_NODEAD (
+.Dq .nodead )
+can be applied to layouts with
+.Dq dead accents
+to switch them off.
+.Pp
+The
+.Li KB_US ,
+.Li KB_UK ,
+.Li KB_FR ,
+.Li KB_JP
+and
+.Li KB_US|KB_DVORAK
+mappings can be modified
+to swap the left CTRL and the CAPS LOCK keys by the
+.Li KB_SWAPCTRLCAPS
+variant bit or the
+.Dq .swapctrlcaps
+suffix.
+.Pp
+The
+.Li KB_METAESC (
+.Dq .metaesc )
+option can be applied to any layout.
+If set, keys pressed together
+with the ALT modifier are prefixed by an ESC character.
+(Standard behaviour is to add 128 to the ASCII value.)
 .Ss Ioctls
 The following
 .Xr ioctl 2
@@ -169,3 +250,6 @@
 .Xr wsmux 4 ,
 .Xr wsconsctl 8 ,
 .Xr wskbd 9
+.Sh BUGS
+The list of builtin mappings doesn't follow any logic.
+It grew as people submitted what they needed.