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

more debug

This commit is contained in:
Brian 2007-03-30 13:43:15 -06:00
parent 92e8cdbd32
commit 1ea842960f
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,9 +464,8 @@ void dmxBackendCollectEvents(DevicePtr pDev,
#if 11/*BP*/ #if 11/*BP*/
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
/*
ErrorF("press/release at %d, %d\n", X.xbutton.x, X.xbutton.y); ErrorF("press/release at %d, %d\n", X.xbutton.x, X.xbutton.y);
*/ /* fall-through */
#endif #endif
default: default:
/* Pass the whole event here, because /* Pass the whole event here, because

18
hw/dmx/input/dmxevents.c
View File

@ -638,9 +638,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
/*pDev*/p, /*pDev*/p,
/*KeyPress*/type, /*KeyPress*/type,
/*n*/detail); /*n*/detail);
/* ErrorF("KEY %d n=%d\n", detail, nevents);
ErrorF("NEW KEY EVENT %d n=%d\n", detail, nevents);
*/
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(p, events + i); mieqEnqueue(p, events + i);
xfree(events); xfree(events);
@ -659,6 +657,10 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
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[1] = dmxGlobalY;
*/
valuators[2] = e->xbutton.button; valuators[2] = e->xbutton.button;
nevents = GetPointerEvents(events, nevents = GetPointerEvents(events,
/*pDev*/p, /*pDev*/p,
@ -666,11 +668,10 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
detail, detail,
POINTER_ABSOLUTE, POINTER_ABSOLUTE,
0, 0, valuators); 0, 0, valuators);
/*
ErrorF("NEW PTR EVENT %d (%d,%d,%d) n=%d\n", ErrorF("BUTTON %d, %d %d n=%d\n",
detail, valuators[0], valuators[1], valuators[2], valuators[0], valuators[1], valuators[2], nevents);
nevents);
*/
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(p, events + i); mieqEnqueue(p, events + i);
xfree(events); xfree(events);
@ -698,6 +699,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
detail, detail,
POINTER_ABSOLUTE, POINTER_ABSOLUTE,
0, 0, valuators); 0, 0, 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", ErrorF("NEW MOTION %d st %d (%d,%d,%d) n=%d\n",
detail, e->xmotion.state, detail, e->xmotion.state,

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

@ -503,10 +503,11 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
GetMaximumEventsNum(), GetMaximumEventsNum(),
#endif #endif
Relative); Relative);
ErrorF("MOTION BUFFER SIZE %d\n", GetMaximumEventsNum());
#ifdef XINPUT #ifdef XINPUT
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],
info.maxval[0], info.res[0], /*1280*/info.maxval[0], info.res[0],
info.minres[0], info.maxres[0]); info.minres[0], info.maxres[0]);
#endif #endif
} else if (info.numRelAxes) { } else if (info.numRelAxes) {
@ -517,7 +518,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
#ifdef XINPUT #ifdef XINPUT
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],
info.maxval[0], info.res[0], /*1280*/info.maxval[0], info.res[0],
info.minres[0], info.maxres[0]); info.minres[0], info.maxres[0]);
#endif #endif
} else if (info.numAbsAxes) { } else if (info.numAbsAxes) {
@ -528,7 +529,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
#ifdef XINPUT #ifdef XINPUT
for (i = 0; i < info.numAbsAxes; i++) for (i = 0; i < info.numAbsAxes; i++)
InitValuatorAxisStruct(pDevice, i+info.numRelAxes, InitValuatorAxisStruct(pDevice, i+info.numRelAxes,
info.minval[i+1], info.maxval[i+1], info.minval[i+1], /*1280*/info.maxval[i+1],
info.res[i+1], info.minres[i+1], info.res[i+1], info.minres[i+1],
info.maxres[i+1]); info.maxres[i+1]);
#endif #endif