Rename remaining XI2 sources to XI<foobar>.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

7 files changed, 22 insertions, 61 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 35ddc01..5760329 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,23 @@
 
 lib_LTLIBRARIES = libXi.la
 
+XI2_sources = XIAllowEvents.c \
+		  XIGrabDevice.c \
+		  XIQueryVersion.c \
+		  XIQueryDevice.c \
+		  XISetDevFocus.c \
+		  XIGetDevFocus.c \
+		  XIPassiveGrab.c \
+		  XIProperties.c \
+		  XIFreeEvent.c \
+		  XISelEv.c \
+		  XIWarpPointer.c \
+		  XIHierarchy.c \
+		  XIDefineCursor.c \
+		  XIQueryPointer.c
+
 libXi_la_SOURCES = \
 		  XAllowDv.c \
-		  XChDevHier.c \
 		  XChDProp.c \
 		  XChgDCtl.c \
 		  XChgFCtl.c \
@@ -13,7 +27,6 @@ libXi_la_SOURCES = \
 		  XChgPnt.c \
 		  XChgProp.c \
 		  XCloseDev.c \
-		  XDefDevCur.c \
 		  XDelDProp.c \
 		  XDevBell.c \
 		  XExtToWire.c \
@@ -36,7 +49,6 @@ libXi_la_SOURCES = \
 		  XListDProp.c \
 		  XOpenDev.c \
 		  XQueryDv.c \
-                  XQueryDvPtr.c \
 		  XSelect.c \
 		  XSetBMap.c \
 		  XSetCPtr.c \
@@ -45,23 +57,12 @@ libXi_la_SOURCES = \
 		  XSetMode.c \
 		  XSndExEv.c \
 		  XStFocus.c \
-		  XUndefDevCur.c \
 		  XUngrDev.c \
 		  XUngrDvB.c \
 		  XUngrDvK.c \
-                  XWarpDvPtr.c \
 		  XExtInt.c  \
-                  XISelEv.c \
 		  XIint.h \
-		  XIAllowEvents.c \
-		  XIGrabDevice.c \
-		  XIQueryVersion.c \
-		  XIQueryDevice.c \
-		  XISetDevFocus.c \
-		  XIGetDevFocus.c \
-		  XIPassiveGrab.c \
-		  XIProperties.c \
-		  XIFreeEvent.c
+		  $(XI2_SOURCES)
 
 
 libXi_la_LIBADD = $(XI_LIBS)
diff --git a/src/XDefDevCur.c b/src/XIDefineCursor.c
index a37544b..5ad1534 100644
--- a/src/XDefDevCur.c
+++ b/src/XIDefineCursor.c
@@ -30,7 +30,6 @@ in this Software without prior written authorization from The Open Group.
  *
  */
 #include <stdint.h>
-#include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/XInput2.h>
@@ -58,3 +57,9 @@ int XIDefineCursor(Display *dpy, int deviceid, Window w, Cursor cursor)
     SyncHandle();
     return Success;
 }
+
+int XIUndefineCursor(Display *dpy, int deviceid, Window w)
+{
+    return XIDefineCursor(dpy, deviceid, w, None);
+}
+
diff --git a/src/XChDevHier.c b/src/XIHierarchy.c
index 813f622..813f622 100644
--- a/src/XChDevHier.c
+++ b/src/XIHierarchy.c
diff --git a/src/XQueryDvPtr.c b/src/XIQueryPointer.c
index b3bfebc..b3bfebc 100644
--- a/src/XQueryDvPtr.c
+++ b/src/XIQueryPointer.c
diff --git a/src/XISelEv.c b/src/XISelEv.c
index 11eb4a2..6ff7beb 100644
--- a/src/XISelEv.c
+++ b/src/XISelEv.c
@@ -33,7 +33,6 @@ in this Software without prior written authorization from the author.
 
 #include <stdint.h>
 #include <X11/Xlibint.h>
-#include <X11/extensions/XI.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/extutil.h>
diff --git a/src/XWarpDvPtr.c b/src/XIWarpPointer.c
index 60188db..60188db 100644
--- a/src/XWarpDvPtr.c
+++ b/src/XIWarpPointer.c
diff --git a/src/XUndefDevCur.c b/src/XUndefDevCur.c
deleted file mode 100644
index 1144625..0000000
--- a/src/XUndefDevCur.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/************************************************************
-
-Copyright 2006 Peter Hutterer <peter@cs.unisa.edu.au>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************************
- *
- * XIUndefineDeviceCursor - Change the cursor of an extension input device to
- * None..
- *
- */
-#include <X11/extensions/XI.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/extensions/extutil.h>
-#include "XIint.h"
-
-
-int XIUndefineCursor(Display *dpy, int deviceid, Window w)
-{
-    return XIDefineCursor(dpy, deviceid, w, None);
-}
-