diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-15 16:32:16 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-23 11:27:28 +1000 |
| commit | 758f6971750ed507e64eee817d720a77181439f2 (patch) | |
| tree | 76a0763a4cfb8a637768920a29a5af2524d2c15d /dix | |
| parent | c0d941913199ed251fceab62fcf65437f6f9bd31 (diff) | |
dix: try to ring the bell even if the current device doesn't have one. (#24503)
Evdev devices do not have the bell proc set, but XTEST devices do. By
exiting early, the bell only rings if the last keyboard used was the XTEST
keyboard and hence the bell proc is still set on the master but not if an
evdev keyboard was used last.
The better approach here is to try to ring the bell on all devices attached
to this master device in case one or more actually do produce an audible
sound. That's also XKB's behaviour if XkbUseCoreKbd is specified as device
identifier.
X.Org Bug 24503 <http://bugs.freedesktop.org/show_bug.cgi?id=24503>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/dix/devices.c b/dix/devices.c index b002150d0..6119dcebb 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2020,14 +2020,6 @@ ProcBell(ClientPtr client) return BadValue; } - /* Seems like no keyboard actually has the BellProc set. Returning - * BadDevice (previous code) will make apps crash badly. The man pages - * doesn't say anything about a BadDevice being returned either. - * So just quietly do nothing and pretend everything has worked. - */ - if (!keybd->kbdfeed->BellProc) - return Success; - newpercent = (base * stuff->percent) / 100; if (stuff->percent < 0) newpercent = base + newpercent; |