From 10860a27c66abcfb9c24cef8c4d4f94f84818a68 Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 16 Apr 1998 13:29:41 +0000 Subject: [PATCH] Don't use KS_GROUP_xxx values which have set something in the lower 8 bits. This allows to OR them with keycodes. This is probably a workaround for namespace confusion happening else- where (in wskbdutil.c:ksym_upcase() perhaps?), but it helps without too much digging into the details. --- sys/dev/wscons/wsksymdef.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h index d5decf23bd66..8952adf9f3f8 100644 --- a/sys/dev/wscons/wsksymdef.h +++ b/sys/dev/wscons/wsksymdef.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsksymdef.h,v 1.3 1998/04/07 13:59:38 hannken Exp $ */ +/* $NetBSD: wsksymdef.h,v 1.4 1998/04/16 13:29:41 drochner Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -411,17 +411,15 @@ #define KS_GROUP_Function 0xf300 #define KS_GROUP_Command 0xf400 #define KS_GROUP_Internal 0xf500 -#define KS_GROUP_Dead 0xf800 /* not encoded in keysym */ -#define KS_GROUP_Ascii 0xf801 /* not encoded in keysym */ -#define KS_GROUP_Keycode 0xf802 /* not encoded in keysym */ +#define KS_GROUP_Dead 0x0300 /* not encoded in keysym */ +#define KS_GROUP_Ascii 0x0000 /* not encoded in keysym */ +#define KS_GROUP_Keycode 0xe000 /* not encoded in keysym */ -#define KS_GROUP(k) ((k) >= 0x0300 && (k) < 0x0370 ? KS_GROUP_Dead : \ - (((k) & 0xf000) == 0xe000 ? KS_GROUP_Keycode : \ - (((k) & 0xf800) == 0xf000 ? ((k) & 0xff00) : \ - KS_GROUP_Ascii))) +#define KS_GROUP(k) (((k) & 0xf000) == 0xe000 ? KS_GROUP_Keycode : \ + ((k) & 0xff00)) #define KS_VALUE(k) (((k) & 0xf000) == 0xe000 ? ((k) & 0x0fff) : \ - (((k) & 0xf800) == 0xf000 ? ((k) & 0x00ff) : (k))) + ((k) & 0x00ff)) /* * Keyboard types: 8bit encoding, 8bit variant