summaryrefslogtreecommitdiff
path: root/sys/arch/sgi/hpc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-01-26 17:48:09 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-01-26 17:48:09 +0000
commit35a3a139adea42c4c20e238b0d4ea37da355141e (patch)
tree99a326bc88f8c40d0263a63fb9d0fcffc77957d5 /sys/arch/sgi/hpc
parent535d4a7abde2f69d9922ec3e33c3d7786c26e67c (diff)
Attempt to make user changes of keyboard layout a bit more `sticky' on wsmux
kernels: - keyboard drivers will now tell wskbd if the keyboard layout they ask for is a default value, or a value they are 100% sure of (either because your kernel has a XXXKBD_LAYOUT option, or because the driver can tell the keyboard layout, e.g. by the country code on USB keyboards which provide it, such as Sun's) - when attaching a keyboard with a non-default layout, the layout will become the default layout of the mux for new keyboard attachments if the mux doesn't have a layout set already. - when changing the keyboard layout of a particular keyboard with an ioctl (i.e. using kbd(8) or wsconsctl(8)), the layout will become the default layout of the mux for new keyboard attachments. ok mpi@
Diffstat (limited to 'sys/arch/sgi/hpc')
-rw-r--r--sys/arch/sgi/hpc/z8530kbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/sgi/hpc/z8530kbd.c b/sys/arch/sgi/hpc/z8530kbd.c
index 1fcb0162ca6..b671cb99578 100644
--- a/sys/arch/sgi/hpc/z8530kbd.c
+++ b/sys/arch/sgi/hpc/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.4 2012/04/29 09:01:38 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.5 2014/01/26 17:48:07 miod Exp $ */
/* $NetBSD: zs_kbd.c,v 1.8 2008/03/29 19:15:35 tsutsui Exp $ */
/*
@@ -163,7 +163,7 @@ static struct zsops zskbd_zsops = {
extern const struct wscons_keydesc wssgi_keydesctab[];
const struct wskbd_mapdata sgikbd_wskbd_keymapdata = {
wssgi_keydesctab,
- KB_US
+ KB_US | KB_DEFAULT
};
const struct wskbd_accessops zskbd_wskbd_accessops = {