aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* *probably* recover better in case of config errorscode-remap-2.7.0Gianni Ceccarelli2012-11-17
| | | | Thanks to Lee form Albuquerque Laser Engraving for the report
* fix error messageGianni Ceccarelli2012-11-17
| | | | Thanks to Lee from Albuquerque Laser Engraving for the report
* code-remap for 2.7.0Gianni Ceccarelli2012-11-17
|
* evdev 2.7.3xf86-input-evdev-2.7.3Peter Hutterer2012-08-13
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix broken ButtonMapping option (#53168)Peter Hutterer2012-08-13
| | | | | | | | | | Regression introduced in 8af0e6f1ebaf327f735bca507134b34bb24b26c6. s is now initialized to NULL, so we never entered the loop. X.Org Bug 53168 <http://bugs.freedesktop.org/show_bug.cgi?id=53168> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 33e7831b5fabc5c9dcc0224800a04761086952a7)
* Link against libudevPeter Hutterer2012-08-07
| | | | | | | | | | | | | Fixes /usr/bin/Xorg: symbol lookup error: /usr/lib64/xorg/modules/input/evdev_drv.so: undefined symbol: udev_new This doesn't appear in the default configuration as Xorg links against libudev and the symbol is defined when evdev is loaded. It can be reproduced with a HAL-enabled server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit bc8997e8120cc8d4f33f44e0734fa488f9fef3b0)
* Don't delete the device on ENODEVPeter Hutterer2012-08-07
| | | | | | | | | | | | | This is signal handler code and we cannot clean up properly while in the signal handler. So reduce the code to removing the signal handler and let the device be cleaned up later. If hotplugging is on, the server will remove it when the config backend says so and if it is off, the server will remove it on shutdown. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit 1cb8f074df8d16879ec80d778d26fb5b9af05a3b)
* evdev 2.7.2xf86-input-evdev-2.7.2Peter Hutterer2012-08-03
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Don't re-open mtdev after PreInitPeter Hutterer2012-07-30
| | | | | | | | | | | | | | | | | | | | | | | ==16557== 388,240 (3,520 direct, 384,720 indirect) bytes in 10 blocks are definitely lost in loss record 1,669 of 1,671 ==16557== at 0x4A06F18: calloc (vg_replace_malloc.c:566) ==16557== by 0xC3EAD4D: mtdev_new (core.c:345) ==16557== by 0xC3EAE6B: mtdev_new_open (core.c:383) ==16557== by 0xC1E0452: EvdevOpenDevice (evdev.c:2365) ==16557== by 0xC1E068C: EvdevPreInit (evdev.c:2431) ==16557== by 0x4B8304: xf86NewInputDevice (xf86Xinput.c:846) ==16557== by 0x4B8857: NewInputDeviceRequest (xf86Xinput.c:989) ==16557== by 0x4CCB4C: device_added (udev.c:211) ==16557== by 0x4CCFA6: config_udev_init (udev.c:342) ==16557== by 0x4CBE81: config_init (config.c:48) ==16557== by 0x4A8A9A: InitInput (xf86Init.c:918) ==16557== by 0x4921EE: main (main.c:258) After PreInit, the fd and mtdev pointer are still valid. We check for the fd, but unconditionally allocated another mtdev struct for each device. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit 98af2003d48530b2e102cf667a9d40dcb94cb0fe)
* Constify InputDriverRec->default_optionsPeter Hutterer2012-07-30
| | | | | | | | | Removes a warning, and with the input ABI 18 this is forced to const in the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit 9624f4e2ba7d1973813de066806eed108748a53a)
* Fix some obvious constness-related compile warnings.Marcin Slusarz2012-07-30
| | | | | | Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 2c8da280b3ab635d049784345d025d289348687b)
* Fix compilation warnings for non-multitouch buildsDaniel Stone2012-07-30
| | | | | | | Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit f5ede98085688b59dc56a9cc6592f75552a4e7ed)
* strtol doesn't need a empty string, NULL is good enough.Peter Hutterer2012-07-30
| | | | | | | | | | | Fixes: evdev.c: In function 'EvdevInitButtonMapping': evdev.c:1659:25: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit 61faf2e6e70a4c9ecffe638d46829738dc2e3452)
* evdev 2.7.1xf86-input-evdev-2.7.1Peter Hutterer2012-07-24
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Close the fd when mtdev open failsPeter Hutterer2012-07-04
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit 8251d7a8ec00b4160b6601a6f2f4f0f5d461cbee)
* Release mtdev data whenever we close the fdPeter Hutterer2012-07-04
| | | | | | | | | | | | Add a new EvdevCloseDevice() function to unify this. We used to leak data - PreInit allocates mtdev, but nothing except one error path released it. - each DEVICE_ON re-allocates mtdev but it is never released Reported-by: Zdenek Kabelac <zdenek.kabelac@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit ac5173163d7d1e18d47630a397ece0f26b2568c8)
* Fix buffer overrun when populating axis label property arrayChase Douglas2012-07-04
| | | | | | | | | | | The axis label property array currently only has enough elements for the non-multitouch axes. This change allocates enough space for all axes, which prevents an array overrun write. This may manifest as stack corruption on some platforms. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 4145fe1c087708bf5d6608e328342282ecb93ab0)
* Report the correct number of touches for MT protocol B devicesChase Douglas2012-07-04
| | | | | | | | | | Protocol B devices report the number of touches by giving a maximum and minimum slot value. The current code ignores the minimum value, which is usually 0, and underreports the number of touches by 1. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 9ce068e760e1282183c7aa1b4cc6b0fcb6b494dd)
* Devices configured as mice need REL_X/YPeter Hutterer2012-07-04
| | | | | | | | | | | | | Some keyboards export scroll axes and any absolute axis possible in 11 dimensions. All these axes are mute, except possibly for the scroll wheels. So if a device has a scroll axis, and we're configuring it as mouse, force the x/y axes into existence. This stops the logspam complaining about not enough axes on pointer movement after a xrandr change. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit f28507e8ce2bd45b51c28f024baebd9711c28fc3)
* Fix inverted horizontal scroll (#46205)Peter Hutterer2012-07-04
| | | | | | | | | | REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL. X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit 99340147b9092a5aaec997eca407282a51e1f063)
* evdev 2.7.0xf86-input-evdev-2.7.0Peter Hutterer2012-03-07
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Only force REL_X/Y if no ABS_X/Y existsPeter Hutterer2012-01-26
| | | | | | | | | | | | | | 5c5b2c8db851df7921cedd888222a6630a007fd8 added forced x/y axes if a device has any axes of the same mode. This was too broad a brush, some devices have a relative wheel but absolute x/y axes and would now get misdetected as purely relative device. Only force relative axes if a device no rel x/y _and_ no abs x/y. Reproducible: virtual machine with QEMU USB Tablet will stop working Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
* Copy last valuator values into new touch valuator masksChase Douglas2012-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Evdev is a 100% stateful protocol. The following represents three touches. Two touches begin and end at the same time at (500, 500) and (1000, 1000). The third touch begins after the first two end, and is at (500, 500). ABS_MT_SLOT 0 /* Set touch slot */ ABS_MT_TRACKING_ID 0 /* New touch with ID 0 in slot 0 */ ABS_MT_POSITION_X 500 /* Initial X position */ ABS_MT_POSITION_Y 500 /* Initial Y position */ ABS_MT_SLOT 1 /* Set touch slot */ ABS_MT_TRACKING_ID 1 /* New touch with ID 1 in slot 1 */ ABS_MT_POSITION_X 1000 /* Initial X position */ ABS_MT_POSITION_Y 1000 /* Initial Y position */ SYNC /* End of frame */ ABS_MT_SLOT 0 /* Go back to slot 0 */ ABS_MT_TRACKING_ID -1 /* Touch in slot 0 ended */ ABS_MT_SLOT 1 /* Go to slot 1 */ ABS_MT_TRACKING_ID -1 /* Touch in slot 1 ended */ SYNC /* End of frame */ ABS_MT_SLOT 0 /* Go back to slot 0 */ ABS_MT_TRACKING_ID 2 /* New touch in slot 0 with ID 2 */ SYNC /* End of frame */ ABS_MT_TRACKING_ID -1 /* Touch in last slot (0) ended */ SYNC /* End of frame */ Note that touch 2 has the same X and Y position as touch 0. This is implied because no new value was emitted for slot 0. In fact, Linux will not emit an event in the same slot with the same event type and code unless the value has changed. Thus, we can only assume that all the MT valuators have the same values as they were when they were last sent for the given slot. This change adds an array of valuator mask to hold all the last valuator values that came from evdev for each slot. When a new touch begins, all the last values are copied into it. This patch assumes initial axis values of 0 in each slot. Linux and mtdev do not provide a facility to query the current values of axes in each slot yet. This may cause spurious incorrect touch valuator values at the beginning of an X session, but there's nothing we can do about it right now. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Prefere relative axis labelling over absolute axis labellingPeter Hutterer2012-01-18
| | | | | | | | | | | | | If a device has both relative and absolute axes, we'd initialise the relative axes but label them with the absolute labels. The current code is broken for mixed mode devices. Most of these devices operate primarily in relative mode, but have some absolute axes available for secondary functionality. For now, label the relative axes properly. We can fix the absolute axes later. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
* Force x/y axes to exist on devices with any other axes (#44655)Peter Hutterer2012-01-17
| | | | | | | | | | | | | | | | | Too much in the server relies on x/y to exist and to be axes 0 and 1. So if any relative axes exist, initialize REL_X/Y or ABS_X/Y as well. For servers up to 1.11: a scrollwheel-only device now has relative axes where it only had buttons before. For servers 1.12 or later: the device now has x/y in addition to the scroll axes. X.Org Bug 44655 <http://bugs.freedesktop.org/show_bug.cgi?id=44655> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* missing multitouch related define testsPete Beardmore2012-01-10
| | | | | | | | | | addition of two missing define tests required when no multitouch related symbols are available in user-space Fixes X.Org Bug 44578 <https://bugs.freedesktop.org/show_bug.cgi?id=44578> Signed-off-by: Pete Beardmore <pete.beardmore@msn.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Set the default resolution to 0Chase Douglas2012-01-06
| | | | | | | | | | | | | If we don't know the resolution, set it to 0. This is invalid, and tells the X client that we don't know the resolution, rather than reporting an incorrect value. This value was originally from commit 6271494faa4c45f4fa10509f72e0515f2cef36c6, which is the initial commit from Adam Jackson adding absolute axis support. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove unused udev.cPeter Hutterer2012-01-03
| | | | | | | | Added in 683a55e504f4fc2d1c847c54986439a0c61b2f20 due to a botched up rebase -i. The contents of udev.c and EvdevIsVirtual are identical, there is no need for an extra file for this one function. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* configure.ac: Fix udev/libudev dependency.Cyril Brulebois2012-01-03
| | | | | | | | | In 683a55e504f4fc2d1c847c54986439a0c61b2f20, a dependency on libudev was added, but documented in configure.ac as a dependency on udev (which also happens to ship a pkg-config file). Signed-off-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove redundant redeclaration of Evdev3BEmuPreInitJeremy Huddleston2011-12-31
| | | | | Found-by: Tinderbox Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
* evdev 2.6.99.901xf86-input-evdev-2.6.99.901Cyril Brulebois2011-12-31
| | | | Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Require xserver 1.12 RC1Peter Hutterer2011-12-29
| | | | | | | Remove the ABI check hack, just check for the server version directly now that we have one that definitely has the multitouch APIs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Test for mtdev before assuming multitouchPeter Hutterer2011-12-29
| | | | | | | If the XI2.2 headers are present but mtdev isn't, build without MULTITOUCH defined. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove need for --enable-multitouchPeter Hutterer2011-12-24
| | | | | | | | If we spot inputproto 2.1.99.3, we assume we have a capable X server. This should really be a server version check, but the server version hasn't been bumped yet. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Include config.h from evdev.hPeter Hutterer2011-12-24
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Always include mt_mask in the evdev structPeter Hutterer2011-12-24
| | | | | | | | | | | Even if MT support isn't available, include it in the build. The checks in the code check whether mt_mask is non-NULL but they would all need ifdef escaping otherwise. Leave the mtdev part inside the ifdef however, so that we don't need the mtdev header if we don't build with multitouch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge branch 'multitouch'Peter Hutterer2011-12-23
|\
| * Don't count legacy and MT axes twicePeter Hutterer2011-12-20
| | | | | | | | | | | | | | | | The kernel exports both ABS_X and ABS_MT_POSITION_X (and a couple others) for a multi-touch capable device. For such devices, only count the axis once since we submit ABS_MT_POSITION_X through ABS_X. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Add is_blacklisted_axis() helperPeter Hutterer2011-12-20
| | | | | | | | | | | | | | | | | | | | The kernel exports a bunch of information as axis that shouldn't be an axis and we don't treat it as axis in the server. Add this helper instead of checking for the axis codes manually. No function change. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Drop now-unnecessary XI 2.1 and XI 2.2 error suppression definesPeter Hutterer2011-12-20
| | | | | | | | | | | | Gone since inputproto 2.1.99.3 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Map ABS_MT_POSITION_X/Y into ABS_X/YPeter Hutterer2011-12-20
| | | | | | | | | | | | | | MT axes are the same as traditional axes, so one into the other so we get x/y coordinates regardless wich axes it comes from. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Use xf86InitValuatorAxisStruct, the touch-specific version was droppedPeter Hutterer2011-12-15
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Don't send pointer events for multitouch touchscreen devicesChase Douglas2011-11-29
| | | | | | | | | | | | Pointer events will be emulated by the server. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
| * Add the required defines to compile against the inputprotoPeter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Print to the log if we find multitouch axes.Peter Hutterer2011-11-11
| | | | | | | | | | | | | | No real effect on the code, but it helps to have that line in the log when searching for driver issues. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Replace 0/1 button values with enumsPeter Hutterer2011-11-11
| | | | | | | | | | | | BUTTON_PRESS is much harder to confuse with a button number than a simple 1. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Skip event posting for empty slots.Peter Hutterer2011-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ABS_MT_SLOT comes before any other events. The following order of events is common for protocol B devices (and mtdev): ... EV_SYN ABS_MT_SLOT → posting here means we miss on the position information ABS_MT_POSITION_X ABS_MT_POSITION_Y ABS_MT_SLOT ABS_MT_POSITION_X ABS_MT_POSITION_Y EV_SYN Store the stot state as SLOT_EMPTY after posting an event (i.e. EV_SYN and ABS_MT_SLOT) and then don't post until the next slot/syn event. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Replace open_slot/close_slot with a SlotState enumPeter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Simplify a condition, only the event type differs herePeter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * When resetting the queue, don't reset the touchMaskPeter Hutterer2011-11-11
| | | | | | | | | | | | Otherwise we segfault after the first SYN event Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 06:37:43 +0000