diff options
authorPeter Hutterer <>2010-02-15 16:32:16 +1000
committerPeter Hutterer <>2010-02-23 11:27:28 +1000
commit758f6971750ed507e64eee817d720a77181439f2 (patch)
parentc0d941913199ed251fceab62fcf65437f6f9bd31 (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 <> Signed-off-by: Peter Hutterer <> Reviewed-by: Adam Jackson <>
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;