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

Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac

This commit is contained in:
Peter Hutterer 2008-04-25 16:49:35 +09:30
parent 1d0438de17
commit e251c9e75a
28 changed files with 12 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1004,7 +1004,7 @@ DAMAGE_INC='-I$(top_srcdir)/damageext'
MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' 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_LIB='$(top_builddir)/Xi/libXi.la'
XI_INC='-I$(top_srcdir)/Xi' XI_INC='-I$(top_srcdir)/Xi'

2
hw/dmx/dmxclient.h
View File

@ -98,9 +98,7 @@ typedef XID KeySym64;
#include <X11/extensions/XKBstr.h> #include <X11/extensions/XKBstr.h>
#endif #endif
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#endif
/* Always include these, since we query them even if we don't export XINPUT. */ /* Always include these, since we query them even if we don't export XINPUT. */
#include <X11/extensions/XInput.h> /* For XDevice */ #include <X11/extensions/XInput.h> /* For XDevice */

4
hw/dmx/dmxlog.c
View File

@ -42,10 +42,8 @@
#include "dmx.h" #include "dmx.h"
#include "dmxlog.h" #include "dmxlog.h"
#include "dmxinput.h" #include "dmxinput.h"
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#endif
static dmxLogLevel dmxCurrentLogLevel = dmxDebug; 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 /** Translate a (normalized) XInput event \a type into a human-readable
* string. */ * string. */
const char *dmxXInputEventName(int type) const char *dmxXInputEventName(int type)
@ -304,7 +301,6 @@ const char *dmxXInputEventName(int type)
} }
} }
#endif
#endif #endif
/** Translate an event \a type into a human-readable string. */ /** Translate an event \a type into a human-readable string. */

2
hw/dmx/dmxlog.h
View File

@ -70,9 +70,7 @@ extern void dmxLogInputCont(DMXInputInfo *dmxInput, const char *format, ...);
extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv); extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
extern void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi, extern void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi,
int defaultVisual); int defaultVisual);
#ifdef XINPUT
extern const char *dmxXInputEventName(int type); extern const char *dmxXInputEventName(int type);
#endif #endif
#endif
#endif #endif

4
hw/dmx/input/dmxcommon.h
View File

@ -63,13 +63,9 @@
#define DMX_COMMON_XKB DMX_COMMON_OTHER #define DMX_COMMON_XKB DMX_COMMON_OTHER
#endif #endif
#ifdef XINPUT
#define DMX_COMMON_PRIVATE \ #define DMX_COMMON_PRIVATE \
DMX_COMMON_XKB; \ DMX_COMMON_XKB; \
XDevice *xi XDevice *xi
#else
#define DMX_COMMON_PRIVATE DMX_COMMON_OTHER
#endif
#define GETONLYPRIVFROMPRIVATE \ #define GETONLYPRIVFROMPRIVATE \
myPrivate *priv = private myPrivate *priv = private

13
hw/dmx/input/dmxeq.c
View File

