[src/trunk]: src/etc Add support for selection of a kernel builtin keymap and...

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

details:   https://anonhg.NetBSD.org/src/rev/cd4bb783bcd3
branches:  trunk
changeset: 509375:cd4bb783bcd3
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed May 02 15:14:02 2001 +0000

description:
Add support for selection of a kernel builtin keymap and/or a userspace
keymap file to wscons.conf.
Follows PR misc/12760 by Stephen Borrill, but uses the external keymap
file instead of individual key entries in wscons.conf. This saves a lot
of editing work if the map has to be switched.

diffstat:

 etc/rc.d/wscons |  25 ++++++++++++++++++++++++-
 etc/wscons.conf |  14 +++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diffs (74 lines):

diff -r 99bf5cbc1c1a -r cd4bb783bcd3 etc/rc.d/wscons
--- a/etc/rc.d/wscons   Wed May 02 15:08:35 2001 +0000
+++ b/etc/rc.d/wscons   Wed May 02 15:14:02 2001 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: wscons,v 1.6 2000/09/19 13:04:39 lukem Exp $
+# $NetBSD: wscons,v 1.7 2001/05/02 15:14:03 drochner Exp $
 #
 
 # PROVIDE: wscons
@@ -17,6 +17,7 @@
 {
        wscfg=/usr/sbin/wsconscfg
        wsfld=/usr/sbin/wsfontload
+       wsctl=/sbin/wsconsctl
        config=/etc/wscons.conf
        usage="Usage: wsconfig [-n] [-f configfile] [-font fontpgm] [-screen screenpgm]"
        DOIT=
@@ -123,6 +124,28 @@
                                esac
                                eval $DOIT $cmd
                                ;;
+                       encoding)
+                               map=$arg1
+                               cmd=$wsctl
+                               cmd="$cmd -w \"encoding=$map\""
+                               eval $DOIT $cmd
+                               ;;
+                       mapfile)
+                               mapfile=$arg1
+                               ( while read entry; do
+                                   case "$entry" in
+                                       \#*|"")
+                                           continue
+                                           ;;
+                                       *)
+                                           cmd=$wsctl
+                                           cmd="$cmd -w \"map+=$entry\""
+                                           cmd="$cmd >/dev/null"
+                                           eval $DOIT $cmd
+                                           ;;
+                                   esac
+                               done ) < $mapfile
+                               ;;
                        mux)
                                cmd="$wscfg -m $arg1"
                                eval $DOIT $cmd
diff -r 99bf5cbc1c1a -r cd4bb783bcd3 etc/wscons.conf
--- a/etc/wscons.conf   Wed May 02 15:08:35 2001 +0000
+++ b/etc/wscons.conf   Wed May 02 15:14:02 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: wscons.conf,v 1.7 2000/12/31 01:22:14 david Exp $
+#      $NetBSD: wscons.conf,v 1.8 2001/05/02 15:14:02 drochner Exp $
 #
 # workstation console configuration
 
@@ -27,4 +27,16 @@
 #screen        5       80x50   vt100
 
 #keyboard      auto
+
+# Select a kernel builtin keyboard map by uncommenting the following line and
+# altering the country code to your requirements
+# (choose from user, us, uk, de, dk, it, fr, uk, jp, sv, no, es).
+# See wsconsctl(8), pckbd(4), ukbd(4) etc. for more details.
+#encoding sv
+
+# Redefine individual keys from a file containing "keysym" and/or "keycode"
+# entries.
+# See wsconsctl(8) for more details.
+#mapfile /usr/share/wscons/keymaps/pckbd.sv.svascii
+
 mux            1