xserver: Branch 'master' - 3 commits
Brian Paul
brianp at kemper.freedesktop.org
Sat Mar 31 00:06:21 EEST 2007
hw/dmx/input/dmxbackend.c | 3 +--
hw/dmx/input/dmxevents.c | 24 ++++++++++++++----------
hw/dmx/input/dmxinputinit.c | 1 +
3 files changed, 16 insertions(+), 12 deletions(-)
New commits:
diff-tree 3c7413e0c2f87e154aa8aa4a83bd585a6d1091e8 (from 7989dacdcb1449b10d7733dda11cd96e260e9fae)
Author: Brian <brian at yutani.localnet.net>
Date: Fri Mar 30 14:07:04 2007 -0600
Tweak some parameters, etc. Things seem a little better now, but still a ways to go.
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 3027457..0cc3054 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -262,6 +262,7 @@ void dmxCoreMotion(int x, int y, int del
#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
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
/*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 c098c46..1465ade 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -507,7 +507,7 @@ static int dmxDeviceOnOff(DeviceIntPtr p
#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 p
#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 p
#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
diff-tree 7989dacdcb1449b10d7733dda11cd96e260e9fae (from 1ea842960fddbc6363cc6e7f914d70ba45525a6b)
Author: Brian <brian at yutani.localnet.net>
Date: Fri Mar 30 13:44:24 2007 -0600
num_valuators=1 for GetPointerEvents(), hack ButtonPress/Release position
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 9a31ba6..3027457 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -655,19 +655,19 @@ void dmxEnqueue(DevicePtr pDev, int type
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, 0, valuators);
+ 0, 1, valuators);
ErrorF("BUTTON %d, %d %d n=%d\n",
valuators[0], valuators[1], valuators[2], nevents);
@@ -698,7 +698,7 @@ void dmxEnqueue(DevicePtr pDev, int type
/*KeyPress*/type,
detail,
POINTER_ABSOLUTE,
- 0, 0, valuators);
+ 0, 1, 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-tree 1ea842960fddbc6363cc6e7f914d70ba45525a6b (from 92e8cdbd32b0d86cabd4ad88e3240bf90c018b9a)
Author: Brian <brian at yutani.localnet.net>
Date: Fri Mar 30 13:43:15 2007 -0600
more debug
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index 48de4c9..61d1bfe 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -464,9 +464,8 @@ void dmxBackendCollectEvents(DevicePtr p
#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 90b45a9..9a31ba6 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -638,9 +638,7 @@ void dmxEnqueue(DevicePtr pDev, int type
/*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
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
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
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 7c0ae58..c098c46 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -503,10 +503,11 @@ static int dmxDeviceOnOff(DeviceIntPtr p
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 p
#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 p
#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
More information about the xorg-commit
mailing list