Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo change from drochner (Rev 1.4 of wsksymdef.h) and fix PR #5298 and #5299.

This commit is contained in:
hannken 1998-04-20 10:47:36 +00:00
parent 6326329eba
commit 3cdf7f6607
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/wscons/wskbdutil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wskbdutil.c,v 1.2 1998/04/09 13:09:46 hannken Exp $ */ /* $NetBSD: wskbdutil.c,v 1.3 1998/04/20 10:47:36 hannken Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -411,9 +411,9 @@ ksym_upcase(ksym)
if (ksym >= KS_f1 && ksym <= KS_f20) if (ksym >= KS_f1 && ksym <= KS_f20)
return(KS_F1 - KS_f1 + ksym); return(KS_F1 - KS_f1 + ksym);
if (KS_GROUP(ksym) == KS_GROUP_Ascii && if (KS_GROUP(ksym) == KS_GROUP_Ascii && ksym <= 0xff &&
latin1_to_upper[ksym & 0xff] != 0x00) latin1_to_upper[ksym] != 0x00)
return(latin1_to_upper[ksym & 0xff] | KS_GROUP_Ascii); return(latin1_to_upper[ksym]);
return(ksym); return(ksym);
} }

16
sys/dev/wscons/wsksymdef.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsksymdef.h,v 1.5 1998/04/18 10:57:13 drochner Exp $ */ /* $NetBSD: wsksymdef.h,v 1.6 1998/04/20 10:47:36 hannken Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -411,15 +411,17 @@
#define KS_GROUP_Function 0xf300 #define KS_GROUP_Function 0xf300
#define KS_GROUP_Command 0xf400 #define KS_GROUP_Command 0xf400
#define KS_GROUP_Internal 0xf500 #define KS_GROUP_Internal 0xf500
#define KS_GROUP_Dead 0x0300 /* not encoded in keysym */ #define KS_GROUP_Dead 0xf801 /* not encoded in keysym */
#define KS_GROUP_Ascii 0x0000 /* not encoded in keysym */ #define KS_GROUP_Ascii 0xf802 /* not encoded in keysym */
#define KS_GROUP_Keycode 0xe000 /* not encoded in keysym */ #define KS_GROUP_Keycode 0xf803 /* not encoded in keysym */
#define KS_GROUP(k) (((k) & 0xf000) == 0xe000 ? KS_GROUP_Keycode : \ #define KS_GROUP(k) ((k) >= 0x0300 && (k) < 0x0370 ? KS_GROUP_Dead : \
((k) & 0xff00)) (((k) & 0xf000) == 0xe000 ? KS_GROUP_Keycode : \
(((k) & 0xf800) == 0xf000 ? ((k) & 0xff00) : \
KS_GROUP_Ascii)))
#define KS_VALUE(k) (((k) & 0xf000) == 0xe000 ? ((k) & 0x0fff) : \ #define KS_VALUE(k) (((k) & 0xf000) == 0xe000 ? ((k) & 0x0fff) : \
((k) & 0x00ff)) (((k) & 0xf800) == 0xf000 ? ((k) & 0x00ff) : (k)))
/* /*
* Keyboard types: 8bit encoding, 8bit variant * Keyboard types: 8bit encoding, 8bit variant