From 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 9 Nov 2009 13:09:55 -0800 Subject: [PATCH] XQuartz: Explicitly pass a bellProc to make XBell() work again. Signed-off-by: Jeremy Huddleston --- hw/xquartz/quartzKeyboard.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index c5047624e..62b2ebbdf 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -184,6 +184,12 @@ 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 //----------------------------------------------------------------------------- @@ -297,7 +303,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { /* We need to really have rules... or something... */ //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL); - InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl); + InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl); DarwinKeyboardReloadHandler();