summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-05-17 09:07:44 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-05-20 08:15:49 +1000
commit5d43d4914dcabb6de69859567061e99300e56ef4 (patch)
tree8721d92d33db61be50f6900286dfd5fc4cedb274
parentbb82c72a1d69eaf60b7586570faf797df967f661 (diff)
downloadxorg-lib-libXi-5d43d4914dcabb6de69859567061e99300e56ef4.tar.gz
Copy the sequence number into the target event too (#64687)
X.Org Bug 64687 <http://bugs.freedesktop.org/show_bug.cgi?id=64687> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
-rw-r--r--src/XExtInt.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 507573b..8e19b97 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev,
cookie->type = ev->type;
cookie->evtype = ev->evtype;
cookie->extension = ev->extension;
+ cookie->serial = ev->sequenceNumber;
}
static Bool
@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie)
out = next_block(&ptr_lib, sizeof(XIDeviceEvent));
out->display = cookie->display;
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie)
cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len);
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie)
out->info = (XIHierarchyInfo*)&out[1];
out->display = cookie->display;
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook
out = next_block(&ptr, sizeof(XIRawEvent));
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie)
out->buttons.mask = (unsigned char*)&out[1];
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie)
cookie->data = out;
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
cookie->data = out;
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie)
out->display = cookie->display;
out->type = in->type;
+ out->serial = in->sequenceNumber;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);