Require an xserver 1.9.99.1 or higher and put an ifdef in for ABI 12. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- configure.ac | 2 +- src/void.c | 36 ++++++------------------------------ 2 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac index 855bbae..3a00de3 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ inputdir=${moduledir}/input AC_SUBST(inputdir) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/void.c b/src/void.c index 6b3bcaa..0184893 100644 --- a/src/void.c +++ b/src/void.c @@ -29,7 +29,6 @@ #include "config.h" #endif - #include <misc.h> #include <xf86.h> #define NEED_XF86_TYPES 1 @@ -49,14 +48,13 @@ #define MAXBUTTONS 3 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 +#error "XINPUT ABI 12 required." +#endif /****************************************************************************** * Function/Macro keys variables *****************************************************************************/ -static const char *DEFAULTS[] = { - NULL -}; - static void BellProc( int percent, @@ -195,42 +193,20 @@ xf86VoidUninit(InputDriverPtr drv, * * called when the module subsection is found in XF86Config */ -static InputInfoPtr +static int xf86VoidInit(InputDriverPtr drv, - IDevPtr dev, + InputInfoPtr pInfo, int flags) { - InputInfoPtr pInfo; - - if (!(pInfo = xf86AllocateInput(drv, 0))) - return NULL; - /* Initialise the InputInfoRec. */ - pInfo->name = dev->identifier; pInfo->type_name = "Void"; - pInfo->flags = XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; pInfo->device_control = xf86VoidControlProc; pInfo->read_input = NULL; pInfo->control_proc = NULL; - pInfo->close_proc = NULL; pInfo->switch_mode = NULL; - pInfo->conversion_proc = NULL; - pInfo->reverse_conversion_proc = NULL; pInfo->fd = -1; - pInfo->dev = NULL; - pInfo->private_flags = 0; - pInfo->always_core_feedback = NULL; - pInfo->conf_idev = dev; - /* Collect the options, and process the common options. */ - xf86CollectInputOptions(pInfo, DEFAULTS, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); - - /* Mark the device configured */ - pInfo->flags |= XI86_CONFIGURED; - - /* Return the configured device */ - return (pInfo); + return Success; } _X_EXPORT InputDriverRec VOID = { -- 1.7.3.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel