andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused.

Browse Source
This commit is contained in:
Tiago Vignatti 2008-10-08 01:11:38 -03:00
parent 54294e15ec
commit 50081d2dfb
2 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,8 +195,6 @@ void xf86DisableInputHandler(pointer handler);
void xf86EnableInputHandler(pointer handler); void xf86EnableInputHandler(pointer handler);
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data); pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveGeneralHandler(pointer handler); int xf86RemoveGeneralHandler(pointer handler);
void xf86DisableGeneralHandler(pointer handler);
void xf86EnableGeneralHandler(pointer handler);
void xf86InterceptSignals(int *signo); void xf86InterceptSignals(int *signo);
void xf86InterceptSigIll(void (*sigillhandler)(void)); void xf86InterceptSigIll(void (*sigillhandler)(void));
Bool xf86EnableVTSwitch(Bool new); Bool xf86EnableVTSwitch(Bool new);

51
hw/xfree86/common/xf86Events.c
View File

@ -57,16 +57,13 @@
#include <X11/Xpoll.h> #include <X11/Xpoll.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "compiler.h" #include "compiler.h"
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#define XF86_OS_PRIVS #define XF86_OS_PRIVS
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include <X11/keysym.h> #include <X11/keysym.h>
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include "dgaproc.h" #include "dgaproc.h"
#endif #endif
@ -87,25 +84,12 @@
#include <X11/extensions/xf86bigfont.h> #include <X11/extensions/xf86bigfont.h>
#endif #endif
#ifdef XKB
extern Bool noXkbExtension;
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #define DPMS_SERVER
#include <X11/extensions/dpms.h> #include <X11/extensions/dpms.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#endif #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 * 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 * 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 * Function used for screensaver purposes by the os module. Returns the
* time in milliseconds since there last was any input. * time in milliseconds since there last was any input.
*/ */
int int
TimeSinceLastInputEvent() TimeSinceLastInputEvent()
{ {
@ -170,28 +153,22 @@ TimeSinceLastInputEvent()
return GetTimeInMillis() - xf86Info.lastEventTime; return GetTimeInMillis() - xf86Info.lastEventTime;
} }
/* /*
* SetTimeSinceLastInputEvent -- * SetTimeSinceLastInputEvent --
* Set the lastEventTime to now. * Set the lastEventTime to now.
*/ */
_X_EXPORT void _X_EXPORT void
SetTimeSinceLastInputEvent() SetTimeSinceLastInputEvent()
{ {
xf86Info.lastEventTime = GetTimeInMillis(); xf86Info.lastEventTime = GetTimeInMillis();
} }
/* /*
* ProcessInputEvents -- * ProcessInputEvents --
* Retrieve all waiting input events and pass them to DIX in their * Retrieve all waiting input events and pass them to DIX in their
* correct chronological order. Only reads from the system pointer * correct chronological order. Only reads from the system pointer
* and keyboard. * and keyboard.
*/ */
void void
ProcessInputEvents () ProcessInputEvents ()
{ {
@ -938,20 +915,6 @@ xf86DisableInputHandler(pointer handler)
RemoveEnabledDevice(ih->fd); 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 _X_EXPORT void
xf86EnableInputHandler(pointer handler) xf86EnableInputHandler(pointer handler)
{ {
@ -966,20 +929,6 @@ xf86EnableInputHandler(pointer handler)
AddEnabledDevice(ih->fd); 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. * As used currently by the DRI, the return value is ignored.
*/ */