Commit cb8d19b8 authored by Peter Hutterer's avatar Peter Hutterer

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's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
Reviewed-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent 7456467a
......@@ -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 = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment