diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-22 15:03:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-22 15:03:18 +0000 |
| commit | aa5b2e956fcc17b27d0f20ba7af65c52b34ef135 (patch) | |
| tree | 6117dbd9745f6fa241d5ca19af20d1c3adb6e859 /xorg-server/dix | |
| parent | 2d47702332ee534cda7f913e8d7892e53e4e23dc (diff) | |
| parent | 9273afeeb4499a0493f120b7525e17b6ae51113e (diff) | |
| download | vcxsrv-aa5b2e956fcc17b27d0f20ba7af65c52b34ef135.tar.gz vcxsrv-aa5b2e956fcc17b27d0f20ba7af65c52b34ef135.tar.bz2 vcxsrv-aa5b2e956fcc17b27d0f20ba7af65c52b34ef135.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/eventconvert.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c index dff1a5631..1009550c3 100644 --- a/xorg-server/dix/eventconvert.c +++ b/xorg-server/dix/eventconvert.c @@ -263,8 +263,20 @@ eventToKeyButtonPointer(DeviceEvent *ev, xEvent **xi, int *count) num_events = (countValuators(ev, &first) + 5)/6; /* valuator ev */
if (num_events <= 0)
{
- *count = 0;
- return BadMatch;
+ switch (ev->type)
+ {
+ case ET_KeyPress:
+ case ET_KeyRelease:
+ case ET_ButtonPress:
+ case ET_ButtonRelease:
+ /* no axes is ok */
+ break;
+ case ET_Motion:
+ case ET_ProximityIn:
+ case ET_ProximityOut:
+ *count = 0;
+ return BadMatch;
+ }
}
num_events++; /* the actual event event */
|