xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused.
This commit is contained in:
parent
54294e15ec
commit
50081d2dfb
|
@ -195,8 +195,6 @@ void xf86DisableInputHandler(pointer handler);
|
|||
void xf86EnableInputHandler(pointer handler);
|
||||
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
|
||||
int xf86RemoveGeneralHandler(pointer handler);
|
||||
void xf86DisableGeneralHandler(pointer handler);
|
||||
void xf86EnableGeneralHandler(pointer handler);
|
||||
void xf86InterceptSignals(int *signo);
|
||||
void xf86InterceptSigIll(void (*sigillhandler)(void));
|
||||
Bool xf86EnableVTSwitch(Bool new);
|
||||
|
|
|
@ -57,16 +57,13 @@
|
|||
#include <X11/Xpoll.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include "misc.h"
|
||||
|
||||
#include "compiler.h"
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86Priv.h"
|
||||
#define XF86_OS_PRIVS
|
||||
#include "xf86_OSlib.h"
|
||||
#include <X11/keysym.h>
|
||||
|
||||
|
||||
#ifdef XFreeXDGA
|
||||
#include "dgaproc.h"
|
||||
#endif
|
||||
|
@ -87,25 +84,12 @@
|
|||
#include <X11/extensions/xf86bigfont.h>
|
||||
#endif
|
||||
|
||||
#ifdef XKB
|
||||
extern Bool noXkbExtension;
|
||||
#endif
|
||||
|
||||
#ifdef DPMSExtension
|
||||
#define DPMS_SERVER
|
||||
#include <X11/extensions/dpms.h>
|
||||
#include "dpmsproc.h"
|
||||
#endif
|
||||
|
||||
#define XE_POINTER 1
|
||||
#define XE_KEYBOARD 2
|
||||
|
||||
#define EqEnqueue(pDev, ev) { \
|
||||
int __sigstate = xf86BlockSIGIO (); \
|
||||
mieqEnqueue (pDev, ev); \
|
||||
xf86UnblockSIGIO(__sigstate); \
|
||||
}
|
||||
|
||||
/*
|
||||
* The first of many hacks to get VT switching to work under
|
||||
* Solaris 2.1 for x86. The basic problem is that Solaris is supposed
|
||||
|
@ -160,7 +144,6 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
|
|||
* Function used for screensaver purposes by the os module. Returns the
|
||||
* time in milliseconds since there last was any input.
|
||||
*/
|
||||
|
||||
int
|
||||
TimeSinceLastInputEvent()
|
||||
{
|
||||
|
@ -170,28 +153,22 @@ TimeSinceLastInputEvent()
|
|||
return GetTimeInMillis() - xf86Info.lastEventTime;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* SetTimeSinceLastInputEvent --
|
||||
* Set the lastEventTime to now.
|
||||
*/
|
||||
|
||||
_X_EXPORT void
|
||||
SetTimeSinceLastInputEvent()
|
||||
{
|
||||
xf86Info.lastEventTime = GetTimeInMillis();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* ProcessInputEvents --
|
||||
* Retrieve all waiting input events and pass them to DIX in their
|
||||
* correct chronological order. Only reads from the system pointer
|
||||
* and keyboard.
|
||||
*/
|
||||
|
||||
void
|
||||
ProcessInputEvents ()
|
||||
{
|
||||
|
@ -938,20 +915,6 @@ xf86DisableInputHandler(pointer handler)
|
|||
RemoveEnabledDevice(ih->fd);
|
||||
}
|
||||
|
||||
_X_EXPORT void
|
||||
xf86DisableGeneralHandler(pointer handler)
|
||||
{
|
||||
IHPtr ih;
|
||||
|
||||
if (!handler)
|
||||
return;
|
||||
|
||||
ih = handler;
|
||||
ih->enabled = FALSE;
|
||||
if (ih->fd >= 0)
|
||||
RemoveGeneralSocket(ih->fd);
|
||||
}
|
||||
|
||||
_X_EXPORT void
|
||||
xf86EnableInputHandler(pointer handler)
|
||||
{
|
||||
|
@ -966,20 +929,6 @@ xf86EnableInputHandler(pointer handler)
|
|||
AddEnabledDevice(ih->fd);
|
||||
}
|
||||
|
||||
_X_EXPORT void
|
||||
xf86EnableGeneralHandler(pointer handler)
|
||||
{
|
||||
IHPtr ih;
|
||||
|
||||
if (!handler)
|
||||
return;
|
||||
|
||||
ih = handler;
|
||||
ih->enabled = TRUE;
|
||||
if (ih->fd >= 0)
|
||||
AddGeneralSocket(ih->fd);
|
||||
}
|
||||
|
||||
/*
|
||||
* As used currently by the DRI, the return value is ignored.
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user