dix: Init DeviceEnterLeave event's type before FixUpEventFromWindow (#19064)
X.Org Bug 19064 <http://bugs.freedesktop.org/show_bug.cgi?id=19064>
This commit is contained in:
parent
49d38ab232
commit
6383bc93b2
|
@ -4300,6 +4300,7 @@ DeviceEnterLeaveEvent(
|
||||||
/* we don't have enough bytes, so we squash flags and mode into
|
/* we don't have enough bytes, so we squash flags and mode into
|
||||||
one byte, and use the last byte for the deviceid. */
|
one byte, and use the last byte for the deviceid. */
|
||||||
devEnterLeave = (deviceEnterNotify*)&event;
|
devEnterLeave = (deviceEnterNotify*)&event;
|
||||||
|
devEnterLeave->type = type;
|
||||||
devEnterLeave->detail = detail;
|
devEnterLeave->detail = detail;
|
||||||
devEnterLeave->time = currentTime.milliseconds;
|
devEnterLeave->time = currentTime.milliseconds;
|
||||||
devEnterLeave->rootX = mouse->spriteInfo->sprite->hot.x;
|
devEnterLeave->rootX = mouse->spriteInfo->sprite->hot.x;
|
||||||
|
@ -4308,7 +4309,6 @@ DeviceEnterLeaveEvent(
|
||||||
sameScreen = event.u.keyButtonPointer.sameScreen;
|
sameScreen = event.u.keyButtonPointer.sameScreen;
|
||||||
|
|
||||||
devEnterLeave->child = child;
|
devEnterLeave->child = child;
|
||||||
devEnterLeave->type = type;
|
|
||||||
devEnterLeave->deviceid = mouse->id;
|
devEnterLeave->deviceid = mouse->id;
|
||||||
devEnterLeave->mode = mode;
|
devEnterLeave->mode = mode;
|
||||||
devEnterLeave->mode |= (sameScreen ? (ELFlagSameScreen << 4) : 0);
|
devEnterLeave->mode |= (sameScreen ? (ELFlagSameScreen << 4) : 0);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user