diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-30 13:43:15 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-30 13:43:15 -0600 |
| commit | 1ea842960fddbc6363cc6e7f914d70ba45525a6b (patch) | |
| tree | 735c929a570df413fd2840bcfa2414a0c1906b80 /hw/dmx | |
| parent | 92e8cdbd32b0d86cabd4ad88e3240bf90c018b9a (diff) | |
more debug
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/input/dmxbackend.c | 3 | ||||
| -rw-r--r-- | hw/dmx/input/dmxevents.c | 18 | ||||
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 7 |
3 files changed, 15 insertions, 13 deletions
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c index 48de4c9a8..61d1bfe3e 100644 --- a/hw/dmx/input/dmxbackend.c +++ b/hw/dmx/input/dmxbackend.c @@ -464,9 +464,8 @@ void dmxBackendCollectEvents(DevicePtr pDev, #if 11/*BP*/ case ButtonPress: case ButtonRelease: - /* ErrorF("press/release at %d, %d\n", X.xbutton.x, X.xbutton.y); - */ + /* fall-through */ #endif default: /* Pass the whole event here, because diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 90b45a9b9..9a31ba6c0 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -638,9 +638,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, /*pDev*/p, /*KeyPress*/type, /*n*/detail); - /* - ErrorF("NEW KEY EVENT %d n=%d\n", detail, nevents); - */ + ErrorF("KEY %d n=%d\n", detail, nevents); for (i = 0; i < nevents; i++) mieqEnqueue(p, events + i); xfree(events); @@ -659,6 +657,10 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, 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, @@ -666,11 +668,10 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, detail, POINTER_ABSOLUTE, 0, 0, valuators); - /* - ErrorF("NEW PTR EVENT %d (%d,%d,%d) n=%d\n", - detail, valuators[0], valuators[1], valuators[2], - nevents); - */ + + ErrorF("BUTTON %d, %d %d n=%d\n", + valuators[0], valuators[1], valuators[2], nevents); + for (i = 0; i < nevents; i++) mieqEnqueue(p, events + i); xfree(events); @@ -698,6 +699,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym, detail, POINTER_ABSOLUTE, 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", detail, e->xmotion.state, diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 7c0ae58a7..c098c46e2 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -503,10 +503,11 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) GetMaximumEventsNum(), #endif Relative); + ErrorF("MOTION BUFFER SIZE %d\n", GetMaximumEventsNum()); #ifdef XINPUT for (i = 0; i < info.numRelAxes; i++) 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]); #endif } else if (info.numRelAxes) { @@ -517,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], - info.maxval[0], info.res[0], + /*1280*/info.maxval[0], info.res[0], info.minres[0], info.maxres[0]); #endif } else if (info.numAbsAxes) { @@ -528,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], info.maxval[i+1], + info.minval[i+1], /*1280*/info.maxval[i+1], info.res[i+1], info.minres[i+1], info.maxres[i+1]); #endif |