From dfc3a8ed713c2878407c6443c4d3092da3125e0c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 21 Feb 2012 11:32:40 +1000 Subject: synclient: accept XA_CARDINAL as 32-bit type (#46330) PressureMotionMaxZ and PressureMotionMinZ were changed from float to XA_CARDINAL in 24c44375025576dd600ccf370ba365e5d94dc22. Accept the new type. Fixes: PressureMotionMinZ = format mismatch (32) PressureMotionMaxZ = format mismatch (32) X.Org Bug 46330 Signed-off-by: Peter Hutterer --- tools/synclient.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/synclient.c b/tools/synclient.c index 76610ce..8d1e8f4 100644 --- a/tools/synclient.c +++ b/tools/synclient.c @@ -446,7 +446,8 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c b[par->prop_offset] = rint(val); break; case 32: - if (format != par->prop_format || type != XA_INTEGER) { + if (format != par->prop_format || + (type != XA_INTEGER && type != XA_CARDINAL)) { fprintf(stderr, " %-23s = format mismatch (%d)\n", par->name, format); break; @@ -517,7 +518,8 @@ dp_show_settings(Display *dpy, XDevice *dev) printf(" %-23s = %d\n", par->name, b[par->prop_offset]); break; case 32: - if (format != par->prop_format || type != XA_INTEGER) { + if (format != par->prop_format || + (type != XA_INTEGER && type != XA_CARDINAL)) { fprintf(stderr, " %-23s = format mismatch (%d)\n", par->name, format); break; -- cgit v1.2.3