dix: use BitIsOn/SetBit/ClearBit macros for set_key_down helpers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
parent
c184429080
commit
32473d6bf3
|
@ -94,18 +94,18 @@ void
|
||||||
set_key_down(DeviceIntPtr pDev, int key_code, int type)
|
set_key_down(DeviceIntPtr pDev, int key_code, int type)
|
||||||
{
|
{
|
||||||
if (type == KEY_PROCESSED)
|
if (type == KEY_PROCESSED)
|
||||||
pDev->key->down[key_code >> 3] |= (1 << (key_code & 7));
|
SetBit(pDev->key->down, key_code);
|
||||||
else
|
else
|
||||||
pDev->key->postdown[key_code >> 3] |= (1 << (key_code & 7));
|
SetBit(pDev->key->postdown, key_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
set_key_up(DeviceIntPtr pDev, int key_code, int type)
|
set_key_up(DeviceIntPtr pDev, int key_code, int type)
|
||||||
{
|
{
|
||||||
if (type == KEY_PROCESSED)
|
if (type == KEY_PROCESSED)
|
||||||
pDev->key->down[key_code >> 3] &= ~(1 << (key_code & 7));
|
ClearBit(pDev->key->down, key_code);
|
||||||
else
|
else
|
||||||
pDev->key->postdown[key_code >> 3] &= ~(1 << (key_code & 7));
|
ClearBit(pDev->key->postdown, key_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
Bool
|
Bool
|
||||||
|
@ -114,9 +114,9 @@ key_is_down(DeviceIntPtr pDev, int key_code, int type)
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (type & KEY_PROCESSED)
|
if (type & KEY_PROCESSED)
|
||||||
ret |= !!(pDev->key->down[key_code >> 3] & (1 << (key_code & 7)));
|
ret |= !!BitIsOn(pDev->key->down, key_code);
|
||||||
if (type & KEY_POSTED)
|
if (type & KEY_POSTED)
|
||||||
ret |= !!(pDev->key->postdown[key_code >> 3] & (1 << (key_code & 7)));
|
ret |= !!BitIsOn(pDev->key->postdown, key_code);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue