diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
| commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
| tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/dix/eventconvert.c | |
| parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
| parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
| download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/eventconvert.c')
| -rw-r--r-- | xorg-server/dix/eventconvert.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c index aa72708ed..e891f0698 100644 --- a/xorg-server/dix/eventconvert.c +++ b/xorg-server/dix/eventconvert.c @@ -102,6 +102,15 @@ EventToCore(InternalEvent *event, xEvent *core) switch(event->any.type)
{
case ET_Motion:
+ {
+ DeviceEvent *e = &event->device_event;
+ /* Don't create core motion event if neither x nor y are
+ * present */
+ if (!BitIsOn(e->valuators.mask, 0) &&
+ !BitIsOn(e->valuators.mask, 1))
+ return BadMatch;
+ }
+ /* fallthrough */
case ET_ButtonPress:
case ET_ButtonRelease:
case ET_KeyPress:
|