libxi: Changes to 'upstream-experimental'
configure.ac | 2 +-
man/XIGrabButton.txt | 44 ++++++++++++++++++++++++++------------------
man/XIGrabEnter.txt | 10 +++++++++-
src/XAllowDv.c | 3 +++
src/XChgDCtl.c | 4 ++++
src/XChgFCtl.c | 4 ++++
src/XChgKMap.c | 4 ++++
src/XChgKbd.c | 4 ++++
src/XChgPnt.c | 4 ++++
src/XChgProp.c | 4 ++++
src/XCloseDev.c | 4 ++++
src/XDevBell.c | 4 ++++
src/XExtInt.c | 8 ++++++--
src/XExtToWire.c | 4 ++++
src/XFreeLst.c | 4 ++++
src/XGMotion.c | 3 +++
src/XGetBMap.c | 4 ++++
src/XGetCPtr.c | 3 +++
src/XGetDCtl.c | 4 ++++
src/XGetFCtl.c | 4 ++++
src/XGetKMap.c | 4 ++++
src/XGetMMap.c | 3 +++
src/XGetProp.c | 3 +++
src/XGetVers.c | 4 ++++
src/XGrDvBut.c | 3 +++
src/XGrDvKey.c | 3 +++
src/XGrabDev.c | 3 +++
src/XGtFocus.c | 3 +++
src/XGtSelect.c | 3 +++
src/XIAllowEvents.c | 4 ++++
src/XIDefineCursor.c | 4 ++++
src/XIGetDevFocus.c | 3 +++
src/XIGrabDevice.c | 4 ++++
src/XIHierarchy.c | 3 +++
src/XIPassiveGrab.c | 3 +++
src/XIQueryDevice.c | 8 +++++++-
src/XIQueryPointer.c | 3 +++
src/XIQueryVersion.c | 5 +++++
src/XISelEv.c | 3 +++
src/XISetCPtr.c | 3 +++
src/XISetDevFocus.c | 4 ++++
src/XIWarpPointer.c | 3 +++
src/XListDev.c | 3 +++
src/XOpenDev.c | 3 +++
src/XQueryDv.c | 3 +++
src/XSelect.c | 3 +++
src/XSetBMap.c | 3 +++
src/XSetDVal.c | 3 +++
src/XSetMMap.c | 3 +++
src/XSetMode.c | 3 +++
src/XSndExEv.c | 3 +++
src/XStFocus.c | 3 +++
src/XUngrDev.c | 3 +++
src/XUngrDvB.c | 3 +++
src/XUngrDvK.c | 3 +++
55 files changed, 220 insertions(+), 23 deletions(-)
New commits:
commit 82a631263ef4e6f46c1f33748089db8bf603b095
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 21 15:33:17 2011 +1000
libXi 1.5.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 10d2e5d..46329b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.4.99.1],
+AC_INIT([libXi], [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
commit fa6505f0a86b296e8f12f0fb8f472ef17b501fdb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 19 09:36:34 2011 +1000
man: minor formatting fix in XIGrabButton
diff --git a/man/XIGrabButton.txt b/man/XIGrabButton.txt
index 5b14532..45ac25e 100644
--- a/man/XIGrabButton.txt
+++ b/man/XIGrabButton.txt
@@ -32,22 +32,22 @@ SYNOPSIS
XIGrabModifiers *modifiers);
int XIGrabKeycode( Display *display,
- int deviceid,
- int keycode,
- Window grab_window,
- int grab_mode,
- int paired_device_mode,
- Bool owner_events,
- XIEventMask *mask,
- int num_modifiers,
- XIGrabModifiers *modifiers_inout);
+ int deviceid,
+ int keycode,
+ Window grab_window,
+ int grab_mode,
+ int paired_device_mode,
+ Bool owner_events,
+ XIEventMask *mask,
+ int num_modifiers,
+ XIGrabModifiers *modifiers_inout);
int XIUngrabKeycode( Display *display,
- int deviceid,
- int keycode,
- Window grab_window,
- int num_modifiers,
- XIGrabModifiers *modifiers);
+ int deviceid,
+ int keycode,
+ Window grab_window,
+ int num_modifiers,
+ XIGrabModifiers *modifiers);
display
Specifies the connection to the X server.
commit 49408e39e4b084fe362e9ee197bfa0aa1c55384d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 11 15:32:21 2011 +1000
Include config.h from source files
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/XAllowDv.c b/src/XAllowDv.c
index d19443d..ccecead 100644
--- a/src/XAllowDv.c
+++ b/src/XAllowDv.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XAllowDeviceEvents - Thaw a frozen extension device.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XChgDCtl.c b/src/XChgDCtl.c
index 172cb5e..41354ce 100644
--- a/src/XChgDCtl.c
+++ b/src/XChgDCtl.c
@@ -51,6 +51,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XChgFCtl.c b/src/XChgFCtl.c
index df703a2..d5ec8dc 100644
--- a/src/XChgFCtl.c
+++ b/src/XChgFCtl.c
@@ -51,6 +51,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XChgKMap.c b/src/XChgKMap.c
index e88b71d..df301cb 100644
--- a/src/XChgKMap.c
+++ b/src/XChgKMap.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XChgKbd.c b/src/XChgKbd.c
index ab9a936..3eb46bf 100644
--- a/src/XChgKbd.c
+++ b/src/XChgKbd.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XChgPnt.c b/src/XChgPnt.c
index 9caeabf..4cb9ee1 100644
--- a/src/XChgPnt.c
+++ b/src/XChgPnt.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XChgProp.c b/src/XChgProp.c
index 6d35e06..dfb5186 100644
--- a/src/XChgProp.c
+++ b/src/XChgProp.c
@@ -51,6 +51,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XCloseDev.c b/src/XCloseDev.c
index b5f3dfc..dbf7e50 100644
--- a/src/XCloseDev.c
+++ b/src/XCloseDev.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XDevBell.c b/src/XDevBell.c
index 3792f8a..1fe8297 100644
--- a/src/XDevBell.c
+++ b/src/XDevBell.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 82f5bf3..29ecfa3 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdint.h>
#include <X11/extensions/XI.h>
diff --git a/src/XExtToWire.c b/src/XExtToWire.c
index 674781f..5f84574 100644
--- a/src/XExtToWire.c
+++ b/src/XExtToWire.c
@@ -49,6 +49,10 @@ SOFTWARE.
* XExtToWire.c - reformat an XEvent into a wire event.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XInput.h>
diff --git a/src/XFreeLst.c b/src/XFreeLst.c
index 1b7693f..02cdcf7 100644
--- a/src/XFreeLst.c
+++ b/src/XFreeLst.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <X11/Xlib.h>
diff --git a/src/XGMotion.c b/src/XGMotion.c
index aee6671..99b1c44 100644
--- a/src/XGMotion.c
+++ b/src/XGMotion.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGetDeviceMotionEvents - Get the motion history of an input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGetBMap.c b/src/XGetBMap.c
index 610795b..211c9ca 100644
--- a/src/XGetBMap.c
+++ b/src/XGetBMap.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XGetCPtr.c b/src/XGetCPtr.c
index 4517b6a..a6a44b7 100644
--- a/src/XGetCPtr.c
+++ b/src/XGetCPtr.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
* XIGetClientPointer - Get the clientPointer setting for a client.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 729b0a0..c66212d 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c
index 3d64404..2961034 100644
--- a/src/XGetFCtl.c
+++ b/src/XGetFCtl.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XGetKMap.c b/src/XGetKMap.c
index 4596ff0..9431fbb 100644
--- a/src/XGetKMap.c
+++ b/src/XGetKMap.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XGetMMap.c b/src/XGetMMap.c
index a4bf094..8a1cdb2 100644
--- a/src/XGetMMap.c
+++ b/src/XGetMMap.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGetDeviceModifierMapping - get the modifier map of an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGetProp.c b/src/XGetProp.c
index 7ccf9fe..c5d088b 100644
--- a/src/XGetProp.c
+++ b/src/XGetProp.c
@@ -50,6 +50,9 @@ SOFTWARE.
* window.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGetVers.c b/src/XGetVers.c
index 4718617..0751b98 100644
--- a/src/XGetVers.c
+++ b/src/XGetVers.c
@@ -50,6 +50,10 @@ SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/Xlibint.h>
diff --git a/src/XGrDvBut.c b/src/XGrDvBut.c
index 264effd..312ff20 100644
--- a/src/XGrDvBut.c
+++ b/src/XGrDvBut.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGrabDeviceBut - Grab a button on an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGrDvKey.c b/src/XGrDvKey.c
index 3c36000..7f6571b 100644
--- a/src/XGrDvKey.c
+++ b/src/XGrDvKey.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGrabDeviceKey - Grab a key on an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGrabDev.c b/src/XGrabDev.c
index 1cba1f6..ce4613e 100644
--- a/src/XGrabDev.c
+++ b/src/XGrabDev.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGrabDevice - grab an extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGtFocus.c b/src/XGtFocus.c
index 6b95361..b4c4bd9 100644
--- a/src/XGtFocus.c
+++ b/src/XGtFocus.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGetDeviceFocus - Get the focus of an input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XGtSelect.c b/src/XGtSelect.c
index dea8c4c..f890db7 100644
--- a/src/XGtSelect.c
+++ b/src/XGtSelect.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XGetSelectedExtensionEvents - return a list of currently selected events.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XIAllowEvents.c b/src/XIAllowEvents.c
index 1d388b3..d4da6d0 100644
--- a/src/XIAllowEvents.c
+++ b/src/XIAllowEvents.c
@@ -22,6 +22,10 @@
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdint.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XIDefineCursor.c b/src/XIDefineCursor.c
index be6dadb..6308945 100644
--- a/src/XIDefineCursor.c
+++ b/src/XIDefineCursor.c
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
* XIDefineCursor - Change the cursor of an extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
#include <X11/Xlibint.h>
diff --git a/src/XIGetDevFocus.c b/src/XIGetDevFocus.c
index 524bf39..172f93e 100644
--- a/src/XIGetDevFocus.c
+++ b/src/XIGetDevFocus.c
@@ -21,6 +21,9 @@
* DEALINGS IN THE SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/Xlibint.h>
diff --git a/src/XIGrabDevice.c b/src/XIGrabDevice.c
index 94feaee..dd1bd10 100644
--- a/src/XIGrabDevice.c
+++ b/src/XIGrabDevice.c
@@ -22,6 +22,10 @@
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdint.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XIHierarchy.c b/src/XIHierarchy.c
index 09e6f93..39c3d1b 100644
--- a/src/XIHierarchy.c
+++ b/src/XIHierarchy.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
* XIChangeHierarchy - change the device hierarchy, i.e. which slave
* device is attached to which master, etc.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c
index 34f1bf3..7625521 100644
--- a/src/XIPassiveGrab.c
+++ b/src/XIPassiveGrab.c
@@ -21,6 +21,9 @@
* DEALINGS IN THE SOFTWARE.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/Xlibint.h>
diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index 66452c2..4be1eca 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -22,6 +22,10 @@
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdint.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XIQueryPointer.c b/src/XIQueryPointer.c
index 1a02a5a..6666d1a 100644
--- a/src/XIQueryPointer.c
+++ b/src/XIQueryPointer.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
* XIQueryPointer - Query the pointer of an extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XIQueryVersion.c b/src/XIQueryVersion.c
index 1e4f9a4..225737f 100644
--- a/src/XIQueryVersion.c
+++ b/src/XIQueryVersion.c
@@ -22,6 +22,11 @@
*
*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdint.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XISelEv.c b/src/XISelEv.c
index 3192b6b..fa7eb54 100644
--- a/src/XISelEv.c
+++ b/src/XISelEv.c
@@ -30,6 +30,9 @@ in this Software without prior written authorization from the author.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/Xlibint.h>
diff --git a/src/XISetCPtr.c b/src/XISetCPtr.c
index 4948598..8537d8a 100644
--- a/src/XISetCPtr.c
+++ b/src/XISetCPtr.c
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
* Ideally, the window manager will always send a SetClientPointer request
* before the client interacts with an application.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XISetDevFocus.c b/src/XISetDevFocus.c
index 7090c8f..6208000 100644
--- a/src/XISetDevFocus.c
+++ b/src/XISetDevFocus.c
@@ -22,6 +22,10 @@
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdint.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XIWarpPointer.c b/src/XIWarpPointer.c
index b150915..426bf3b 100644
--- a/src/XIWarpPointer.c
+++ b/src/XIWarpPointer.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
* XIWarpPointer - Warp the pointer of an extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/src/XListDev.c b/src/XListDev.c
index c544ae0..6a16da4 100644
--- a/src/XListDev.c
+++ b/src/XListDev.c
@@ -50,6 +50,9 @@ SOFTWARE.
* available input devices.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XOpenDev.c b/src/XOpenDev.c
index b50d5b0..74f18ac 100644
--- a/src/XOpenDev.c
+++ b/src/XOpenDev.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XOpenDevice - Request the server to open and extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XQueryDv.c b/src/XQueryDv.c
index 637d5cf..24d4e4e 100644
--- a/src/XQueryDv.c
+++ b/src/XQueryDv.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XQueryDeviceState - Query the state of an extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XSelect.c b/src/XSelect.c
index fb401a6..ec5ba57 100644
--- a/src/XSelect.c
+++ b/src/XSelect.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XSelectExtensionEvent - Select input from an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XSetBMap.c b/src/XSetBMap.c
index d0a6398..8aea9fb 100644
--- a/src/XSetBMap.c
+++ b/src/XSetBMap.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XSetDeviceButtonMapping - Set the button mapping of an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XSetDVal.c b/src/XSetDVal.c
index dcbf25e..431887b 100644
--- a/src/XSetDVal.c
+++ b/src/XSetDVal.c
@@ -50,6 +50,9 @@ SOFTWARE.
* device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XSetMMap.c b/src/XSetMMap.c
index 11e8859..7361f62 100644
--- a/src/XSetMMap.c
+++ b/src/XSetMMap.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XSetDeviceModifierMapping - set the modifier map of an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XSetMode.c b/src/XSetMode.c
index b184a33..9204a8e 100644
--- a/src/XSetMode.c
+++ b/src/XSetMode.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XSetDeviceMode - Set the mode of an extension input device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XSndExEv.c b/src/XSndExEv.c
index e21f8f7..5c0775f 100644
--- a/src/XSndExEv.c
+++ b/src/XSndExEv.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XSendExtensionEvent - send an extension event to a client.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XStFocus.c b/src/XStFocus.c
index 273cd0d..abc0bdc 100644
--- a/src/XStFocus.c
+++ b/src/XStFocus.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XSetDeviceFocus - Set the focus of an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XUngrDev.c b/src/XUngrDev.c
index 7b59ae6..2d12718 100644
--- a/src/XUngrDev.c
+++ b/src/XUngrDev.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XUngrabDevice - Ungrab an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XUngrDvB.c b/src/XUngrDvB.c
index 38267a6..baa12fb 100644
--- a/src/XUngrDvB.c
+++ b/src/XUngrDvB.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XUngrabDeviceButton - Ungrab a button on an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/src/XUngrDvK.c b/src/XUngrDvK.c
index 1a60785..cab45a4 100644
--- a/src/XUngrDvK.c
+++ b/src/XUngrDvK.c
@@ -49,6 +49,9 @@ SOFTWARE.
* XUngrabDeviceKey - Ungrab a key on an extension device.
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
commit ba83a1e58592e41f207524f106ba26dd71fe4171
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 26 08:55:35 2011 +1000
Stop unnecessary calls to size_classes
Xmalloc is a macro evaluating its argument twice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index af2f27a..66452c2 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -71,6 +71,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return)
for (i = 0; i < reply.num_devices; i++)
{
int nclasses;
+ size_t sz;
XIDeviceInfo *lib = &info[i];
xXIDeviceInfo *wire = (xXIDeviceInfo*)ptr;
@@ -86,7 +87,8 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return)
strncpy(lib->name, ptr, wire->name_len);
ptr += ((wire->name_len + 3)/4) * 4;
- lib->classes = Xmalloc(size_classes((xXIAnyInfo*)ptr, nclasses));
+ sz = size_classes((xXIAnyInfo*)ptr, nclasses);
+ lib->classes = Xmalloc(sz);
ptr += copy_classes(lib, (xXIAnyInfo*)ptr, &nclasses);
/* We skip over unused classes */
lib->num_classes = nclasses;
commit 6d6ae8fc8b9620bf864ac7dff8d818573eee3e4f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 26 08:54:53 2011 +1000
Fix duplicate sizeof in copy_classes
sizeof(bla * sizeof()) is'nt right.
Plus add some () to the next_block call too to emphasise that *nclasses is
the multiplicator.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/XExtInt.c b/src/XExtInt.c
index d74a8d4..82f5bf3 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -1481,8 +1481,8 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses)
ptr_wire = (char*)from;
ptr_lib = to->classes;
- to->classes = next_block(&ptr_lib, *nclasses * sizeof(XIAnyClassInfo*));
- memset(to->classes, 0, sizeof(*nclasses * sizeof(XIAnyClassInfo*)));
+ to->classes = next_block(&ptr_lib, (*nclasses) * sizeof(XIAnyClassInfo*));
+ memset(to->classes, 0, (*nclasses) * sizeof(XIAnyClassInfo*));
len = 0; /* count wire length */
for (i = 0; i < *nclasses; i++)
commit 323730f7fa70190d2ea00e62c6964fee524ca430
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 27 10:27:49 2011 +1000
man: passive grabs return the number of failed modifier combinations
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/XIGrabButton.txt b/man/XIGrabButton.txt
index 0a74f3d..5b14532 100644
--- a/man/XIGrabButton.txt
+++ b/man/XIGrabButton.txt
@@ -64,7 +64,7 @@ SYNOPSIS
or XIAnyKeycode.
num_modifiers
- Number of elements in modifiers or modifiers_return
+ Number of elements in modifiers or modifiers_inout.
modifiers
Specifies the set of latched and base modifiers or
@@ -178,6 +178,14 @@ DESCRIPTION
XIUngrabButton and XIUngrabKeycode can generate BadDevice,
BadMatch, BadValue and BadWindow errors.
+RETURN VALUE
+------------
+ XIGrabButton and XIGrabKeycode return the number of modifier combination
+ that could not establish a passive grab. The modifiers are returned in
+ modifiers_inout, along with the respective error for this modifier
+ combination. If XIGrabButton or XIGrabKeycode return zero, passive grabs
+ with all requested modifier combinations were established successfully.
+
DIAGNOSTICS
-----------
diff --git a/man/XIGrabEnter.txt b/man/XIGrabEnter.txt
index 83e97ca..5203f05 100644
--- a/man/XIGrabEnter.txt
+++ b/man/XIGrabEnter.txt
@@ -51,7 +51,7 @@ SYNOPSIS
Specifies the device that is to be grabbed or released
num_modifiers
- Number of elements in modifiers or modifiers_return
+ Number of elements in modifiers or modifiers_inout.
Reply to: