diff options
Diffstat (limited to 'Xi/listdev.c')
| -rw-r--r-- | Xi/listdev.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/Xi/listdev.c b/Xi/listdev.c index c15e61b37..bf2f439a4 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -50,40 +50,26 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#endif #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> + +#include "dix/input_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" #include "extnsionst.h" #include "exevents.h" #include "xace.h" #include "xkbsrv.h" #include "xkbstr.h" - #include "listdev.h" /*********************************************************************** * - * This procedure lists the input devices available to the server. - * - */ - -int _X_COLD -SProcXListInputDevices(ClientPtr client) -{ - REQUEST(xListInputDevicesReq); - swaps(&stuff->length); - return (ProcXListInputDevices(client)); -} - -/*********************************************************************** - * * This procedure calculates the size of the information to be returned * for an input device. * @@ -309,7 +295,7 @@ ShouldSkipDevice(ClientPtr client, DeviceIntPtr d) { /* don't send master devices other than VCP/VCK */ if (!IsMaster(d) || d == inputInfo.pointer ||d == inputInfo.keyboard) { - int rc = XaceHook(XACE_DEVICE_ACCESS, client, d, DixGetAttrAccess); + int rc = XaceHookDeviceAccess(client, d, DixGetAttrAccess); if (rc == Success) return FALSE; @@ -350,7 +336,7 @@ ProcXListInputDevices(ClientPtr client) }; /* allocate space for saving skip value */ - skip = calloc(sizeof(Bool), inputInfo.numDevices); + skip = calloc(inputInfo.numDevices, sizeof(Bool)); if (!skip) return BadAlloc; |