andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GetPointerEvents: add first_valuator parameter

Browse Source 
Add a first_valuator parameter.  Looks correct by inspection, but untested
with first_valuator != 0 as yet.
This commit is contained in:
Daniel Stone 2006-10-08 16:18:05 +03:00 committed by Daniel Stone
parent 84f5d2291c
commit 58314756ae
4 changed files with 89 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
dix/events.c
View File

@ -4789,15 +4789,28 @@ int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
/* Originally a part of xf86PostMotionEvent. */ /* Originally a part of xf86PostMotionEvent. */
static void static void
acceleratePointer(DeviceIntPtr pDev, int num_valuators, int *valuators) acceleratePointer(DeviceIntPtr pDev, int first_valuator, int num_valuators,
int *valuators)
{ {
float mult = 0.0; float mult = 0.0;
int dx = num_valuators >= 1 ? valuators[0] : 0; int dx = 0, dy = 0;
int dy = num_valuators >= 2 ? valuators[1] : 0; int *px = NULL, *py = NULL;
if (!num_valuators || !valuators) if (!num_valuators || !valuators)
return; return;
if (first_valuator == 0) {
dx = valuators[0];
px = &valuators[0];
}
if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) {
dy = valuators[1 - first_valuator];
py = &valuators[1 - first_valuator];
}
if (!dx && !dy)
return;
/* /*
* Accelerate * Accelerate
*/ */
@ -4809,20 +4822,24 @@ acceleratePointer(DeviceIntPtr pDev, int num_valuators, int *valuators)
(float)(pDev->ptrfeed->ctrl.num)) / (float)(pDev->ptrfeed->ctrl.num)) /
(float)(pDev->ptrfeed->ctrl.den) + (float)(pDev->ptrfeed->ctrl.den) +
pDev->valuator->dxremaind; pDev->valuator->dxremaind;
valuators[0] = (int)pDev->valuator->dxremaind; if (px) {
pDev->valuator->dxremaind = pDev->valuator->dxremaind - *px = (int)pDev->valuator->dxremaind;
(float)valuators[0]; pDev->valuator->dxremaind = pDev->valuator->dxremaind -
(float)(*px);
}
pDev->valuator->dyremaind = ((float)dy * pDev->valuator->dyremaind = ((float)dy *
(float)(pDev->ptrfeed->ctrl.num)) / (float)(pDev->ptrfeed->ctrl.num)) /
(float)(pDev->ptrfeed->ctrl.den) + (float)(pDev->ptrfeed->ctrl.den) +
pDev->valuator->dyremaind; pDev->valuator->dyremaind;
valuators[1] = (int)pDev->valuator->dyremaind; if (py) {
pDev->valuator->dyremaind = pDev->valuator->dyremaind - *py = (int)pDev->valuator->dyremaind;
(float)valuators[1]; pDev->valuator->dyremaind = pDev->valuator->dyremaind -
(float)(*py);
}
} }
} }
else if (dx || dy) { else {
mult = pow((float)(dx * dx + dy * dy), mult = pow((float)(dx * dx + dy * dy),
((float)(pDev->ptrfeed->ctrl.num) / ((float)(pDev->ptrfeed->ctrl.num) /
(float)(pDev->ptrfeed->ctrl.den) - 1.0) / (float)(pDev->ptrfeed->ctrl.den) - 1.0) /
@ -4830,16 +4847,16 @@ acceleratePointer(DeviceIntPtr pDev, int num_valuators, int *valuators)
if (dx) { if (dx) {
pDev->valuator->dxremaind = mult * (float)dx + pDev->valuator->dxremaind = mult * (float)dx +
pDev->valuator->dxremaind; pDev->valuator->dxremaind;
valuators[0] = (int)pDev->valuator->dxremaind; *px = (int)pDev->valuator->dxremaind;
pDev->valuator->dxremaind = pDev->valuator->dxremaind - pDev->valuator->dxremaind = pDev->valuator->dxremaind -
(float)valuators[0]; (float)(*px);
} }
if (dy) { if (dy) {
pDev->valuator->dyremaind = mult * (float)dy + pDev->valuator->dyremaind = mult * (float)dy +
pDev->valuator->dyremaind; pDev->valuator->dyremaind;
valuators[1] = (int)pDev->valuator->dyremaind; *py = (int)pDev->valuator->dyremaind;
pDev->valuator->dyremaind = pDev->valuator->dyremaind - pDev->valuator->dyremaind = pDev->valuator->dyremaind -
(float)valuators[1]; (float)(*py);
} }
} }
} }
@ -4855,8 +4872,9 @@ acceleratePointer(DeviceIntPtr pDev, int num_valuators, int *valuators)
*/ */
int int
GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
int flags, int num_valuators, int *valuators) { int flags, int first_valuator, int num_valuators,
int numEvents = 0, ms = 0, first_valuator = 0; int *valuators) {
int num_events = 0, ms = 0, final_valuator = 0, i = 0;
deviceKeyButtonPointer *kbp = NULL; deviceKeyButtonPointer *kbp = NULL;
deviceValuator *xv = NULL; deviceValuator *xv = NULL;
AxisInfoPtr axes = NULL; AxisInfoPtr axes = NULL;
@ -4869,20 +4887,27 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
if (!pDev->button || (pDev->coreEvents && (!cp->button || !cp->valuator))) if (!pDev->button || (pDev->coreEvents && (!cp->button || !cp->valuator)))
return 0; return 0;
if (pDev->coreEvents) /* You fail. */
numEvents = 2; if (first_valuator < 0)
else return 0;
numEvents = 1;
if (num_valuators > 2 && sendValuators) { if (pDev->coreEvents)
num_events = 2;
else
num_events = 1;
/* Do we need to send a DeviceValuator event? */
if ((num_valuators + first_valuator) >= 2 && sendValuators) {
if (((num_valuators / 6) + 1) > MAX_VALUATOR_EVENTS) if (((num_valuators / 6) + 1) > MAX_VALUATOR_EVENTS)
num_valuators = MAX_VALUATOR_EVENTS; num_valuators = MAX_VALUATOR_EVENTS;
numEvents += (num_valuators / 6) + 1; num_events += (num_valuators / 6) + 1;
} }
else if (type == MotionNotify && num_valuators < 2) { else if (type == MotionNotify && num_valuators <= 0) {
return 0; return 0;
} }
final_valuator = num_valuators + first_valuator;
ms = GetTimeInMillis(); ms = GetTimeInMillis();
kbp = (deviceKeyButtonPointer *) events; kbp = (deviceKeyButtonPointer *) events;
@ -4890,7 +4915,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
kbp->deviceid = pDev->id; kbp->deviceid = pDev->id;
if (flags & POINTER_ABSOLUTE) { if (flags & POINTER_ABSOLUTE) {
if (num_valuators >= 1) { if (num_valuators >= 1 && first_valuator == 0) {
kbp->root_x = valuators[0]; kbp->root_x = valuators[0];
} }
else { else {
@ -4899,8 +4924,9 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
else else
kbp->root_x = pDev->valuator->lastx; kbp->root_x = pDev->valuator->lastx;
} }
if (num_valuators >= 2) {
kbp->root_y = valuators[1]; if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) {
kbp->root_y = valuators[1 - first_valuator];
} }
else { else {
if (pDev->coreEvents) if (pDev->coreEvents)
@ -4911,25 +4937,30 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
} }
else { else {
if (flags & POINTER_ACCELERATE) if (flags & POINTER_ACCELERATE)
acceleratePointer(pDev, num_valuators, valuators); acceleratePointer(pDev, first_valuator, num_valuators,
valuators);
if (pDev->coreEvents) { if (pDev->coreEvents) {
if (num_valuators >= 1) if (first_valuator == 0 && num_valuators >= 1)
kbp->root_x = cp->valuator->lastx + valuators[0]; kbp->root_x = cp->valuator->lastx + valuators[0];
else else
kbp->root_x = cp->valuator->lastx; kbp->root_x = cp->valuator->lastx;
if (num_valuators >= 2)
kbp->root_y = cp->valuator->lasty + valuators[1]; if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
kbp->root_y = cp->valuator->lasty +
valuators[1 - first_valuator];
else else
kbp->root_y = cp->valuator->lasty; kbp->root_y = cp->valuator->lasty;
} }
else { else {
if (num_valuators >= 1) if (first_valuator == 0 && num_valuators >= 1)
kbp->root_x = pDev->valuator->lastx + valuators[0]; kbp->root_x = pDev->valuator->lastx + valuators[0];
else else
kbp->root_x = pDev->valuator->lastx; kbp->root_x = pDev->valuator->lastx;
if (num_valuators >= 2)
kbp->root_y = pDev->valuator->lasty + valuators[1]; if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
kbp->root_y = pDev->valuator->lasty +
valuators[1 - first_valuator];
else else
kbp->root_y = pDev->valuator->lasty; kbp->root_y = pDev->valuator->lasty;
} }
@ -4941,6 +4972,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
kbp->root_x = axes->min_value; kbp->root_x = axes->min_value;
if (axes->max_value > 0 && kbp->root_x > axes->max_value) if (axes->max_value > 0 && kbp->root_x > axes->max_value)
kbp->root_x = axes->max_value; kbp->root_x = axes->max_value;
axes++; axes++;
if (kbp->root_y < axes->min_value) if (kbp->root_y < axes->min_value)
kbp->root_y = axes->min_value; kbp->root_y = axes->min_value;
@ -4965,35 +4997,36 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
kbp->detail = pDev->button->map[buttons]; kbp->detail = pDev->button->map[buttons];
} }
if (num_valuators > 2 && sendValuators) { if (final_valuator > 2 && sendValuators) {
kbp->deviceid |= MORE_EVENTS; kbp->deviceid |= MORE_EVENTS;
while (first_valuator < num_valuators) { for (i = first_valuator; i < final_valuator; i += 6) {
xv = (deviceValuator *) ++events; xv = (deviceValuator *) ++events;
xv->type = DeviceValuator; xv->type = DeviceValuator;
xv->first_valuator = first_valuator; xv->first_valuator = i;
xv->num_valuators = num_valuators; xv->num_valuators = num_valuators;
xv->deviceid = kbp->deviceid; xv->deviceid = kbp->deviceid;
switch (num_valuators - first_valuator) { switch (final_valuator - i) {
case 6: case 6:
xv->valuator5 = valuators[first_valuator+5]; xv->valuator5 = valuators[i+5];
case 5: case 5:
xv->valuator4 = valuators[first_valuator+4]; xv->valuator4 = valuators[i+4];
case 4: case 4:
xv->valuator3 = valuators[first_valuator+3]; xv->valuator3 = valuators[i+3];
case 3: case 3:
xv->valuator2 = valuators[first_valuator+2]; xv->valuator2 = valuators[i+2];
case 2: case 2:
if (first_valuator == 0) /* x and y may have been accelerated. */
if (i == 0)
xv->valuator1 = kbp->root_y; xv->valuator1 = kbp->root_y;
else else
xv->valuator1 = valuators[first_valuator+1]; xv->valuator1 = valuators[i+1];
case 1: case 1:
if (first_valuator == 0) /* x and y may have been accelerated. */
if (i == 0)
xv->valuator0 = kbp->root_x; xv->valuator0 = kbp->root_x;
else else
xv->valuator0 = valuators[first_valuator]; xv->valuator0 = valuators[i];
} }
first_valuator += 6;
} }
} }
@ -5005,8 +5038,11 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
events->u.keyButtonPointer.rootY = kbp->root_y; events->u.keyButtonPointer.rootY = kbp->root_y;
cp->valuator->lastx = kbp->root_x; cp->valuator->lastx = kbp->root_x;
cp->valuator->lasty = kbp->root_y; cp->valuator->lasty = kbp->root_y;
if (type == ButtonPress || type == ButtonRelease) { if (type == ButtonPress || type == ButtonRelease) {
/* Core buttons remapping shouldn't be transitive. */ /* We hijack SetPointerMapping to work on all core-sending
* devices, so we use the device-specific map here instead of
* the core one. */
events->u.u.detail = pDev->button->map[buttons]; events->u.u.detail = pDev->button->map[buttons];
} }
else { else {
@ -5018,5 +5054,5 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
inputInfo.pointer->devPrivates[CoreDevicePrivatesIndex].ptr = pDev; inputInfo.pointer->devPrivates[CoreDevicePrivatesIndex].ptr = pDev;
} }
return numEvents; return num_events;
} }

