num_valuators=1 for GetPointerEvents(), hack ButtonPress/Release position

This commit is contained in:
Brian 2007-03-30 13:44:24 -06:00
parent 1ea842960f
commit 7989dacdcb

View File

@ -655,19 +655,19 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
DeviceIntPtr p = dmxLocal->pDevice; DeviceIntPtr p = dmxLocal->pDevice;
int i, nevents, valuators[3]; int i, nevents, valuators[3];
xEvent *events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum()); xEvent *events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum());
/*
valuators[0] = e->xbutton.x; valuators[0] = e->xbutton.x;
valuators[1] = e->xbutton.y; valuators[1] = e->xbutton.y;
/* */
valuators[0] = dmxGlobalX; valuators[0] = dmxGlobalX;
valuators[1] = dmxGlobalY; valuators[1] = dmxGlobalY;
*/
valuators[2] = e->xbutton.button; valuators[2] = e->xbutton.button;
nevents = GetPointerEvents(events, nevents = GetPointerEvents(events,
/*pDev*/p, /*pDev*/p,
/*KeyPress*/type, /*KeyPress*/type,
detail, detail,
POINTER_ABSOLUTE, POINTER_ABSOLUTE,
0, 0, valuators); 0, 1, valuators);
ErrorF("BUTTON %d, %d %d n=%d\n", ErrorF("BUTTON %d, %d %d n=%d\n",
valuators[0], valuators[1], valuators[2], nevents); valuators[0], valuators[1], valuators[2], nevents);
@ -698,7 +698,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
/*KeyPress*/type, /*KeyPress*/type,
detail, detail,
POINTER_ABSOLUTE, POINTER_ABSOLUTE,
0, 0, valuators); 0, 1, valuators);
ErrorF("MOTION %d, %d n = %d\n", valuators[0], valuators[1], nevents); ErrorF("MOTION %d, %d n = %d\n", valuators[0], valuators[1], nevents);
/* /*
ErrorF("NEW MOTION %d st %d (%d,%d,%d) n=%d\n", ErrorF("NEW MOTION %d st %d (%d,%d,%d) n=%d\n",