@ -79,10 +79,8 @@
#include "inputstr.h" #include "inputstr.h"
#include "scrnintstr.h" /* For screenInfo */ #include "scrnintstr.h" /* For screenInfo */
#ifdef XINPUT
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#define EXTENSION_PROC_ARGS void * #define EXTENSION_PROC_ARGS void *
#endif
#if DMX_EQ_DEBUG #if DMX_EQ_DEBUG
#define DMXDBG2(f,a,b) dmxLog(dmxDebug,f,a,b) #define DMXDBG2(f,a,b) dmxLog(dmxDebug,f,a,b)
@ -100,9 +98,7 @@
typedef struct _Event { typedef struct _Event {
xEvent event; /**< Event. */ xEvent event; /**< Event. */
ScreenPtr pScreen; /**< Screen on which event occurred. */ ScreenPtr pScreen; /**< Screen on which event occurred. */
#ifdef XINPUT
deviceValuator valuator; /**< XInput device valuator information. */ deviceValuator valuator; /**< XInput device valuator information. */
#endif
} EventRec, *EventPtr; } EventRec, *EventPtr;
/** Event queue. */ /** Event queue. */
@ -183,15 +179,11 @@ void dmxeqEnqueue(xEvent *e)
/* Store the event in the queue */ /* Store the event in the queue */
dmxEventQueue.events[oldtail].event = *e; dmxEventQueue.events[oldtail].event = *e;
#ifdef XINPUT
{
/* If this is an XInput event, store the /* If this is an XInput event, store the
* valuator event, too */ * valuator event, too */
deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)e; deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)e;
if (e->u.u.type >= LASTEvent && (ev->deviceid & MORE_EVENTS)) if (e->u.u.type >= LASTEvent && (ev->deviceid & MORE_EVENTS))
dmxEventQueue.events[oldtail].valuator = *(deviceValuator *)(ev+1); dmxEventQueue.events[oldtail].valuator = *(deviceValuator *)(ev+1);
}
#endif
/* Make sure that event times don't go /* Make sure that event times don't go
* backwards - this is "unnecessary", * backwards - this is "unnecessary",
@ -211,7 +203,6 @@ void dmxeqSwitchScreen(ScreenPtr pScreen, Bool fromDIX)
if (fromDIX) dmxEventQueue.pDequeueScreen = pScreen; if (fromDIX) dmxEventQueue.pDequeueScreen = pScreen;
} }
#ifdef XINPUT
static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e) static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e)
{ {
deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)xe; deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)xe;
@ -238,7 +229,6 @@ static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e)
pDevice->public.processInputProc(xe, pDevice, 1); pDevice->public.processInputProc(xe, pDevice, 1);
} }
} }
#endif
/** /**
* This function is called from #ProcessInputEvents() to remove events * This function is called from #ProcessInputEvents() to remove events
@ -285,11 +275,8 @@ void dmxeqProcessInputEvents(void)
(DeviceIntPtr)dmxEventQueue.pKbd, 1); (DeviceIntPtr)dmxEventQueue.pKbd, 1);
break; break;
default: default:
#ifdef XINPUT
dmxeqProcessXInputEvent(xe, e); dmxeqProcessXInputEvent(xe, e);
break; break;
#endif
/* ifndef XINPUT, fall through */
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
case MotionNotify: case MotionNotify:

14
hw/dmx/input/dmxevents.c
View File

