frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add XInput extension support, disabled by default.

This commit is contained in:
Eamon Walsh 2008-01-24 15:57:35 -05:00 committed by Eamon Walsh
parent c72581c844
commit 0b5f684eb0
5 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -54,6 +54,9 @@ endif
if BUILD_XINERAMA if BUILD_XINERAMA
pkgconfig_DATA += xcb-xinerama.pc pkgconfig_DATA += xcb-xinerama.pc
endif endif
if BUILD_XINPUT
pkgconfig_DATA += xcb-xinput.pc
endif
if BUILD_XPRINT if BUILD_XPRINT
pkgconfig_DATA += xcb-xprint.pc pkgconfig_DATA += xcb-xprint.pc
endif endif

4
configure.ac
View File

@ -118,6 +118,8 @@ AC_ARG_ENABLE(xfixes, AS_HELP_STRING([--enable-xfixes], [Build XCB XFixes Extens
AM_CONDITIONAL(BUILD_XFIXES, [test "x$BUILD_XFIXES" = xyes]) AM_CONDITIONAL(BUILD_XFIXES, [test "x$BUILD_XFIXES" = xyes])
AC_ARG_ENABLE(xinerama, AS_HELP_STRING([--enable-xinerama], [Build XCB Xinerama Extension (default: yes)]), [BUILD_XINERAMA=$enableval], [BUILD_XINERAMA=yes]) AC_ARG_ENABLE(xinerama, AS_HELP_STRING([--enable-xinerama], [Build XCB Xinerama Extension (default: yes)]), [BUILD_XINERAMA=$enableval], [BUILD_XINERAMA=yes])
AM_CONDITIONAL(BUILD_XINERAMA, [test "x$BUILD_XINERAMA" = xyes]) AM_CONDITIONAL(BUILD_XINERAMA, [test "x$BUILD_XINERAMA" = xyes])
AC_ARG_ENABLE(xinput, AS_HELP_STRING([--enable-xinput], [Build XCB XInput Extension (EXPERIMENTAL) (default: no)]), [BUILD_XINPUT=$enableval], [BUILD_XINPUT=no])
AM_CONDITIONAL(BUILD_XINPUT, [test "x$BUILD_XINPUT" = xyes])
AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build XCB Xprint Extension (default: yes)]), [BUILD_XPRINT=$enableval], [BUILD_XPRINT=yes]) AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build XCB Xprint Extension (default: yes)]), [BUILD_XPRINT=$enableval], [BUILD_XPRINT=yes])
AM_CONDITIONAL(BUILD_XPRINT, [test "x$BUILD_XPRINT" = xyes]) AM_CONDITIONAL(BUILD_XPRINT, [test "x$BUILD_XPRINT" = xyes])
AC_ARG_ENABLE(xtest, AS_HELP_STRING([--enable-xtest], [Build XCB XTEST Extension (default: yes)]), [BUILD_XTEST=$enableval], [BUILD_XTEST=yes]) AC_ARG_ENABLE(xtest, AS_HELP_STRING([--enable-xtest], [Build XCB XTEST Extension (default: yes)]), [BUILD_XTEST=$enableval], [BUILD_XTEST=yes])
@ -129,7 +131,7 @@ AM_CONDITIONAL(BUILD_XVMC, [test "x$BUILD_XVMC" = xyes])
AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile])
AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc]) AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xinput.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
AC_CONFIG_FILES([doc/xcb.doxygen]) AC_CONFIG_FILES([doc/xcb.doxygen])
AC_OUTPUT AC_OUTPUT

1
src/.gitignore vendored
View File

@ -16,6 +16,7 @@ xevie.*
xf86dri.* xf86dri.*
xfixes.* xfixes.*
xinerama.* xinerama.*
xinput.*
xprint.* xprint.*
xtest.* xtest.*
xv.* xv.*

10
src/Makefile.am
View File

@ -195,6 +195,16 @@ libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
endif endif
if BUILD_XINPUT
lib_LTLIBRARIES += libxcb-xinput.la
EXTHEADERS += xinput.h
EXTSOURCES += xinput.c
EXTENSION_XML += xinput.xml
libxcb_xinput_la_LDFLAGS = -version-info 0:0:0
libxcb_xinput_la_LIBADD = $(XCB_LIBS)
libxcb_xinput_la_SOURCES = xinput.c xinput.h
endif
if BUILD_XPRINT if BUILD_XPRINT
lib_LTLIBRARIES += libxcb-xprint.la lib_LTLIBRARIES += libxcb-xprint.la
EXTHEADERS += xprint.h EXTHEADERS += xprint.h

11
xcb-xinput.pc.in Normal file
View File

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: XCB XInput
Description: XCB XInput Extension (EXPERIMENTAL)
Version: @PACKAGE_VERSION@
Requires: xcb
Libs: -L${libdir} -lxcb-xinput
Cflags: -I${includedir}