commit 311be3952d3557720bbb5e0203066ca1864f74ef
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Apr 24 11:40:58 2012 -0700

    wacom 0.14.99.1
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit 5fab61b10aabdc5b5461798f9002669adf18f263
Author: Adam Nielsen <a.nielsen@shikadi.net>
Date:   Wed Apr 11 16:13:08 2012 +1000

    Add support for the DTI-520
    
    Signed-off-by: Adam Nielsen <a.nielsen@shikadi.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 35d855025bb26e0a2daac9b08b4ea868512fb9ab
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Mar 6 14:10:00 2012 -0800

    Add support for the Intuos5
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 466b119b12a0e149a3b79a031878e04d89c628c4
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Apr 3 13:13:22 2012 -0700

    Fix off-by-one error in xsetwacom's button handling
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 52a795d2fb1fee5b13e95a2c7089dd87c37d2ea8
Author: Nikolai Kondrashov <spbnick@gmail.com>
Date:   Wed Mar 21 22:27:22 2012 +0200

    conf: Only match tablet Waltop devices
    
    Only match Waltop event devices classified as tablets.
    
    Advanced Waltop tablets have on-the-frame controls such as multifunction
    dials (controlling scrolling, zooming, volume and keyboard navigation) and
    keyboard modifier buttons. These are represented as separate event devices
    and are better handled by xf86-input-evdev.
    
    Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 5e0c6ff52e9fb25e0fcd8228992ffc7a41b1db8e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 21 15:36:47 2012 +1000

    Don't dereference priv before checking it for NULL
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit d23809af1613a93ad5b68623cadd4d122da32820
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 21 15:36:04 2012 +1000

    Plug minor memory leak
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit 99a9542cb14b763ddf417c71d4966f80eda417fe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 21 15:34:06 2012 +1000

    Avoid buffer overrun
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit f0e338a4bb54d69a0c83207651efb739d843a469
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 21 15:32:55 2012 +1000

    Don't pass NULL to fclose(3)
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit 8b59c9ff369c1b148f716dbc6234ead68311fa21
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 21 15:29:56 2012 +1000

    Fix broken NULL check
    
    This check was ok until 7958bb9b1ddef9e8238615fd1b3d15996f00effe, when more
    code was moved here and it made no sense this way anymore. Change it to
    return early in the case of NULL allocation.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit 61146662a1c3ffff87b71506f3f0c06a18a069a6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Mar 21 15:28:17 2012 +1000

    Check ioctl return value
    
    Really, this shouldn't ever fail but at least it shuts up some static
    analysers.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit fe2d108dbd2d0769e314a32c9b11376919adcea6
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Mar 14 12:24:04 2012 -0700

    Don't share names of action atoms across properties
    
    The names of action atoms are currently created without regard to
    the property they will be stored in. This results in both e.g.
    button 1 and StripLeftUp using atoms with the name "Wacom button
    action 1". When setting either button 1 or StripLeftUp, we ask
    the server for an atom named "Wacom button action 1" and in both
    cases receive the *same* atom. This means button 1 is nothing
    more than an alias for StripLeft up (and similarly for the other
    actions which share the same name).
    
    This patch uses the name of the property the action will be stored
    in as the prefix to prevent this aliasing from occuring.

commit 220d3fb0bc1cbc9cee4f771f310c36cb07d7af68
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Mar 15 08:05:27 2012 +1000

    man: fix typo in xsetwacom man page
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 2ec45ba39ad5c43e97e8ed02e37ebbdc3f41668c
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Fri Mar 9 18:17:58 2012 -0800

    wacom 0.14.0
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit c2c1a42d4dd97b26dee395b5911bee209fddf030
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Mar 6 16:33:31 2012 -0800

    wacom 0.13.99.2
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit 8e22ba6d8cfe9a21ea40b959152318efe8e0b338
Author: Colin Walters <walters@verbum.org>
Date:   Fri Mar 2 07:24:17 2012 +1000

    wcmXCommand: Fix invalid array size for serial values.
    
    Introduced in c21b6876b435bb34112956716fea14477ef9e8d7
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit 60b4c868ac5baf5dba82c8c9146dfac068c06eef
Merge: e7564c9 28abd26
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Thu Mar 1 09:48:50 2012 -0800

    Merge branch 'master' of git://people.freedesktop.org/~whot/xf86-input-wacom

commit 28abd26ba9379004db8667eaa2fcd2aa0b3d6fc4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Feb 28 11:27:28 2012 +1000

    xsetwacom: fix compiler warning
    
    xsetwacom.c: In function ‘set_output’:
    xsetwacom.c:2359:6: warning: variable ‘success’ set but not used
    [-Wunused-but-set-variable]
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit 6a862efd7f3d8504b600e9d67c2b9b43e41ee8d5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Feb 28 11:18:12 2012 +1000

    xsetwacom: re-add ToolID with the current tool ID in proximity
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit ef11021997c850d0d3e579777468ec6d52f28f20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Feb 28 11:16:57 2012 +1000

    xsetwacom: ToolID is actually ToolType
    
    ToolID should be the ID of the tool in proximity.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit c21b6876b435bb34112956716fea14477ef9e8d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Feb 22 16:52:52 2012 +1000

    Export current tool ID in the property too
    
    Previously, we exported old serial number, old tool ID and current serial
    number. Export the current tool ID as well.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Tested-by: Bastien Nocera <hadess@hadess.net>

commit e7564c941e8ac5ab9549332730844b2380b9e641
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Feb 29 15:24:31 2012 -0800

    wacom 0.13.99.1
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit 00b784202448dfc8f1e142c3745053ae1e82b042
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Feb 29 15:12:27 2012 -0800

    Change return type of 'test_flag_set' to void
    
    Compiler complains that nothing is being returned, but nothing
    *should* be returned.

commit 632134f4697935ada00d72bc19286f551b42da53
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Fri Feb 10 12:00:03 2012 -0800

    Extend length of wheel_actions array to 6
    
    This array was apparently overlooked when adding support for the
    second touch ring present on the 24HD.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 45fd72c9031ed88e4af26b43cbb51d1c64e88602
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Thu Dec 22 13:41:43 2011 -0800

    Remove AC_CORE status print
    
    Flag is deprecated, has no effect, and serves no purpose anymore.
    Remove from the DBG statement.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 6240c226ef429ade3926be0a65341117de2b24e5
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Thu Feb 9 11:07:39 2012 -0800

    Check for appropriate number of properties when setting buttons
    
    Commit 7e92aca6 changed the length of the Wacom Button Actions
    property to be dynamically calculated, but did not take this
    into account for the property setter (preventing xsetwacom from
    updating them). This patch replaces the constant length with an
    identical calculation to ensure we check for the proper size.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 5a2221de13f73c7edbe4221909225ef5c7c5c18a
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Feb 7 10:57:05 2012 -0800

    Remove redundant redeclaration of 'wcmInitialScreens'
    
    From GCC:
       In file included from ../src/xf86Wacom.c:46:0:
       ../src/xf86Wacom.h:147:13: warning: redundant redeclaration of
       'wcmInitialScreens' [-Wredundant-decls]
       ../src/xf86Wacom.h:146:13: note: previous declaration of
       'wcmInitialScreens' was here
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 4709394d76267df05f8dfa7f13e6beb1f9c7394f
Author: Przemo Firszt <przemo@firszt.eu>
Date:   Fri Feb 10 17:55:16 2012 +0000

    Add Wacom Intuos4 Wireless to 50-wacom.conf
    
    Intuos4 Wireless doesn't match list of devices in 50-wacom.conf, so evdev was
    taking over. This patch fixes it, so now wacom driver is used fo Intuoe4 WL
    PTK-540WL
    
    Signed-off-by: Przemo Firszt <przemo@firszt.eu>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 96a2e90c0f6a727fe6942c7b8f05b37167a10ab1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Sat Feb 4 19:20:44 2012 +1000

    Move some usb-specific keys to wcmUSBData.
    
    nbuttons and npadkeys is only used for USB-specific parsing, move them
    there.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 7e92aca68a666499c7d6f1946cc849cfb5653ae0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Feb 3 19:15:54 2012 +1000

    Initialize button action properties for the correct button number (#45557)
    
    Previous code had the number of properties for button actions hardcoded to
    16 (WCM_MAX_MOUSE_BUTTONS). Drop that define and instead initialize the same
    number of properties that we have on the device as well.
    
    X.Org Bug 45557 <http://bugs.freedesktop.org/show_bug.cgi?id=45557>
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit b6fd73d4f79b4731caee4dc72e9f6fcecd2b5161
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Feb 3 19:21:28 2012 +1000

    Compress button counting statement
    
    No functional change, just compressing several lines into one.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit bc7db7f1ef57beab2a149ca9589cea08f5e69af2
Author: David Foley <favux.is@gmail.com>
Date:   Sun Jan 29 11:18:43 2012 -0600

    man.wacom: Fix typo in Touch Gestures.
    
    Fix initiates typo in TOUCH GESTURES' Vertical scroll.
    
    Signed-off-by: David Foley <favux.is@gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 16749eb2d82166a3389fe6209c654bb1fce2e639
Author: David Foley <favux.is@gmail.com>
Date:   Thu Jan 26 13:10:23 2012 -0600

    man.wacom: Add gesture description.
    
    Add description of the touch gestures to the wacom manual.
    
    Signed-off-by: David Foley <favux.is@gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit dbc25fa4fd86af7ccd42af04e6360dfdd0336735
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Jan 12 13:40:27 2012 +1000

    Allow for a threshold of -1 to reset to the built-in default (#43221)
    
    This switches interpretation of the property from unsigned to signed. Not a
    big deal, since the maximum value has always been 2048 anyway and on 32-bit
    that doesn't actually change anything.
    
    X.Org Bug 43221 <http://bugs.freedesktop.org/show_bug.cgi?id=43221>
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Ping Cheng <pinglinux@gmail.com>

commit 09b1aa6538cd48e20928da9a835999dfc851f62c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Jan 10 11:55:14 2012 +1000

    Fix wrong check for configdir
    
    We care about configdir, not sysconfigdir. Otherwise, --with-config-dir=""
    on a server that does support xorg.conf.d has no effect and the fdi files do
    not get installed.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Acked-by: Ping Cheng <pinglinux@gmail.com>

commit 8a8931cc77babbd84a4ec7a1df04e995aaa1e980
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Jan 16 10:03:10 2012 -0800

    wacom 0.13.0
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit a94a6fbaa5bde44d1d6fc2f33f56d6ffddefca75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Jan 6 13:26:19 2012 +1000

    release.sh: set announces' Reply-To to the linuxwacom-discuss
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 933905070d6fd6e438b7a5ff445570e1fad1e70a
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Jan 3 09:29:51 2012 -0800

    wacom 0.12.99.1
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit 5ca665dd77b074d95fd0d9191f544b022eaaddd8
Author: Alexey Osipov <simba@lerlan.ru>
Date:   Tue Jan 3 15:13:48 2012 +0700

    'Left mouse button' dragging support.
    
    First, we define two new GESTURE_ modes:
    - GESTURE_PREDRAG_MODE - when first tap happen and we wait for second touch.
    - GESTURE_DRAG_MODE -  when actual drag happening (left button pressed).
    
    Second, we define tap timeout function wcmSingleFingerTapTimer(), which
    simulate single click if no drag operation started within timeout.
    
    Third, we make an exception for GESTURE_DRAG_MODE in wcmCommon.c, because
    we actually want cursor movements while dragging. This exception is made
    through new function wcmTouchNeedSendEvents().
    
    Now, to do a single tap you just tap (touch and untouch). Actual click
    happens after TapTime period.
    To drag something you make a tap (touch and untouch) and then quickly
    (in TapTime period) touch device again. Then drag.
    
    Signed-off-by: Alexey Osipov <simba@lerlan.ru>
    Reviewed-by: Chris Bagwell <chris@cnpgabwell.com>

commit 1c5c25d7b4a4ce0686f6a088d282e437dbadadfe
Author: Alexey Osipov <simba@lerlan.ru>
Date:   Tue Jan 3 15:13:45 2012 +0700

    Create wcmTouchFilter.h
    
    Moving declarations for touch filter from xf86Wacom.h to wcmTouchFilter.h
    
    Signed-off-by: Alexey Osipov <simba@lerlan.ru>
    Reviewed-by: Chris Bagwell <chris@cnpgabwell.com>

commit a119545769f208d5722561a928a93824f87cdc81
Author: Alexey Osipov <simba@lerlan.ru>
Date:   Tue Jan 3 15:13:42 2012 +0700

    Fix cursor jumping after zoom and scroll gestures when in Relative mode.
    
    When touchpad is in Relative mode of operation, we need allow driver
    update internal old{x,y,z} variables to eliminate cursor jump after
    gesture ended. That update performed in wcmSendEvents() function in
    wcmCommon.c. So, when we in gesture mode, allow call wcmSendEvents()
    to update variables, but don't allow actual events sending to X server.
    
    Unnecessary axes modification removed from wcmSendButtonClick() in
    wcmTouchFilter.c, which was causing cursor movement in Absolute mode
    while gestures are active with respect to above changes. Call to
    xf86PostButtonEvent() replaced by call to xf86PostButtonEventP().
    
    Signed-off-by: Alexey Osipov <simba@lerlan.ru>
    Reviewed-by: Chris Bagwell <chris@cnpgabwell.com>

commit 7a7af3eb1c5e809aa7020795b3c170f6360d6c5f
Author: Alexey Osipov <simba@lerlan.ru>
Date:   Tue Jan 3 15:13:38 2012 +0700

    Extra right clicks removed.
    
    As right click performed with second finger, then we only interested
    in second finger touch when trying to match 'right click' gesture.
    
    Signed-off-by: Alexey Osipov <simba@lerlan.ru>
    Reviewed-by: Chris Bagwell <chris@cnpgabwell.com>
    Acked-by: Ping Cheng <pinglinux@gmail.com>

commit ba851feb1a5f28ff3e68ef07bc84a7d75e3444ea
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Fri Dec 30 09:26:00 2011 -0800

    Remove testing code
    
    This bit of code slipped in between v4 and v5 of the "add abswheel2"
    patch. It was testing code that was never intended to be part of
    the 24HD patch set, and wasn't caught until too late.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit 3989bdb4b42cbd44f7dd99b244eeb4d1618a7ff3
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Dec 21 13:13:11 2011 -0800

    Expose the second touch ring's raw value in a new 7th valuator
    
    This patch expands the number of valuators reported by devices to
    seven. The new seventh valuator reports the raw value provided from
    the kernel for the second touch ring.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 7e3b2b9223629119472469569a2e23150e5c0c68
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Dec 21 09:30:22 2011 -0800

    Have the second touch ring emulate wheel events by default
    
    Touch strips as well as the first touch ring are set up to emulate
    mouse wheel events by default. This patch duplicates this behavior
    for the second touch ring, so that it behaves in an identical manner.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit ced9465599434c68fa40210aa890970386a08b84
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Oct 17 17:11:19 2011 -0700

    Add 'abswheel2' to device state for dual-ring devices
    
    This patch adds an 'abswheel2' field to the _WacomDeviceState
    structure, along with corresponding 'oldWheel2' field to the
    _WacomDeviceRec structure. These fields store the state of the
    second touch ring on dual-ring devices such as the Cintiq 24HD.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit fe1dc1753010809a7741f05784b5abe9d2ee5cff
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Dec 12 09:20:31 2011 -0800

    Add basic support for Cintiq 24HD
    
    Adds the Cintiq 24HD (056a:00f4) to the device lists. The 24HD
    has two features not found on prior tablets: three capacitive
    buttons, and a second touch ring. Subsuquent patches will
    address adding support for them.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 477a261ef79172d6378613fc4cab0026ed49d02f
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Dec 21 09:26:46 2011 -0800

    De-duplicate code for wheel/strip scrolling
    
    Replaces sendWheelStripEvents and getWheelButton with several
    small functions to reduce unnecessary code duplication.
    
    As a side-effect, it is now possible for the driver to handle
    simultaneous scrolls on multiple axes. Previously, getWheelButton
    would go through all the axes but was limited to returning a
    single button/action.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit a60e59a4730d6a11f999085aa8754fd0de5dfbaf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Dec 19 13:18:03 2011 +1000

    test: fix linker error 'input_option_new' undefined
    
    We need a copy of it in the driver. This is just the one the driver uses for
    pre-ABI 14 compatibility, we don't need the server's exact copy since we're
    not testing that API (that's the server's job), only our use of the API.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit d54d936146fa58fb10a1b6839e1413671f96f86e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Dec 19 13:01:35 2011 +1000

    test: add more #defines to fix build issues.
    
    sigh, upstream changed the option function prototypes without bumping the
    ABI. This is the best we can do, though there will be a period between the
    actual abi bump and this commit where we get test build errors now.
    
    commit 09e4b78f7944234865f4648940453303af0c2663
    Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    Date:   Mon Nov 7 19:19:47 2011 -0800
    
        Fix gcc -Wwrite-strings warnings in xf86 ddx
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit 388c2630881d74b10bcd0aad57796c9e09341471
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Dec 19 12:59:53 2011 +1000

    test: drop duplicate definition of xf86FindOptionValue
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit c6dba3dab054be19921a11f8ee38f847e4ef8962
Author: Chris Bagwell <chris@cnpbagwell.com>
Date:   Tue Nov 22 20:18:44 2011 -0600

    Remove wcmTapTimeDefault variable
    
    Its not really needed anymore. The whole *Default variable concept is
    at least partially related to historically the PAD device was Init'ed
    before the TOUCH device on Bamboo's but that is no longer true.
    
    And since the TOUCH device is now Init'ed before PAD, when PAD
    got Init'ed, wcmTapTimeDefault would override Touch's TapTime value;
    probably not what user wanted.
    
    For times *Default was really useful, I think wcmPostInitParseOption()
    is probably a better replacement concept.  I'll slowly remove these
    *Defaults as I have time to test each behavior.
    
    Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit b0aab508269acb3a8bf9e6699a4a283f374e8488
Author: Chris Bagwell <chris@cnpbagwell.com>
Date:   Tue Nov 22 20:12:21 2011 -0600

    default gesture distance values based on hw maximums
    
    2 finger Gestures will start working on a wider range of
    hardware with different resolutions now.
    
    Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit f9fe7c7b74418378a5fc09a03c2da381a87b4561
Author: Chris Bagwell <chris@cnpbagwell.com>
Date:   Mon Nov 21 21:52:28 2011 -0600

    Break option parsing into two init phases
    
    This is ground work to allow much easier overriding of
    default values for case were exact default value is not
    known until after init phase (for example, if default value
    depends on resolution of hardware which is not known until
    after init phase).
    
    Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
    Reviewed-by: Jason Gerecke <killertofu@gmail.com>

commit 31dbd9fc9fdd3691d9ef43c707ecc780e0c62d24
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Nov 14 11:43:56 2011 -0800

    xf86-input-wacom 0.12.0
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit 22a26f34ba4f47a648cd01d87aa649033db2e1e1
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Nov 14 11:12:00 2011 -0800

    Fix include reference to wacom-util.h
    
    Running "make distcheck" fails under the quoted path.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit e4aa352f0ded30fcc3ec90a187957f6f8920fd8e
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Nov 14 16:52:35 2011 -0800

    Have usbInitToolType return the old tool type if available
    
    If the tool was not specified within an event packet, the
    usbInitToolType function would return TOUCH_ID. This caused
    problems for combined pen+touch devices when the pen was in
    range, since only the first packet (which explicitely specified
    the STYLUS tool) would not be filtered as "single touch"
    data.
    
    This patch passes along the old tool type, so that if no
    tool is found in the current packet, the old tool type may
    be adopted.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit f7c0a64bf6550ac8ada19345bd03916bd4aa8890
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Mon Nov 14 13:04:24 2011 -0800

    Fix usbInitToolType to not always return TOUCH_ID
    
    Commit ca922994 changed usbInitToolType to use the tool
    TOUCH_ID by default. Because of the way the 'for' loop just
    below is handled though, the function would never return
    anything but TOUCH_ID. This patch changes things to only
    return TOUCH_ID if no data for an alternate tool type
    could be found in the event packets.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 20958f84eef0b40f91e4559099f342f28650c183
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Oct 26 12:33:48 2011 -0700

    Use xf86PostButtonEventP for held button action releases
    
    It appears that commit 485137ef partially missed this particular
    call in its mass-migration away from xf86PostButtonEvent. This
    results in the pointer jumping away from the correct location
    when a held button action is finally released. It is most noticible
    when the action "button +1" is assigned to the stylus or eraser and
    a window is dragged.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 2f233f62544f9419a6f12e201d09189339f7c1d2
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Nov 9 11:41:23 2011 -0800

    Migrate Tablet(Has|Set)Feature to use the wacom-util macros
    
    In addition to consolidating code, this happens to fix a bug
    in the implementation of TabletHasFeature which would return
    true provided *any* bit of a multi-bit mask was set. Ever
    since 7c667678 when WCM_TPC was changed to a multi-bit mask,
    tablets with WCM_LCD set have been (mis-)treated as tablet PCs.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>

commit 2c4360d7be38f242a89f2da291e075b28e0dfc51
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Nov 9 09:14:14 2011 -0800

    Only convert I4 tilt bits to rotation for the I4 mouse (v2)
    
    This re-implements commit 9be9719d78af035c45ea4b191c21fab0ee54f198.
    Ping pointed out the device_type field that I had somehow missed
    when making the earlier commit. This provides essentially the same
    information as the IsCursor() macro that the original patch went
    through so much trouble to use.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit ef47fa044b6bc3949c0b8d96c665d18937da719b
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Nov 9 08:59:58 2011 -0800

    Revert "Only convert I4 tilt bits to rotation for the I4 mouse"
    
    This reverts commit 9be9719d78af035c45ea4b191c21fab0ee54f198.
    Under the right conditions, the 'tool' pointer can be NULL,
    leading to the X server crashing. An easy way to trigger the
    crash is to spam pad events (such as button presses) while
    holding the stylus on the edge of proximity.
    
    Rather than fix this with additional checks for NULL, Ping
    clued me into a much more elegant (and bug-free) way to
    implement the check for an I4 mouse. See next patch.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 882795767a975854f373d58a9b15a57dfa244f28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Oct 21 16:22:53 2011 +1000

    Deal with opaque InputOption in ABI 14
    
    Input ABI 14 makes the InputOption struct opaque, so use the new API
    provided (and wrap for older ABIs).
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 5cdd524f9986bc8bc628d953379c5eb8c0003c9b
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Sun Oct 30 20:13:51 2011 -0700

    wacom 0.11.99.1
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit ee6abf754d08b6b073c2494353db68b7275fdac3
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Thu Oct 20 16:59:46 2011 -0700

    Add 0x10804 to recognized Art Pen device IDs
    
    Intuos4 Art Pens may have an ID of 0x10804 for their tip and
    0x1080C for their eraser. There may be other IDs which need
    matching as well, but that is a "to investigate" item for the
    moment.
    
    Note that due to a mostly-benign issue in the kernel driver, the
    highest nybble of the ID is placed one nybble *too* high. Until
    a proper fix is made and tested for the kernel, we need to check
    for an ID of "0x100804" instead of "0x10804".
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 64f72480396f4398f0ad03aabc7b570d606c290c
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Thu Oct 20 16:59:45 2011 -0700

    Correct Cintiq 21UX2 features to advertise touch strips, not rings
    
    Moves the 0xCC case (21UX2) to be in the proper spot. There are
    touch strips, not rings on this device.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 9be9719d78af035c45ea4b191c21fab0ee54f198
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Thu Oct 20 16:59:44 2011 -0700

    Only convert I4 tilt bits to rotation for the I4 mouse
    
    The comment claims that the conversion is to be performed for the
    I4 mouse only, but doesn't actually check to see if the tool is
    indeed a mouse. This patch adds in the necessary check, allowing
    the I4 stylus to properly report tilt data.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit fff28802c2a803525d30cb8cb27c385f3e589f8a
Author: Ping Cheng <pinglinux@gmail.com>
Date:   Wed Oct 19 17:01:08 2011 -0700

    Process pressure only when it is supported
    
    normalizePressure crashes if wcmMaxZ is 0.
    
    Signed-off-by: Ping Cheng <pingc@wacom.com>
    Acked-by: Chris Bagwell <chris@cnpbagwell.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 8a803975522bbb94e7df41c806dd2a573f058585
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Aug 23 14:23:31 2011 +1000

    Handle ABI 14 option types
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 5544d3aeec362f09d2a68b10834f2be31c7bd1f0
Author: Eduard Hasenleithner <eduard@hasenleithner.at>
Date:   Sun Oct 9 15:22:19 2011 +0200

    Make InitWcmAtom support arbitrary property types
    
    InitWcmAtom could only create properties of type XA_INTEGER or
    XA_ATOM. This commit adds support for any atom type by means
    of adding a type parameter to InitWcmAtom. All instances of
    InitWcmAtom use are adapted to the new parameters.
    
    This is a preparation for a new parameter of type XA_PIXMAP
    needed for the upcoming OLED commit.
    
    Signed-off-by: Eduard Hasenleithner <eduard@hasenleithner.at>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 594deceed76e46617838dab2560ecbdf6b42421d
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date:   Sun Oct 9 12:18:19 2011 -0400

    Exit gesture mode when pen comes in range
    
    Otherwise, the driver will be in an unusable state until the pen is lifted and
    the user touches the device.
    
    Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
    Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit 705c6df5a75e3408b048d15cadd1652124767893
Author: Eduard Hasenleithner <eduard@hasenleithner.at>
Date:   Sun Oct 9 15:01:43 2011 +0200

    Fixing format strings in list_mod
    
    Two printf calls in xsetwacom.c were using a "%d" for output of an
    expression of type size_t. Changing format string to use correct
    "%zd" in order to avoid the format string warning at compile time:
    
    xsetwacom.c:787:2: warning: format '%d' expects argument of type 'int',
    	but argument 2 has type 'long unsigned int' [-Wformat]
    
    Signed-off-by: Eduard Hasenleithner <eduard@hasenleithner.at>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

commit c0504a80c5b94323072326e0b1d78ed2378817e7
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Wed Sep 28 11:52:44 2011 -0700

    Return boolean where required
    
    This particular return statement was missed in e9d9ddc3.
    
    Signed-off-by: Jason Gerecke <killertofu@gmail.com>

commit f2ee4f22f2ab258f3c2cd615342c56c793835362
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Tue Sep 20 11:25:22 2011 +1000

    Move DebugLevel options up.
    
    Having them in wcmParseOptions() means we don't get debug messages until we
    hit wcmParseOptions(). For new devices that don't initialize (for whatever
    reason) this makes debugging a lot harder.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Acked-by: Chris Bagwell <chris@cnpbagwell.com>

commit e9d9ddc309746f6e8537223fcf946d434ea188c0
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Sep 27 15:47:08 2011 -0700

    Have MapToOutput helpers return booleans to indicate success
    
    MapToOutput helper functions now return 'true' when they sucessfully
    change the transformation matrix, and 'false' otherwise. Though this
    information is not used at the moment, it will be used with the
    KeepShape patch to ensure that the active area is only modified if
    the output mapping occured sucessfully.

commit b1f0c9ac801e48de16c6afe3bf680565a4e5c5db
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Fri Sep 9 15:44:37 2011 -0700

    Have 'MapToOutput' require the keyword "desktop" to do such
    
    Instead of allowing zero arguments to map the tablet to the entire
    desktop, we require the use of the keyword "desktop" to accomplish
    this. This is to make it easier to figure out the user's intent
    later on when we introduce KeepShape.

commit 6da898eba50a8499d770214684bd3d2d46033037
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Fri Sep 9 15:43:29 2011 -0700

    Add 'set_output_next' helper for MapToOutput
    
    Adds a helper function for MapToOutput which determines which
    output the device is currently mapped to, and moves to the next
    available output. Repeatedly calling this function will result
    in the device being mapped to every available output (including
    the desktop as a whole) in turn.

commit f09def951b7bd8ca57894e15ea3a47cda96c6a00
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Fri Sep 16 17:25:12 2011 -0700

    Allow 'MapToOutput' to accept X geometry strings
    
    This patch allows the MapToOutput command to accept fully-
    specified X geometry strings as valid output names. The
    XParseGeometry function describes these strings as having
    the folowing format:
    
    [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]
    
    Strings with width, height, xoffset, and yoffset defined
    will be accepted and the device mapped to the rectangle
    it describes.
    
    This patch also renames the function '_set_matrix' to bring
    its naming in line with the other set_output_XXXX functions.

commit d0f15345546fc9396261ceaf2268cf0ddc7b32af
Author: Jason Gerecke <killertofu@gmail.com>
Date:   Tue Sep 6 18:13:49 2011 -0700

    Have 'set_output' check and convert arguments as necessary
    
    The 'set_output' function is now responsible for parsing the
    command-line arguments to both determine the proper function
    to call, as well as converting them into a form that can be
    more easily used by the helper functions. This patch also
[--snip--]