@ -57,9 +57,7 @@
#include "mipointer.h" #include "mipointer.h"
#include "mi.h" #include "mi.h"
#ifdef XINPUT
#include "XIstubs.h" #include "XIstubs.h"
#endif
static int dmxGlobalX, dmxGlobalY; /* Global cursor position */ static int dmxGlobalX, dmxGlobalY; /* Global cursor position */
static int dmxGlobalInvalid; /* Flag indicating dmxCoreMotion static int dmxGlobalInvalid; /* Flag indicating dmxCoreMotion
@ -154,7 +152,6 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
return 0; return 0;
} }
#ifdef XINPUT
static void dmxEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal, xEvent *e, static void dmxEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal, xEvent *e,
DMXBlockType block) DMXBlockType block)
{ {
@ -208,7 +205,6 @@ static void dmxEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal, xEvent *e,
if (block) if (block)
dmxSigioUnblock(); dmxSigioUnblock();
} }
#endif
DMXScreenInfo *dmxFindFirstScreen(int x, int y) 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 */ #define DMX_MAX_AXES 32 /* Max axes reported by this routine */
static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal, static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
int *v, int firstAxis, int axesCount, int *v, int firstAxis, int axesCount,
@ -537,7 +532,6 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
} }
return 0; return 0;
} }
#endif
static int dmxGetButtonMapping(DMXLocalInputInfoPtr dmxLocal, int button) static int dmxGetButtonMapping(DMXLocalInputInfoPtr dmxLocal, int button)
{ {
@ -578,14 +572,12 @@ void dmxInvalidateGlobalPosition(void)
void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount, void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount,
DMXMotionType type, DMXBlockType block) DMXMotionType type, DMXBlockType block)
{ {
#ifdef XINPUT
GETDMXLOCALFROMPDEV; GETDMXLOCALFROMPDEV;
if (!dmxLocal->sendsCore) { if (!dmxLocal->sendsCore) {
dmxExtMotion(dmxLocal, v, firstAxes, axesCount, type, block); dmxExtMotion(dmxLocal, v, firstAxes, axesCount, type, block);
return; return;
} }
#endif
if (axesCount == 2) { if (axesCount == 2) {
switch (type) { switch (type) {
case DMX_RELATIVE: case DMX_RELATIVE:
@ -739,17 +731,13 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
* control of the input device LEDs. */ * control of the input device LEDs. */
return; return;
default: default:
#ifdef XINPUT
if (type == ProximityIn || type == ProximityOut) { if (type == ProximityIn || type == ProximityOut) {
if (dmxLocal->sendsCore) if (dmxLocal->sendsCore)
return; /* Not a core event */ return; /* Not a core event */
break; break;
} }
#endif
if (type >= LASTEvent) { if (type >= LASTEvent) {
#ifdef XINPUT
if (dmxTranslateAndEnqueueExtEvent(dmxLocal, e, block)) if (dmxTranslateAndEnqueueExtEvent(dmxLocal, e, block))
#endif
dmxLogInput(dmxInput, "Unhandled extension event: %d\n", type); dmxLogInput(dmxInput, "Unhandled extension event: %d\n", type);
} else { } else {
dmxLogInput(dmxInput, "Unhandled event: %d (%s)\n", 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.u.detail = detail;
xE.u.keyButtonPointer.time = GetTimeInMillis(); xE.u.keyButtonPointer.time = GetTimeInMillis();
#ifdef XINPUT
if (!dmxLocal->sendsCore) if (!dmxLocal->sendsCore)
dmxEnqueueExtEvent(dmxLocal, &xE, block); dmxEnqueueExtEvent(dmxLocal, &xE, block);
else else
#endif
dmxeqEnqueue(&xE); dmxeqEnqueue(&xE);
#endif /*00*/ #endif /*00*/
} }

19
hw/dmx/input/dmxinputinit.c
View File

@ -73,13 +73,11 @@
#include "windowstr.h" #include "windowstr.h"
#include "mi.h" #include "mi.h"
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "exevents.h" #include "exevents.h"
#define EXTENSION_PROC_ARGS void * #define EXTENSION_PROC_ARGS void *
#include "extinit.h" #include "extinit.h"
#endif
/* From XI.h */ /* From XI.h */
#ifndef Relative #ifndef Relative
@ -462,9 +460,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
GETDMXINPUTFROMPDEVICE; GETDMXINPUTFROMPDEVICE;
int fd; int fd;
DMXLocalInitInfo info; DMXLocalInitInfo info;
#ifdef XINPUT
int i; int i;
#endif
if (dmxInput->detached) return Success; if (dmxInput->detached) return Success;
@ -504,41 +500,33 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
GetMaximumEventsNum(), GetMaximumEventsNum(),
#endif #endif
Relative); Relative);
#ifdef XINPUT
for (i = 0; i < info.numRelAxes; i++) for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, info.minval[0], InitValuatorAxisStruct(pDevice, i, info.minval[0],
info.maxval[0], info.res[0], info.maxval[0], info.res[0],
info.minres[0], info.maxres[0]); info.minres[0], info.maxres[0]);
#endif
} else if (info.numRelAxes) { } else if (info.numRelAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
dmxPointerGetMotionEvents, dmxPointerGetMotionEvents,
dmxPointerGetMotionBufferSize(), dmxPointerGetMotionBufferSize(),
Relative); Relative);
#ifdef XINPUT
for (i = 0; i < info.numRelAxes; i++) for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, info.minval[0], InitValuatorAxisStruct(pDevice, i, info.minval[0],
info.maxval[0], info.res[0], info.maxval[0], info.res[0],
info.minres[0], info.maxres[0]); info.minres[0], info.maxres[0]);
#endif
} else if (info.numAbsAxes) { } else if (info.numAbsAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes, InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
dmxPointerGetMotionEvents, dmxPointerGetMotionEvents,
dmxPointerGetMotionBufferSize(), dmxPointerGetMotionBufferSize(),
Absolute); Absolute);
#ifdef XINPUT
for (i = 0; i < info.numAbsAxes; i++) for (i = 0; i < info.numAbsAxes; i++)
InitValuatorAxisStruct(pDevice, i+info.numRelAxes, InitValuatorAxisStruct(pDevice, i+info.numRelAxes,
info.minval[i+1], info.maxval[i+1], info.minval[i+1], info.maxval[i+1],
info.res[i+1], info.minres[i+1], info.res[i+1], info.minres[i+1],
info.maxres[i+1]); info.maxres[i+1]);
#endif
} }
} }
if (info.focusClass) InitFocusClassDeviceStruct(pDevice); if (info.focusClass) InitFocusClassDeviceStruct(pDevice);
#ifdef XINPUT
if (info.proximityClass) InitProximityClassDeviceStruct(pDevice); if (info.proximityClass) InitProximityClassDeviceStruct(pDevice);
#endif
if (info.ptrFeedbackClass) if (info.ptrFeedbackClass)
InitPtrFeedbackClassDeviceStruct(pDevice, dmxChangePointerControl); InitPtrFeedbackClassDeviceStruct(pDevice, dmxChangePointerControl);
if (info.kbdFeedbackClass) if (info.kbdFeedbackClass)
@ -759,17 +747,10 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
} }
} }
#ifdef XINPUT
if (!name) { if (!name) {
name = "extension"; name = "extension";
registerProcPtr = RegisterOtherDevice; registerProcPtr = RegisterOtherDevice;
} }
#else
if (!name)
dmxLog(dmxFatal,
"Server not build with XINPUT support (cannot add %s)\n",
dmxLocal->name);
#endif
if (!name || !registerProcPtr) if (!name || !registerProcPtr)
dmxLog(dmxFatal, "Cannot add device %s\n", dmxLocal->name); dmxLog(dmxFatal, "Cannot add device %s\n", dmxLocal->name);

