summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2008-12-13 15:44:52 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2008-12-15 11:24:52 +1000
commit6383bc93b2ae76361a58653bc7e291df0d6ddfec (patch)
tree69817a27f716098fa6e90f4c99f9f0ee831102b9
parent49d38ab2328c409b2a98465b52677af057121513 (diff)
dix: Init DeviceEnterLeave event's type before FixUpEventFromWindow (#19064)
X.Org Bug 19064 <http://bugs.freedesktop.org/show_bug.cgi?id=19064>
-rw-r--r--dix/events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c
index e30f40b17..7b698a0d1 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);