[src/trunk]: src/sys/dev Bring br.nodead closer to X11

[nia <nia%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5ee5e16e046
branches:  trunk
changeset: 1011793:b5ee5e16e046
user:      nia <nia%NetBSD.org@localhost>
date:      Sun Jul 12 01:44:24 2020 +0000

description:
Bring br.nodead closer to X11

diffstat:

 sys/dev/hid/hidkbdmap.c          |  5 +++--
 sys/dev/pckbport/wskbdmap_mfii.c |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 3a46ed2a73fa -r b5ee5e16e046 sys/dev/hid/hidkbdmap.c
--- a/sys/dev/hid/hidkbdmap.c   Sun Jul 12 01:36:32 2020 +0000
+++ b/sys/dev/hid/hidkbdmap.c   Sun Jul 12 01:44:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $        */
+/*     $NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $        */
 
 /*
  * Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -649,6 +649,7 @@
 
 static const keysym_t hidkbd_keydesc_br_nodead[] = {
 /*  pos      normal             shifted         altgr           shift-altgr */
+    KC(35),  KS_6,             KS_diaeresis,   KS_notsign,     KS_dead_diaeresis,
     KC(47),  KS_apostrophe,    KS_grave,       KS_dead_acute,  KS_dead_grave,
     KC(52),  KS_asciitilde,    KS_asciicircum, KS_dead_tilde,  KS_dead_circumflex,
 };
diff -r 3a46ed2a73fa -r b5ee5e16e046 sys/dev/pckbport/wskbdmap_mfii.c
--- a/sys/dev/pckbport/wskbdmap_mfii.c  Sun Jul 12 01:36:32 2020 +0000
+++ b/sys/dev/pckbport/wskbdmap_mfii.c  Sun Jul 12 01:44:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $   */
+/*     $NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia Exp $");
 
 #include "opt_wskbdmap.h"
 #include <sys/types.h>
@@ -857,6 +857,7 @@
 
 static const keysym_t pckbd_keydesc_br_nodead[] = {
 /*  pos      normal             shifted         altgr           shift-altgr */
+    KC(7),   KS_6,             KS_diaeresis,   KS_notsign,     KS_dead_diaeresis,
     KC(26),  KS_apostrophe,    KS_grave,       KS_dead_acute,  KS_dead_grave,
     KC(40),  KS_asciitilde,    KS_asciicircum, KS_dead_tilde,  KS_dead_circumflex,
 };