diff options
| author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2014-03-13 07:48:15 +0000 |
|---|---|---|
| committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2014-03-13 07:48:15 +0000 |
| commit | 87d69693f6f2a76704610adac3645f78fc096bb9 (patch) | |
| tree | 3c25d6f46e5b2577bf993acb23b443dc4300635d /sys | |
| parent | e3888c7afc0e2e69247a63cea83912907198aeea (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 pckbd(4) driver.
ok deraadt, kettenis
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pckbc/pckbd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c index 59906a824c7..81215f8fe0b 100644 --- a/sys/dev/pckbc/pckbd.c +++ b/sys/dev/pckbc/pckbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbd.c,v 1.35 2014/01/26 17:48:08 miod Exp $ */ +/* $OpenBSD: pckbd.c,v 1.36 2014/03/13 07:48:14 ratchov Exp $ */ /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -911,12 +911,7 @@ pckbd_input(void *vsc, int data) sc->sc_rawcnt); sc->sc_rawcnt = 0; } - - /* - * Pass audio keys to wskbd_input anyway. - */ - if (rc == 0 || (key != 160 && key != 174 && key != 176)) - return; + return; } #endif if (rc != 0) |