aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/modes/xf86Cursors.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-23 07:03:58 +0000
committermarha <marha@users.sourceforge.net>2010-06-23 07:03:58 +0000
commit345335d61c71c245846d679d568a8b5eca1a5ca9 (patch)
tree7b878ae84134fa091dd2bdc2695251e609209ebe /xorg-server/hw/xfree86/modes/xf86Cursors.c
parentfbbbbe88405440920f4baa5a3107ec0b9a6f8cb7 (diff)
parentc356d5298f18cd103ef7caad015d98d2022044ac (diff)
downloadvcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.gz
vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.bz2
vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.zip
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Cursors.c')
-rw-r--r--xorg-server/hw/xfree86/modes/xf86Cursors.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 4cf6147bb..090f29c2f 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -325,10 +325,13 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
xf86CursorScreenKey);
struct pict_f_vector v;
- v.v[0] = x + ScreenPriv->HotX; v.v[1] = y + ScreenPriv->HotY; v.v[2] = 1;
+ v.v[0] = (x + ScreenPriv->HotX) + 0.5;
+ v.v[1] = (y + ScreenPriv->HotY) + 0.5;
+ v.v[2] = 1;
pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);
- x = floor (v.v[0] + 0.5);
- y = floor (v.v[1] + 0.5);
+ /* cursor will have 0.5 added to it already so floor is sufficent */
+ x = floor (v.v[0]);
+ y = floor (v.v[1]);
/*
* Transform position of cursor upper left corner
*/