summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-01xsetwacom: fix compiler warningHEADmasterPeter Hutterer1-6/+5
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>
2012-03-01xsetwacom: re-add ToolID with the current tool ID in proximityPeter Hutterer1-1/+10
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jason Gerecke <killertofu@gmail.com>
2012-03-01xsetwacom: ToolID is actually ToolTypePeter Hutterer1-2/+2
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>
2012-03-01Export current tool ID in the property tooPeter Hutterer5-12/+19
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>
2012-02-21Extend length of wheel_actions array to 6Jason Gerecke1-1/+1
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>
2012-02-16Remove AC_CORE status printJason Gerecke1-3/+2
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>
2012-02-16Check for appropriate number of properties when setting buttonsJason Gerecke1-1/+2
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>
2012-02-16Remove redundant redeclaration of 'wcmInitialScreens'Jason Gerecke1-1/+0
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>
2012-02-11Add Wacom Intuos4 Wireless to 50-wacom.confPrzemo Firszt1-1/+1
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>
2012-02-05Move some usb-specific keys to wcmUSBData.Peter Hutterer2-15/+18
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>
2012-02-04Initialize button action properties for the correct button number (#45557)Peter Hutterer2-19/+17
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>
2012-02-04Compress button counting statementPeter Hutterer1-6/+1
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>
2012-01-31man.wacom: Fix typo in Touch Gestures.David Foley1-1/+1
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>
2012-01-27man.wacom: Add gesture description.David Foley1-0/+33
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>
2012-01-26Allow for a threshold of -1 to reset to the built-in default (#43221)Peter Hutterer3-7/+9
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>
2012-01-26Fix wrong check for configdirPeter Hutterer1-1/+1
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>
2012-01-16wacom 0.13.0Jason Gerecke1-1/+1
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
2012-01-06release.sh: set announces' Reply-To to the linuxwacom-discussPeter Hutterer1-0/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-01-03wacom 0.12.99.1Jason Gerecke1-1/+1
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
2012-01-03'Left mouse button' dragging support.Alexey Osipov3-10/+52
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>
2012-01-03Create wcmTouchFilter.hAlexey Osipov5-2/+33
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>
2012-01-03Fix cursor jumping after zoom and scroll gestures when in Relative mode.Alexey Osipov2-16/+7
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>
2012-01-03Extra right clicks removed.Alexey Osipov1-1/+1
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>
2011-12-30Remove testing codeJason Gerecke1-4/+1
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>
2011-12-29Expose the second touch ring's raw value in a new 7th valuatorJason Gerecke2-6/+33
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>
2011-12-29Have the second touch ring emulate wheel events by defaultJason Gerecke7-14/+59
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>
2011-12-29Add 'abswheel2' to device state for dual-ring devicesJason Gerecke3-9/+20
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>
2011-12-29Add basic support for Cintiq 24HDJason Gerecke3-0/+6
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>
2011-12-29De-duplicate code for wheel/strip scrollingJason Gerecke3-63/+200
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>
2011-12-20test: fix linker error 'input_option_new' undefinedPeter Hutterer1-0/+35
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>
2011-12-20test: add more #defines to fix build issues.Peter Hutterer2-4/+6
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>
2011-12-20test: drop duplicate definition of xf86FindOptionValuePeter Hutterer1-1/+0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com>
2011-11-26Remove wcmTapTimeDefault variableChris Bagwell3-3/+1
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>
2011-11-26default gesture distance values based on hw maximumsChris Bagwell4-19/+30
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>
2011-11-26Break option parsing into two init phasesChris Bagwell3-14/+50
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>
2011-11-15xf86-input-wacom 0.12.0Jason Gerecke1-1/+1
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
2011-11-15Fix include reference to wacom-util.hJason Gerecke1-1/+1
Running "make distcheck" fails under the quoted path. Signed-off-by: Jason Gerecke <killertofu@gmail.com>
2011-11-15Have usbInitToolType return the old tool type if availableJason Gerecke1-4/+10
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>
2011-11-15Fix usbInitToolType to not always return TOUCH_IDJason Gerecke1-2/+7
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>
2011-11-14Use xf86PostButtonEventP for held button action releasesJason Gerecke1-1/+1
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>
2011-11-14Migrate Tablet(Has|Set)Feature to use the wacom-util macrosJason Gerecke1-2/+3
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>
2011-11-14Only convert I4 tilt bits to rotation for the I4 mouse (v2)Jason Gerecke1-1/+2
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>
2011-11-14Revert "Only convert I4 tilt bits to rotation for the I4 mouse"Jason Gerecke1-12/+5
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>
2011-11-03Deal with opaque InputOption in ABI 14Peter Hutterer1-20/+33
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>
2011-10-30wacom 0.11.99.1Jason Gerecke1-1/+1
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
2011-10-21Add 0x10804 to recognized Art Pen device IDsJason Gerecke1-1/+1
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>
2011-10-21Correct Cintiq 21UX2 features to advertise touch strips, not ringsJason Gerecke1-4/+1
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>
2011-10-21Only convert I4 tilt bits to rotation for the I4 mouseJason Gerecke1-5/+12
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>
2011-10-21Process pressure only when it is supportedPing Cheng1-4/+4
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>
2011-10-19Handle ABI 14 option typesPeter Hutterer2-34/+40
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 11:26:06 +0000