Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
This commit is contained in:
parent
1d0438de17
commit
e251c9e75a
|
@ -1004,7 +1004,7 @@ DAMAGE_INC='-I$(top_srcdir)/damageext'
|
|||
MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
|
||||
MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'
|
||||
|
||||
AC_DEFINE(XINPUT, 1, [Support X Input extension])
|
||||
# XINPUT extension is integral part of the server
|
||||
XI_LIB='$(top_builddir)/Xi/libXi.la'
|
||||
XI_INC='-I$(top_srcdir)/Xi'
|
||||
|
||||
|
|
|
@ -98,9 +98,7 @@ typedef XID KeySym64;
|
|||
#include <X11/extensions/XKBstr.h>
|
||||
#endif
|
||||
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#endif
|
||||
|
||||
/* Always include these, since we query them even if we don't export XINPUT. */
|
||||
#include <X11/extensions/XInput.h> /* For XDevice */
|
||||
|
|
|
@ -42,10 +42,8 @@
|
|||
#include "dmx.h"
|
||||
#include "dmxlog.h"
|
||||
#include "dmxinput.h"
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#endif
|
||||
|
||||
static dmxLogLevel dmxCurrentLogLevel = dmxDebug;
|
||||
|
||||
|
@ -279,7 +277,6 @@ void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef XINPUT
|
||||
/** Translate a (normalized) XInput event \a type into a human-readable
|
||||
* string. */
|
||||
const char *dmxXInputEventName(int type)
|
||||
|
@ -304,7 +301,6 @@ const char *dmxXInputEventName(int type)
|
|||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/** Translate an event \a type into a human-readable string. */
|
||||
|
|
|
@ -70,9 +70,7 @@ extern void dmxLogInputCont(DMXInputInfo *dmxInput, const char *format, ...);
|
|||
extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
|
||||
extern void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi,
|
||||
int defaultVisual);
|
||||
#ifdef XINPUT
|
||||
extern const char *dmxXInputEventName(int type);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -63,13 +63,9 @@
|
|||
#define DMX_COMMON_XKB DMX_COMMON_OTHER
|
||||
#endif
|
||||
|
||||
#ifdef XINPUT
|
||||
#define DMX_COMMON_PRIVATE \
|
||||
DMX_COMMON_XKB; \
|
||||
XDevice *xi
|
||||
#else
|
||||
#define DMX_COMMON_PRIVATE DMX_COMMON_OTHER
|
||||
#endif
|
||||
|
||||
#define GETONLYPRIVFROMPRIVATE \
|
||||
myPrivate *priv = private
|
||||
|
|
|
@ -79,10 +79,8 @@
|
|||
#include "inputstr.h"
|
||||
#include "scrnintstr.h" /* For screenInfo */
|
||||
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#define EXTENSION_PROC_ARGS void *
|
||||
#endif
|
||||
|
||||
#if DMX_EQ_DEBUG
|
||||
#define DMXDBG2(f,a,b) dmxLog(dmxDebug,f,a,b)
|
||||
|
@ -100,9 +98,7 @@
|
|||
typedef struct _Event {
|
||||
xEvent event; /**< Event. */
|
||||
ScreenPtr pScreen; /**< Screen on which event occurred. */
|
||||
#ifdef XINPUT
|
||||
deviceValuator valuator; /**< XInput device valuator information. */
|
||||
#endif
|
||||
} EventRec, *EventPtr;
|
||||
|
||||
/** Event queue. */
|
||||
|
@ -183,15 +179,11 @@ void dmxeqEnqueue(xEvent *e)
|
|||
|
||||
/* Store the event in the queue */
|
||||
dmxEventQueue.events[oldtail].event = *e;
|
||||
#ifdef XINPUT
|
||||
{
|
||||
/* If this is an XInput event, store the
|
||||
* valuator event, too */
|
||||
deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)e;
|
||||
if (e->u.u.type >= LASTEvent && (ev->deviceid & MORE_EVENTS))
|
||||
dmxEventQueue.events[oldtail].valuator = *(deviceValuator *)(ev+1);
|
||||
}
|
||||
#endif
|
||||
/* If this is an XInput event, store the
|
||||
* valuator event, too */
|
||||
deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)e;
|
||||
if (e->u.u.type >= LASTEvent && (ev->deviceid & MORE_EVENTS))
|
||||
dmxEventQueue.events[oldtail].valuator = *(deviceValuator *)(ev+1);
|
||||
|
||||
/* Make sure that event times don't go
|
||||
* backwards - this is "unnecessary",
|
||||
|
@ -211,7 +203,6 @@ void dmxeqSwitchScreen(ScreenPtr pScreen, Bool fromDIX)
|
|||
if (fromDIX) dmxEventQueue.pDequeueScreen = pScreen;
|
||||
}
|
||||
|
||||
#ifdef XINPUT
|
||||
static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e)
|
||||
{
|
||||
deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)xe;
|
||||
|
@ -238,7 +229,6 @@ static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e)
|
|||
pDevice->public.processInputProc(xe, pDevice, 1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* This function is called from #ProcessInputEvents() to remove events
|
||||
|
@ -285,11 +275,8 @@ void dmxeqProcessInputEvents(void)
|
|||
(DeviceIntPtr)dmxEventQueue.pKbd, 1);
|
||||
break;
|
||||
default:
|
||||
#ifdef XINPUT
|
||||
dmxeqProcessXInputEvent(xe, e);
|
||||
break;
|
||||
#endif
|
||||
/* ifndef XINPUT, fall through */
|
||||
case ButtonPress:
|
||||
case ButtonRelease:
|
||||
case MotionNotify:
|
||||
|
|
|
@ -57,9 +57,7 @@
|
|||
#include "mipointer.h"
|
||||
#include "mi.h"
|
||||
|
||||
#ifdef XINPUT
|
||||
#include "XIstubs.h"
|
||||
#endif
|
||||
|
||||
static int dmxGlobalX, dmxGlobalY; /* Global cursor position */
|
||||
static int dmxGlobalInvalid; /* Flag indicating dmxCoreMotion
|
||||
|
@ -154,7 +152,6 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef XINPUT
|
||||
static void dmxEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal, xEvent *e,
|
||||
DMXBlockType block)
|
||||
{
|
||||
|
@ -208,7 +205,6 @@ static void dmxEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal, xEvent *e,
|
|||
if (block)
|
||||
dmxSigioUnblock();
|
||||
}
|
||||
#endif
|
||||
|
||||
DMXScreenInfo *dmxFindFirstScreen(int x, int y)
|
||||
{
|
||||
|
@ -331,7 +327,6 @@ dmxCoreMotion(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)
|
|||
|
||||
|
||||
|
||||
#ifdef XINPUT
|
||||
#define DMX_MAX_AXES 32 /* Max axes reported by this routine */
|
||||
static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
|
||||
int *v, int firstAxis, int axesCount,
|
||||
|
@ -537,7 +532,6 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int dmxGetButtonMapping(DMXLocalInputInfoPtr dmxLocal, int button)
|
||||
{
|
||||
|
@ -578,14 +572,12 @@ void dmxInvalidateGlobalPosition(void)
|
|||
void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount,
|
||||
DMXMotionType type, DMXBlockType block)
|
||||
{
|
||||
#ifdef XINPUT
|
||||
GETDMXLOCALFROMPDEV;
|
||||
|
||||
if (!dmxLocal->sendsCore) {
|
||||
dmxExtMotion(dmxLocal, v, firstAxes, axesCount, type, block);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
if (axesCount == 2) {
|
||||
switch (type) {
|
||||
case DMX_RELATIVE:
|
||||
|
@ -739,17 +731,13 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
|
|||
* control of the input device LEDs. */
|
||||
return;
|
||||
default:
|
||||
#ifdef XINPUT
|
||||
if (type == ProximityIn || type == ProximityOut) {
|
||||
if (dmxLocal->sendsCore)
|
||||
return; /* Not a core event */
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
if (type >= LASTEvent) {
|
||||
#ifdef XINPUT
|
||||
if (dmxTranslateAndEnqueueExtEvent(dmxLocal, e, block))
|
||||
#endif
|
||||
dmxLogInput(dmxInput, "Unhandled extension event: %d\n", type);
|
||||
} else {
|
||||
dmxLogInput(dmxInput, "Unhandled event: %d (%s)\n",
|
||||
|
@ -764,11 +752,9 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
|
|||
xE.u.u.detail = detail;
|
||||
xE.u.keyButtonPointer.time = GetTimeInMillis();
|
||||
|
||||
#ifdef XINPUT
|
||||
if (!dmxLocal->sendsCore)
|
||||
dmxEnqueueExtEvent(dmxLocal, &xE, block);
|
||||
else
|
||||
#endif
|
||||
dmxeqEnqueue(&xE);
|
||||
#endif /*00*/
|
||||
}
|
||||
|
|
|
@ -73,13 +73,11 @@
|
|||
#include "windowstr.h"
|
||||
#include "mi.h"
|
||||
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#include "exevents.h"
|
||||
#define EXTENSION_PROC_ARGS void *
|
||||
#include "extinit.h"
|
||||
#endif
|
||||
|
||||
/* From XI.h */
|
||||
#ifndef Relative
|
||||
|
@ -462,9 +460,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
|
|||
GETDMXINPUTFROMPDEVICE;
|
||||
int fd;
|
||||
DMXLocalInitInfo info;
|
||||
#ifdef XINPUT
|
||||
int i;
|
||||
#endif
|
||||
|
||||
if (dmxInput->detached) return Success;
|
||||
|
||||
|
@ -504,41 +500,33 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
|
|||
GetMaximumEventsNum(),
|
||||
#endif
|
||||
Relative);
|
||||
#ifdef XINPUT
|
||||
for (i = 0; i < info.numRelAxes; i++)
|
||||
InitValuatorAxisStruct(pDevice, i, info.minval[0],
|
||||
info.maxval[0], info.res[0],
|
||||
info.minres[0], info.maxres[0]);
|
||||
#endif
|
||||
} else if (info.numRelAxes) {
|
||||
InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
|
||||
dmxPointerGetMotionEvents,
|
||||
dmxPointerGetMotionBufferSize(),
|
||||
Relative);
|
||||
#ifdef XINPUT
|
||||
for (i = 0; i < info.numRelAxes; i++)
|
||||
InitValuatorAxisStruct(pDevice, i, info.minval[0],
|
||||
info.maxval[0], info.res[0],
|
||||
info.minres[0], info.maxres[0]);
|
||||
#endif
|
||||
} else if (info.numAbsAxes) {
|
||||
InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
|
||||
dmxPointerGetMotionEvents,
|
||||
dmxPointerGetMotionBufferSize(),
|
||||
Absolute);
|
||||
#ifdef XINPUT
|
||||
for (i = 0; i < info.numAbsAxes; i++)
|
||||
InitValuatorAxisStruct(pDevice, i+info.numRelAxes,
|
||||
info.minval[i+1], info.maxval[i+1],
|
||||
info.res[i+1], info.minres[i+1],
|
||||
info.maxres[i+1]);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (info.focusClass) InitFocusClassDeviceStruct(pDevice);
|
||||
#ifdef XINPUT
|
||||
if (info.proximityClass) InitProximityClassDeviceStruct(pDevice);
|
||||
#endif
|
||||
if (info.ptrFeedbackClass)
|
||||
InitPtrFeedbackClassDeviceStruct(pDevice, dmxChangePointerControl);
|
||||
if (info.kbdFeedbackClass)
|
||||
|
@ -759,17 +747,10 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef XINPUT
|
||||
if (!name) {
|
||||
name = "extension";
|
||||
registerProcPtr = RegisterOtherDevice;
|
||||
}
|
||||
#else
|
||||
if (!name)
|
||||
dmxLog(dmxFatal,
|
||||
"Server not build with XINPUT support (cannot add %s)\n",
|
||||
dmxLocal->name);
|
||||
#endif
|
||||
|
||||
if (!name || !registerProcPtr)
|
||||
dmxLog(dmxFatal, "Cannot add device %s\n", dmxLocal->name);
|
||||
|
|
|
@ -62,10 +62,8 @@
|
|||
#include "extension.h"
|
||||
#include "Pci.h"
|
||||
|
||||
#ifdef XINPUT
|
||||
#include "xf86Xinput.h"
|
||||
extern DeviceAssocRec mouse_assoc;
|
||||
#endif
|
||||
|
||||
#ifdef XKB
|
||||
#undef XKB_IN_SERVER
|
||||
|
|
|
@ -44,10 +44,8 @@
|
|||
#include "xf86Priv.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#include "xf86Xinput.h"
|
||||
#endif
|
||||
|
||||
#ifdef XFreeXDGA
|
||||
#include "dgaproc.h"
|
||||
|
|
|
@ -100,9 +100,7 @@ xf86InfoRec xf86Info = {
|
|||
FALSE, /* vtSysreq */
|
||||
SKWhenNeeded, /* ddxSpecialKeys */
|
||||
NULL, /* pMouse */
|
||||
#ifdef XINPUT
|
||||
NULL, /* mouseLocal */
|
||||
#endif
|
||||
-1, /* lastEventTime */
|
||||
FALSE, /* vtRequestsPending */
|
||||
FALSE, /* inputPending */
|
||||
|
|
|
@ -71,12 +71,8 @@
|
|||
#include "xf86Date.h"
|
||||
#include "xf86Build.h"
|
||||
#include "mipointer.h"
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#else
|
||||
#include "inputstr.h"
|
||||
#endif
|
||||
#include "xf86DDC.h"
|
||||
#include "xf86Xinput.h"
|
||||
#include "xf86InPriv.h"
|
||||
|
|
|
@ -48,13 +48,9 @@
|
|||
#define XF86_OS_PRIVS
|
||||
#include "xf86_OSlib.h"
|
||||
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#include "xf86Xinput.h"
|
||||
#else
|
||||
#include "inputstr.h"
|
||||
#endif
|
||||
|
||||
#include "xf86OSmouse.h"
|
||||
|
||||
|
|
|
@ -80,9 +80,7 @@ typedef struct {
|
|||
|
||||
/* mouse part */
|
||||
DeviceIntPtr pMouse;
|
||||
#ifdef XINPUT
|
||||
pointer mouseLocal;
|
||||
#endif
|
||||
|
||||
/* event handler part */
|
||||
int lastEventTime;
|
||||
|
|
|
@ -52,17 +52,13 @@
|
|||
|
||||
#include <X11/Xfuncproto.h>
|
||||
#include <X11/Xmd.h>
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#endif
|
||||
#include "xf86.h"
|
||||
#include "xf86Priv.h"
|
||||
#include "xf86Xinput.h"
|
||||
#ifdef XINPUT
|
||||
#include "XIstubs.h"
|
||||
#include "xf86Optrec.h"
|
||||
#endif
|
||||
#include "mipointer.h"
|
||||
#include "xf86InPriv.h"
|
||||
|
||||
|
@ -193,7 +189,6 @@ xf86ActivateDevice(LocalDevicePtr local)
|
|||
}
|
||||
|
||||
|
||||
#ifdef XINPUT
|
||||
/***********************************************************************
|
||||
*
|
||||
* Caller: ProcXOpenDevice
|
||||
|
@ -322,7 +317,6 @@ void
|
|||
AddOtherInputDevices()
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
|
||||
|
|
|
@ -57,11 +57,9 @@
|
|||
#endif
|
||||
#include "xf86str.h"
|
||||
#include "inputstr.h"
|
||||
#ifdef XINPUT
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#include "XIstubs.h"
|
||||
#endif
|
||||
|
||||
/* Input device flags */
|
||||
#define XI86_OPEN_ON_INIT 0x01 /* open the device at startup time */
|
||||
|
@ -89,7 +87,6 @@
|
|||
#define TS_Raw 60
|
||||
#define TS_Scaled 61
|
||||
|
||||
#ifdef XINPUT
|
||||
/* This holds the input driver entry and module information. */
|
||||
typedef struct _InputDriverRec {
|
||||
int driverVersion;
|
||||
|
@ -103,7 +100,6 @@ typedef struct _InputDriverRec {
|
|||
pointer module;
|
||||
int refCount;
|
||||
} InputDriverRec, *InputDriverPtr;
|
||||
#endif
|
||||
|
||||
/* This is to input devices what the ScrnInfoRec is to screens. */
|
||||
|
||||
|
|
|
@ -422,9 +422,9 @@ _X_HIDDEN void *dixLookupTab[] = {
|
|||
#ifdef PANORAMIX
|
||||
SYMVAR(noPanoramiXExtension)
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
|
||||
SYMVAR(noXInputExtension)
|
||||
#endif
|
||||
|
||||
#ifdef XIDLE
|
||||
SYMVAR(noXIdleExtension)
|
||||
#endif
|
||||
|
@ -481,14 +481,12 @@ _X_HIDDEN void *dixLookupTab[] = {
|
|||
SYMVAR(XkbDfltRepeatInterval)
|
||||
#endif
|
||||
|
||||
#ifdef XINPUT
|
||||
/* Xi */
|
||||
/* exevents.c */
|
||||
SYMFUNC(InitValuatorAxisStruct)
|
||||
SYMFUNC(InitProximityClassDeviceStruct)
|
||||
/* extinit.c */
|
||||
SYMFUNC(AssignTypeAndName)
|
||||
#endif
|
||||
|
||||
/* xf86DGA.c */
|
||||
/* XXX This is exported from the DDX, not DIX. */
|
||||
|
|
|
@ -59,9 +59,7 @@
|
|||
#include "misc.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86Priv.h"
|
||||
#ifdef XINPUT
|
||||
#include "xf86Xinput.h"
|
||||
#endif
|
||||
#include "loader.h"
|
||||
#include "xf86Optrec.h"
|
||||
|
||||
|
|
|
@ -64,9 +64,7 @@
|
|||
#include "xf86_OSproc.h"
|
||||
#include "xf86Parser.h"
|
||||
#include "xf86Config.h"
|
||||
#ifdef XINPUT
|
||||
# include "xf86Xinput.h"
|
||||
#endif
|
||||
#include "xf86OSmouse.h"
|
||||
#ifdef XV
|
||||
#include "xf86xv.h"
|
||||
|
@ -291,14 +289,12 @@ _X_HIDDEN void *xfree86LookupTab[] = {
|
|||
SYMFUNC(xf86UnbindGARTMemory)
|
||||
SYMFUNC(xf86EnableAGP)
|
||||
SYMFUNC(xf86GARTCloseScreen)
|
||||
#ifdef XINPUT
|
||||
SYMFUNC(XisbNew)
|
||||
SYMFUNC(XisbFree)
|
||||
SYMFUNC(XisbRead)
|
||||
SYMFUNC(XisbWrite)
|
||||
SYMFUNC(XisbTrace)
|
||||
SYMFUNC(XisbBlockDuration)
|
||||
#endif
|
||||
|
||||
/* xf86Bus.c */
|
||||
SYMFUNC(xf86CheckPciSlot)
|
||||
|
@ -673,7 +669,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
|
|||
SYMFUNC(GetTimeInMillis)
|
||||
|
||||
/* xf86Xinput.c */
|
||||
#ifdef XINPUT
|
||||
SYMFUNC(xf86ProcessCommonOptions)
|
||||
SYMFUNC(xf86PostMotionEvent)
|
||||
SYMFUNC(xf86PostProximityEvent)
|
||||
|
@ -684,7 +679,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
|
|||
SYMFUNC(xf86ActivateDevice)
|
||||
SYMFUNC(xf86XInputSetScreen)
|
||||
SYMFUNC(xf86ScaleAxis)
|
||||
#endif
|
||||
#ifdef DPMSExtension
|
||||
SYMFUNC(DPMSGet)
|
||||
SYMFUNC(DPMSSet)
|
||||
|
|
|
@ -612,7 +612,6 @@ eglInitInput(KdMouseFuncs *pMouseFuncs,
|
|||
RegisterKeyboardDevice(pKeyboard);
|
||||
miRegisterPointerDevice(screenInfo.screens[0], pPointer);
|
||||
mieqInit(&pKeyboard->public, &pPointer->public);
|
||||
#ifdef XINPUT
|
||||
{
|
||||
static long zero1, zero2;
|
||||
|
||||
|
@ -620,7 +619,6 @@ eglInitInput(KdMouseFuncs *pMouseFuncs,
|
|||
ErrorF("Extended Input Devices not yet supported. Impelement it at line %d in %s\n",
|
||||
__LINE__, __FILE__);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -284,8 +284,6 @@ ddxProcessArgument (
|
|||
return(0);
|
||||
}
|
||||
|
||||
#ifdef XINPUT
|
||||
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XIproto.h>
|
||||
#include "XIstubs.h"
|
||||
|
@ -373,8 +371,6 @@ SetDeviceValuators (
|
|||
}
|
||||
|
||||
|
||||
#endif /* XINPUT */
|
||||
|
||||
#ifdef AIXV3
|
||||
/*
|
||||
* This is just to get the server to link on AIX, where some bits
|
||||
|
|
|
@ -47,12 +47,10 @@
|
|||
#include "globals.h"
|
||||
#include "dix.h"
|
||||
|
||||
#ifdef XINPUT
|
||||
# include <X11/extensions/XI.h>
|
||||
# include <X11/extensions/XIproto.h>
|
||||
# include "exevents.h"
|
||||
# include "extinit.h"
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#endif
|
||||
#include "win.h"
|
||||
|
||||
#if defined(XFree86Server) && defined(XINPUT)
|
||||
#if defined(XFree86Server)
|
||||
#include "inputstr.h"
|
||||
|
||||
/* Peek the internal button mapping */
|
||||
|
@ -106,7 +106,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
|
|||
2);
|
||||
free(map);
|
||||
|
||||
#if defined(XFree86Server) && defined(XINPUT)
|
||||
#if defined(XFree86Server)
|
||||
g_winMouseButtonMap = pDeviceInt->button->map;
|
||||
#endif
|
||||
break;
|
||||
|
@ -116,7 +116,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
|
|||
break;
|
||||
|
||||
case DEVICE_CLOSE:
|
||||
#if defined(XFree86Server) && defined(XINPUT)
|
||||
#if defined(XFree86Server)
|
||||
g_winMouseButtonMap = NULL;
|
||||
#endif
|
||||
case DEVICE_OFF:
|
||||
|
@ -225,7 +225,7 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
|
|||
|
||||
/* Load an xEvent and enqueue the event */
|
||||
xCurrentEvent.u.u.type = iEventType;
|
||||
#if defined(XFree86Server) && defined(XINPUT)
|
||||
#if defined(XFree86Server)
|
||||
if (g_winMouseButtonMap)
|
||||
xCurrentEvent.u.u.detail = g_winMouseButtonMap[iButton];
|
||||
else
|
||||
|
|
|
@ -371,9 +371,6 @@
|
|||
/* Support Xinerama extension */
|
||||
#undef XINERAMA
|
||||
|
||||
/* Support X Input extension */
|
||||
#undef XINPUT
|
||||
|
||||
/* Build XKB */
|
||||
#undef XKB
|
||||
|
||||
|
|
|
@ -151,9 +151,7 @@ extern Bool noXkbExtension;
|
|||
extern Bool noPanoramiXExtension;
|
||||
#endif
|
||||
|
||||
#ifdef XINPUT
|
||||
extern Bool noXInputExtension;
|
||||
#endif
|
||||
|
||||
#ifdef XIDLE
|
||||
extern Bool noXIdleExtension;
|
||||
|
|
|
@ -113,9 +113,7 @@ typedef struct _WindowOpt {
|
|||
RegionPtr clipShape; /* default: NULL */
|
||||
RegionPtr inputShape; /* default: NULL */
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
struct _OtherInputMasks *inputMasks; /* default: NULL */
|
||||
#endif
|
||||
DevCursorList deviceCursors; /* default: NULL */
|
||||
struct _GenericClientMasks *geMasks;/* default: NULL */
|
||||
WindowAccessRec access;
|
||||
|
@ -214,11 +212,7 @@ extern Mask DontPropagateMasks[];
|
|||
#define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
|
||||
#define wOtherEventMasks(w) wUseDefault(w, otherEventMasks, 0)
|
||||
#define wOtherClients(w) wUseDefault(w, otherClients, NULL)
|
||||
#ifdef XINPUT
|
||||
#define wOtherInputMasks(w) wUseDefault(w, inputMasks, NULL)
|
||||
#else
|
||||
#define wOtherInputMasks(w) NULL
|
||||
#endif
|
||||
#define wPassiveGrabs(w) wUseDefault(w, passiveGrabs, NULL)
|
||||
#define wUserProps(w) wUseDefault(w, userProps, NULL)
|
||||
#define wBackingBitPlanes(w) wUseDefault(w, backingBitPlanes, ~0L)
|
||||
|
|
|
@ -197,9 +197,7 @@ extern Bool noPanoramiXExtension;
|
|||
#ifdef INXQUARTZ
|
||||
extern Bool noPseudoramiXExtension;
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
extern Bool noXInputExtension;
|
||||
#endif
|
||||
#ifdef XIDLE
|
||||
extern Bool noXIdleExtension;
|
||||
#endif
|
||||
|
@ -262,9 +260,7 @@ extern void PanoramiXExtensionInit(INITARGS);
|
|||
#ifdef INXQUARTZ
|
||||
extern void PseudoramiXExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
extern void XInputExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XTEST
|
||||
extern void XTestExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
@ -448,9 +444,7 @@ static ExtensionToggle ExtensionToggleList[] =
|
|||
#ifdef PANORAMIX
|
||||
{ "XINERAMA", &noPanoramiXExtension },
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
{ "XInputExtension", &noXInputExtension },
|
||||
#endif
|
||||
#ifdef XKB
|
||||
{ "XKEYBOARD", &noXkbExtension },
|
||||
#endif
|
||||
|
@ -632,9 +626,7 @@ static ExtensionModule staticExtensions[] = {
|
|||
#ifdef MITSHM
|
||||
{ ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
{ XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
|
||||
#endif
|
||||
#ifdef XTEST
|
||||
{ XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
|
||||
#endif
|
||||
|
|
|
@ -214,9 +214,7 @@ _X_EXPORT Bool noXFixesExtension = FALSE;
|
|||
/* Xinerama is disabled by default unless enabled via +xinerama */
|
||||
_X_EXPORT Bool noPanoramiXExtension = TRUE;
|
||||
#endif
|
||||
#ifdef XINPUT
|
||||
_X_EXPORT Bool noXInputExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XIDLE
|
||||
_X_EXPORT Bool noXIdleExtension = FALSE;
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user