diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-11-09 13:09:55 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-11-15 11:03:39 -0800 |
commit | 7e7e7935eeb86b5990664a662471800cfd2e7ce0 (patch) | |
tree | 28dbbe0d78d61dbda6c699578f4f02e83de65ad8 | |
parent | d6495bb272c9be8b3376d65b16bf0342c5975bd0 (diff) |
XQuartz: Explicitly pass a bellProc to make XBell() work again.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4)
-rw-r--r-- | hw/xquartz/quartzKeyboard.c | 8 |
1 files changed, 7 insertions, 1 deletions
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(); |