summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2011-01-30 16:21:04 +0000
committermiod <miod@openbsd.org>2011-01-30 16:21:04 +0000
commit87722ce98ac1d04d891cad8bc69fac5230ebcb74 (patch)
tree9f396e9319404f452eca110b7df6abd041be7d53
parentImplement the \N'number' (numbered character) roff escape sequence. (diff)
downloadwireguard-openbsd-87722ce98ac1d04d891cad8bc69fac5230ebcb74.tar.xz
wireguard-openbsd-87722ce98ac1d04d891cad8bc69fac5230ebcb74.zip
Report the compose key on sun keyboards in raw mode as a different keycode
from right alt. ok krw@ shadchin@ deraadt@
-rw-r--r--sys/dev/sun/sunkbdmap.c4
-rw-r--r--sys/dev/wscons/wskbdraw.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/sun/sunkbdmap.c b/sys/dev/sun/sunkbdmap.c
index c313d6dea50..7da2155bc89 100644
--- a/sys/dev/sun/sunkbdmap.c
+++ b/sys/dev/sun/sunkbdmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sunkbdmap.c,v 1.3 2009/01/12 17:45:37 miod Exp $ */
+/* $OpenBSD: sunkbdmap.c,v 1.4 2011/01/30 16:21:04 miod Exp $ */
/*
* Copyright (c) 2002, 2003 Miodrag Vallat.
@@ -121,7 +121,7 @@ const u_int8_t sunkbd_rawmap[0x80] = {
RAWKEY_bracketleft,
RAWKEY_bracketright,
RAWKEY_Delete,
- RAWKEY_Alt_R,
+ RAWKEY_Compose,
RAWKEY_KP_Home,
RAWKEY_KP_Up,
RAWKEY_KP_Prior,
diff --git a/sys/dev/wscons/wskbdraw.h b/sys/dev/wscons/wskbdraw.h
index 1d38fa139e4..d1bc9cb0171 100644
--- a/sys/dev/wscons/wskbdraw.h
+++ b/sys/dev/wscons/wskbdraw.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbdraw.h,v 1.2 2009/01/11 18:59:57 miod Exp $ */
+/* $OpenBSD: wskbdraw.h,v 1.3 2011/01/30 16:21:05 miod Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -142,6 +142,7 @@
#define RAWKEY_Begin 0x5d
#define RAWKEY_Menu 0x6d
+#define RAWKEY_Compose 0x72
/*
* The following keys have no KS_xxx equivalents