summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-07-13 14:22:47 +0000
committermartin <martin@NetBSD.org>2020-07-13 14:22:47 +0000
commitc788d4d3d78019ade80986975ae9196d10efa09c (patch)
treedaa7609ffc05151c8edfe01b9fefc7521d6cc826 /sbin
parent9d8314cb33ed7de63c0af9c85e023e69f3f5f6a7 (diff)
Pull up following revision(s) (requested by nia in ticket #1002):
sys/dev/wscons/wsksymdef.h: revision 1.68 sys/dev/wscons/wsksymdef.h: revision 1.69 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.28 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.29 sys/dev/hid/hidkbdmap.c: revision 1.10 share/man/man4/pckbd.4: revision 1.23 share/man/man4/wskbd.4: revision 1.18 share/man/man4/wskbd.4: revision 1.19 share/man/man4/pckbd.4: revision 1.25 sys/dev/wscons/wsksymdef.h: revision 1.70 sys/dev/wscons/wsksymdef.h: revision 1.71 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.30 sys/dev/wscons/wsksymdef.h: revision 1.72 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.31 sys/dev/wscons/wsksymdef.h: revision 1.73 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.32 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.33 sys/dev/hid/hidkbdmap.c: revision 1.4 sbin/wsconsctl/wsconsctl.8: revision 1.30 sys/dev/hid/hidkbdmap.c: revision 1.5 etc/wscons.conf: revision 1.20 sys/dev/hid/hidkbdmap.c: revision 1.6 etc/wscons.conf: revision 1.21 sys/dev/hid/hidkbdmap.c: revision 1.7 sys/dev/hid/hidkbdmap.c: revision 1.8 sys/dev/hid/hidkbdmap.c: revision 1.9 Add support for the Brazilian keyboard layout to pckbd and ukbd. This is significantly different from the European Portugese layout, and was pieced together from Wikipedia, X11 layout files, and to some extent with trial and error. Thanks to lun-4 for helping test this. PR kern/44570 Update lists of keyboard layouts to add Turkish and Brazilian Bring br.nodead closer to X11 Add Estonian layout as a variation of Swedish for ukbd and pckbd Add KB_TR for uhid keyboards (it was PS/2 only, this seems wrong) Add Icelandic keyboard layout to ukbd/pckbd. Add keyboard layout for Latin American Spanish to ukbd/pckbd Canadian French keyboard layout for ukbd/pckbd Clarify that KB_TR is the "Q" layout - there's two standards for Turkish. 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. wskbd.4: Add KB_LA Point readers at wskbd.4
Diffstat (limited to 'sbin')
-rw-r--r--sbin/wsconsctl/wsconsctl.814
1 files changed, 5 insertions, 9 deletions
diff --git a/sbin/wsconsctl/wsconsctl.8 b/sbin/wsconsctl/wsconsctl.8
index 0458067f4a2..6bb22ac51f9 100644
--- a/sbin/wsconsctl/wsconsctl.8
+++ b/sbin/wsconsctl/wsconsctl.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsconsctl.8,v 1.28 2012/02/14 11:05:32 wiz Exp $
+.\" $NetBSD: wsconsctl.8,v 1.28.42.1 2020/07/13 14:22:47 martin 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 June 9, 2009
++.Dd July 13, 2020
.Dt WSCONSCTL 8
.Os
.Sh NAME
@@ -114,12 +114,6 @@ file.
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, Danish, Finnish,
-French, German, Greek, Hungarian, Italian, Japanese, Norwegian, Polish,
-Portuguese, Russian, Spanish, Swedish, Swiss, and Ukrainian.
-Additionally, a user-defined encoding is supported.
.Sh FILES
.Bl -tag -width /dev/wsmouse
.It Pa /dev/wskbd
@@ -137,6 +131,8 @@ and its functionality.
.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
@@ -200,8 +196,8 @@ and
.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