diff options
author | Daniel Stone <daniel@fooishbar.org> | 2006-10-06 16:26:54 +0300 |
---|---|---|
committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-10-06 16:26:54 +0300 |
commit | 7b4dc171b036107cfba87a1a16bf692b982005a5 (patch) | |
tree | 5209ce384f2058e1df47089d4059e2fe7b89e280 /xkb | |
parent | ab56f0c5b516269bb99ae8b5f479e49e61a3af76 (diff) |
xkb: remove unused #ifndef
Diffstat (limited to 'xkb')
-rw-r--r-- | xkb/xkb.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -821,9 +821,11 @@ ProcXkbSetControls(ClientPtr client) if (stuff->changeCtrls&XkbPerKeyRepeatMask) { memcpy(new.per_key_repeat,stuff->perKeyRepeat,XkbPerKeyBitArraySize); } + old= *ctrl; *ctrl= new; XkbDDXChangeControls(dev,&old,ctrl); + if (XkbComputeControlsNotify(dev,&old,ctrl,&cn,False)) { cn.keycode= 0; cn.eventType = 0; @@ -831,15 +833,16 @@ ProcXkbSetControls(ClientPtr client) cn.requestMinor = X_kbSetControls; XkbSendControlsNotify(dev,&cn); } + if ((sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0))!=NULL) 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 ((old.enabled_ctrls&XkbStickyKeysMask)&& (!(ctrl->enabled_ctrls&XkbStickyKeysMask))) { XkbClearAllLatchesAndLocks(dev,xkbi,True,&cause); } -#endif + return client->noClientException; } |