diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-03-16 10:32:32 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-03-16 10:32:32 +0000 |
| commit | fc9c327ccc47dcc7b2c4197af2cbb842f362ae10 (patch) | |
| tree | 654b65bf88b39c0b73f71bb7e4ba26d615da5039 /sys/dev/usb/hidkbd.c | |
| parent | 8861026911fceda2f4c6eca300e7e69a1c26b1b2 (diff) | |
Don't use volume keys when in raw-mode (this doesn't work), and let
Xorg driver do the translation and handle them as regular keys. Fixes
confusion caused by the volume being changed twice in contradictory
ways: once by X programs and once by the ukbd(4) driver.
ok ratchov@
Diffstat (limited to 'sys/dev/usb/hidkbd.c')
| -rw-r--r-- | sys/dev/usb/hidkbd.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/dev/usb/hidkbd.c b/sys/dev/usb/hidkbd.c index b04dd1294ad..06d0976a6a8 100644 --- a/sys/dev/usb/hidkbd.c +++ b/sys/dev/usb/hidkbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hidkbd.c,v 1.8 2013/04/22 15:10:56 deraadt Exp $ */ +/* $OpenBSD: hidkbd.c,v 1.9 2014/03/16 10:32:31 mpi Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -425,22 +425,6 @@ hidkbd_decode(struct hidkbd *kbd, struct hidkbd_data *ud) } s = spltty(); wskbd_rawinput(kbd->sc_wskbddev, cbuf, j); - - /* - * Pass audio keys to wskbd_input anyway. - */ - for (i = 0; i < nkeys; i++) { - key = ibuf[i]; - switch (key & CODEMASK) { - case 127: - case 128: - case 129: - wskbd_input(kbd->sc_wskbddev, - key & RELEASE ? WSCONS_EVENT_KEY_UP : - WSCONS_EVENT_KEY_DOWN, key & CODEMASK); - break; - } - } splx(s); return; |