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

xkb: remove unused #ifndef

This commit is contained in:
Daniel Stone 2006-10-06 16:26:54 +03:00 committed by Daniel Stone
parent ab56f0c5b5
commit 7b4dc171b0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xkb/xkb.c
View File

@ -821,9 +821,11 @@ ProcXkbSetControls(ClientPtr client)
if (stuff->changeCtrls&XkbPerKeyRepeatMask) { if (stuff->changeCtrls&XkbPerKeyRepeatMask) {
memcpy(new.per_key_repeat,stuff->perKeyRepeat,XkbPerKeyBitArraySize); memcpy(new.per_key_repeat,stuff->perKeyRepeat,XkbPerKeyBitArraySize);
} }
old= *ctrl; old= *ctrl;
*ctrl= new; *ctrl= new;
XkbDDXChangeControls(dev,&old,ctrl); XkbDDXChangeControls(dev,&old,ctrl);
if (XkbComputeControlsNotify(dev,&old,ctrl,&cn,False)) { if (XkbComputeControlsNotify(dev,&old,ctrl,&cn,False)) {
cn.keycode= 0; cn.keycode= 0;
cn.eventType = 0; cn.eventType = 0;
@ -831,15 +833,16 @@ ProcXkbSetControls(ClientPtr client)
cn.requestMinor = X_kbSetControls; cn.requestMinor = X_kbSetControls;
XkbSendControlsNotify(dev,&cn); XkbSendControlsNotify(dev,&cn);
} }
if ((sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0))!=NULL) if ((sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0))!=NULL)
XkbUpdateIndicators(dev,sli->usesControls,True,NULL,&cause); XkbUpdateIndicators(dev,sli->usesControls,True,NULL,&cause);
#ifndef NO_CLEAR_LATCHES_FOR_STICKY_KEYS_OFF
/* If sticky keys were disabled, clear all locks and latches */ /* If sticky keys were disabled, clear all locks and latches */
if ((old.enabled_ctrls&XkbStickyKeysMask)&& if ((old.enabled_ctrls&XkbStickyKeysMask)&&
(!(ctrl->enabled_ctrls&XkbStickyKeysMask))) { (!(ctrl->enabled_ctrls&XkbStickyKeysMask))) {
XkbClearAllLatchesAndLocks(dev,xkbi,True,&cause); XkbClearAllLatchesAndLocks(dev,xkbi,True,&cause);
} }
#endif
return client->noClientException; return client->noClientException;
} }