diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-25 12:48:22 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-30 07:50:57 +1000 |
| commit | cb8d19b8ac433d5292502e032f6210ee5151d6e2 (patch) | |
| tree | b455f421d77fadeef34f73e94db18f95a6366588 | |
| parent | 7456467a0453677b9e5bca914c9274a305f35586 (diff) | |
Fix PreInit for ABI 12.
Require an xserver 1.9.99.1 or higher and put an ifdef in for ABI 12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/void.c | 35 |
2 files changed, 7 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index ed755c2..4271b5a 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]) @@ -48,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, @@ -194,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 = { |