Skip to content

Xi: inline SProcXChangeDeviceKeyMapping() #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2025
Merged

Xi: inline SProcXChangeDeviceKeyMapping() #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 7 additions & 25 deletions Xi/chgkmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,43 +63,25 @@ SOFTWARE.

/***********************************************************************
*
* This procedure swaps the request when the client and
* server have different byte orderings.
* Change the device key mapping.
*
*/

int _X_COLD
SProcXChangeDeviceKeyMapping(ClientPtr client)
int
ProcXChangeDeviceKeyMapping(ClientPtr client)
{
unsigned int count;

REQUEST(xChangeDeviceKeyMappingReq);
REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
count = stuff->keyCodes * stuff->keySymsPerKeyCode;

unsigned count = stuff->keyCodes * stuff->keySymsPerKeyCode;
REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
SwapLongs((CARD32 *) (&stuff[1]), count);
return (ProcXChangeDeviceKeyMapping(client));
}

/***********************************************************************
*
* Change the device key mapping.
*
*/
if (client->swapped)
SwapLongs((CARD32 *) (&stuff[1]), count);

int
ProcXChangeDeviceKeyMapping(ClientPtr client)
{
int ret;
unsigned len;
DeviceIntPtr dev;
unsigned int count;

REQUEST(xChangeDeviceKeyMappingReq);
REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);

count = stuff->keyCodes * stuff->keySymsPerKeyCode;
REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));

ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
if (ret != Success)
Expand Down
2 changes: 1 addition & 1 deletion Xi/extinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ SProcIDispatch(ClientPtr client)
case X_GetDeviceKeyMapping:
return ProcXGetDeviceKeyMapping(client);
case X_ChangeDeviceKeyMapping:
return SProcXChangeDeviceKeyMapping(client);
return ProcXChangeDeviceKeyMapping(client);
case X_GetDeviceModifierMapping:
return ProcXGetDeviceModifierMapping(client);
case X_SetDeviceModifierMapping:
Expand Down
1 change: 0 additions & 1 deletion Xi/handlers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ int ProcXUngrabDeviceKey(ClientPtr client);
int SProcXAllowDeviceEvents(ClientPtr client);
int SProcXChangeDeviceControl(ClientPtr client);
int SProcXChangeDeviceDontPropagateList(ClientPtr client);
int SProcXChangeDeviceKeyMapping(ClientPtr client);
int SProcXChangeDeviceProperty(ClientPtr client);
int SProcXChangeFeedbackControl(ClientPtr client);
int SProcXDeleteDeviceProperty(ClientPtr client);
Expand Down