From 32473d6bf38c95b2d6d5ddbf583a1e801c6605e4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 6 Jul 2010 08:56:12 +1000 Subject: [PATCH] dix: use BitIsOn/SetBit/ClearBit macros for set_key_down helpers. Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone --- dix/getevents.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dix/getevents.c b/dix/getevents.c index 2eacdfed4..1d505e536 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -94,18 +94,18 @@ void set_key_down(DeviceIntPtr pDev, int key_code, int type) { if (type == KEY_PROCESSED) - pDev->key->down[key_code >> 3] |= (1 << (key_code & 7)); + SetBit(pDev->key->down, key_code); else - pDev->key->postdown[key_code >> 3] |= (1 << (key_code & 7)); + SetBit(pDev->key->postdown, key_code); } void set_key_up(DeviceIntPtr pDev, int key_code, int type) { if (type == KEY_PROCESSED) - pDev->key->down[key_code >> 3] &= ~(1 << (key_code & 7)); + ClearBit(pDev->key->down, key_code); else - pDev->key->postdown[key_code >> 3] &= ~(1 << (key_code & 7)); + ClearBit(pDev->key->postdown, key_code); } Bool @@ -114,9 +114,9 @@ key_is_down(DeviceIntPtr pDev, int key_code, int type) int ret = 0; 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) - ret |= !!(pDev->key->postdown[key_code >> 3] & (1 << (key_code & 7))); + ret |= !!BitIsOn(pDev->key->postdown, key_code); return ret; }