summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add Solaris supportsolarisPengcheng Chen - Sun Microsystems2013-04-0211-9/+201
| | | | | | | Patch obtained from OpenSolaris site for use with snv_130 or newer: http://hub.opensolaris.org/bin/view/Community+Group+device_drivers/wacomtablet Signed-off-by: Pengcheng Chen - Sun Microsystems <Pengcheng.Chen@Sun.COM>
* wacom 0.10.4xf86-input-wacom-0.10.4Peter Hutterer2010-01-151-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Protect against input ABI 9 and the input attributes.Peter Hutterer2010-01-111-1/+5
| | | | | | | | | | XINPUT_ABI 9 introduced InputAttributes to NIDR. Attributes are assigned by the config backend (or the configuration). Hence, by the time they hit the driver they've been converted into options already. From the driver's POV, duplicating the options is enough, especially since the driver cannot know which attributes apply to the device anyway. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add Meta keys to xsetwacomPrzemo Firszt2010-01-111-0/+6
| | | | | Signed-off-by: Przemo Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Install the fdi as DATA not a SCRIPTRon Lee2010-01-111-1/+1
| | | | | | | This is xml it isn't executable. Signed-off-by: Ron Lee <ron@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: the capacity property is 32 bit.Peter Hutterer2010-01-061-1/+1
| | | | | Reported-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove duplicate comment in xf86WacomDefs.hPrzemo Firszt2010-01-051-4/+0
| | | | | Signed-off-by: Przemo Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix wacom.fdi location in Makefime.amPrzemo Firszt2010-01-051-0/+2
| | | | | Signed-off-by: Przemo Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Restore valid small data packetsPing2010-01-011-1/+1
| | | | | | | | Protocl 4 devices may send small, such as 2 or less, valid events in one data packet Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Update README to reflect current state a bit better.Peter Hutterer2010-01-011-47/+20
| | | | | | | | | | | This driver is an X11 driver only, and the configure options are explained by configure --help. Let's not mirror this in the README, it may diverge otherwise. Add a very simple explanation on how to set up the driver fro hotplugging with HAL, xorg.conf configuration is better explained in the man page. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Rename xf86Wcm* to wcm* - part 2Przemysław Firszt2010-01-017-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | Rename xf86WcmTilt2R to wcmTilt2R Rename xf86WcmMappingFactor to wcmMappingFactor Change xf86WcmWrite to wcmWriteWait in comment Rename xf86WcmInitialScreens to wcmInitialScreens Rename xf86WcmDesktopSize to wcmDesktopSize Reneme xf86WcmIsWacomDevice to wcmIsWacomDevice Rename xf86WcmRotateTablet to wcmRotateTablet Rename xf86WcmSuppress to wcmCheckSuppress It's wcmCheckSuppress instead of wcmSuppress to avoid collision with variable with the same name used in xf86WacomDefs.h Rename some Wcm* to wcm* to keep function names consistent Signed-off-by: Przemo Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: get "all" is a read-only parameter.Peter Hutterer2010-01-011-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: special output for write-only options.Peter Hutterer2010-01-011-2/+7
| | | | | | | So far we only have xyDefault as write-only option but having some more user-friendly output is helpful. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: Print error message when attempting to change read-only options.Peter Hutterer2010-01-011-1/+41
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Re-indent property code to what's used in the rest of the driver.Peter Hutterer2009-12-241-524/+524
| | | | | | | All files use 8-char tab indentation, not 4 spaces. Re-indent to be conform with the rest of the code. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* wacom 0.10.3xf86-input-wacom-0.10.3Peter Hutterer2009-12-241-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix a tablet rotation bug.Ping Cheng2009-12-241-23/+9
| | | | | | | Caused by the misuse of maximum X and Y. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Validate the active tablet area before initializing the areaPing Cheng2009-12-241-9/+10
| | | | | Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add local maxX, maxY, resolX, and resolYPing Cheng2009-12-244-76/+30
| | | | | | | | | | Instead of switching maximum and resolution back and forth between touch and penabled devices globally, we define them into WacomDevice. The values are initialized in xf86WcmInitialToolSize once and used through out the life of the device. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add routine wcmRotateCoordinatesPing Cheng2009-12-242-35/+45
| | | | | | | | | Both wcmCommon.c and wcmTouchFilter.c need to rotate x and y before sending X input events. wcmRotateCoordinates is added to wcmCommon.c so it can serve both cases. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: update usage help for Rotate optionPing Cheng2009-12-241-1/+1
| | | | | Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: make parameters case-insensitive.Peter Hutterer2009-12-241-1/+1
| | | | | | | | This replicates the behaviour of the old xsetwacom, making xsetwacom ... TopX the same as xsetwacom ... topx. Reported-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add "Wacom Debug Levels" property.Peter Hutterer2009-12-243-4/+39
| | | | | | | | | | | | | | | This property is only present if compiled with --enable-debug and allows for run-time modification of the debug levels. Values supported are 0 to 10, with 10 being the most verbose. xsetwacom --set "device name" DebugLevel 10 xsetwacom --set "device name" CommonDBG 10 Since this is a driver-internal property clients are discouraged from using this property for any purpose. It may disappear or change without warning in future releases of the driver. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove now superfluous name prints.Peter Hutterer2009-12-243-37/+29
| | | | | | The DBG macro prints the device name/device file automatically. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Auto-prepend device name/file to debug messages.Peter Hutterer2009-12-243-1/+5
| | | | | | | | | | | | | | | Add a new "name" field to the WacomDeviceRec. This field is at the same offset as the wcmDevice Field of the WacomCommonRec, hence the access to either is the same if casted. Then use this field to auto-prepend either the device name or the device file wherever a DBG macro is used. The output for DBG on priv is now (II) Wacom Intuos4 6x9 (xf86WcmMappingFactor): X factor = 0.0258, Y factor = 0.0309 and for DBG on common (II) /dev/input/event13 (wcmReadPacket): buffer has 112 bytes Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* common and priv both have debugLevel, just pass them in as-is.Peter Hutterer2009-12-249-106/+104
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge the function name into the DBG macro.Peter Hutterer2009-12-249-76/+76
| | | | | | | Each time DBG is called, prefix with __func__ regardless of the actual message. An empty DBG string thus prints "function name:". Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge the xf86Msg into the DBG macro.Peter Hutterer2009-12-249-164/+167
| | | | | | | All DBG macros call this function, there's no need to have it inside the macro, we might as well leverage __VA_ARGS__. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Rename xf86Wcm* to wcm*Przemo Firszt2009-12-239-69/+69
| | | | | | | | | | | | | | | | | | | | | | | Rename xf86WcmFilterCoord to WcmFilterCoord Rename xf86WcmSetPressureCurve to wcmSetPressureCurve Rename xf86WcmFilterIntuos to wcmFilterIntuos Rename xf86WcmSerialValidate to wcmSerialValidate Rename xf86WcmWaitForTablet to wcmWaitForTablet Rename xf86WcmWriteWait to wcmWriteWait Rename xf86WcmWait to wcmWait Rename xf86WcmReadPacket to wcmReadPacket Rename xf86WcmEvent* to wcmEvent* Signed-off-by: Przemo Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove area overlap check for area propertyPing Cheng2009-12-221-23/+32
| | | | | | | | | | | | Temporarily change the area to the new coordinates, do the range overlap check and then change it back to the original. This is needed since otherwise the area overlap check always fails (since the new area will be mostly identical to the current one). New behaviour: all four coordinates set to -1 reset the area to the defaults. Signed-off-by: Ping Cheng <pinglinux@gmail.com>
* Send horizontal scroll gesture with button 6 and 7 eventsPing Cheng2009-12-221-5/+24
| | | | | | | | | | On older X servers, button 6 and 7 don't do anything special; on X server 1.7 and later, they are being translated into left and right scroll events. This patch changes left/right arrow to button 6/7 for horizontal scroll events. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Use xf86Msg instead of ErrorF for debug messages.Peter Hutterer2009-12-228-101/+101
| | | | | | | ErrorF is supposed to be used in the server, drivers are better off calling xf86Msg since this uses the appropriate prefixes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix touch property out-of-bounds memory access.Peter Hutterer2009-12-221-2/+2
| | | | | | | | | 4fd2af39a5432eaad03af6a48cd16988a165fbbb split out the touch setting from a combined property into its own separate one. The index didn't get updated though, which means wcmTouch was assigned random garbage. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Ping Cheng <pinglinux@gmail.com>
* xsetwacom: add support for "xsetwacom --get <device> all"Peter Hutterer2009-12-211-0/+23
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: split get() into get() and get_param().Peter Hutterer2009-12-211-11/+17
| | | | | | | This makes get_param() the same signature as the other, specific, get() functions and get() a simple wrapper around it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: init nwords to 0 before adding to it in strjoinsplit.Peter Hutterer2009-12-211-0/+2
| | | | | | | nwords is a return value and needs to be initialized before adding to it. Reported-by: Przemysław Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove redundant xf86WcmMappingFactor callsPrzemo Firszt2009-12-212-4/+0
| | | | | | | No need to call xf86WcmMappingFactor before xf86WcmInitialCoordinates because xf86WcmInitialCoordinates calls it anyway. Signed-off-by: Przemo Firszt <przemo@firszt.eu> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Support 2FGT gesturePing Cheng2009-12-214-1/+454
| | | | | | | | | | | There are 3 gesture features: second finger tap to right click (GESTURE_TAP_MODE) vertical/horizontal scroll (GESTURE_SCROLL_MODE) and zoom in/out (GESTURE_ZOOM_MODE) Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: don't line-break after 32 bit values and Absolute/Relative.Peter Hutterer2009-12-171-2/+2
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: don't release modifiers unless explicitly statedPeter Hutterer2009-12-171-0/+28
| | | | | | | modifiers are interpreted as "+keysym" only if the + or - are missing. This allows for configurations like "key shift" to work properly. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: fix handling of unknown modifiers.Peter Hutterer2009-12-171-10/+18
| | | | | | | | | Previous conditions were broken, key F1 wouldn't parse (key f1 would though) and providing a real modifier (Shift_L) would break too. Function keys (lowercased) are now handle like modifier keys, if a modifier couldn't be mapped check with XStringToKeysy if it's valid. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Release keys still down when a button is released.Peter Hutterer2009-12-171-0/+58
| | | | | | | | xsetwacom --set <device name> "Button1" "key +shift" keeps the shift key down until the button is released, allowing it to work like a real modifier. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix up btnaction property setting.Peter Hutterer2009-12-172-17/+5
| | | | | | | | | | | | Buggy behaviour meant that unsetting a property got never removed from the property handlers. Since we only support one action per button anyway, simply overwriting the current one is enough. The static array isn't enough either, it's shared within the driver, hence updating the property on one device will update it on the other. Move it into the priv struct. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Set Touch and Gesture options during the configurationPing Cheng2009-12-164-46/+24
| | | | | | | | | | | | | | We moved the touch and gesture option check from usbWcmInit to wcmValidateDevice.c since usbWcmInit gets called every time the device is opened, which is unnecessary for option check in most cases. The Tablet PC Button option should also be dealt in the same way. But it requires extra defines to make it clean, which will affect more files in the driver. We'll do it in a separate patch later. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Enable Serial ISDV4 2FGT tool type in wcmDeviceTypeKeysPing Cheng2009-12-161-0/+2
| | | | | Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Report time stamp for 2FGT gesturePing Cheng2009-12-161-0/+10
| | | | | | | | 2FGT gesture needs to know the time that an event was received to decide what gesture mode users may want. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: button numbers are one-indexed, store button action accordingly.Peter Hutterer2009-12-151-1/+2
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix typo: xf86WcmVirtualTabletSize → xf86WcmVirtualTabletSizePeter Hutterer2009-12-152-13/+13
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ping Cheng <pinglinux@gmail.com>
* Remove stray semicolon after if conditionPeter Hutterer2009-12-141-1/+1
| | | | | | No wonder changing the TopY didn't work... Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xsetwacom: don't crash on xsetwacom get <device name> without a param.Peter Hutterer2009-12-141-0/+6
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
View Lorry Controller Status