frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: SetModifierMapping should only apply to the ClientPointer and it's SDs.

This commit is contained in:
Peter Hutterer 2008-08-07 11:55:10 +09:30 committed by Peter Hutterer
parent e1b286d495
commit 2c3645581e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dix/devices.c
View File

@ -1651,10 +1651,11 @@ DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
int numKeyPerModifier, xSetModifierMappingReply *rep) int numKeyPerModifier, xSetModifierMappingReply *rep)
{ {
DeviceIntPtr pDev = NULL; DeviceIntPtr pDev = NULL;
DeviceIntPtr cp = PickKeyboard(client); /* ClientPointer keyboard */
int rc, i = 0, inputMapLen = numKeyPerModifier * 8; int rc, i = 0, inputMapLen = numKeyPerModifier * 8;
for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) { if (pDev == cp || (!pDev->isMaster && (pDev->u.master == cp) && pDev->key)) {
for (i = 0; i < inputMapLen; i++) { for (i = 0; i < inputMapLen; i++) {
/* Check that all the new modifiers fall within the advertised /* Check that all the new modifiers fall within the advertised
* keycode range, and are okay with the DDX. */ * keycode range, and are okay with the DDX. */