summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-31Export device node as property.HEADmasterPeter Hutterer3-2/+27
There is currently no mapping between XI devices and physical devices other than what can be extracted by parsing the Xorg logfile. Add new property "Device Node" to the driver to export the open device file. The client is responsible for detecting if the device is on the same host and converting the data into a more useful format (e.g. sysfs path). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-31Static atoms don't need to be initialized to 0.Peter Hutterer1-5/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-31Replace xf86Msg() with xf86IDrvMsg().Peter Hutterer3-128/+115
The latter provides a standardised message format in the form of driver name: device name: message making it easier to grep for driver messages in the log. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-25Add support for masked valuatorsChase Douglas3-87/+111
With the X server now supporting masked valuators for XI2, enable support in X evdev. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-24Switch to "goto" logic for error handling when adding classesChase Douglas1-9/+15
This will be necessary for the addition of multitouch functionality. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-24Remove support for X input ABI < 12.2Chase Douglas5-472/+12
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-11evdev 2.6.0Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-06Print out error messages when failing to init devicesChase Douglas1-4/+16
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-05evdev 2.5.99.903Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-04Don't update first_val and num_val if we don't have data (#32480)Peter Hutterer1-3/+6
For touchpads, rel_queued may be on (due to abs to rel conversion) but the delta for x/y is 0/0 on the first touch. Hence, we don't have any valuators to post. The current results in a num_vals of -15 and a subsequent segfault when the data is posted to the server. Start with a last valuator of -1, so that we know if we have at least one to post. X.Org Bug 32480 <http://bugs.freedesktop.org/show_bug.cgi?id=32480> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
2010-12-22Add use_proximity bit for BTN_TOOL handling.Peter Hutterer2-1/+13
Touchpads send garbage data between BTN_TOOL_FINGER and BTN_TOUCH. This leads to cursor movement towards invalid positions (bottom left corner, usually). Add a new flag "use_proximity" as a delimiter for BTN_TOUCH handling. If unset, the actual proximity bits are ignored, no proximity events are sent and BTN_TOUCH is used for the tool handling. Example event stream for synaptics: Event: time 1292893041.002731, -------------- Report Sync ------------ Event: time 1292893041.015807, type 1 (Key), code 330 (Touch), value 0 Event: time 1292893041.015812, type 3 (Absolute), code 0 (X), value 4283 Event: time 1292893041.015813, type 3 (Absolute), code 1 (Y), value 4860 Event: time 1292893041.015815, type 3 (Absolute), code 24 (Pressure), value 23 Event: time 1292893041.015817, type 3 (Absolute), code 28 (Tool Width), value 5 Event: time 1292893041.027537, -------------- Report Sync ------------ Event: time 1292893041.038854, type 3 (Absolute), code 0 (X), value 1 Event: time 1292893041.038857, type 3 (Absolute), code 1 (Y), value 5855 Event: time 1292893041.038859, type 3 (Absolute), code 24 (Pressure), value 1 Event: time 1292893041.038861, type 3 (Absolute), code 28 (Tool Width), value 5 Event: time 1292893041.038864, -------------- Report Sync ------------ Event: time 1292893041.062432, type 3 (Absolute), code 24 (Pressure), value 0 Event: time 1292893041.062435, type 3 (Absolute), code 28 (Tool Width), value 0 Event: time 1292893041.062437, type 1 (Key), code 325 (ToolFinger), value 0 Event: time 1292893041.062438, -------------- Report Sync ------------ Reported-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
2010-12-22Revert "Don't count BTN_TOUCH as tool. (#29428)"Peter Hutterer1-0/+1
Synaptics devices send garbage between BTN_TOUCH and BTN_TOOL_FINGER. By switching to use this as proximity data now, the pointer is reset to the garbage data position (usually around 1/5855). This reverts commit 899218e18120918138f6d7420465763422d5b3b7. Reported-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
2010-12-22Rename proximity to in_proximity.Peter Hutterer2-15/+15
No functional change, just making it a bit more obvious to read. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
2010-12-21Fix grammar typo in comment.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-12-13evdev: rename EvdevCacheCompare() to EvdevCache()Peter Korsgaard1-59/+8
Since 59056e656c64 (Remove the reopen timer logic) from last year, EvdevCacheCompare() is only used for caching ioctl values and not for comparing, so remove the unused compare logic and rename the function to EvdevCache(). Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-12-08evdev 2.5.99.902Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-12-07Return error codes from EvdevOpenDevice()Peter Hutterer1-9/+12
The server's behaviour is to stop adding new devices when a BadAlloc occurs on any device (on the assumption that new devices won't magically have more memory). Change EvdevOpenDevice() to return an error code of BadValue when it fails (and thus to the server) to prevent other devices being ignored because of one misconfigured one. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-11-19evdev 2.5.99.901Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-28Reshuffle to avoid the need for XI86_CONFIGURED.Peter Hutterer1-9/+13
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
2010-10-27Input API 12 requires a valuator mode for each axis.Peter Hutterer1-2/+10
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
2010-10-22Extend button mapping to full rangesNikolai Kondrashov1-2/+2
Extend button code to number mapping to cover full BTN_MOUSE and BTN_MISC ranges, including undefined codes. This extends mapping introduced with 0367e387 to the following: 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 0x118 BTN_8 14 0x119 BTN_9 15 0x11A 0x10A 16 0x11B 0x10B 17 0x11C 0x10C 18 0x11D 0x10D 19 0x11E 0x10E 20 0x11F 0x10F This should fix https://bugs.freedesktop.org/show_bug.cgi?id=30336 Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-21Rename CountBits to EvdevCountBits.Peter Hutterer1-3/+3
Avoid name collision with the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
2010-10-21Use an array for the proximity bits.Peter Hutterer1-22/+29
Instead of two lists that need to be kept in sync, just store the bits in an array and run through them. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-10-21Rename abs/rel/prox to abs_queued/rel_queued/prox_queued.Peter Hutterer2-25/+25
Mainly to avoid confusing between pEvdev->prox and pEvdev->proximity and to better express what these fields are actually holding. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-10-18Add the names of the valuators for the multitouch propertiesBenjamin Tissoires1-0/+29
Thoses definitions have been included in the kernel and in the X server. However, the evdev driver has not been updated accordingly. Without these definitions, the multitouch axes are not correctly labelled. Signed-off-by: Benjamin Tissoires <tissoire@cena.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-18Add proximity support.Peter Hutterer2-2/+121
When one of the tools comes into proximity, queue up a proximity event and send it accordingly. Includes special handling for tablets that do not send axes with tools (#29645) Some tablets send axis values, then EV_SYN, and in the next event the BTN_TOOL_PEN/BTN_TOUCH, etc. For these tablets, the cursor doesn't move as coordinates while not in proximity are ignored. Buffer coordinates received while out-of-proximity and if we get a proximity event without other coordinates, re-use the last ones received. X.Org Bug 29645 <http://bugs.freedesktop.org/show_bug.cgi?id=29645> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
2010-10-13Rename evdev->tool to evdev->proximity.Peter Hutterer2-10/+10
evdev doesn't care about the actual tool used, only that it is used as an indicator for proximity. Rename the field accordingly to make the code more obvious to read. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
2010-10-11When posting buttons, post absolute valuators if we have them.Peter Hutterer1-5/+10
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
2010-10-11Fix valuator offset when posting absolute motion events.Peter Hutterer1-1/+1
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>
2010-10-11Don't pass pointers around to first_v and num_v.Peter Hutterer2-10/+10
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>
2010-10-11De-duplicate event queue access.Peter Hutterer1-19/+23
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>
2010-10-11Remove refcnt initialization from InputDriverRec.Peter Hutterer1-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>
2010-09-07Clean up button code to number mappingNikolai Kondrashov1-73/+26
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>
2010-09-07Add BTN_TOUCH/STYLUS/STYLUS2 support.Nikolai Kondrashov1-0/+10
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>
2010-09-07SwapAxes should rescale raw values when enabledTim Yamin1-2/+10
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>
2010-09-01Merge branch 'input-api' of git://people.freedesktop.org/~whot/xf86-input-evdevPeter Hutterer1-39/+46
2010-09-01Improve dumb tablet detectionNikolai Kondrashov1-1/+3
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>
2010-08-31Bump to 2.5.99.proximityPeter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-08-31Fix comments about BTN_TOOL_PEN.Nikolai Kondrashov1-5/+5
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>
2010-08-23evdev 2.5.0Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-08-23man: don't reference README.mousePeter Hutterer1-2/+1
No real reason to refer to the mouse driver's readme. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-08-19evdev 2.4.99.901Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-08-16evdev: Initialize valuators array. (#24737)Bartosz Brachaczek1-1/+1
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>
2010-08-16evdev: Revert "Set all valuators for relative motion events (#24737)"Bartosz Brachaczek1-1/+1
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>
2010-08-16Don't count BTN_TOUCH as tool. (#29428)Peter Hutterer1-1/+0
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>
2010-07-22Return BadMatch for already configured devices.input-apiPeter Hutterer1-1/+4
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>
2010-07-22Use the new input API (changed PreInit function prototype).Peter Hutterer1-12/+32
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-07-22Move private init down.Peter Hutterer1-3/+3
No real change, preparation for new input API. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-07-22Use pInfo->options instead of dev->commonOptions.Peter Hutterer1-1/+1
No real change, preparation for new input API. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-07-22Add ifdefs for pre ABI 12 support.Peter Hutterer1-0/+6
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 10:54:03 +0000