diff --git a/Xi/closedev.c b/Xi/closedev.c index e319c737a..1064be67b 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -162,6 +162,5 @@ ProcXCloseDevice(ClientPtr client) DeleteEventsFromChildren(d, p1, client); } - CloseInputDevice(d, client); return Success; } diff --git a/Xi/opendev.c b/Xi/opendev.c index e4c02d32a..13841dc4f 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -115,7 +115,6 @@ ProcXOpenDevice(ClientPtr client) if (IsMaster(dev)) return BadDevice; - OpenInputDevice(dev, client, &status); if (status != Success) return status; diff --git a/Xi/stubs.c b/Xi/stubs.c index de80042ec..4c9795aba 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -66,24 +66,6 @@ SOFTWARE. #include "XIstubs.h" #include "xace.h" -/*********************************************************************** - * - * Caller: ProcXCloseDevice - * - * Take care of implementation-dependent details of closing a device. - * Some implementations may actually close the device, others may just - * remove this clients interest in that device. - * - * The default implementation is to do nothing (assume all input devices - * are initialized during X server initialization and kept open). - * - */ - -void -CloseInputDevice(DeviceIntPtr d, ClientPtr client) -{ -} - /*********************************************************************** * * Caller: ProcXListInputDevices @@ -127,34 +109,6 @@ AddOtherInputDevices(void) } -/*********************************************************************** - * - * Caller: ProcXOpenDevice - * - * This is the implementation-dependent routine to open an input device. - * Some implementations open all input devices when the server is first - * initialized, and never close them. Other implementations open only - * the X pointer and keyboard devices during server initialization, - * and only open other input devices when some client makes an - * XOpenDevice request. This entry point is for the latter type of - * implementation. - * - * If the physical device is not already open, do it here. In this case, - * you need to keep track of the fact that one or more clients has the - * device open, and physically close it when the last client that has - * it open does an XCloseDevice. - * - * The default implementation is to do nothing (assume all input devices - * are opened during X server initialization and kept open). - * - */ - -void -OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) -{ - *status = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixUseAccess); -} - /**************************************************************************** * * Caller: ProcXSetDeviceMode diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c index 8b58eeb69..a5c28a99a 100644 --- a/hw/dmx/input/dmxxinput.c +++ b/hw/dmx/input/dmxxinput.c @@ -51,23 +51,11 @@ #include "dmxinputinit.h" #include "exevents.h" -/** Close the input device. This is not required by the XINPUT model - * that DMX uses. */ -void CloseInputDevice (DeviceIntPtr d, ClientPtr client) -{ -} - /** This is not required by the XINPUT model that DMX uses. */ void AddOtherInputDevices(void) { } -/** Open an input device. This is not required by the XINPUT model that - * DMX uses. */ -void OpenInputDevice (DeviceIntPtr dev, ClientPtr client, int *status) -{ -} - /** Set device mode to \a mode. This is not implemented. */ int SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode) { diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index a4691dfec..2ab6dc2e3 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -2176,23 +2176,6 @@ ProcessInputEvents (void) KdCheckLock (); } -/* FIXME use XSECURITY to work out whether the client should be allowed to - * open and close. */ -void -OpenInputDevice(DeviceIntPtr pDev, ClientPtr client, int *status) -{ - if (!pDev) - *status = BadDevice; - else - *status = Success; -} - -void -CloseInputDevice(DeviceIntPtr pDev, ClientPtr client) -{ - return; -} - /* We initialise all input devices at startup. */ void AddOtherInputDevices(void) diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 1bd008233..4a6adbc17 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -327,47 +327,6 @@ xf86ActivateDevice(InputInfoPtr pInfo) return dev; } - -/*********************************************************************** - * - * Caller: ProcXOpenDevice - * - * This is the implementation-dependent routine to open an input device. - * Some implementations open all input devices when the server is first - * initialized, and never close them. Other implementations open only - * the X pointer and keyboard devices during server initialization, - * and only open other input devices when some client makes an - * XOpenDevice request. This entry point is for the latter type of - * implementation. - * - * If the physical device is not already open, do it here. In this case, - * you need to keep track of the fact that one or more clients has the - * device open, and physically close it when the last client that has - * it open does an XCloseDevice. - * - * The default implementation is to do nothing (assume all input devices - * are opened during X server initialization and kept open). - * - *********************************************************************** - */ - -void -OpenInputDevice(DeviceIntPtr dev, - ClientPtr client, - int *status) -{ - if (!dev->inited) - ActivateDevice(dev, TRUE); - - *status = Success; -} - -void -CloseInputDevice(DeviceIntPtr dev, - ClientPtr client) -{ -} - /**************************************************************************** * * Caller: ProcXSetDeviceMode diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c index 966aaf3e5..64d9b2365 100644 --- a/hw/xquartz/darwinXinput.c +++ b/hw/xquartz/darwinXinput.c @@ -125,34 +125,6 @@ AddOtherInputDevices(void) DEBUG_LOG("AddOtherInputDevices\n"); } -/*********************************************************************** - * - * Caller: ProcXOpenDevice - * - * This is the implementation-dependent routine to open an input device. - * Some implementations open all input devices when the server is first - * initialized, and never close them. Other implementations open only - * the X pointer and keyboard devices during server initialization, - * and only open other input devices when some client makes an - * XOpenDevice request. This entry point is for the latter type of - * implementation. - * - * If the physical device is not already open, do it here. In this case, - * you need to keep track of the fact that one or more clients has the - * device open, and physically close it when the last client that has - * it open does an XCloseDevice. - * - * The default implementation is to do nothing (assume all input devices - * are opened during X server initialization and kept open). - * - */ - -void -OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) -{ - DEBUG_LOG("OpenInputDevice(%p, %p, %p)\n", dev, client, status); -} - /**************************************************************************** * * Caller: ProcXSetDeviceMode diff --git a/include/XIstubs.h b/include/XIstubs.h index ba2f861cd..0bb773e38 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -26,20 +26,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XI_STUBS_H #define XI_STUBS_H 1 -extern _X_EXPORT void -CloseInputDevice ( - DeviceIntPtr /* d */, - ClientPtr /* client */); - extern _X_EXPORT void AddOtherInputDevices (void); -extern _X_EXPORT void -OpenInputDevice ( - DeviceIntPtr /* dev */, - ClientPtr /* client */, - int * /* status */); - extern _X_EXPORT int SetDeviceMode ( ClientPtr /* client */,