diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 06:54:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 06:54:34 +0000 |
| commit | 30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (patch) | |
| tree | 9096dda170059f36806901aee59b8cf2a839a9e9 /xorg-server/dix | |
| parent | 57818d0fe4f7cf94279909f03ec11b326b284f1e (diff) | |
| download | vcxsrv-30eaf03aef5847adb6da7efd4bbf4a4abaf5d738.tar.gz vcxsrv-30eaf03aef5847adb6da7efd4bbf4a4abaf5d738.tar.bz2 vcxsrv-30eaf03aef5847adb6da7efd4bbf4a4abaf5d738.zip | |
xserver libX11 libxcb update 1/12/2010
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/getevents.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 9fb6b689f..96b5ce29c 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -112,12 +112,12 @@ set_button_up(DeviceIntPtr pDev, int button, int type) Bool
button_is_down(DeviceIntPtr pDev, int button, int type)
{
- int ret = 0;
+ Bool ret = FALSE;
if (type & BUTTON_PROCESSED)
- ret |= BitIsOn(pDev->button->down, button);
+ ret = ret || BitIsOn(pDev->button->down, button);
if (type & BUTTON_POSTED)
- ret |= BitIsOn(pDev->button->postdown, button);
+ ret = ret || BitIsOn(pDev->button->postdown, button);
return ret;
}
@@ -143,12 +143,12 @@ set_key_up(DeviceIntPtr pDev, int key_code, int type) Bool
key_is_down(DeviceIntPtr pDev, int key_code, int type)
{
- int ret = 0;
+ Bool ret = FALSE;
if (type & KEY_PROCESSED)
- ret |= BitIsOn(pDev->key->down, key_code);
+ ret = ret || BitIsOn(pDev->key->down, key_code);
if (type & KEY_POSTED)
- ret |= BitIsOn(pDev->key->postdown, key_code);
+ ret = ret || BitIsOn(pDev->key->postdown, key_code);
return ret;
}
|