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@

1 files changed, 11 insertions, 10 deletions

diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h
index b1abb46f393..9570da68ca9 100644
--- a/sys/dev/wscons/wsksymdef.h
+++ b/sys/dev/wscons/wsksymdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsksymdef.h,v 1.35 2013/10/18 22:06:42 miod Exp $	*/
+/*	$OpenBSD: wsksymdef.h,v 1.36 2014/01/26 17:48:08 miod Exp $	*/
 /*	$NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */
 
 /*-
@@ -735,15 +735,16 @@
 #define KB_LV			0x1b00
 #define KB_IS			0x1c00
 
-#define KB_NODEAD		0x000001 /* disable dead accents */
-#define KB_DECLK		0x000002 /* DEC LKnnn layout */
-#define KB_LK401		0x000004 /* DEC LK401 instead LK201 */
-#define KB_SWAPCTRLCAPS		0x000008 /* swap Left-Control and Caps-Lock */
-#define KB_DVORAK		0x000010 /* Dvorak layout */
-#define KB_METAESC		0x000020 /* generate ESC prefix on ALT-key */
-#define KB_IOPENER		0x000040 /* f1-f12 -> ESC,f1-f11 */
-#define KB_MACHDEP		0x000080 /* machine dependent */
-#define	KB_APPLE		0x010000 /* Apple specific layout */
+#define KB_NODEAD		0x00000001 /* disable dead accents */
+#define KB_DECLK		0x00000002 /* DEC LKnnn layout */
+#define KB_LK401		0x00000004 /* DEC LK401 instead LK201 */
+#define KB_SWAPCTRLCAPS		0x00000008 /* swap Left-Control and Caps-Lock */
+#define KB_DVORAK		0x00000010 /* Dvorak layout */
+#define KB_METAESC		0x00000020 /* generate ESC prefix on ALT-key */
+#define KB_IOPENER		0x00000040 /* f1-f12 -> ESC,f1-f11 */
+#define KB_MACHDEP		0x00000080 /* machine dependent */
+#define KB_APPLE		0x00010000 /* Apple specific layout */
+#define KB_DEFAULT		0x80000000 /* (attach-only) default layout */
 
 #define KB_ENCTAB \
 	{ KB_USER,	"user" }, \