summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-05-21Deal with BTN_3 to BTN_9 buttons.Peter Hutterer
These buttons were previously mapped to 0, i.e. inactive. This patch slightly improves things in that the buttons are now mapped to 8+. Devices that have both BTN_3 and BTN_SIDE (or a similar pair in that sequence) have both mapped to the same button number though. Devices that have BTN_LEFT, BTN_0, BTN_3 and BTN_SIDE have the last three mapped to 8 (and their followers have double-mappings too). We'll fix that once we actually see devices affected by this. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-21Only initialize the number of buttons we actually have.Peter Hutterer
This takes into account driver-configured button mappings, i.e. if device with one button has this button mapped to 25 through the ButtonMapping option, the X server will think the device has result 25 buttons. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-21Rename pEvdev->buttons to pEvdev->num_buttons for clarity.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-21Ensure enough buttons are advertised to pass the button mapping.Peter Hutterer
Some buttons are mapped to higher button numbers. For example, BTN_0 is posted as button 8 if BTN_LEFT is present. On top of that, the driver-specific button mapping may map the button to something else again. We need to take these mappings into account when counting the number of buttons on the device. Example: A device with BTN_LEFT and BTN_0 and a mapping from 1 -> 7 and 8 -> 2. BTN_LEFT is mapped to 1. 1 is mapped to 7. num_buttons is 7. BTN_0 is mapped to 8. 8 is mapped to 2. num_buttons remains 7. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-21Up the number of button labels atoms to EVDEV_MAXBUTTONS.Peter Hutterer
Button labels would smash memory if the device had less than 4 buttons and did not advertise a wheel event. In this case the hard-coded wheel button labels would write past the atoms[] boundary. Potential memory smash if a device had a BTN_LEFT and BTN_0, since the latter would map to 8, regardless of the the number of actual buttons (same with BTN_MIDDLE and BTN_1 or BTN_RIGHT and BTN_2). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-21Only label axes and buttons if the device has axes or buttons.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-16Use xf86DisableDevice instead of the DIX' DisableDevice.Peter Hutterer
DisableDevice has changed API in xi2, xf86DisableDevice hasn't. So let's use this one so we can have one version for master and xi2. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-11Fix copy-paste error when probing type nameDan Nicholson
A minor copy and paste error was introduced in 71e9a69e leaving an "if" where an "else if" should be. Without this, any device configured as XI_TOUCHPAD or XI_TABLET will end up having the type_name reset to either XI_TOUCHSCREEN or XI_MOUSE. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-29Revamp the whole "has_axes" definition.Peter Hutterer
Since we can now deal with multiple axes, etc. we might as well print it properly. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-16Print read errors as X_NONE to avoid mallocs in the server.Peter Hutterer
Messages of type X_NONE are just passed down to the log files, everything else gets the (EE) or (II) prefixed. Since this mallocs, we can't use it in the signal handler. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-16Pre-allocate the reopen timer so we don't allocate during sigio handling.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-06Trigger read error handling if len is <= 0.Peter Hutterer
Red Hat Bug 494245 <https://bugzilla.redhat.com/show_bug.cgi?id=494245> Reported-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-26Fix wrong reference to axis and button label atom list.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-26Remove test/ directory.Peter Hutterer
This shouldn't really be part of the driver source, it's better to just have it as a separate repository. Code has moved to git://people.freedesktop.org/~whot/testdevices.git Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-17Fix jumpy touchpads by updating old_vals only when reported by the device.Peter Hutterer
Remember whether ABS_X or ABS_Y were reported before the SYN event and only update the old_vals[0, 1] if we got data for them. Touchpads that reported pressure data before x/y would otherwise update old_x/y with bogus values, leading to jumps when the first x/y coordinates were actually reported. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-17If we have a touchpad, print so, don't claim we're configuring a tablet.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-17make sure to clear all axis_map entriesJeremy Jay
don't use uninitialized axis_map entries, ie axis_map[ABS_PRESSURE] Signed-off-by: Jeremy Jay <dinkumator@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-17Assume touchscreen/touchpad if we have _either_ ABS_PRESSURE or BTN_TOUCHPeter Hutterer
Touchpads have pressure or touch and also BTN_TOOL_FINGER. Touchscreens have either pressure or touch, but no finger. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-16Move keymap/modifier initialization behind the ABI < 5 ifdefs.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-16Set "rel" when converting absolute touchpad coordinates to relative (#20661)Jeremy Jay
We unset "abs" and convert to relative, but never set "rel" so the events don't get posted. This bit got broken in 43dd2a959243877. X.Org Bug 20661 <http://bugs.freedesktop.org/show_bug.cgi?id=20661> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-10Restore repeat-filtering for server 1.5 and earlier.Peter Hutterer
Letting the server deal with key repeats is fine if we have server 1.6. For earlier servers, we need to pass on the repeat events (except for modifier keys). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Marty Jack <martyj19@comcast.net>
2009-03-09Bump to 2.2.99.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-09Define MAX_VALUATORS if it's missing to allow for builds against 1.5.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-09Check button label before fetching the Atom from the server. (#20524)Peter Hutterer
The server doesn't like NULL names, so don't call XIGetKnownProperty for labels that don't exist. X.Org Bug 20524 <http://bugs.freedesktop.org/show_bug.cgi?id=20524> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Peter Henriksson
2009-03-06Fix duplicate wheel button up mapping.Peter Hutterer
Reported by Simon Thum. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Simon Thum <simon.thum@gmx.de>
2009-03-02evdev 2.1.99.1xf86-input-evdev-2.1.99.1Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-02Add support for button labelling.Peter Hutterer
Buttons 4/5 and 6/7 are hardcoded for wheel buttons. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-03-02Rename prop_label to prop_axis_label.Peter Hutterer
2009-02-26Don't double-assign the UKNOWN axis label.Peter Hutterer
All labels default to unknown anyway. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-26If scrollwheels are found, bump the button number by 4 (or up to 7).Peter Hutterer
Scrollwheel data is always posted as buttons, so we need to advertise at least enough buttons to accommodate for 6/7 (horizontal wheel). Note that this may mean that if you have a device that has scroll wheels and axes, but no buttons, it may be interpreted as a mouse. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-26Ignore REL_WHEEL, REL_HWHEEL and REL_DIAL during axis initialisation.Peter Hutterer
We don't post the events for them anyway, so lets ignore them completely. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-26Pass on all relative events, not just x/y.Peter Hutterer
9620fe776 added generic axes support for relativ values, but values from such axes didn't get passed on to the server. Fix this. Note that wheel events are not posted as motion events. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-26Reduce the number of read calls in ReadInput.Adam Jackson
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-02-26Split ReadInput into ReadInput and ProcessEvent.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-26Move relative motion and other magic up to EV_SYN processing.Adam Jackson
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-02-23Open with O_NONBLOCK, and simplify EvdevReadInput to match.Adam Jackson
xf86WaitForInput() would call select() with zero timeout to discover if more input was ready. But we know that's always true at least once, since we're only ever called from the sigio handler (if silken is active) or from the main loop (if it's not and we selected readable). With nonblocking IO we can just spin around until we hit EAGAIN, which gets us down to n+1 syscalls per event instead of 2n.
2009-02-19Revert "Remove useless include directive."Peter Hutterer
Necessary for builds against 1.6, but let's at least get rid of XKB defines. This reverts commit aa5dfa1d6ae374479d39f1394b85660e6b6bb881. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-18Label axes conditional on actual support.Peter Hutterer
Server 1.6 has device properties, but not axis labels. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-18Accommodate for holes in the ABS label defines.Peter Hutterer
abs_labels[] has to be aligned with the defines in linux/input.h, but the latter does not have continuous range. Pad the holes with AXIS_LABEL_PROP_ABS_MISC. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-17Add support for arbitrary relative axis labels.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-17Remove superfluous (and duplicate) call to xf86MotionHistoryAllocate.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-17Add generic axis support for relative axes.Peter Hutterer
Just query the kernel what axes we actually have, rather than hard-coding x/y. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-17Add dynamic axis labelling for absolute devices.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-16remove duplicate (code > 255) check.Peter Hutterer
2009-02-16man: list the options and properties in alphabetical order.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-16man: Fix two minor typos in man page.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-16Swap axes after scaling, not before.Peter Hutterer
If we swap before scaling, we scale with the wrong coordinate range. Reported by Matt Helsley. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-16CacheCompare before probing the device.Peter Hutterer
Saves a few duplicate ioctls. Suggested by Matt Helsley. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-16General axis valuator support.Matt Helsley
Instead of x/y and pressure, support any absolute axis that is reported on the device. Note that there are still locations that special-case X and Y. Minor modifications by Peter Hutterer. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-16Change cached bitmasks from long to unsigned long.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:03:52 +0000