2
hw/kdrive/src/kinput.c
View File

@ -2049,7 +2049,7 @@ _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel)) if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel))
return; return;
nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel, 3, nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel, 0, 3,
valuators); valuators);
for (i = 0; i < nEvents; i++) for (i = 0; i < nEvents; i++)
KdQueueEvent(kdEvents + i); KdQueueEvent(kdEvents + i);

4
hw/xfree86/common/xf86Xinput.c
View File

@ -669,7 +669,7 @@ xf86PostMotionEvent(DeviceIntPtr device,
FatalError("Couldn't allocate event store\n"); FatalError("Couldn't allocate event store\n");
nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0, nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0,
flags, num_valuators, valuators); flags, 0, num_valuators, valuators);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(xf86Events + i); mieqEnqueue(xf86Events + i);
@ -820,7 +820,7 @@ xf86PostButtonEvent(DeviceIntPtr device,
is_down ? ButtonPress : ButtonRelease, button, is_down ? ButtonPress : ButtonRelease, button,
is_absolute ? POINTER_ABSOLUTE : is_absolute ? POINTER_ABSOLUTE :
POINTER_RELATIVE, POINTER_RELATIVE,
num_valuators, valuators); 0, num_valuators, valuators);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(xf86Events + i); mieqEnqueue(xf86Events + i);

3
include/input.h
View File

@ -387,7 +387,8 @@ extern int GetPointerEvents(
int type, int type,
int buttons, int buttons,
int flags, int flags,
int num_axes, int first_valuator,
int num_valuators,
int *valuators); int *valuators);
extern int GetKeyboardEvents( extern int GetKeyboardEvents(