kdrive/input: remove unnecessary #ifdef XINPUTs
Xi is now mandatory, so don't bother with the ifdefs.
This commit is contained in:
parent
0514d53e10
commit
65cd5aa4d7
|
@ -45,14 +45,12 @@
|
||||||
#include <X11/extensions/XKBsrv.h>
|
#include <X11/extensions/XKBsrv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#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" /* even though we don't use stubs. cute, no? */
|
#include "XIstubs.h" /* even though we don't use stubs. cute, no? */
|
||||||
#include "exevents.h"
|
#include "exevents.h"
|
||||||
#include "extinit.h"
|
#include "extinit.h"
|
||||||
#include "exglobals.h"
|
#include "exglobals.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
|
#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
|
||||||
|
|
||||||
|
@ -394,9 +392,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
|
||||||
{
|
{
|
||||||
DevicePtr pDev = (DevicePtr)pDevice;
|
DevicePtr pDev = (DevicePtr)pDevice;
|
||||||
KdPointerInfo *pi;
|
KdPointerInfo *pi;
|
||||||
#ifdef XINPUT
|
|
||||||
Atom xiclass;
|
Atom xiclass;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!pDev)
|
if (!pDev)
|
||||||
return BadImplementation;
|
return BadImplementation;
|
||||||
|
@ -719,9 +715,7 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
|
||||||
Bool ret;
|
Bool ret;
|
||||||
DevicePtr pDev = (DevicePtr)pDevice;
|
DevicePtr pDev = (DevicePtr)pDevice;
|
||||||
KdKeyboardInfo *ki;
|
KdKeyboardInfo *ki;
|
||||||
#ifdef XINPUT
|
|
||||||
Atom xiclass;
|
Atom xiclass;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!pDev)
|
if (!pDev)
|
||||||
return BadImplementation;
|
return BadImplementation;
|
||||||
|
@ -794,11 +788,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
|
||||||
return BadImplementation;
|
return BadImplementation;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef XINPUT
|
|
||||||
xiclass = AtomFromName(XI_KEYBOARD);
|
xiclass = AtomFromName(XI_KEYBOARD);
|
||||||
AssignTypeAndName(pDevice, xiclass,
|
AssignTypeAndName(pDevice, xiclass,
|
||||||
ki->name ? ki->name : "Generic KDrive Keyboard");
|
ki->name ? ki->name : "Generic KDrive Keyboard");
|
||||||
#endif
|
|
||||||
|
|
||||||
KdResetInputMachine();
|
KdResetInputMachine();
|
||||||
|
|
||||||
|
@ -987,9 +979,7 @@ KdAddKeyboard (KdKeyboardInfo *ki)
|
||||||
return !Success;
|
return !Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef XINPUT
|
|
||||||
RegisterOtherDevice(ki->dixdev);
|
RegisterOtherDevice(ki->dixdev);
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("added keyboard %s with dix id %d\n", ki->name, ki->dixdev->id);
|
ErrorF("added keyboard %s with dix id %d\n", ki->name, ki->dixdev->id);
|
||||||
|
@ -1058,9 +1048,7 @@ KdAddPointer (KdPointerInfo *pi)
|
||||||
return BadDevice;
|
return BadDevice;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef XINPUT
|
|
||||||
RegisterOtherDevice(pi->dixdev);
|
RegisterOtherDevice(pi->dixdev);
|
||||||
#endif
|
|
||||||
|
|
||||||
for (prev = &kdPointers; *prev; prev = &(*prev)->next);
|
for (prev = &kdPointers; *prev; prev = &(*prev)->next);
|
||||||
*prev = pi;
|
*prev = pi;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user