xserver: Branch 'master'
Peter Hutterer
whot at kemper.freedesktop.org
Sun Dec 14 17:26:19 PST 2008
dix/events.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6383bc93b2ae76361a58653bc7e291df0d6ddfec
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sat Dec 13 15:44:52 2008 +1000
dix: Init DeviceEnterLeave event's type before FixUpEventFromWindow (#19064)
X.Org Bug 19064 <http://bugs.freedesktop.org/show_bug.cgi?id=19064>
diff --git a/dix/events.c b/dix/events.c
index e30f40b..7b698a0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4300,6 +4300,7 @@ DeviceEnterLeaveEvent(
/* we don't have enough bytes, so we squash flags and mode into
one byte, and use the last byte for the deviceid. */
devEnterLeave = (deviceEnterNotify*)&event;
+ devEnterLeave->type = type;
devEnterLeave->detail = detail;
devEnterLeave->time = currentTime.milliseconds;
devEnterLeave->rootX = mouse->spriteInfo->sprite->hot.x;
@@ -4308,7 +4309,6 @@ DeviceEnterLeaveEvent(
sameScreen = event.u.keyButtonPointer.sameScreen;
devEnterLeave->child = child;
- devEnterLeave->type = type;
devEnterLeave->deviceid = mouse->id;
devEnterLeave->mode = mode;
devEnterLeave->mode |= (sameScreen ? (ELFlagSameScreen << 4) : 0);
More information about the xorg-commit
mailing list