frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmx: some more build fixes.

This commit is contained in:
Peter Hutterer 2008-06-03 21:28:26 +09:30
parent 8d4d0b47a0
commit d10ba4591a
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/dmx/input/dmxinputinit.c
View File

@ -476,15 +476,11 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
break; break;
} }
if (info.keyClass) { if (info.keyClass) {
#if 00 /*BP*/
InitKeyClassDeviceStruct(pDevice, &info.keySyms, info.modMap);
#else
DevicePtr pDev = (DevicePtr) pDevice; DevicePtr pDev = (DevicePtr) pDevice;
InitKeyboardDeviceStruct(pDev, InitKeyboardDeviceStruct(pDev,
&info.keySyms, &info.keySyms,
info.modMap, info.modMap,
dmxBell, dmxKbdCtrl); dmxBell, dmxKbdCtrl);
#endif
} }
if (info.buttonClass) { if (info.buttonClass) {
InitButtonClassDeviceStruct(pDevice, info.numButtons, info.map); InitButtonClassDeviceStruct(pDevice, info.numButtons, info.map);
@ -492,13 +488,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
if (info.valuatorClass) { if (info.valuatorClass) {
if (info.numRelAxes && dmxLocal->sendsCore) { if (info.numRelAxes && dmxLocal->sendsCore) {
InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
#if 00 /*BP*/
miPointerGetMotionEvents,
miPointerGetMotionBufferSize(),
#else
GetMotionHistory,
GetMaximumEventsNum(), GetMaximumEventsNum(),
#endif
Relative); Relative);
for (i = 0; i < info.numRelAxes; i++) for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, info.minval[0], InitValuatorAxisStruct(pDevice, i, info.minval[0],
@ -506,7 +496,6 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
info.minres[0], info.maxres[0]); info.minres[0], info.maxres[0]);
} else if (info.numRelAxes) { } else if (info.numRelAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
dmxPointerGetMotionEvents,
dmxPointerGetMotionBufferSize(), dmxPointerGetMotionBufferSize(),
Relative); Relative);
for (i = 0; i < info.numRelAxes; i++) for (i = 0; i < info.numRelAxes; i++)
@ -515,7 +504,6 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
info.minres[0], info.maxres[0]); info.minres[0], info.maxres[0]);
} else if (info.numAbsAxes) { } else if (info.numAbsAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes, InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
dmxPointerGetMotionEvents,
dmxPointerGetMotionBufferSize(), dmxPointerGetMotionBufferSize(),
Absolute); Absolute);
for (i = 0; i < info.numAbsAxes; i++) for (i = 0; i < info.numAbsAxes; i++)

3
hw/dmx/input/dmxxinput.c
View File

@ -93,12 +93,9 @@ int ChangePointerDevice(DeviceIntPtr old_dev,
/* Switch the motion history buffers */ /* Switch the motion history buffers */
if (dmxLocalOld->savedMotionProc) { if (dmxLocalOld->savedMotionProc) {
old_dev->valuator->GetMotionProc = dmxLocalOld->savedMotionProc;
old_dev->valuator->numMotionEvents = dmxLocalOld->savedMotionEvents; old_dev->valuator->numMotionEvents = dmxLocalOld->savedMotionEvents;
} }
dmxLocalNew->savedMotionProc = new_dev->valuator->GetMotionProc;
dmxLocalNew->savedMotionEvents = new_dev->valuator->numMotionEvents; dmxLocalNew->savedMotionEvents = new_dev->valuator->numMotionEvents;
new_dev->valuator->GetMotionProc = GetMotionHistory;
new_dev->valuator->numMotionEvents = GetMaximumEventsNum(); new_dev->valuator->numMotionEvents = GetMaximumEventsNum();
/* Switch our notion of core pointer */ /* Switch our notion of core pointer */
dmxLocalOld->isCore = 0; dmxLocalOld->isCore = 0;