mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
Xi: drop redundant SProcIDispatch()
Now that all individual swapping request handlers have been merged into the actual ones, there's no need for a separate dispatcher anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
09d35f1e0d
commit
a18480ef84
148
Xi/extinit.c
148
Xi/extinit.c
@@ -334,152 +334,6 @@ ProcIDispatch(ClientPtr client)
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* SProcXDispatch
|
||||
*
|
||||
* Main swapped dispatch routine for requests to this extension.
|
||||
* This routine is used if server and client do not have the same byte ordering.
|
||||
*
|
||||
*/
|
||||
|
||||
static int _X_COLD
|
||||
SProcIDispatch(ClientPtr client)
|
||||
{
|
||||
REQUEST(xReq);
|
||||
|
||||
UpdateCurrentTimeIf();
|
||||
|
||||
switch (stuff->data) {
|
||||
case X_GetExtensionVersion:
|
||||
return ProcXGetExtensionVersion(client);
|
||||
case X_ListInputDevices:
|
||||
return ProcXListInputDevices(client);
|
||||
case X_OpenDevice:
|
||||
return ProcXOpenDevice(client);
|
||||
case X_CloseDevice:
|
||||
return ProcXCloseDevice(client);
|
||||
case X_SetDeviceMode:
|
||||
return ProcXSetDeviceMode(client);
|
||||
case X_SelectExtensionEvent:
|
||||
return ProcXSelectExtensionEvent(client);
|
||||
case X_GetSelectedExtensionEvents:
|
||||
return ProcXGetSelectedExtensionEvents(client);
|
||||
case X_ChangeDeviceDontPropagateList:
|
||||
return ProcXChangeDeviceDontPropagateList(client);
|
||||
case X_GetDeviceDontPropagateList:
|
||||
return ProcXGetDeviceDontPropagateList(client);
|
||||
case X_GetDeviceMotionEvents:
|
||||
return ProcXGetDeviceMotionEvents(client);
|
||||
case X_ChangeKeyboardDevice:
|
||||
return ProcXChangeKeyboardDevice(client);
|
||||
case X_ChangePointerDevice:
|
||||
return ProcXChangePointerDevice(client);
|
||||
case X_GrabDevice:
|
||||
return ProcXGrabDevice(client);
|
||||
case X_UngrabDevice:
|
||||
return ProcXUngrabDevice(client);
|
||||
case X_GrabDeviceKey:
|
||||
return ProcXGrabDeviceKey(client);
|
||||
case X_UngrabDeviceKey:
|
||||
return ProcXUngrabDeviceKey(client);
|
||||
case X_GrabDeviceButton:
|
||||
return ProcXGrabDeviceButton(client);
|
||||
case X_UngrabDeviceButton:
|
||||
return ProcXUngrabDeviceButton(client);
|
||||
case X_AllowDeviceEvents:
|
||||
return ProcXAllowDeviceEvents(client);
|
||||
case X_GetDeviceFocus:
|
||||
return ProcXGetDeviceFocus(client);
|
||||
case X_SetDeviceFocus:
|
||||
return ProcXSetDeviceFocus(client);
|
||||
case X_GetFeedbackControl:
|
||||
return ProcXGetFeedbackControl(client);
|
||||
case X_ChangeFeedbackControl:
|
||||
return ProcXChangeFeedbackControl(client);
|
||||
case X_GetDeviceKeyMapping:
|
||||
return ProcXGetDeviceKeyMapping(client);
|
||||
case X_ChangeDeviceKeyMapping:
|
||||
return ProcXChangeDeviceKeyMapping(client);
|
||||
case X_GetDeviceModifierMapping:
|
||||
return ProcXGetDeviceModifierMapping(client);
|
||||
case X_SetDeviceModifierMapping:
|
||||
return ProcXSetDeviceModifierMapping(client);
|
||||
case X_GetDeviceButtonMapping:
|
||||
return ProcXGetDeviceButtonMapping(client);
|
||||
case X_SetDeviceButtonMapping:
|
||||
return ProcXSetDeviceButtonMapping(client);
|
||||
case X_QueryDeviceState:
|
||||
return ProcXQueryDeviceState(client);
|
||||
case X_SendExtensionEvent:
|
||||
return ProcXSendExtensionEvent(client);
|
||||
case X_DeviceBell:
|
||||
return ProcXDeviceBell(client);
|
||||
case X_SetDeviceValuators:
|
||||
return ProcXSetDeviceValuators(client);
|
||||
case X_GetDeviceControl:
|
||||
return ProcXGetDeviceControl(client);
|
||||
case X_ChangeDeviceControl:
|
||||
return ProcXChangeDeviceControl(client);
|
||||
/* XI 1.5 */
|
||||
case X_ListDeviceProperties:
|
||||
return ProcXListDeviceProperties(client);
|
||||
case X_ChangeDeviceProperty:
|
||||
return ProcXChangeDeviceProperty(client);
|
||||
case X_DeleteDeviceProperty:
|
||||
return ProcXDeleteDeviceProperty(client);
|
||||
case X_GetDeviceProperty:
|
||||
return ProcXGetDeviceProperty(client);
|
||||
/* XI 2 */
|
||||
case X_XIQueryPointer:
|
||||
return ProcXIQueryPointer(client);
|
||||
case X_XIWarpPointer:
|
||||
return ProcXIWarpPointer(client);
|
||||
case X_XIChangeCursor:
|
||||
return ProcXIChangeCursor(client);
|
||||
case X_XIChangeHierarchy:
|
||||
return ProcXIChangeHierarchy(client);
|
||||
case X_XISetClientPointer:
|
||||
return ProcXISetClientPointer(client);
|
||||
case X_XIGetClientPointer:
|
||||
return ProcXIGetClientPointer(client);
|
||||
case X_XISelectEvents:
|
||||
return ProcXISelectEvents(client);
|
||||
case X_XIQueryVersion:
|
||||
return ProcXIQueryVersion(client);
|
||||
case X_XIQueryDevice:
|
||||
return ProcXIQueryDevice(client);
|
||||
case X_XISetFocus:
|
||||
return ProcXISetFocus(client);
|
||||
case X_XIGetFocus:
|
||||
return ProcXIGetFocus(client);
|
||||
case X_XIGrabDevice:
|
||||
return ProcXIGrabDevice(client);
|
||||
case X_XIUngrabDevice:
|
||||
return ProcXIUngrabDevice(client);
|
||||
case X_XIAllowEvents:
|
||||
return ProcXIAllowEvents(client);
|
||||
case X_XIPassiveGrabDevice:
|
||||
return ProcXIPassiveGrabDevice(client);
|
||||
case X_XIPassiveUngrabDevice:
|
||||
return ProcXIPassiveUngrabDevice(client);
|
||||
case X_XIListProperties:
|
||||
return ProcXIListProperties(client);
|
||||
case X_XIChangeProperty:
|
||||
return ProcXIChangeProperty(client);
|
||||
case X_XIDeleteProperty:
|
||||
return ProcXIDeleteProperty(client);
|
||||
case X_XIGetProperty:
|
||||
return ProcXIGetProperty(client);
|
||||
case X_XIGetSelectedEvents:
|
||||
return ProcXIGetSelectedEvents(client);
|
||||
case X_XIBarrierReleasePointer:
|
||||
return ProcXIBarrierReleasePointer(client);
|
||||
default:
|
||||
return BadRequest;
|
||||
}
|
||||
}
|
||||
|
||||
/************************************************************************
|
||||
*
|
||||
* This function swaps the DeviceValuator event.
|
||||
@@ -1297,7 +1151,7 @@ XInputExtensionInit(void)
|
||||
FatalError("Could not initialize barriers.\n");
|
||||
|
||||
extEntry = AddExtension(INAME, IEVENTS, IERRORS, ProcIDispatch,
|
||||
SProcIDispatch, IResetProc, StandardMinorOpcode);
|
||||
ProcIDispatch, IResetProc, StandardMinorOpcode);
|
||||
if (extEntry) {
|
||||
assert(extEntry->base == EXTENSION_MAJOR_XINPUT);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user