diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 302745760..0cc3054ac 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -262,6 +262,7 @@ void dmxCoreMotion(int x, int y, int delta, DMXBlockType block) #endif dmxGlobalX = localX + dmxScreens[pScreen->myNum].rootXOrigin; dmxGlobalY = localY + dmxScreens[pScreen->myNum].rootYOrigin; + ErrorF("Global is now %d, %d\n", dmxGlobalX, dmxGlobalY); DMXDBG6(" Moved to dmxGlobalX=%d dmxGlobalY=%d" " on screen index=%d/%d localX=%d localY=%d\n", dmxGlobalX, dmxGlobalY, @@ -655,19 +656,20 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, DeviceIntPtr p = dmxLocal->pDevice; int i, nevents, valuators[3]; xEvent *events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum()); - /* + valuators[0] = e->xbutton.x; valuators[1] = e->xbutton.y; - */ + /* valuators[0] = dmxGlobalX; valuators[1] = dmxGlobalY; + */ valuators[2] = e->xbutton.button; nevents = GetPointerEvents(events, /*pDev*/p, /*KeyPress*/type, detail, POINTER_ABSOLUTE, - 0, 1, valuators); + 0, 3, valuators); ErrorF("BUTTON %d, %d %d n=%d\n", valuators[0], valuators[1], valuators[2], nevents); @@ -698,7 +700,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, /*KeyPress*/type, detail, POINTER_ABSOLUTE, - 0, 1, valuators); + 0, 3, valuators); ErrorF("MOTION %d, %d n = %d\n", valuators[0], valuators[1], nevents); /* ErrorF("NEW MOTION %d st %d (%d,%d,%d) n=%d\n", diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index c098c46e2..1465ade27 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -507,7 +507,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) #ifdef XINPUT for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, info.minval[0], - /*1280*/info.maxval[0], info.res[0], + info.maxval[0], info.res[0], info.minres[0], info.maxres[0]); #endif } else if (info.numRelAxes) { @@ -518,7 +518,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) #ifdef XINPUT for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, info.minval[0], - /*1280*/info.maxval[0], info.res[0], + info.maxval[0], info.res[0], info.minres[0], info.maxres[0]); #endif } else if (info.numAbsAxes) { @@ -529,7 +529,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) #ifdef XINPUT for (i = 0; i < info.numAbsAxes; i++) InitValuatorAxisStruct(pDevice, i+info.numRelAxes, - info.minval[i+1], /*1280*/info.maxval[i+1], + info.minval[i+1], info.maxval[i+1], info.res[i+1], info.minres[i+1], info.maxres[i+1]); #endif