2
hw/xfree86/common/xf86Config.c
View File

@ -62,10 +62,8 @@
#include "extension.h" #include "extension.h"
#include "Pci.h" #include "Pci.h"
#ifdef XINPUT
#include "xf86Xinput.h" #include "xf86Xinput.h"
extern DeviceAssocRec mouse_assoc; extern DeviceAssocRec mouse_assoc;
#endif
#ifdef XKB #ifdef XKB
#undef XKB_IN_SERVER #undef XKB_IN_SERVER

2
hw/xfree86/common/xf86Cursor.c
View File

@ -44,10 +44,8 @@
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#ifdef XINPUT
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "xf86Xinput.h" #include "xf86Xinput.h"
#endif
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include "dgaproc.h" #include "dgaproc.h"

2
hw/xfree86/common/xf86Globals.c
View File

@ -100,9 +100,7 @@ xf86InfoRec xf86Info = {
FALSE, /* vtSysreq */ FALSE, /* vtSysreq */
SKWhenNeeded, /* ddxSpecialKeys */ SKWhenNeeded, /* ddxSpecialKeys */
NULL, /* pMouse */ NULL, /* pMouse */
#ifdef XINPUT
NULL, /* mouseLocal */ NULL, /* mouseLocal */
#endif
-1, /* lastEventTime */ -1, /* lastEventTime */
FALSE, /* vtRequestsPending */ FALSE, /* vtRequestsPending */
FALSE, /* inputPending */ FALSE, /* inputPending */

4
hw/xfree86/common/xf86Init.c
View File

@ -71,12 +71,8 @@
#include "xf86Date.h" #include "xf86Date.h"
#include "xf86Build.h" #include "xf86Build.h"
#include "mipointer.h" #include "mipointer.h"
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#else
#include "inputstr.h"
#endif
#include "xf86DDC.h" #include "xf86DDC.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "xf86InPriv.h" #include "xf86InPriv.h"

4
hw/xfree86/common/xf86MiscExt.c
View File

@ -48,13 +48,9 @@
#define XF86_OS_PRIVS #define XF86_OS_PRIVS
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "xf86Xinput.h" #include "xf86Xinput.h"
#else
#include "inputstr.h"
#endif
#include "xf86OSmouse.h" #include "xf86OSmouse.h"

2
hw/xfree86/common/xf86Privstr.h
View File

@ -80,9 +80,7 @@ typedef struct {
/* mouse part */ /* mouse part */
DeviceIntPtr pMouse; DeviceIntPtr pMouse;
#ifdef XINPUT
pointer mouseLocal; pointer mouseLocal;
#endif
/* event handler part */ /* event handler part */
int lastEventTime; int lastEventTime;

6
hw/xfree86/common/xf86Xinput.c
View File

@ -52,17 +52,13 @@
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#endif
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
#ifdef XINPUT
#include "XIstubs.h" #include "XIstubs.h"
#include "xf86Optrec.h" #include "xf86Optrec.h"
#endif
#include "mipointer.h" #include "mipointer.h"
#include "xf86InPriv.h" #include "xf86InPriv.h"
@ -193,7 +189,6 @@ xf86ActivateDevice(LocalDevicePtr local)
} }
#ifdef XINPUT
/*********************************************************************** /***********************************************************************
* *
* Caller: ProcXOpenDevice * Caller: ProcXOpenDevice
@ -322,7 +317,6 @@ void
AddOtherInputDevices() AddOtherInputDevices()
{ {
} }
#endif
int int
NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)

4
hw/xfree86/common/xf86Xinput.h
View File

@ -57,11 +57,9 @@
#endif #endif
#include "xf86str.h" #include "xf86str.h"
#include "inputstr.h" #include "inputstr.h"
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "XIstubs.h" #include "XIstubs.h"
#endif
/* Input device flags */ /* Input device flags */
#define XI86_OPEN_ON_INIT 0x01 /* open the device at startup time */ #define XI86_OPEN_ON_INIT 0x01 /* open the device at startup time */
@ -89,7 +87,6 @@
#define TS_Raw 60 #define TS_Raw 60
#define TS_Scaled 61 #define TS_Scaled 61
#ifdef XINPUT
/* This holds the input driver entry and module information. */ /* This holds the input driver entry and module information. */
typedef struct _InputDriverRec { typedef struct _InputDriverRec {
int driverVersion; int driverVersion;
@ -103,7 +100,6 @@ typedef struct _InputDriverRec {
pointer module; pointer module;
int refCount; int refCount;
} InputDriverRec, *InputDriverPtr; } InputDriverRec, *InputDriverPtr;
#endif
/* This is to input devices what the ScrnInfoRec is to screens. */ /* This is to input devices what the ScrnInfoRec is to screens. */

6
hw/xfree86/loader/dixsym.c
View File

@ -422,9 +422,9 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef PANORAMIX #ifdef PANORAMIX
SYMVAR(noPanoramiXExtension) SYMVAR(noPanoramiXExtension)
#endif #endif
#ifdef XINPUT
SYMVAR(noXInputExtension) SYMVAR(noXInputExtension)
#endif
#ifdef XIDLE #ifdef XIDLE
SYMVAR(noXIdleExtension) SYMVAR(noXIdleExtension)
#endif #endif
@ -481,14 +481,12 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(XkbDfltRepeatInterval) SYMVAR(XkbDfltRepeatInterval)
#endif #endif
#ifdef XINPUT
/* Xi */ /* Xi */
/* exevents.c */ /* exevents.c */
SYMFUNC(InitValuatorAxisStruct) SYMFUNC(InitValuatorAxisStruct)
SYMFUNC(InitProximityClassDeviceStruct) SYMFUNC(InitProximityClassDeviceStruct)
/* extinit.c */ /* extinit.c */
SYMFUNC(AssignTypeAndName) SYMFUNC(AssignTypeAndName)
#endif
/* xf86DGA.c */ /* xf86DGA.c */
/* XXX This is exported from the DDX, not DIX. */ /* XXX This is exported from the DDX, not DIX. */

2
hw/xfree86/loader/loadmod.c
View File

@ -59,9 +59,7 @@
#include "misc.h" #include "misc.h"
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#ifdef XINPUT
#include "xf86Xinput.h" #include "xf86Xinput.h"
#endif
#include "loader.h" #include "loader.h"
#include "xf86Optrec.h" #include "xf86Optrec.h"

6
hw/xfree86/loader/xf86sym.c
View File

@ -64,9 +64,7 @@
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86Parser.h" #include "xf86Parser.h"
#include "xf86Config.h" #include "xf86Config.h"
#ifdef XINPUT
# include "xf86Xinput.h" # include "xf86Xinput.h"
#endif
#include "xf86OSmouse.h" #include "xf86OSmouse.h"
#ifdef XV #ifdef XV
#include "xf86xv.h" #include "xf86xv.h"
@ -291,14 +289,12 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86UnbindGARTMemory) SYMFUNC(xf86UnbindGARTMemory)
SYMFUNC(xf86EnableAGP) SYMFUNC(xf86EnableAGP)
SYMFUNC(xf86GARTCloseScreen) SYMFUNC(xf86GARTCloseScreen)
#ifdef XINPUT
SYMFUNC(XisbNew) SYMFUNC(XisbNew)
SYMFUNC(XisbFree) SYMFUNC(XisbFree)
SYMFUNC(XisbRead) SYMFUNC(XisbRead)
SYMFUNC(XisbWrite) SYMFUNC(XisbWrite)
SYMFUNC(XisbTrace) SYMFUNC(XisbTrace)
SYMFUNC(XisbBlockDuration) SYMFUNC(XisbBlockDuration)
#endif
/* xf86Bus.c */ /* xf86Bus.c */
SYMFUNC(xf86CheckPciSlot) SYMFUNC(xf86CheckPciSlot)
@ -673,7 +669,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(GetTimeInMillis) SYMFUNC(GetTimeInMillis)
/* xf86Xinput.c */ /* xf86Xinput.c */
#ifdef XINPUT
SYMFUNC(xf86ProcessCommonOptions) SYMFUNC(xf86ProcessCommonOptions)
SYMFUNC(xf86PostMotionEvent) SYMFUNC(xf86PostMotionEvent)
SYMFUNC(xf86PostProximityEvent) SYMFUNC(xf86PostProximityEvent)
@ -684,7 +679,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86ActivateDevice) SYMFUNC(xf86ActivateDevice)
SYMFUNC(xf86XInputSetScreen) SYMFUNC(xf86XInputSetScreen)
SYMFUNC(xf86ScaleAxis) SYMFUNC(xf86ScaleAxis)
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
SYMFUNC(DPMSGet) SYMFUNC(DPMSGet)
SYMFUNC(DPMSSet) SYMFUNC(DPMSSet)

