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

dix: mark motion events as emulated if we're scrolling from button press 

The protocol requires that the emulated event is marked as such. So if a
driver with smooth scrolling axis sends legacy button events, the motion
event must be marked as emulated.

Pass the real type to emulate_scroll_button_events and create the events
accordingly. For real button press or relase events, only that event must be
generated since a release event will follow or a press event has already
occured, respectively. (This fixes a bug where we'd get two release events
for each legacy button event)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-10-05 12:08:31 +10:00
parent 82c60232c0
commit 2cb63180fa
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dix/getevents.c
View File

@ -1228,6 +1228,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
* *
* @param events The pointer to the event list to fill the events * @param events The pointer to the event list to fill the events
* @param dev The device to generate the events for * @param dev The device to generate the events for
* @param type The real type of the event
* @param axis The axis number to generate events for * @param axis The axis number to generate events for
* @param mask State before this event in absolute coords * @param mask State before this event in absolute coords
* @param[in,out] last Last scroll state posted in absolute coords (modified * @param[in,out] last Last scroll state posted in absolute coords (modified
@ -1239,6 +1240,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
static int static int
emulate_scroll_button_events(InternalEvent *events, emulate_scroll_button_events(InternalEvent *events,
DeviceIntPtr dev, DeviceIntPtr dev,
int type,
int axis, int axis,
const ValuatorMask *mask, const ValuatorMask *mask,
ValuatorMask *last, ValuatorMask *last,
@ -1251,6 +1253,7 @@ emulate_scroll_button_events(InternalEvent *events,
int num_events = 0; int num_events = 0;
double total; double total;
int b; int b;
int flags = 0;
if (dev->valuator->axes[axis].scroll.type == SCROLL_TYPE_NONE) if (dev->valuator->axes[axis].scroll.type == SCROLL_TYPE_NONE)
return 0; return 0;
@ -1261,6 +1264,9 @@ emulate_scroll_button_events(InternalEvent *events,
ax = &dev->valuator->axes[axis]; ax = &dev->valuator->axes[axis];
incr = ax->scroll.increment; incr = ax->scroll.increment;
if (type != ButtonPress && type != ButtonRelease)
flags |= POINTER_EMULATED;
if (!valuator_mask_isset(last, axis)) if (!valuator_mask_isset(last, axis))
valuator_mask_set_double(last, axis, 0); valuator_mask_set_double(last, axis, 0);
@ -1288,14 +1294,20 @@ emulate_scroll_button_events(InternalEvent *events,
*/ */
if (num_events + 4 < max_events) if (num_events + 4 < max_events)
{ {
nev_tmp = fill_pointer_events(events, dev, ButtonPress, b, ms, if (type != ButtonRelease)
POINTER_EMULATED, NULL); {
events += nev_tmp; nev_tmp = fill_pointer_events(events, dev, ButtonPress, b, ms,
num_events += nev_tmp; flags, NULL);
nev_tmp = fill_pointer_events(events, dev, ButtonRelease, b, ms, events += nev_tmp;
POINTER_EMULATED, NULL); num_events += nev_tmp;
events += nev_tmp; }
num_events += nev_tmp; if (type != ButtonPress)
{
nev_tmp = fill_pointer_events(events, dev, ButtonRelease, b, ms,
flags, NULL);
events += nev_tmp;
num_events += nev_tmp;
}
} }
} }
@ -1340,6 +1352,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
ValuatorMask mask; ValuatorMask mask;
ValuatorMask scroll; ValuatorMask scroll;
int i; int i;
int realtype = type;
/* refuse events from disabled devices */ /* refuse events from disabled devices */
if (!pDev->enabled) if (!pDev->enabled)
@ -1392,6 +1405,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
valuator_mask_set_double(&mask, axis, val); valuator_mask_set_double(&mask, axis, val);
type = MotionNotify; type = MotionNotify;
buttons = 0; buttons = 0;
flags |= POINTER_EMULATED;
} }
} }
@ -1411,7 +1425,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
valuator_mask_set_double(&scroll, i, pDev->last.valuators[i]); valuator_mask_set_double(&scroll, i, pDev->last.valuators[i]);
nev_tmp = emulate_scroll_button_events(events, pDev, i, &scroll, nev_tmp = emulate_scroll_button_events(events, pDev, realtype, i, &scroll,
pDev->last.scroll, ms, pDev->last.scroll, ms,
GetMaximumEventsNum() - num_events); GetMaximumEventsNum() - num_events);
events += nev_tmp; events += nev_tmp;