aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* When posting buttons, post absolute valuators if we have them.Peter Hutterer2010-10-11
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
* Fix valuator offset when posting absolute motion events.Peter Hutterer2010-10-11
| | | | | | | | If first_v was not zero, the values passed to xf86PostMotionEventP were wrong. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
* Don't pass pointers around to first_v and num_v.Peter Hutterer2010-10-11
| | | | | | | We only use them as values, no need for the addresses. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
* De-duplicate event queue access.Peter Hutterer2010-10-11
| | | | | | | | Factor out access to the next queue element in a static function to be reused for button and key presses. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
* Remove refcnt initialization from InputDriverRec.Peter Hutterer2010-10-11
| | | | | | | | | | | | | 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>
* Clean up button code to number mappingNikolai Kondrashov2010-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | Now BTN_MOUSE, BTN_MISC and BTN_DIGI button ranges are all mapped to the same lower numbers including first three, corresponding to the LMR mouse buttons. Like this: 1 BTN_LEFT BTN_0 BTN_TOUCH 2 BTN_MIDDLE BTN_1 BTN_STYLUS 3 BTN_RIGHT BTN_2 BTN_STYLUS2 8 BTN_SIDE BTN_3 9 BTN_EXTRA BTN_4 10 BTN_FORWARD BTN_5 11 BTN_BACK BTN_6 12 BTN_TASK BTN_7 13 BTN_8 14 BTN_9 This streamlines the button mapping under the assumption that these ranges don't generally appear in a single device simultaneously. If they do appear, they will simply report overlapping button numbers. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add BTN_TOUCH/STYLUS/STYLUS2 support.Nikolai Kondrashov2010-09-07
| | | | | | | | | These three buttons are mapped into buttons 1/2/3, respectively. Overlapping range with BTN_LEFT/MIDDLE/RIGHT, assuming that these ranges don't generally appear in a single device simultaneously. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* SwapAxes should rescale raw values when enabledTim Yamin2010-09-07
| | | | | | | | | Current implementation assumes that X & Y axes have the same min and max values. If they don't, you'll end up with funny behaviour if SwapAxes is turned on. Signed-off-by: Tim Yamin <plasm@roo.me.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge branch 'input-api' of git://people.freedesktop.org/~whot/xf86-input-evdevPeter Hutterer2010-09-01
|\
| * Return BadMatch for already configured devices.Peter Hutterer2010-07-22
| | | | | | | | | | | | | | | | PreInit can now return different error codes. Return BadAlloc for alloc failures and BadMatch if the device was already configured or the cache comparison/probe failed. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Use the new input API (changed PreInit function prototype).Peter Hutterer2010-07-22
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Move private init down.Peter Hutterer2010-07-22
| | | | | | | | | | | | No real change, preparation for new input API. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Use pInfo->options instead of dev->commonOptions.Peter Hutterer2010-07-22
| | | | | | | | | | | | No real change, preparation for new input API. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Add ifdefs for pre ABI 12 support.Peter Hutterer2010-07-22
| | | | | | | | | | | | | | The server doesn't provide these defines anymore, define them here for future use. To be purged whenever we drop support for the current server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Remove usage of XI86_POINTER_CAPABLE and XI86_KEYBOARD_CAPABLE.Peter Hutterer2010-07-22
| | | | | | | | | | | | | | | | XI86_KEYBOARD_CAPABLE was write-only, both in the driver and the server. XI86_POINTER_CAPABLE was write-only in the server and can be emulated with has_abs_axes and has_rel_axes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | Improve dumb tablet detectionNikolai Kondrashov2010-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve dumb tablet detection by checking if BTN_STYLUS or BTN_STYLUS2 (first or second pen barrel button) is present when BTN_TOOL_PEN is not found. This enables detection of tablets without explicit tool proximity reporting. These include at least four UC-Logic tablet models: WP4030U, WP5540U, WP8060U and PF1209, on which many Genius and Trust models are based. 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>
* | Bump to 2.5.99.Peter Hutterer2010-08-31
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | Fix comments about BTN_TOOL_PEN.Nikolai Kondrashov2010-08-31
| | | | | | | | | | | | | | | | Fix incorrect usage of BTN_DIGI instead of BTN_TOOL_PEN in comments. Fix forgotten pEvdev->digi reference. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | evdev 2.5.0xf86-input-evdev-2.5.0Peter Hutterer2010-08-23
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | man: don't reference README.mousePeter Hutterer2010-08-23
| | | | | | | | | | | | No real reason to refer to the mouse driver's readme. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | evdev 2.4.99.901xf86-input-evdev-2.4.99.901Peter Hutterer2010-08-19
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | evdev: Initialize valuators array. (#24737)Bartosz Brachaczek2010-08-16
| | | | | | | | | | | | | | | | | | | | | | | | | | The array needs to be filled with zeros, otherwise we may end up sending it with random values if non-zero values aren't in one row (which is the case for A4Tech X-750F which sends REL_MISC events without a reason). X.Org Bug 24737 <http://bugs.freedesktop.org/show_bug.cgi?id=24737> Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com> Tested-by: Bartek Iwaniec <hash87@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | evdev: Revert "Set all valuators for relative motion events (#24737)"Bartosz Brachaczek2010-08-16
| | | | | | | | | | | | | | | | | | | | | | | | It isn't necessary to post zero-deltas to X Server. In order not to post uninitialized "v" array we should rather simply initialize it. This reverts commit c1f16a4f59a584ab4546c2f16e20b06703042057. Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com> Tested-by: Bartek Iwaniec <hash87@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | Don't count BTN_TOUCH as tool. (#29428)Peter Hutterer2010-08-16
|/ | | | | | | | | | Devices that don't have a tool but BTN_TOUCH simply have the tool always on. Devices that have a tool other than BTN_TOUCH set this tool before BTN_TOUCH is emitted anyway. X.Org Bug 29428 <http://bugs.freedesktop.org/show_bug.cgi?id=29428> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix out-of-bounds access if more than MAX_VALUATORS are present. (#28809)Alex Warg2010-07-01
| | | | | | | | | | | The functions EvdevAddRelClass and EvdevAddAbsClass do out of bounds accesses to vals and old_vals arrays in the EvdevRec structure if there are more than MAX_VALUATORS axes reported by the kernel. X.Org Bug 28809 <http://bugs.freedesktop.org/show_bug.cgi?id=28809> Signed-off-by: Alex Warg <alexander.warg@os.inf.tu-dresden.de> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* man: some minor fixes to man page.Peter Hutterer2010-06-28
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add myself to Authors in man page.Peter Hutterer2010-06-28
| | | | | | | git blames me for about half the driver now, I guess that's enough justification ;) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONSGaetan Nadon2010-06-16
| | | | | | | It depends on util-macros 1.8 The existing statement can now be removed from the configuration file. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: upgrade to util-macros 1.8 for additional man page supportGaetan Nadon2010-06-16
| | | | | | | | | | | | Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS The existing statement can now be removed from the configuration file. Use Automake $() for variables in Makefile.am Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* COPYING: update and refactor the Copyright noticesGaetan Nadon2010-06-16
| | | | Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Bump to 2.4.99Peter Hutterer2010-06-01
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Disable middle mouse button emulation by default.Peter Hutterer2010-05-31
| | | | | | | | | | | | | | | | | | | | | | | The AUTO feature was the default, MB emulation was on until a middle mouse button was pressed. MB emulation however results in a delay of the first press, causing minor annoyances to the users and being generally confusing when the behaviour before a button press is different to after a button pres. Disable the feature by default instead. There's not a lot of two-button mice around anymore though and the inability to detect two-button mice makes for non-deterministic detection of when the emulation should be on. Middle button emulation can be enabled with a configuration snippet: Section "InputClass" Identifier "middle button emulation" MatchIsPointer "on" Option "Emulate3Buttons" "on" EndSection Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Daniel Stone <daniel@fooishbar.org>
* Remove libc wrappers for malloc, calloc and free.Peter Hutterer2010-05-28
| | | | | | | | | Evdev is Linux-only, and we've had the above calls for quite a while now. Plus, now that the server has removed them they generate _a lot_ of warnings otherwise. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
* Move mode declaration, it's not const either.Peter Hutterer2010-05-28
| | | | | | | What we're getting back from xf86SetStrOption is a strdup'd string, not const, especially given that we free it a few lines down. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Move opening the device into a separate function.Peter Hutterer2010-05-28
| | | | | | Re-use from EvdevOn and PreInit. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Move checks for calibration, inversion and axis swap to EvdevProbe.Peter Hutterer2010-05-28
| | | | | | Keyboard devices don't need these checks. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Move EVIOCGRAB into a static func.Peter Hutterer2010-05-28
| | | | | | | This is in preparation of some major rework, there are no functional changes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Move error handling in PreInit down to the end.Peter Hutterer2010-05-28
| | | | | | | | Just have one exit path instead of different ones. Guards are in place to avoid freeing/deleting something that shouldn't be. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
* Comment odd EVIOCGRAB behaviour and reshuffle conditions a bit.Peter Hutterer2010-05-28
| | | | | | | | | The reason for this rather weird approach is to ungrab immediately after getting a successful grab. Evdev shouldn't be hogging the device if nothing is done with it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
* Remove support for kernel 2.4.Peter Hutterer2010-05-28
| | | | | | | | It's been 6 years since 2.6, I doubt evdev would even work on 2.4 right now. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
* config: AC_PROG_SED is required explicitly.Gaetan Nadon2010-05-10
| | | | | | | It sets the SED env variable with an appropriate sed program path It still works on some platform when not explicity called. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Update a stale comment about the use of pEvdev->tool.Peter Hutterer2010-05-06
| | | | | | Including some typo fixes in the same comment. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Read the device resolution from the kernel.Peter Hutterer2010-04-29
| | | | | | | For earlier kernels, use the previous hardcoded resolution in place. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
* config: remove AH_TOP autoheader statement.Peter Hutterer2010-04-29
| | | | | | | | | Include it in evdev.h instead. xorg-server.h is required to define the right datatype sizes on 64 bit, hence ensure that evdev.h is the first included in each file. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
* Revert "config: remove AH_TOP autoheader statement"Gaetan Nadon2010-04-22
| | | | | | | | | | The changed location of xorg-server.h had some side-effects. See Bug 27768 <https://bugs.freedesktop.org/show_bug.cgi?id=27768> This reverts commit 9dbace89bee55a001e794ccf3ff36e3afeda4715. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge branch 'master' of git://gitorious.org/omcfadde/xf86-input-evdevPeter Hutterer2010-04-20
|\
| * evdev: EvdevProbe: check ioctl() return value and warn on failure.Oliver McFadden2010-04-20
| | | | | | | | | | | | | | | | Called function "ioctl" whose return value should be checked (checked 10 out of 11 times) Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| * evdev: ioctl() may return a negative value therefor use a signed integer.Oliver McFadden2010-04-20
| | | | | | | | | | Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| * evdev: leaked_storage: free memory allocated from the xf86Option code.Oliver McFadden2010-04-20
| | | | | | | | | | Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* | man: Use Autoconf provided $(AM_V_GEN)$(SED)Gaetan Nadon2010-04-19
| | | | | | | | | | | | Enables silent rule and use platform appropriate version of sed. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>