diff options
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | man/.gitignore | 5 | ||||
| -rw-r--r-- | src/.gitignore | 10 | ||||
| -rw-r--r-- | src/XExtInt.c | 4 | ||||
| -rw-r--r-- | src/XIint.h | 17 |
7 files changed, 38 insertions, 26 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -5,6 +7,7 @@ config.guess config.log config.status config.sub +config.h* configure depcomp INSTALL @@ -16,6 +19,15 @@ Makefile.in MakeOut missing mkinstalldirs +stamp-h1 xi.pc -man/*.man +*.man +*.stamp *~ +*.3 +*.o +*.la +*.lo +libXi-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 0693217..b78d032 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,15 @@ -# $XdotOrg: $ - -AM_CFLAGS = $(XI_CFLAGS) - SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xi.pc -EXTRA_DIST = xi.pc.in autogen.sh ChangeLog +EXTRA_DIST = xi.pc.in ChangeLog CLEANFILES = ChangeLog .PHONY: ChangeLog 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) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 03b249f..709e55b 100644 --- a/configure.ac +++ b/configure.ac @@ -8,14 +8,19 @@ AC_INIT(libXi, 1.2.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xor AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.6]) +XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS" AC_SUBST(XI_CFLAGS) AC_SUBST(XI_LIBS) @@ -31,6 +36,7 @@ fi XORG_CHECK_MALLOC_ZERO XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 727ea33..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -*.3* -xi.stamp -xi.tmp diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index c3da614..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -config.h -config.h.in -.deps -.libs -libXi.la -*.o -*.lo -Makefile -Makefile.in -stamp-h1 diff --git a/src/XExtInt.c b/src/XExtInt.c index 647fc93..572cfcd 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -119,10 +119,6 @@ static Bool XInputWireToEvent( static /* const */ XEvent emptyevent; -/* ge events handling */ -static Bool XInputWireToGEEvent(Display*, XEvent*, xEvent*); -static Status XIGEEventToWire(Display*, XEvent*, xEvent*); - typedef struct _XInputData { XEvent data; diff --git a/src/XIint.h b/src/XIint.h index 51ea1e8..57ed95d 100644 --- a/src/XIint.h +++ b/src/XIint.h @@ -21,4 +21,21 @@ extern Status _XiEventToWire( register int * /* count */ ); +extern int SizeClassInfo( + xAnyClassPtr * /* any */, + int /* num_classes */ +); + +extern void ParseClassInfo( + xAnyClassPtr * /* any */, + XAnyClassPtr * /* Any */, + int /* num_classes */ +); + +extern int XUndefDeviceCursor( + Display * /* dpy */, + XDevice * /* dev */, + Window /* w */ +); + #endif |