[src/trunk]: src/sys/arch/luna68k/dev Handle CAP and Kana modifier key specif...

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

details:   https://anonhg.NetBSD.org/src/rev/3e9b0c7d139a
branches:  trunk
changeset: 1023627:3e9b0c7d139a
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Sep 19 07:55:17 2021 +0000

description:
Handle CAP and Kana modifier key specification quirk of LUNA's keyboard.

LUNA's keyboard doesn't send any keycode when these modifier keys are
released.  Instead, it sends a pressed or released code per how each
modifier LED status will be changed when the modifier keys are pressed.
To handle this quirk in MI wskbd(4) layer, we have to send a faked
"pressed and released" sequence on passing keycodes to wskbd_input(9).

Tested on LUNA both on ttyE0 and WSKBD_RAW mode (on Xorg server).

diffstat:

 sys/arch/luna68k/dev/lunaws.c |  35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diffs (63 lines):

diff -r 7cb0f88641b6 -r 3e9b0c7d139a sys/arch/luna68k/dev/lunaws.c
--- a/sys/arch/luna68k/dev/lunaws.c     Sun Sep 19 04:55:58 2021 +0000
+++ b/sys/arch/luna68k/dev/lunaws.c     Sun Sep 19 07:55:17 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.35 2021/09/18 13:44:02 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.36 2021/09/19 07:55:17 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.35 2021/09/18 13:44:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.36 2021/09/19 07:55:17 tsutsui Exp $");
 
 #include "opt_wsdisplay_compat.h"
 #include "wsmouse.h"
@@ -401,6 +401,14 @@
                int c, j = 0;
 
                c = omkbd_raw[key];
+               if (c == 0x70 /* Kana */ ||
+                   c == 0x3a /* CAP  */) {
+                       /* See comment in !sc->sc_rawkbd case */
+                       cbuf[0] = c;
+                       wskbd_rawinput(sc->sc_wskbddev, cbuf, 1);
+                       cbuf[0] = c | 0x80;
+                       wskbd_rawinput(sc->sc_wskbddev, cbuf, 1);
+               } else
                if (c != 0x00) {
                        /* fake extended scancode if necessary */
                        if (c & 0x80)
@@ -415,8 +423,27 @@
        } else
 #endif
        {
-               if (sc->sc_wskbddev != NULL)
-                       wskbd_input(sc->sc_wskbddev, type, key);
+               if (sc->sc_wskbddev != NULL) {
+                       if (key == 0x0b /* Kana */ ||
+                           key == 0x0e /* CAP  */) {
+                               /*
+                                * LUNA's keyboard doesn't send any keycode
+                                * when these modifier keys are released.
+                                * Instead, it sends a pressed or released code
+                                * per how each modifier LED status will be
+                                * changed when the modifier keys are pressed.
+                                * To handle this quirk in MI wskbd(4) layer,
+                                * we have to send a faked
+                                * "pressed and released" sequence here.
+                                */
+                               wskbd_input(sc->sc_wskbddev,
+                                   WSCONS_EVENT_KEY_DOWN, key);
+                               wskbd_input(sc->sc_wskbddev,
+                                   WSCONS_EVENT_KEY_UP, key);
+                       } else {
+                               wskbd_input(sc->sc_wskbddev, type, key);
+                       }
+               }
        }
 }