On Wed, Sep 30, 2015 at 04:52:13PM -0400, Connor Behan wrote:
> I'm pretty sure the calls for ABI versions between 13 and 15 also need
> the "&". For example, in the
> http://cgit.freedesktop.org/xorg/xserver/tree/?id=81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d
> tree, hw/xfree86/common/xf86Module.h says ABI_XINPUT_VERSION is 14. But
> mi/mipointer.c still has miPointerSetPosition() taking pointers to integers.
Good catch, new patch attached.
Thomas
>From c11f3e7bf57df27b3bcd0ab1a7b176525c248002 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <w...@netbsd.org>
Date: Sun, 13 Sep 2015 23:28:53 +0200
Subject: [PATCH:xf86-video-sis] Fix arguments for miSetPointerPosition.
For the call for the API between versions 5 and 15.
---
src/sis_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 854cb54..8f06164 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -9395,9 +9395,9 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
y = (int)dy;
}
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
- miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
+ miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y);
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- miPointerSetPosition(inputInfo.pointer, x, y);
+ miPointerSetPosition(inputInfo.pointer, &x, &y);
#else
UpdateCurrentTime();
miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
--
2.5.3
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
