diff options
| author | David Reveman <davidr@novell.com> | 2008-09-12 22:58:45 +0200 |
|---|---|---|
| committer | David Reveman <davidr@novell.com> | 2008-10-30 03:37:41 -0400 |
| commit | c4ba32e1508a2884d68d7b74fc4e5f5870cc8f2a (patch) | |
| tree | 354a9a55c08088320ec6efe28e8a72c6010b934e /hw/dmx | |
| parent | a8394499d8150cfdd78009beb391488909566f35 (diff) | |
Cleanup.
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 2c37b45e1..ab81f9c8f 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -99,56 +99,21 @@ static DMXLocalInputInfoRec DMXBackendKbd = { NULL, dmxCommonKbdCtrl, dmxCommonKbdBell }; -#if 11 /*BP*/ void DDXRingBell(int volume, int pitch, int duration) { - /* NO-OP */ } -/* taken from kdrive/src/kinput.c: */ static void dmxKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl) { -#if 0 - KdKeyboardInfo *ki; - - for (ki = kdKeyboards; ki; ki = ki->next) { - if (ki->dixdev && ki->dixdev->id == pDevice->id) - break; - } - - if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id || !ki->driver) - return; - - KdSetLeds(ki, ctrl->leds); - ki->bellPitch = ctrl->bell_pitch; - ki->bellDuration = ctrl->bell_duration; -#endif } -/* taken from kdrive/src/kinput.c: */ static void dmxBell(int volume, DeviceIntPtr pDev, pointer arg, int something) { -#if 0 - KeybdCtrl *ctrl = arg; - KdKeyboardInfo *ki = NULL; - - for (ki = kdKeyboards; ki; ki = ki->next) { - if (ki->dixdev && ki->dixdev->id == pDev->id) - break; - } - - if (!ki || !ki->dixdev || ki->dixdev->id != pDev->id || !ki->driver) - return; - - KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration); -#endif } -#endif /*BP*/ - static void _dmxChangePointerControl(DMXLocalInputInfoPtr dmxLocal, PtrCtrl *ctrl) { @@ -429,18 +394,11 @@ static void dmxProcessInputEvents(DMXInputInfo *dmxInput) { int i; -#if 00 /*BP*/ - miPointerUpdate(); -#endif if (dmxInput->detached) return; for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding) - if (dmxInput->devs[i]->process_input) { -#if 11 /*BP*/ - //miPointerUpdateSprite(dmxInput->devs[i]->pDevice); -#endif + if (dmxInput->devs[i]->process_input) dmxInput->devs[i]->process_input(dmxInput->devs[i]->private); - } } static void dmxGrabButton(DMXInputInfo *dmxInput, |