[src/trunk]: src/sys/dev/wscons add a symbol for keyboard variant bits which ...

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

details:   https://anonhg.NetBSD.org/src/rev/32efca9224d3
branches:  trunk
changeset: 479790:32efca9224d3
user:      drochner <drochner%NetBSD.org@localhost>
date:      Tue Dec 21 11:59:13 1999 +0000

description:
add a symbol for keyboard variant bits which are not handled by the
mapping code

diffstat:

 sys/dev/wscons/wskbdutil.c |  7 ++++---
 sys/dev/wscons/wsksymvar.h |  5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 3aa76ec9753d -r 32efca9224d3 sys/dev/wscons/wskbdutil.c
--- a/sys/dev/wscons/wskbdutil.c        Tue Dec 21 11:57:59 1999 +0000
+++ b/sys/dev/wscons/wskbdutil.c        Tue Dec 21 11:59:13 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wskbdutil.c,v 1.6 1998/09/17 18:10:53 drochner Exp $   */
+/*     $NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -343,7 +343,7 @@
        mapentry->group2[0] = KS_voidSymbol;
        mapentry->group2[1] = KS_voidSymbol;
 
-       for (cur = mapdata->layout; cur != 0; ) {
+       for (cur = mapdata->layout & ~KB_HANDLEDBYWSKBD; cur != 0; ) {
                mp = mapdata->keydesc;
                while (mp->map_size > 0) {
                        if (mp->name == cur)
@@ -414,7 +414,8 @@
        const struct wscons_keydesc *mp, *stack[10];
        kbd_t cur;
 
-       for (cur = mapdata->layout, stack_ptr = 0; cur != 0; stack_ptr++) {
+       for (cur = mapdata->layout & ~KB_HANDLEDBYWSKBD, stack_ptr = 0;
+            cur != 0; stack_ptr++) {
                mp = mapdata->keydesc;
                while (mp->map_size > 0) {
                        if (cur == 0 || mp->name == cur) {
diff -r 3aa76ec9753d -r 32efca9224d3 sys/dev/wscons/wsksymvar.h
--- a/sys/dev/wscons/wsksymvar.h        Tue Dec 21 11:57:59 1999 +0000
+++ b/sys/dev/wscons/wsksymvar.h        Tue Dec 21 11:59:13 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsksymvar.h,v 1.7 1998/09/17 18:10:53 drochner Exp $ */
+/*     $NetBSD: wsksymvar.h,v 1.8 1999/12/21 11:59:13 drochner Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -65,6 +65,9 @@
        kbd_t layout;
 };
 
+/* layout variant bits ignored by mapping code */
+#define KB_HANDLEDBYWSKBD KB_METAESC
+
 /*
  * Utility functions.
  */