summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-30 19:43:29 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-30 19:43:29 +0930
commit1467dbc393eb61ae26b3f65722e0397c020c3d27 (patch)
treece8c6bd747ac8c299a34cdba2fab765ff274e582
parentc0f13a2490f7fcb8a742affb15f1beeb0259d0f8 (diff)
Fix compiler warning: don't use deprecated calls for newer XInput ABIS.
-rw-r--r--src/js_x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/js_x.c b/src/js_x.c
index 3b6997f..c27a0da 100644
--- a/src/js_x.c
+++ b/src/js_x.c
@@ -148,8 +148,13 @@ xf86JS_XConvert(LocalDevicePtr local, int first, int num, int v0, int v1,
int width, height;
int deltaX, deltaY;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
width = miPointerCurrentScreen()->width;
height = miPointerCurrentScreen()->height;
+#else
+ width = miPointerGetScreen(local->dev)->width;
+ height = miPointerGetScreen(local->dev)->height;
+#endif
/*
deltaX=(float)width/priv->jsxMaxX; deltaY=(float)height/priv->jsxMaxY;
*/