andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: Replace a few manual bitflips with SetBit & friends.

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
This commit is contained in:
Peter Hutterer 2011-01-13 09:19:28 +10:00
parent 16eb4f2a7b
commit f1326ed291
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xkb/XKBMisc.c
View File

@ -454,11 +454,12 @@ unsigned changed,tmp;
} }
if (((explicit&XkbExplicitAutoRepeatMask)==0)&&(xkb->ctrls)) { if (((explicit&XkbExplicitAutoRepeatMask)==0)&&(xkb->ctrls)) {
CARD8 old; CARD8 old;
old= xkb->ctrls->per_key_repeat[key/8]; old= BitIsOn(xkb->ctrls->per_key_repeat, key);
if (interps[0]->flags&XkbSI_AutoRepeat) if (interps[0]->flags&XkbSI_AutoRepeat)
xkb->ctrls->per_key_repeat[key/8]|= (1<<(key%8)); SetBit(xkb->ctrls->per_key_repeat, key);
else xkb->ctrls->per_key_repeat[key/8]&= ~(1<<(key%8)); else
if (changes && (old!=xkb->ctrls->per_key_repeat[key/8])) ClearBit(xkb->ctrls->per_key_repeat, key);
if (changes && old != BitIsOn(xkb->ctrls->per_key_repeat, key))
changes->ctrls.changed_ctrls|= XkbPerKeyRepeatMask; changes->ctrls.changed_ctrls|= XkbPerKeyRepeatMask;
} }
} }
@ -466,9 +467,9 @@ unsigned changed,tmp;
if ((!found)||(interps[0]==NULL)) { if ((!found)||(interps[0]==NULL)) {
if (((explicit&XkbExplicitAutoRepeatMask)==0)&&(xkb->ctrls)) { if (((explicit&XkbExplicitAutoRepeatMask)==0)&&(xkb->ctrls)) {
CARD8 old; CARD8 old;
old= xkb->ctrls->per_key_repeat[key/8]; old = BitIsOn(xkb->ctrls->per_key_repeat, key);
xkb->ctrls->per_key_repeat[key/8]|= (1<<(key%8)); SetBit(xkb->ctrls->per_key_repeat, key);
if (changes && (old!=xkb->ctrls->per_key_repeat[key/8])) if (changes && (old != BitIsOn(xkb->ctrls->per_key_repeat, key)))
changes->ctrls.changed_ctrls|= XkbPerKeyRepeatMask; changes->ctrls.changed_ctrls|= XkbPerKeyRepeatMask;
} }
if (((explicit&XkbExplicitBehaviorMask)==0)&& if (((explicit&XkbExplicitBehaviorMask)==0)&&