summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-11-13Only map x and y to axes 0 and 1Peter Hutterer
The Logitech G600 has one device with all axes north of ABS_MISC. The current code assigns ABS_MISC as first axis to map to axis 0, i.e. x. On button press, one node sends the BTN_LEFT but the other node sends an ABS_MISC with a 1 0 value. ABS_MISC is mapped to axis 0, this moves the pointer to (0, y) on every button click. Avoid this by simply mapping any axis other than x/y to at least axis 3, and make sure we only override the MT 0/1 axes when we actually have MT axes. https://bugs.freedesktop.org/show_bug.cgi?id=92856 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com>
2015-08-27Add "Resolution" option for mice to the evdev driverThomas Hindoe Paaboel Andersen
It can be used to scale the resolution of a mouse to that of a 1000 DPI mouse. This can be useful to make high resolution mice less sensitive without turning off acceleration. The target of 1000 DPI is used as the same default is used in libinput. If the option is not set no scaling will be done. https://bugs.freedesktop.org/show_bug.cgi?id=88134 Signed-off-by: Thomas Hindoe Paaboel Andersen <phomes@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-03-16Always check for a return value on creating a propertyPeter Hutterer
Mostly to make static analyzers happy Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-03-13Invert a condition to reduce nestingPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-03-11Disable axis faking and MT event processing on fake MT devicesPeter Hutterer
This effectively disables all axes >= ABS_MT_SLOT on those devices. But at least the device comes up without an error and it didn't work correctly beforehand anyway. https://bugs.freedesktop.org/show_bug.cgi?id=89473 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-03-11Invert two conditions to reduce nestingPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-03-11Factor out MT axis counting into a separate functionPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-03-11Split android axis simulation into a helper functionPeter Hutterer
No functional changes Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-03-11Require multitouch/smooth scrolling dependenciesPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-02-13Drop evdev-specific XKB defaultsPeter Hutterer
Just use the server defaults instead. This has very little effect, on most systems there was some sort of default configuration applied anyway. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-01-23Check for incoming MT slot indices exceeding the allocated number of slots.Tobias Himmer
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88715 Signed-off-by: Tobias Himmer <provisorisch@online.de> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-12-23Workaround lack of ABS_X on MT devices (#80470)Colin B. Macdonald
Often on Android, we have ABS_MT_POSITION_X without ABS_X (which is contrary to spec). We add fake ABS_X axis in that case. X.Org Bug 80470 <http://bugs.freedesktop.org/show_bug.cgi?id=80470> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-12-17Move EVDEV_RELATIVE_MODE logic earlierÉric Brunet
When in EVDEV_RELATIVE_MODE, after converting the absolute valuators, the code unsets pEvdev->abs_queued. This is wrong if there are some absolute valuators which are not positions, such as a pressure valuators, because events on these valuators would be lost. This patch fixes the problem by doing the absolute->relative translation early. This way, abs_queued is not set and then unset when receiving absolute valuators representing positions. Other absolute events now set abs_queued and will be processed. Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-12-17Don't update old_vals when not in EVDEV_RELATIVE_MODEÉric Brunet
When not in EVDEV_RELATIVE_MODE, absolute position is stored in old_vals. This serves no purpose except that old_vals is ready when the device is switched to EVDEV_RELATIVE_MODE. It is however better to make the copy between old_vals and abs_vals at the time of the switch rather than all the time. Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-12-17Change the logic concerning EVDEV_RELATIVE_MODE and in_proximityÉric Brunet
When not in_proximity, we don't really trust data, even though a valuator sent just before a in_proximity event might actually be important. The present code for EVDEV_RELATIVE_MODE throws away all data if not in_proximity, which is a little bit too much. This patch allows for relative values to be calculated and old_vals to be updated even if not in_proximity, but will prevent evdev to sending (presumably) wrong information to the X server. But at least, old_vals will be correctly filled when the device comes into proximity again. Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-12-17drop the pEvdev->delta arrayÉric Brunet
Now that relative events have their own valuator mask, use it instead of delta Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-12-17Split pEvdev->vals into pEvdev->abs_vals and pEvdev->rel_valsÉric Brunet
This should hopefully fix bug 84445. Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-11-07Remove three unused #definesPeter Hutterer
Obsolete since 768c25a99b2f4ec07993eb15a0f05a5e22b5c695 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-09-29Don't pass superfluous arguments to EvdevPost*EventsÉric Brunet
The functions EvdevPostProximityEvents, EvdevPostRelativeMotionEvents, EvdevPostAbsoluteMotionEvents and EvdevPostQueuedEvents are only called by EvdevProcessSyncEvent. These functions take as arguments an array of valuators which is set by EvdevProcessSyncEvent to contain ... nothing. This patch changes the prototype of the four functions, their definitions and the way they are called to remove the useless array of valuators. Signed-off-by: Éric Brunet <Eric.Brunet@lps.ens.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-08-29Drop some unused #definesPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-08-18If only IgnoreRelativeAxes is set, init like a normal relative devicePeter Hutterer
In the current code, if only IgnoreRelativeAxes is set, the code would go on and force absolute axes to initialize even if the relative axes were successfully initialized. Evdev gives precedence to relative axes anyway, initializing absolute axes if the relative axes failed. Thus, if we explicitely want relative axes but leave the abs axes as-is, proceed as normal. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-08-18Fix axis initialization for devices with abs x/y and rel scrollwheelsPeter Hutterer
The Xen Virtual Pointer device has ABS_X, ABS_Y and REL_WHEEL. If smooth scrolling is detected, the current code would first initialize relative axes for scrolling and immediately overwrite those axes when the abs valuators are written out. This patch fixes the default case only, in the case of a device setting the two Ignore*Axis options both to "off", the axes are still overwritten. The wheels will work, other axes only if the same number of abs axes exists. And it keeps the current memory leak too, but it's marked with a FIXME now. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-08-18Make the slot-state per slotPeter Hutterer
The previous approach only had the slot state for the current slot. If we changed slots, that means we lost the information if the slot was ever initialized. If the ABS_MT_TRACKING_ID was never received, the slot would still update and try to send events (which the server refused with a warning). Avoid this by having a per-slot state and a dirty bit that tells us if the current slot updated at all. If we don't get the tracking ID, leave the slot empty and refuse any further events from that touch. This quashes the various "unable to find touch point 0" warnings caused if a touchpoint starts before the device is enabled. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Walter Harms <wharms@bfs.de>
2014-05-07Use the server's device list for duplicate detection (#78309)Peter Hutterer
EvdevAddDevice/EvdevRemoveDevice keep a reference to the device to detect duplicate devices based on the dev_t. EvdevAddDevices was called during PreInit, EvdevRemoveDevice was called during DEVICE_CLOSE. That makes it imbalanced if the device succeeds PreInit but the server skips everything else because MAX_DEVICES is exceeded. So for all devices after MAX_DEVICES, we'd add a reference but never remove it, eventually reading/writing past evdev_devices. The server keeps the list of devices for us anyway, so remove the copy of all the pointers and instead run through the device list the server gives us. X.Org Bug 78309 <http://bugs.freedesktop.org/show_bug.cgi?id=78309> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2014-04-29Map REL_DIAL to horizontal scrolling (#73105)Peter Hutterer
This was the original behavior introduced in f77410e1f97d394e98c854fd174f712666b0544c and stayed that way until smooth scrolling erroneously added it as vertical axis in b450efdf95999cad08de23ce069f04a66bdae24b. Revert to horizontal scrolling to restore the previous behaviour - which unbreaks scrolling on Microsoft mice. This effectively reverts 54a3120e339e55fc4721543abb15692c3e9ede09 too. X.Org Bug 73105 <http://bugs.freedesktop.org/show_bug.cgi?id=73105> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-04-29Revert "Map REL_DIAL to horizontal scrolling (#73105)"Peter Hutterer
Whoops, the vertical axis is swapped, so when changing the axis we also need to change the direction. This reverts commit 16c85cbeacb721ed365c6240aabaad921b811fe0.
2014-04-29Map REL_DIAL to horizontal scrolling (#73105)Peter Hutterer
This was the original behavior introduced in f77410e1f97d394e98c854fd174f712666b0544c and stayed that way until smooth scrolling erroneously added it as vertical axis in b450efdf95999cad08de23ce069f04a66bdae24b. Revert to horizontal scrolling to restore the previous behaviour - which unbreaks scrolling on Microsoft mice. This effectively reverts 54a3120e339e55fc4721543abb15692c3e9ede09 too. X.Org Bug 73105 <http://bugs.freedesktop.org/show_bug.cgi?id=73105> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2014-03-10evdev: Add support for server managed fdsHans de Goede
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-22Fix wheel emulation for absolute device (#68415)Peter Hutterer
wheel emulation, for some reasons beyond time, got the value from pEvdev->vals, then set the value back into pEvdev->vals. Alas, that value is always 0, hence oldValue is zero and the delta is nil. If we're not in relative (touchpad) mode, store the current value in old_vals, so they're retrievable for the next event. X.Org Bug 68415 <http://bugs.freedesktop.org/show_bug.cgi?id=68415> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-21Export smooth scroll settings as an XInput property.Peter De Wachter
A new property "Evdev Scrolling Distance" is created that holds three values (vertical, horizontal and dial). Signed-off-by: Peter De Wachter <pdewacht@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-21Add configuration options for smooth scrolling.Peter De Wachter
This patch creates three new xorg.conf options, VertScrollDelta, HorizScrollDelta and DialDelta, which adjust the sensitivity of smooth scrolling. These options take a positive integer, default value is 1. Signed-off-by: Peter De Wachter <pdewacht@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-14Use num_slots where appropriatePeter Hutterer
This was supposed to be added in 43e270fb7a10da20ab89dd699839c1cb6df119b4, but got lost somehow. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-07Merge branch 'libevdev'Peter Hutterer
2013-10-07Map REL_DIAL to vertical scrollingPeter De Wachter
This makes the absolute axis codepath behave the same as the relative axis path. Signed-off-by: Peter De Wachter <pdewacht@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-04Use libevdev as backendPeter Hutterer
Removes the need to ioctl manually and check bits, with all the dangers that come with that. libevdev is much better prepared for invalid values, OOB checks, etc. Plus, we get almost free SYN_DROPPED handling as well which we didn't have before. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-09-10Use helper function for counting slotsPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-09-10Drop ABS_MT_SLOT minimum - the kernel guarantees a minimum of 0Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-08-28Remove a commentPeter Hutterer
This comment is now in the wrong place. It was moved when abs support for wheel emulation was added but is now only confusing. Remove it altogether, the code is quite obvious what it does. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-08-28Don't use mtdev for protocol B devicesPeter Hutterer
If a device has ABS_MT_SLOT, mtdev merely reads the events and returns them to the caller as-is. For this we don't need mtdev, we can just handle those events ourselves. This patch switches to the mtdev plumbing layer that takes events and converts them instead of reading them off the fd. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-08-13Write a SYN_REPORT after the last LEDPeter Hutterer
When writing LED values to the device, append a SYN_REPORT to the list to ensure other clients are updated immediately. Otherwise, the LED events will be queued and not sent to other clients until the next input event arrives. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2013-06-27Don't allow a wheel emulation inertia of 0 (#66125)Peter Hutterer
Inertia of 0 results in an infinite loop of events being sent to the server. X.Org Bug 66125 <http://bugs.freedesktop.org/show_bug.cgi?id=66125> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-05-31Use EvdevBitIsSet, not the server's BitIsOnPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-05-31Drop cached name and led_bitmask - nothing reads thisPeter Hutterer
Both fields are write-only as of xf86-input-evdev-2.5.99.902-1-g1ced7ec Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-05-31Switch default model to pc104.Peter Hutterer
As of xkeyboard-config 1.9, the evdev model is hidden (c887d2876) The server switched to pc105 with version 1.8 (1df4bd601). The evdev model resolves to pc104 anyway, so this commit has no real effect other than to switch from a catch-all rule to explicit. Use pc104 so this is easy to find for those investigating the code and wondering why. pc104 is the 'correct' geometry for the us layout, which is the default after all. Switching to pc105 would show keys missing if no model is set (e.g. on uk/de layouts) but it would be the wrong layout for the default. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Daniel Stone <daniel@fooishbar.org>
2013-05-01Fail to set up axes for devices that only have MT axes but no ABS_X/Y ↵Peter Hutterer
equivalents (#64029) The kernel should give us ABS_X/Y for backwards compat but some devices don't. For now, ignore these devices as evdev is not suited to handle this yet and will crash if a device is set up without axes (i.e. pEvdev->vals == NULL) and later receives an event from an MT axis. X.Org Bug 64029 <http://bugs.freedesktop.org/show_bug.cgi?id=64029> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
2013-04-16Add option TypeName (#62831)Peter Hutterer
evdev tries to assign the right XI 1.x type-name based on various device capabilities. In some cases, that fails. e.g. the Mionix Naos 5000 mouse looks like a keyboard. And we assign a keyboard type in that case since there are plenty of keyboards that also advertise some axes or others. Add a new option TypeName to allow for system-wide configuration of such devices in a quirks file. This can also be used to address #55867 X.Org Bug 62831 <http://bugs.freedesktop.org/show_bug.cgi?id=62831> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-12Return BadValue if EvdevOpenMTDev failsPeter Hutterer
FALSE == Success, so if we fail during EvdevOpenMTDev, the caller thinks that everything worked fine, proceeds to set up the fd, etc. This may later cause a crash, when a device comes back later as different device and posts axis events where we didn't configure axes in the first place. Note: Unclear why there was no udev event received for the device being removed and coming back as different device though. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-12Make errors on EVIOCGBIT more obviousPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-25Always init axis mapping for the first two rel axes (#59784)Peter Hutterer
Fixes regression introduced in 2f67509b53b27dd7f51ca2aadd19605aee613a61. If evdev is used for touchpads, the abs axis movement is converted to a rel movement. Without the two relative axes initialized, the events are discarded. Axes 0 and 1 are always x/y anyway unless specifically configured otherwise. X.Org Bug 59784 <http://bugs.freedesktop.org/show_bug.cgi?id=59784> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-25Merge branch 'touch-axis-swap'Peter Hutterer
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 03:22:13 +0000