debian/changelog
| 2 -
debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
| 15 +++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 3975e5219d713c8962a3a3f7c02ec7efc07b22eb
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jan 6 16:20:34 2010 +0000
Fixup a couple issues in the patch
- make sure we unlock the display on error
- output error message to stderr
- fix off-by-two in number of events for XI1
diff --git a/debian/changelog b/debian/changelog
index f702684..bc7af21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ libxi (2:1.3-2) unstable; urgency=low
#515734, #515946). Patch by Peter Hutterer, analysis by Nathan Kidd.
* Upload to unstable.
- -- Julien Cristau <jcris...@debian.org> Wed, 06 Jan 2010 13:02:46 +0000
+ -- Julien Cristau <jcris...@debian.org> Wed, 06 Jan 2010 16:23:44 +0000
libxi (2:1.3-1) experimental; urgency=low
diff --git
a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
index 34b4544..47d32b6 100644
---
a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
+++
b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
@@ -22,7 +22,7 @@ diff --git a/src/XExtInt.c b/src/XExtInt.c
index e87ead8..125a72e 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
-@@ -173,6 +173,63 @@ static char *XInputErrorList[] = {
+@@ -173,6 +173,64 @@ static char *XInputErrorList[] = {
"BadClass, invalid event class", /* BadClass */
};
@@ -47,16 +47,17 @@ index e87ead8..125a72e 100644
+ LockDisplay(dpy);
+ extversion = _XiGetExtensionVersionRequest(dpy, INAME,
+ codes.major_opcode);
-+ if (!extversion || !extversion->present)
-+ goto out;
+ UnlockDisplay(dpy);
+ SyncHandle();
++ if (!extversion || !extversion->present)
++ goto out;
+
+ if (extversion->major_version >= 2)
+ nevents = IEVENTS; /* number is fixed, XI2 adds GenericEvents only */
+ else if (extversion->major_version <= 0)
+ {
-+ printf("XInput_find_display: invalid extension version %d.%d\n",
++ fprintf(stderr,
++ "XInput_find_display: invalid extension version %d.%d\n",
+ extversion->major_version, extversion->minor_version);
+ goto out;
+ }
@@ -65,13 +66,13 @@ index e87ead8..125a72e 100644
+ switch(extversion->minor_version)
+ {
+ case XI_Add_DeviceProperties_Minor:
-+ nevents = XI_DevicePropertyNotify - 1;
++ nevents = XI_DevicePropertyNotify + 1;
+ break;
+ case XI_Add_DevicePresenceNotify_Minor:
-+ nevents = XI_DevicePresenceNotify - 1;
++ nevents = XI_DevicePresenceNotify + 1;
+ break;
+ default:
-+ nevents = XI_DeviceButtonstateNotify - 1;
++ nevents = XI_DeviceButtonstateNotify + 1;
+ break;
+ }
+ }
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
