summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1996-09-01 19:40:56 +0000
committerderaadt <deraadt@openbsd.org>1996-09-01 19:40:56 +0000
commit37ff68b1f23650da220fc1e4062a6f0547cba60b (patch)
tree0f8b1d773de2f70b96085d4f957c54008dbe6995
parentfpr goes away, use asa (diff)
downloadwireguard-openbsd-37ff68b1f23650da220fc1e4062a6f0547cba60b.tar.xz
wireguard-openbsd-37ff68b1f23650da220fc1e4062a6f0547cba60b.zip
distinguish between left/right shift keys for X; from Mathieu.Herrb@mipnet.fr
Diffstat
-rw-r--r--sbin/kbd/tables/french6
-rw-r--r--sbin/kbd/tables/german6
-rw-r--r--sbin/kbd/tables/koi86
-rw-r--r--sbin/kbd/tables/swedish6
-rw-r--r--sbin/kbd/tables/swedish76
-rw-r--r--sbin/kbd/tables/us.english6
-rw-r--r--sys/arch/arc/dev/pccons.c8
-rw-r--r--sys/arch/i386/isa/pccons.c8
8 files changed, 28 insertions, 24 deletions
diff --git a/sbin/kbd/tables/french b/sbin/kbd/tables/french
index 453bb2e898f..19f2b9d0e18 100644
--- a/sbin/kbd/tables/french
+++ b/sbin/kbd/tables/french
@@ -1,4 +1,4 @@
-/* $OpenBSD: french,v 1.1 1996/06/23 15:30:55 deraadt Exp $ */
+/* $OpenBSD: french,v 1.2 1996/09/01 19:41:19 deraadt Exp $ */
/*
* Copyright (c) 1996 Matthieu Herrb
@@ -76,7 +76,7 @@
KB_ASCII, "m", "M", "\r", "", "", /* 39 m */
KB_ASCII, "\371", "%", "\231", "", "", /* 40 u` */
KB_ASCII, "\262", "", "\262", "", "", /* 41 ^2 */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "*", "\265", "*", "", "", /* 43 * */
KB_ASCII, "w", "W", "\027", "", "", /* 44 w */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -88,7 +88,7 @@
KB_ASCII, ";", ".", ";", "", "", /* 51 ; */
KB_ASCII, ":", "/", "\037", "", "", /* 52 : */
KB_ASCII, "!", "\266", "!", "", "", /* 53 ! */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
diff --git a/sbin/kbd/tables/german b/sbin/kbd/tables/german
index 0eeb909cc90..efe4bf5519b 100644
--- a/sbin/kbd/tables/german
+++ b/sbin/kbd/tables/german
@@ -1,4 +1,4 @@
-/* $OpenBSD: german,v 1.2 1996/05/09 14:19:50 deraadt Exp $ */
+/* $OpenBSD: german,v 1.3 1996/09/01 19:41:20 deraadt Exp $ */
/*
* Copyright (c) 1996 Juergen Hannken-Illjes
@@ -76,7 +76,7 @@
KB_ASCII, "\366", "\326", "\366", "", "", /* 39 oe */
KB_ASCII, "\344", "\304", "\344", "", "", /* 40 ae */
KB_ASCII, "^", "\260", "\036", "", "", /* 41 ^ */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "#", "'", "#", "", "", /* 43 # */
KB_ASCII, "y", "Y", "\031", "", "", /* 44 y */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -88,7 +88,7 @@
KB_ASCII, ",", ";", ",", "", "", /* 51 , */
KB_ASCII, ".", ":", ".", "", "", /* 52 . */
KB_ASCII, "-", "_", "\037", "", "", /* 53 - */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
diff --git a/sbin/kbd/tables/koi8 b/sbin/kbd/tables/koi8
index 8f61be593cb..801cd053722 100644
--- a/sbin/kbd/tables/koi8
+++ b/sbin/kbd/tables/koi8
@@ -1,4 +1,4 @@
-/* $OpenBSD: koi8,v 1.3 1996/05/12 08:58:21 mickey Exp $ */
+/* $OpenBSD: koi8,v 1.4 1996/09/01 19:41:21 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -76,7 +76,7 @@
KB_ASCII, ";", ":", ";", "\xd6", "\xf6", /* 39 ; */
KB_ASCII, "'", "\"", "'", "\xdc", "\xfc", /* 40 ' */
KB_ASCII, "`", "~", "`", "\xa3", "\xb3", /* 41 ` */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "\\", "|", "\034", "\\", "|", /* 43 \ */
KB_ASCII, "z", "Z", "\032", "\xd1", "\xf1", /* 44 z */
KB_ASCII, "x", "X", "\030", "\xde", "\xfe", /* 45 x */
@@ -88,7 +88,7 @@
KB_ASCII, ",", "<", "<", "\xc2", "\xe2", /* 51 , */
KB_ASCII, ".", ">", ">", "\xc0", "\xe0", /* 52 . */
KB_ASCII, "/", "?", "\037", "/", "?", /* 53 / */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "*", "*", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", " ", " ", /* 57 space */
diff --git a/sbin/kbd/tables/swedish b/sbin/kbd/tables/swedish
index 03d03c7c4cf..7488e8f287f 100644
--- a/sbin/kbd/tables/swedish
+++ b/sbin/kbd/tables/swedish
@@ -1,4 +1,4 @@
-/* $OpenBSD: swedish,v 1.2 1996/06/30 00:46:26 maja Exp $ */
+/* $OpenBSD: swedish,v 1.3 1996/09/01 19:41:22 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson
@@ -75,7 +75,7 @@
KB_ASCII, "\366", "\326", "\034", "", "", /* 39 | */
KB_ASCII, "\344", "\304", "\033", "", "", /* 40 { */
KB_ASCII, "@", "~", "\000", "", "", /* 41 ` */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "'", "*", "*", "", "", /* 43 \ */
KB_ASCII, "z", "Z", "\032", "", "", /* 44 z */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -87,7 +87,7 @@
KB_ASCII, ",", ";", ";", "", "", /* 51 , */
KB_ASCII, ".", ":", ":", "", "", /* 52 . */
KB_ASCII, "-", "_", "\037", "", "", /* 53 - */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
diff --git a/sbin/kbd/tables/swedish7 b/sbin/kbd/tables/swedish7
index 2d57df82799..2cc4a9193b0 100644
--- a/sbin/kbd/tables/swedish7
+++ b/sbin/kbd/tables/swedish7
@@ -1,4 +1,4 @@
-/* $OpenBSD: swedish7,v 1.2 1996/06/30 00:46:26 maja Exp $ */
+/* $OpenBSD: swedish7,v 1.3 1996/09/01 19:41:23 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson
@@ -76,7 +76,7 @@
KB_ASCII, "|", "\\", "\034", "", "", /* 39 | */
KB_ASCII, "{", "[", "\033", "", "", /* 40 { */
KB_ASCII, "@", "~", "\000", "", "", /* 41 ` */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "'", "*", "*", "", "", /* 43 \ */
KB_ASCII, "z", "Z", "\032", "", "", /* 44 z */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -88,7 +88,7 @@
KB_ASCII, ",", ";", ";", "", "", /* 51 , */
KB_ASCII, ".", ":", ":", "", "", /* 52 . */
KB_ASCII, "-", "_", "\037", "", "", /* 53 - */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
diff --git a/sbin/kbd/tables/us.english b/sbin/kbd/tables/us.english
index 3526619b4c1..5ca50bb081b 100644
--- a/sbin/kbd/tables/us.english
+++ b/sbin/kbd/tables/us.english
@@ -1,4 +1,4 @@
-/* $OpenBSD: us.english,v 1.2 1996/05/09 14:19:52 deraadt Exp $ */
+/* $OpenBSD: us.english,v 1.3 1996/09/01 19:41:25 deraadt Exp $ */
/*
* Copyright (c) 1996 Juergen Hannken-Illjes
@@ -76,7 +76,7 @@
KB_ASCII, ";", ":", ";", "", "", /* 39 ; */
KB_ASCII, "'", "\"", "'", "", "", /* 40 ' */
KB_ASCII, "`", "~", "`", "", "", /* 41 ` */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "\\", "|", "\034", "", "", /* 43 \ */
KB_ASCII, "z", "Z", "\032", "", "", /* 44 z */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -88,7 +88,7 @@
KB_ASCII, ",", "<", "<", "", "", /* 51 , */
KB_ASCII, ".", ">", ">", "", "", /* 52 . */
KB_ASCII, "/", "?", "\037", "", "", /* 53 / */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c
index ad40177d6bd..d813ba20899 100644
--- a/sys/arch/arc/dev/pccons.c
+++ b/sys/arch/arc/dev/pccons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccons.c,v 1.3 1996/09/01 16:50:08 deraadt Exp $ */
+/* $OpenBSD: pccons.c,v 1.4 1996/09/01 19:41:16 deraadt Exp $ */
/* $NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp $ */
/*-
@@ -1331,6 +1331,8 @@ sput(cp, n)
async_update();
}
+/* the unshifted code for KB_SHIFT keys is used by X to distinguish between
+ left and right shift when reading the keyboard map */
static pccons_keymap_t scan_codes[KB_NUM_KEYS] = {
/* type unshift shift control altgr shift_altgr scancode */
KB_NONE, "", "", "", "", "", /* 0 unused */
@@ -1375,7 +1377,7 @@ static pccons_keymap_t scan_codes[KB_NUM_KEYS] = {
KB_ASCII, ";", ":", ";", "", "", /* 39 ; */
KB_ASCII, "'", "\"", "'", "", "", /* 40 ' */
KB_ASCII, "`", "~", "`", "", "", /* 41 ` */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "\\", "|", "\034", "", "", /* 43 \ */
KB_ASCII, "z", "Z", "\032", "", "", /* 44 z */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -1387,7 +1389,7 @@ static pccons_keymap_t scan_codes[KB_NUM_KEYS] = {
KB_ASCII, ",", "<", "<", "", "", /* 51 , */
KB_ASCII, ".", ">", ">", "", "", /* 52 . */
KB_ASCII, "/", "?", "\037", "", "", /* 53 / */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 9bc45f0fe0d..6f343d619ae 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccons.c,v 1.26 1996/09/01 16:39:59 deraadt Exp $ */
+/* $OpenBSD: pccons.c,v 1.27 1996/09/01 19:40:56 deraadt Exp $ */
/* $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $ */
/*-
@@ -1441,6 +1441,8 @@ sput(cp, n)
async_update();
}
+/* the unshifted code for KB_SHIFT keys is used by X to distinguish between
+ left and right shift when reading the keyboard map */
static pccons_keymap_t scan_codes[KB_NUM_KEYS] = {
/* type unshift shift control altgr shift_altgr scancode */
KB_NONE, "", "", "", "", "", /* 0 unused */
@@ -1485,7 +1487,7 @@ static pccons_keymap_t scan_codes[KB_NUM_KEYS] = {
KB_ASCII, ";", ":", ";", "", "", /* 39 ; */
KB_ASCII, "'", "\"", "'", "", "", /* 40 ' */
KB_ASCII, "`", "~", "`", "", "", /* 41 ` */
- KB_SHIFT, "", "", "", "", "", /* 42 shift */
+ KB_SHIFT, "\001", "", "", "", "", /* 42 shift */
KB_ASCII, "\\", "|", "\034", "", "", /* 43 \ */
KB_ASCII, "z", "Z", "\032", "", "", /* 44 z */
KB_ASCII, "x", "X", "\030", "", "", /* 45 x */
@@ -1497,7 +1499,7 @@ static pccons_keymap_t scan_codes[KB_NUM_KEYS] = {
KB_ASCII, ",", "<", "<", "", "", /* 51 , */
KB_ASCII, ".", ">", ">", "", "", /* 52 . */
KB_ASCII, "/", "?", "\037", "", "", /* 53 / */
- KB_SHIFT, "", "", "", "", "", /* 54 shift */
+ KB_SHIFT, "\002", "", "", "", "", /* 54 shift */
KB_KP, "*", "*", "*", "", "", /* 55 kp * */
KB_ALT, "", "", "", "", "", /* 56 alt */
KB_ASCII, " ", " ", "\000", "", "", /* 57 space */
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.