summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* conf: add Intuos4 WL (PTK-540WL) to fdi filerhel6-branchPeter Hutterer2012-07-251-1/+1
| | | | | | | | | 4709394d76267df05f8dfa7f13e6beb1f9c7394f added it to the xorg.conf.d snippet. For those stuck on HAL add it to the fdi file too. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Przemo Firszt <przemo@firszt.eu> (cherry picked from commit 7ee27fee0741cc756dfd20a60afb3de1c9e0ed1b)
* Don't dereference priv before checking it for NULLPeter Hutterer2012-03-211-1/+3
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Plug minor memory leakPeter Hutterer2012-03-211-0/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Avoid buffer overrunPeter Hutterer2012-03-211-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Don't pass NULL to fclose(3)Peter Hutterer2012-03-211-1/+2
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix broken NULL checkPeter Hutterer2012-03-211-2/+3
| | | | | | | | 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>
* Check ioctl return valuePeter Hutterer2012-03-211-2/+9
| | | | | | | 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>
* Merge branch 'rhel6-branch' into wacom-0.13.0Peter Hutterer2012-03-210-0/+0
|\ | | | | | | | | Merge made with 'git pull -s ours', discarding the old rhel6-branch history. Package was rebased to 0.13.0
| * man: fix typo in man page "list mods" → "list mod"Peter Hutterer2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | Reported-by: Alex Hamon Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 8674a77acb141c2e861edbacfd527f32c84a28fd) Conflicts: man/xsetwacom.man
| * Always reset the fd to -1Peter Hutterer2011-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | If the device is specified in the xorg.conf, the fd is on 0 by default. If no Option Device is present, pInfo->fd isn't touched but still close(2)'d, stopping error logging. This is a RHEL6-commit only, upstream should just fix the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Don't free the device info on a failed PreInit.Peter Hutterer2011-07-181-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This data is later freed when the xserver calls UnInit(). Freeing too early means we segfault later when trying to dereference null-pointers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 799bbf2cf9cd54942c66f9117df319e933bbd10b) Conflicts: src/wcmConfig.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Don't manually UnInit the devices for ABI 12Peter Hutterer2011-07-181-0/+3
| | | | | | | | | | | | | | | | | | One of the changes going into ABI 12 were that the server calls Uninit even on driver-hotplugged devices. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 490e345f9d85a73263e96ba0b2918a9a2ca913ad)
| * Don't call xf86DeleteInput from PreInit if the device failed to initializePeter Hutterer2011-07-181-1/+0
| | | | | | | | | | | | | | | | | | Causes a double-free on pInfo when the server calls UnInit later. Introduced in 2ceee5a0572c968eb36702589b8b9eec4b4c20ef by a bad merge conflict resolve. The upstream patch has this part included. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * xsetwacom: plug minor memory leakPeter Hutterer2011-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data is allocated, needs to be freed. No real impact since xsetwacom will exit anyway after this. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 42132efc7f22a353f5d5976cb898abd1ea04e761) Cherry-picked, but essentially newly written. It's just one line and upstream is _very_ different Conflicts: tools/xsetwacom.c
| * Don't adjust the tablet area property for multimonitor.Peter Hutterer2011-07-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interactions between tablet_area in multimonitor setups are complicated to say the least. Amongst other issues, it caused the calibration to be out by a bit and rather unpredictable. Force the area property to always be in device coordinates. This means that clients that need this property now also need to set the property in device coordinates which may be difficult if the axis ranges have already been adjusted. Only way for clients: reset the property with -1 values, read the values, then set from there. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Add comment, padding is in device coordinatesPeter Hutterer2011-07-061-2/+2
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * When updating the area with -1/-1, re-update with actual values.Peter Hutterer2011-07-061-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | xsetwacom xydefaults updates the area property with -1 values. Accept them as before but schedule a new update with the real values we're setting the area to. Otherwise, the value stored in the property will be -1 as well. Since the value passed by the server isn't const and written into the server's storage _after_ calling all SetProperty handlers, a memcpy(values, {priv->topX, priv->topY...}, sizeof(*values)) would do the same job, but relying on rather hack-ish behaviour.
| * Limit debug level max values to 12, not 10.Peter Hutterer2011-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's do what the man page says. Reported-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit ab71355f6e251833f422cf5c591ed42208cf3f91) Note that we build with debugging disabled by default. But for debugging purposes, it's easier to have this build in the tree Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Allow reset to 0 for twinview resolutions on TV_NONEPeter Hutterer2011-07-061-1/+4
| | | | | | | | | | | | | | xsetwacom does exactly that when TV_NONE is set, don't return BadValue from the driver. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Don't init close_proc, the server doesn't call it anyway.Peter Hutterer2011-06-291-1/+0
| | | | | | | | | | | | | | | | Also scheduled for removal. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 0b9756915d44d9b1f19eb4317533a05295637d52)
| * Don't init pInfo->atom, the server will init it for us.Peter Hutterer2011-06-291-1/+0
| | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit a65857d6e30aec1f8a819b60834d14621f67514d)
| * Don't set private_flags if we don't use it.Peter Hutterer2011-06-291-1/+0
| | | | | | | | | | | | | | | | Scheduled to be removed in the server and neither the server nor we need it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 95aea505990716c1b7d635e5d34a86b37832c173)
| * Don't set old_x/old_y on init.Peter Hutterer2011-06-291-2/+0
| | | | | | | | | | | | | | | | | | These fields are unused and to be removed soon anyway. Don't init them, we don't access them at any time. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 2515103d4672c1cdf4c2d0ac6e7a55ab1201da24)
| * Fix build error against current master - ScreenRec has changed.Peter Hutterer2011-06-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dixScreenOrigins was removed in xserver commit commit a83cff9f4d622b069c96a68b4e87a669bf1f6446 Author: Jamey Sharp <jamey@minilop.net> AuthorDate: Sun May 23 10:11:47 2010 -0700 Move each screen's x/y origin into ScreenRec. the x/y fields were moved into the ScreenRec. The ABI wasn't bumped (thanks guys, ...) , so we have to resort to this ifdef check. This leaves us with unbisectable state between a83cff9f and 1.8.99.901 (83 commits) where the patch has to be manually applied. Sorry. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 23698917748419185217cf891b6aef03dedab093)
| * Use the device's name directly, not conf_idev.Peter Hutterer2011-06-291-1/+1
| | | | | | | | | | | | | | | | conf_idev is slated for removal in the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit fd3c86ee1e17df2b186aa52977be71772f7f360a)
| * Input API 12 requires a valuator mode for each axis.Peter Hutterer2011-06-291-12/+60
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Chris Bagwell <chris@cnpbagwell.com> (cherry picked from commit c6dcc3a1f78b6eb2e3d0ac1b7074ec5b94d5c209) Conflicts: src/xf86Wacom.c
| * Use xf86OptionListDuplicate under input ABI 12.Peter Hutterer2011-06-291-9/+18
| | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit ea392a15560e19d28caf082f113e58edb6e56132)
| * Remove refcnt initialization from InputDriverRec.Peter Hutterer2011-06-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed from the server with commit 6130170e7e9b64c611ee942ec3455dd1a185193d Author: Adam Jackson <ajax@redhat.com> Date: Sat Sep 18 06:41:35 2010 -0400 xfree86: Remove unused refcounting from input drivers And given that it was unused, we don't need to ifdef it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit a598ba47028075c0192533e12b825490e361e698) Conflicts: src/wcmConfig.c
| * Adjust to new input PreInit from API 12.Peter Hutterer2011-06-291-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | New PreInit prototype streamlines the process a bit, leaving most of the task up to the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit d086b320fef1bde7db149309a6d77f072f8cbdb1) Conflicts: src/wcmConfig.c
| * Rename LocalDevicePtr to InputInfoPtrPeter Hutterer2011-05-2011-598/+598
| | | | | | | | | | | | Not cherry-picked, sed is much faster than I am at resolving conflicts. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Remove usage of XI86_CORE_POINTER and XI86_POINTER_CAPABLE..Peter Hutterer2011-05-203-3/+3
| | | | | | | | | | | | | | | | This flag has been write-only since server 1.4. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 74645df081575eaff7e2ce2c8325df9d47261dfb)
| * Remove libc wrappers.Peter Hutterer2011-05-204-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The X server is just deprecating them from the headers and the wrapping never had the desired effect anyway (which was to have alternative allocation implementations). This patch brought to you by sed. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pingc@wacom.com> (cherry picked from commit 44f4b81300b63fb01857197a96993bd85cc873ea) Conflicts: src/wcmCommon.c
| * xsetwacom: fix map_button indexingPeter Hutterer2011-05-201-2/+2
| | | | | | | | | | | | | | Don't allow for button 0 to be map-able but allow for the last button to be mapped. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Add 5 new devicesPeter Hutterer2011-05-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added DTU2231, DTU1631, Intuos4 WL, and Cintiq 21UX2 tablets. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Conflicts: src/wcmUSB.c (cherry-picked from commit c23a3a320120069367e067f11973e9d4bacc3b1b) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Offset the new area values with the left/top padding if needed.Peter Hutterer2011-05-203-10/+38
| |
| * Clean up wcmVirtualPaddingPeter Hutterer2011-05-201-8/+20
| |
| * Add some more comments to help explain things.Peter Hutterer2011-05-202-2/+9
| |
| * clear up wcmVirtualTabletSize() to make it easier to understandPeter Hutterer2011-05-202-25/+59
| |
| * xsetwacom: support "displaytoggle" as special button event.Peter Hutterer2011-05-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit f1d3c1b1486c99ef64d0a34f354d7f89c3d181c8) Conflicts: tools/xsetwacom.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * xsetwacom: support "modetoggle" keyword.Peter Hutterer2011-05-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 48bbc89e7cc4e263a04287fff68ac109a8727910) Conflicts: tools/xsetwacom.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * xsetwacom: "core" as keyword is not supported, tell users so.Peter Hutterer2011-05-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver has no say whether a key is to be sent as core event or not, the attachment of the device will decide this (since X server 1.7). To let users know that their old configurations may not do the same thing, print a notice. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 20715a4a066435b1d785a5b5df50b96c7bc5dcb5) Conflicts: tools/xsetwacom.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * When updating a button action property, always update all of them.Peter Hutterer2011-05-201-4/+4
| | | | | | | | | | | | Otherwise, unsetting a property is impossible. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * xsetwacom: always update the parent property for wheel/strip actions.Peter Hutterer2011-05-201-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | With the new support for wheel actions, the actual action would be delayed by one invocation, i.e. any action would always reflect the last xsetwacom command, not the current one. Caused by the driver now calls XIGetProperty() during the update but the property hasn't actually set the value yet. Hack around this by always updating the parent property, triggering a reload of all actions. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit ba77b532e6c2a0b7b05ab129009c1f614b089c37)
| * xsetwacom: unset special button mappings when switching to simple ones.Peter Hutterer2011-05-201-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a special button mapping was assigned, allow switching back to a simple button mapping. The following sequence now works: xsetwacom set <device> Button1 key a b c xsetwacom set <device> Button1 1 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 3055c4cf8b1140bfb6e0a7c89da0eec4f306416d) Conflicts: tools/xsetwacom.c
| * xsetwacom: for button mappings with keycodes, print the keysymsPeter Hutterer2011-05-201-2/+8
| | | | | | | | | | | | | | | | This isn't really accurate as it relies on the current keymap, but then again, that's what you get for having keysym handling in the driver... Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit da364f528bf42a80a9bb45e27beaf1632265c21c)
| * xsetwacom: print special button maps.Peter Hutterer2011-05-201-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | If a device has something more complex than a simple button mapping for a given button, print it. Note that this doesn't simplify the mappings, so xsetwacom set <device> Button1 "button 1" will print as ... "button +1 -1" instead. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit f9f2a531e81c97b0d56175844de02017540c37fc)
| * xsetwacom.c: Add BackSpace key to special keysDavid Foley2011-05-201-0/+2
| | | | | | | | | | | | Signed-off-by: David Foley <favux.is@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 3770aaf4a4b91454e9c6894e240583dace2afbbc)
| * xsetwacom: support up/down/left/right as special keys.Peter Hutterer2011-05-201-0/+3
| | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit c5a2829459df2d95a60527f1e5af279150a28fd9)
| * xsetwacom: add Escape key to special characters.Peter Hutterer2011-05-201-0/+2
| | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit de4a3690c25b822d0bdc54602befa9a09c2af54b)
| * xsetwacom: fix button mapping for button clicks.Peter Hutterer2011-05-201-3/+4
| | | | | | | | | | | | | | | | | | Misplaced scanf caused button mappings to always be 0 if no + or - was specified or the button number was < 10. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 6d5a4bea3319901ab872550ddfd703d601b873e9)
View Lorry Controller Status