libxi: Changes to 'upstream-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 Makefile.am   |    2 +-
 src/XExtInt.c |   20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit c8696a5230c565f8999fea136a85a875b04e7b9a
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Wed Dec 6 18:56:56 2006 +0200

    Makefile.am: make ChangeLog hook safer
    
    Make ChangeLog hook as safe as possible.

diff --git a/Makefile.am b/Makefile.am
index 48b6eea..0693217 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	GIT_DIR=${srcdir}/.git git-log > ChangeLog
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
 dist-hook: ChangeLog

commit 60dccd9a7be95e35b4b8c90934888efedfde84cc
Author: Jamey Sharp <jamey@minilop.net>
Date:   Sun Nov 19 01:04:26 2006 -0800

    Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.

diff --git a/src/XExtInt.c b/src/XExtInt.c
index 427e406..8366104 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -80,9 +80,6 @@ typedef struct _XInputData
     XExtensionVersion *vers;
 } XInputData;
 
-#define XInputCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, xinput_extension_name, val)
-
 static /* const */ XExtensionHooks xinput_extension_hooks = {
     NULL,	/* create_gc */
     NULL,	/* copy_gc */
@@ -183,6 +180,12 @@ _xidevicebusy(dpy, error)
     *error = info->codes->first_error + XI_DeviceBusy;
 }
 
+static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
+{
+    XextCheckExtension (dpy, info, xinput_extension_name, 0);
+    return 1;
+}
+
 /***********************************************************************
  *
  * Check to see if the input extension is installed in the server.
@@ -198,7 +201,10 @@ _XiCheckExtInit(dpy, version_index, info
 {
     XExtensionVersion *ext;
 
-    XInputCheckExtension(dpy, info, -1);
+    if (!XInputCheckExtension(dpy, info)) {
+	UnlockDisplay(dpy);
+	return (-1);
+    }
 
     if (info->data == NULL) {
 	info->data = (XPointer) Xmalloc(sizeof(XInputData));

commit 41710257257939b181a1615937610550b40621b9
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Wed Nov 8 16:19:58 2006 +0200

    DevicePresenceNotify: remove verbosity, fill out all fields
    Don't throw a printf every time we get a DPN, and fill in all the fields
    when copying the structure.

diff --git a/src/XExtInt.c b/src/XExtInt.c
index b7297dc..427e406 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -681,12 +681,12 @@ XInputWireToEvent(dpy, re, event)
 	XDevicePresenceNotifyEvent *ev = (XDevicePresenceNotifyEvent *) re;
 	devicePresenceNotify *ev2 = (devicePresenceNotify *) event;
 
-	fprintf(stderr, "got DevicePresenceNotify event (reltype=%d)\n",
-		reltype);
-
 	*ev = *(XDevicePresenceNotifyEvent *) save;
 	ev->window = 0;
 	ev->time = ev2->time;
+        ev->devchange = ev2->devchange;
+        ev->deviceid = ev2->deviceid;
+        ev->control = ev2->control;
 	return (ENQUEUE_EVENT);
     }
 	break;