diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-30 14:26:06 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-01 15:26:52 +1000 |
commit | 4ac3be29bc1af19f15e84ee0ea609de5c54ca0e0 (patch) | |
tree | df9d4943fadc708fbac5cd362a8d07f0269d43e9 /Xi | |
parent | cb672a461cc6cd668ab7e61994b94e9ff46b3ef1 (diff) |
input: Purge AddOtherInputDevices DDX hook.
This hook wasn't used by any DDX. Device addition and removal is handled by
the config backend, so we don't need to do anything special that during the
ListInputDevices request processing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'Xi')
-rw-r--r-- | Xi/listdev.c | 3 | ||||
-rw-r--r-- | Xi/stubs.c | 43 |
2 files changed, 0 insertions, 46 deletions
diff --git a/Xi/listdev.c b/Xi/listdev.c index 3b2272bc3..3e5f3d9d2 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -356,9 +356,6 @@ ProcXListInputDevices(ClientPtr client) rep.length = 0; rep.sequenceNumber = client->sequence; - - AddOtherInputDevices(); - /* allocate space for saving skip value */ skip = calloc(sizeof(Bool), inputInfo.numDevices); if (!skip) diff --git a/Xi/stubs.c b/Xi/stubs.c index 4c9795aba..d9e8eec72 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -66,49 +66,6 @@ SOFTWARE. #include "XIstubs.h" #include "xace.h" -/*********************************************************************** - * - * Caller: ProcXListInputDevices - * - * This is the implementation-dependent routine to initialize an input - * device to the point that information about it can be listed. - * 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. If some other process has the device open, the - * server may not be able to get information about the device to list it. - * - * This procedure should be used by implementations that do not initialize - * all input devices at server startup. It should do device-dependent - * initialization for any devices not previously initialized, and call - * AddInputDevice for each of those devices so that a DeviceIntRec will be - * created for them. - * - * The default implementation is to do nothing (assume all input devices - * are initialized during X server initialization and kept open). - * The commented-out sample code shows what you might do if you don't want - * the default. - * - */ - -void -AddOtherInputDevices(void) -{ - /********************************************************************** - for each uninitialized device, do something like: - - DeviceIntPtr dev; - DeviceProc deviceProc; - pointer private; - - dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE); - dev->public.devicePrivate = private; - dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success); - ************************************************************************/ - -} - /**************************************************************************** * * Caller: ProcXSetDeviceMode |