Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."
I'm not quite sure why this was necessary, but DDXRingBell is being called
from CoreKeyboardBell, so we don't need a separate bellProc which would
result in multiple rings.
This reverts commit 9071b0d697
.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
235fa50304
commit
eac7cdabec
|
@ -184,12 +184,6 @@ static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
|
|||
// keyclick, bell volume / pitch, autorepead, LED's
|
||||
}
|
||||
|
||||
static void DarwinKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something) {
|
||||
KeybdCtrl *ctrl = arg;
|
||||
|
||||
DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Utility functions to help parse Darwin keymap
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@ -301,7 +295,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
|
|||
// for a kIOHIDParamConnectType connection.
|
||||
assert(darwinParamConnect = NXOpenEventStatus());
|
||||
|
||||
InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
|
||||
InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
|
||||
|
||||
DarwinKeyboardReloadHandler();
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user