debian/changelog | 7 +++++++
src/XExtInt.c | 5 +++++
2 files changed, 12 insertions(+)
New commits:
commit 2f07f69e6e27b1fbc9156b3a2d722b84a4246659
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 17 17:00:54 2010 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index a075fee..3ecdd89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.3-6) unstable; urgency=medium
+
+ * WireToEvent: Set display member of all events as well (cherry-pick from
+ upstream).
+
+ -- Julien Cristau <jcris...@debian.org> Fri, 17 Dec 2010 17:00:44 +0100
+
libxi (2:1.3-5) unstable; urgency=low
* Cherry-picked fixes from upstream:
commit e603bcd743930313e679b7dcc6fd3a3dddf6303e
Author: Daniel Stone <dan...@fooishbar.org>
Date: Mon Dec 13 19:49:58 2010 +0000
WireToEvent: Set display member of all events as well
All events were getting random uninitialised garbage for display; fix
that.
Signed-off-by: Daniel Stone <dan...@fooishbar.org>
(cherry picked from commit 9419fe9f0b21232d342885a693fbf9222b5844e4)
diff --git a/src/XExtInt.c b/src/XExtInt.c
index db7aa78..4b7154b 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -1349,6 +1349,7 @@ wireToDeviceEvent(xXIDeviceEvent *in,
XGenericEventCookie* cookie)
cookie->data = ptr_lib = malloc(len);
out = next_block(&ptr_lib, sizeof(XIDeviceEvent));
+ out->display = cookie->display;
out->type = in->type;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1548,6 +1549,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in,
XGenericEventCookie *cookie)
cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len);
out->type = in->type;
+ out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1577,6 +1579,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in,
XGenericEventCookie *cookie)
cookie->data = out = malloc(sizeof(XIHierarchyEvent) + in->num_info *
sizeof(XIHierarchyInfo));;
out->info = (XIHierarchyInfo*)&out[1];
+ out->display = cookie->display;
out->type = in->type;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1619,6 +1622,7 @@ wireToRawEvent(xXIRawEvent *in, XGenericEventCookie
*cookie)
out = next_block(&ptr, sizeof(XIRawEvent));
out->type = in->type;
+ out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1662,6 +1666,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie
*cookie)
out->buttons.mask = (unsigned char*)&out[1];
out->type = in->type;
+ out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptctv-0002ay...@alioth.debian.org