2
hw/xgl/egl/kinput.c
View File

@ -612,7 +612,6 @@ eglInitInput(KdMouseFuncs *pMouseFuncs,
RegisterKeyboardDevice(pKeyboard); RegisterKeyboardDevice(pKeyboard);
miRegisterPointerDevice(screenInfo.screens[0], pPointer); miRegisterPointerDevice(screenInfo.screens[0], pPointer);
mieqInit(&pKeyboard->public, &pPointer->public); mieqInit(&pKeyboard->public, &pPointer->public);
#ifdef XINPUT
{ {
static long zero1, zero2; 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", ErrorF("Extended Input Devices not yet supported. Impelement it at line %d in %s\n",
__LINE__, __FILE__); __LINE__, __FILE__);
} }
#endif
} }
/* /*

4
hw/xprint/ddxInit.c
View File

@ -284,8 +284,6 @@ ddxProcessArgument (
return(0); return(0);
} }
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "XIstubs.h" #include "XIstubs.h"
@ -373,8 +371,6 @@ SetDeviceValuators (
} }
#endif /* XINPUT */
#ifdef AIXV3 #ifdef AIXV3
/* /*
* This is just to get the server to link on AIX, where some bits * This is just to get the server to link on AIX, where some bits

2
hw/xquartz/darwin.c
View File

@ -47,12 +47,10 @@
#include "globals.h" #include "globals.h"
#include "dix.h" #include "dix.h"
#ifdef XINPUT
# include <X11/extensions/XI.h> # include <X11/extensions/XI.h>
# include <X11/extensions/XIproto.h> # include <X11/extensions/XIproto.h>
# include "exevents.h" # include "exevents.h"
# include "extinit.h" # include "extinit.h"
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>

8
hw/xwin/winmouse.c
View File

@ -36,7 +36,7 @@
#endif #endif
#include "win.h" #include "win.h"
#if defined(XFree86Server) && defined(XINPUT) #if defined(XFree86Server)
#include "inputstr.h" #include "inputstr.h"
/* Peek the internal button mapping */ /* Peek the internal button mapping */
@ -106,7 +106,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
2); 2);
free(map); free(map);
#if defined(XFree86Server) && defined(XINPUT) #if defined(XFree86Server)
g_winMouseButtonMap = pDeviceInt->button->map; g_winMouseButtonMap = pDeviceInt->button->map;
#endif #endif
break; break;
@ -116,7 +116,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
break; break;
case DEVICE_CLOSE: case DEVICE_CLOSE:
#if defined(XFree86Server) && defined(XINPUT) #if defined(XFree86Server)
g_winMouseButtonMap = NULL; g_winMouseButtonMap = NULL;
#endif #endif
case DEVICE_OFF: case DEVICE_OFF:
@ -225,7 +225,7 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
/* Load an xEvent and enqueue the event */ /* Load an xEvent and enqueue the event */
xCurrentEvent.u.u.type = iEventType; xCurrentEvent.u.u.type = iEventType;
#if defined(XFree86Server) && defined(XINPUT) #if defined(XFree86Server)
if (g_winMouseButtonMap) if (g_winMouseButtonMap)
xCurrentEvent.u.u.detail = g_winMouseButtonMap[iButton]; xCurrentEvent.u.u.detail = g_winMouseButtonMap[iButton];
else else

