summaryrefslogtreecommitdiff
path: root/sys/dev/pckbc
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/dev/pckbc
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/dev/pckbc')
-rw-r--r--sys/dev/pckbc/pckbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index 7971119d4b9..59906a824c7 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbd.c,v 1.34 2013/02/15 10:20:07 ratchov Exp $ */
+/* $OpenBSD: pckbd.c,v 1.35 2014/01/26 17:48:08 miod Exp $ */
/* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -157,7 +157,7 @@ const struct wskbd_mapdata pckbd_keymapdata = {
#ifdef PCKBD_LAYOUT
PCKBD_LAYOUT,
#else
- KB_US,
+ KB_US | KB_DEFAULT,
#endif
};