rpms/libXi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

copy the sequence number into XI2 events

Browse Source
This commit is contained in:
Peter Hutterer 2013-05-17 10:09:00 +10:00
parent 1cd00fb312
commit f333a6eaa0
2 changed files with 99 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
0001-Copy-the-sequence-number-into-the-target-event-too-6.patch Normal file
View File

@ -0,0 +1,92 @@
From 4ee15c55da848c9f3334e9750f28be81bfd6a312 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 17 May 2013 09:07:44 +1000
Subject: [PATCH libXi] 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>
---
src/XExtInt.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 507573b..2139c6a 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);
--
1.8.1.4

8
libXi.spec
View File

@ -5,7 +5,7 @@
Summary: X.Org X11 libXi runtime library
Name: libXi
Version: 1.7.1
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
@ -17,6 +17,8 @@ Source1: make-git-snapshot.sh
Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
%endif
Patch01: 0001-Copy-the-sequence-number-into-the-target-event-too-6.patch
BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-util-macros
BuildRequires: xorg-x11-proto-devel
@ -43,6 +45,7 @@ X.Org X11 libXi development package
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch01 -p1
# Disable static library creation by default.
%define with_static 0
@ -89,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3*
%changelog
* Fri May 17 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.7.1-2
- copy the sequence number into XI2 events
* Fri Apr 05 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.7.1-1
- libXi 1.7.1