diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-03 14:18:54 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-03 14:19:28 +1000 |
| commit | 2e011db3faf786535913cc6d76e6dbfc01117232 (patch) | |
| tree | fd086a6b9eed5b32bbc0226ac03b11e56eef093b | |
| parent | b6d1332f8a6bd22962594ebd92010c4cf845b49b (diff) | |
input/wacom: get axis range from device instead of hardcoding it
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | tests/input/wacom-input-matrix.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/input/wacom-input-matrix.cpp b/tests/input/wacom-input-matrix.cpp index 4a32094..4576ba8 100644 --- a/tests/input/wacom-input-matrix.cpp +++ b/tests/input/wacom-input-matrix.cpp @@ -54,9 +54,6 @@ #include "helpers.h" #define NUM_ELEMS_MATRIX 9 -// Intuos5 maxX=44704 maxY=27940 maxZ=2047 resX=200000 resY=200000 tilt=enabled -#define MAX_X 44704 -#define MAX_Y 27940 typedef struct Matrix { float elem[NUM_ELEMS_MATRIX]; @@ -244,10 +241,16 @@ void test_area (Display *dpy, xorg::testing::evemu::Device *dev, XNextEvent(dpy, &ev); // Simulate stylus movement for the entire tablet resolution - move_stylus (dev, 0, 0, MAX_X, ABS_X); - move_stylus (dev, MAX_X, 0, MAX_Y, ABS_Y); - move_stylus (dev, 0, 0, MAX_Y, ABS_Y); - move_stylus (dev, 0, MAX_Y, MAX_X, ABS_X); + int minx, maxx; + int miny, maxy; + + dev->GetAbsData(ABS_X, &minx, &maxx); + dev->GetAbsData(ABS_Y, &miny, &maxy); + + move_stylus (dev, 0, 0, maxx, ABS_X); + move_stylus (dev, maxx, 0, maxy, ABS_Y); + move_stylus (dev, 0, 0, maxy, ABS_Y); + move_stylus (dev, 0, maxy, maxx, ABS_X); XSync (dpy, False); EXPECT_NE(XPending(dpy), 0) << "No event received??" << std::endl; |