3
include/dix-config.h.in
View File

@ -371,9 +371,6 @@
/* Support Xinerama extension */ /* Support Xinerama extension */
#undef XINERAMA #undef XINERAMA
/* Support X Input extension */
#undef XINPUT
/* Build XKB */ /* Build XKB */
#undef XKB #undef XKB

2
include/globals.h
View File

@ -151,9 +151,7 @@ extern Bool noXkbExtension;
extern Bool noPanoramiXExtension; extern Bool noPanoramiXExtension;
#endif #endif
#ifdef XINPUT
extern Bool noXInputExtension; extern Bool noXInputExtension;
#endif
#ifdef XIDLE #ifdef XIDLE
extern Bool noXIdleExtension; extern Bool noXIdleExtension;

6
include/windowstr.h
View File

@ -113,9 +113,7 @@ typedef struct _WindowOpt {
RegionPtr clipShape; /* default: NULL */ RegionPtr clipShape; /* default: NULL */
RegionPtr inputShape; /* default: NULL */ RegionPtr inputShape; /* default: NULL */
#endif #endif
#ifdef XINPUT
struct _OtherInputMasks *inputMasks; /* default: NULL */ struct _OtherInputMasks *inputMasks; /* default: NULL */
#endif
DevCursorList deviceCursors; /* default: NULL */ DevCursorList deviceCursors; /* default: NULL */
struct _GenericClientMasks *geMasks;/* default: NULL */ struct _GenericClientMasks *geMasks;/* default: NULL */
WindowAccessRec access; WindowAccessRec access;
@ -214,11 +212,7 @@ extern Mask DontPropagateMasks[];
#define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate]) #define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
#define wOtherEventMasks(w) wUseDefault(w, otherEventMasks, 0) #define wOtherEventMasks(w) wUseDefault(w, otherEventMasks, 0)
#define wOtherClients(w) wUseDefault(w, otherClients, NULL) #define wOtherClients(w) wUseDefault(w, otherClients, NULL)
#ifdef XINPUT
#define wOtherInputMasks(w) wUseDefault(w, inputMasks, NULL) #define wOtherInputMasks(w) wUseDefault(w, inputMasks, NULL)
#else
#define wOtherInputMasks(w) NULL
#endif
#define wPassiveGrabs(w) wUseDefault(w, passiveGrabs, NULL) #define wPassiveGrabs(w) wUseDefault(w, passiveGrabs, NULL)
#define wUserProps(w) wUseDefault(w, userProps, NULL) #define wUserProps(w) wUseDefault(w, userProps, NULL)
#define wBackingBitPlanes(w) wUseDefault(w, backingBitPlanes, ~0L) #define wBackingBitPlanes(w) wUseDefault(w, backingBitPlanes, ~0L)

8
mi/miinitext.c
View File

@ -197,9 +197,7 @@ extern Bool noPanoramiXExtension;
#ifdef INXQUARTZ #ifdef INXQUARTZ
extern Bool noPseudoramiXExtension; extern Bool noPseudoramiXExtension;
#endif #endif
#ifdef XINPUT
extern Bool noXInputExtension; extern Bool noXInputExtension;
#endif
#ifdef XIDLE #ifdef XIDLE
extern Bool noXIdleExtension; extern Bool noXIdleExtension;
#endif #endif
@ -262,9 +260,7 @@ extern void PanoramiXExtensionInit(INITARGS);
#ifdef INXQUARTZ #ifdef INXQUARTZ
extern void PseudoramiXExtensionInit(INITARGS); extern void PseudoramiXExtensionInit(INITARGS);
#endif #endif
#ifdef XINPUT
extern void XInputExtensionInit(INITARGS); extern void XInputExtensionInit(INITARGS);
#endif
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(INITARGS);
#endif #endif
@ -448,9 +444,7 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef PANORAMIX #ifdef PANORAMIX
{ "XINERAMA", &noPanoramiXExtension }, { "XINERAMA", &noPanoramiXExtension },
#endif #endif
#ifdef XINPUT
{ "XInputExtension", &noXInputExtension }, { "XInputExtension", &noXInputExtension },
#endif
#ifdef XKB #ifdef XKB
{ "XKEYBOARD", &noXkbExtension }, { "XKEYBOARD", &noXkbExtension },
#endif #endif
@ -632,9 +626,7 @@ static ExtensionModule staticExtensions[] = {
#ifdef MITSHM #ifdef MITSHM
{ ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL }, { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
#endif #endif
#ifdef XINPUT
{ XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL }, { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
#endif
#ifdef XTEST #ifdef XTEST
{ XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL }, { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
#endif #endif

2
os/utils.c
View File

@ -214,9 +214,7 @@ _X_EXPORT Bool noXFixesExtension = FALSE;
/* Xinerama is disabled by default unless enabled via +xinerama */ /* Xinerama is disabled by default unless enabled via +xinerama */
_X_EXPORT Bool noPanoramiXExtension = TRUE; _X_EXPORT Bool noPanoramiXExtension = TRUE;
#endif #endif
#ifdef XINPUT
_X_EXPORT Bool noXInputExtension = FALSE; _X_EXPORT Bool noXInputExtension = FALSE;
#endif
#ifdef XIDLE #ifdef XIDLE
_X_EXPORT Bool noXIdleExtension = FALSE; _X_EXPORT Bool noXIdleExtension = FALSE;
#endif #endif