summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2008-10-12 16:07:24 -0700
committerAaron Plattner <aplattner@nvidia.com>2008-10-12 16:07:24 -0700
commit2217d22a76cdb2460f9683a6bf74c7248612889d (patch)
tree6968940dffd21b30da09781364d0476701ca6aec
parent5b336585a4cdf11d20831a9536ad581e959ea7f1 (diff)
Revert "xfree86: xf86{Enable, Disable}InputHandler can be static."
These were potentially useful as part of the input handler ABI, even if nobody currently uses them. This reverts commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca.
-rw-r--r--hw/xfree86/common/xf86.h2
-rw-r--r--hw/xfree86/common/xf86Events.c56
-rw-r--r--hw/xfree86/loader/xf86sym.c2
3 files changed, 32 insertions, 28 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 0956f9c37..84ea63345 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -191,6 +191,8 @@ xf86SetDGAModeProc xf86SetDGAMode;
void SetTimeSinceLastInputEvent(void);
pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveInputHandler(pointer handler);
+void xf86DisableInputHandler(pointer handler);
+void xf86EnableInputHandler(pointer handler);
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveGeneralHandler(pointer handler);
void xf86InterceptSignals(int *signo);
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index a2c206ec8..e91b332a3 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -462,34 +462,6 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
}
}
-static void
-xf86EnableInputHandler(pointer handler)
-{
- IHPtr ih;
-
- if (!handler)
- return;
-
- ih = handler;
- ih->enabled = TRUE;
- if (ih->fd >= 0)
- AddEnabledDevice(ih->fd);
-}
-
-static void
-xf86DisableInputHandler(pointer handler)
-{
- IHPtr ih;
-
- if (!handler)
- return;
-
- ih = handler;
- ih->enabled = FALSE;
- if (ih->fd >= 0)
- RemoveEnabledDevice(ih->fd);
-}
-
/*
* xf86VTSwitch --
* Handle requests for switching the vt.
@@ -756,6 +728,34 @@ xf86RemoveGeneralHandler(pointer handler)
return fd;
}
+_X_EXPORT void
+xf86DisableInputHandler(pointer handler)
+{
+ IHPtr ih;
+
+ if (!handler)
+ return;
+
+ ih = handler;
+ ih->enabled = FALSE;
+ if (ih->fd >= 0)
+ RemoveEnabledDevice(ih->fd);
+}
+
+_X_EXPORT void
+xf86EnableInputHandler(pointer handler)
+{
+ IHPtr ih;
+
+ if (!handler)
+ return;
+
+ ih = handler;
+ ih->enabled = TRUE;
+ if (ih->fd >= 0)
+ AddEnabledDevice(ih->fd);
+}
+
/*
* As used currently by the DRI, the return value is ignored.
*/
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index d0e855887..4891be245 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -375,6 +375,8 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(SetTimeSinceLastInputEvent)
SYMFUNC(xf86AddInputHandler)
SYMFUNC(xf86RemoveInputHandler)
+ SYMFUNC(xf86DisableInputHandler)
+ SYMFUNC(xf86EnableInputHandler)
SYMFUNC(xf86AddEnabledDevice)
SYMFUNC(xf86RemoveEnabledDevice)
SYMFUNC(xf86InterceptSignals)