diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
| commit | b3e1e62c45f525cdd332073aaa34d8452cb23374 (patch) | |
| tree | 221ee6420074033279921fadc971d30d63d6847b /xorg-server/dix/events.c | |
| parent | b142593315b909b9e202f0f4585b96bf2e74b9db (diff) | |
| download | vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2 vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip | |
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'xorg-server/dix/events.c')
| -rw-r--r-- | xorg-server/dix/events.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index e790bfc20..3282ef818 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -2444,8 +2444,8 @@ FixUpEventFromWindow(SpritePtr pSprite, } if (pSprite->hot.pScreen == pWin->drawable.pScreen) { - event->event_x = event->root_x - FP1616(pWin->drawable.x, 0); - event->event_y = event->root_y - FP1616(pWin->drawable.y, 0); + event->event_x = event->root_x - double_to_fp1616(pWin->drawable.x); + event->event_y = event->root_y - double_to_fp1616(pWin->drawable.y); event->child = child; } else { @@ -4573,8 +4573,8 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, event->deviceid = mouse->id; event->sourceid = sourceid; event->mode = mode; - event->root_x = FP1616(mouse->spriteInfo->sprite->hot.x, 0); - event->root_y = FP1616(mouse->spriteInfo->sprite->hot.y, 0); + event->root_x = double_to_fp1616(mouse->spriteInfo->sprite->hot.x); + event->root_y = double_to_fp1616(mouse->spriteInfo->sprite->hot.y); for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++) if (BitIsOn(mouse->button->down, i)) |