diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-08 08:21:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-08 08:21:55 +0200 |
| commit | adeb8256da9b636648178f729d7b3316a0a8e990 (patch) | |
| tree | e257c9261b81b08242658404c16fcd6749fcd7d5 /xorg-server/dix/events.c | |
| parent | 09a5e4f06e54a817ecbb04b3e2bdc28f27fa3e61 (diff) | |
| download | vcxsrv-adeb8256da9b636648178f729d7b3316a0a8e990.tar.gz vcxsrv-adeb8256da9b636648178f729d7b3316a0a8e990.tar.bz2 vcxsrv-adeb8256da9b636648178f729d7b3316a0a8e990.zip | |
xserver libX11 mesa git update 8 Jun 2011
Diffstat (limited to 'xorg-server/dix/events.c')
| -rw-r--r-- | xorg-server/dix/events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index b60c29952..3c7bd50cd 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -432,7 +432,7 @@ GetEventFilter(DeviceIntPtr dev, xEvent *event) return filters[dev ? dev->id : 0][event->u.u.type]; else if ((evtype = xi2_get_type(event))) return (1 << (evtype % 8)); - ErrorF("[dix] Unknown device type %d. No filter\n", event->u.u.type); + ErrorF("[dix] Unknown event type %d. No filter\n", event->u.u.type); return 0; } @@ -1421,7 +1421,7 @@ CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode) static void DetachFromMaster(DeviceIntPtr dev) { - if (!IsFloating(dev)) + if (IsFloating(dev)) return; dev->saved_master_id = GetMaster(dev, MASTER_ATTACHED)->id; @@ -3997,7 +3997,7 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, rc = EventToXI2(event, &xi2); if (rc == Success) { - int evtype = ((xGenericEvent*)xi2)->evtype; + int evtype = xi2_get_type(xi2); mask = grab->xi2mask[XIAllDevices][evtype/8] | grab->xi2mask[XIAllMasterDevices][evtype/8] | grab->xi2mask[thisDev->id][evtype/8]; |