XQuartz: Explicitly pass a bellProc to make XBell() work again.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
This commit is contained in:
parent
e87a03fd53
commit
9071b0d697
|
@ -184,6 +184,12 @@ static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
|
||||||
// keyclick, bell volume / pitch, autorepead, LED's
|
// 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
|
// Utility functions to help parse Darwin keymap
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@ -297,7 +303,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
|
||||||
/* We need to really have rules... or something... */
|
/* We need to really have rules... or something... */
|
||||||
//XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
|
//XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
|
||||||
|
|
||||||
InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
|
InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
|
||||||
|
|
||||||
DarwinKeyboardReloadHandler();
|
DarwinKeyboardReloadHandler();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user