aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* 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>
| * MT axes are counted separately, make sure they're initialized too.Peter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * 0 is the value for "unknown/unlimited" number of touchesPeter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Use mtdev API to allocate/free mtdev structsPeter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Remove duplicate linePeter Hutterer2011-11-11
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Ensure touchpad events are always processed with MTChase Douglas2011-11-11
| | | | | | | | | | | | | | | | Without this change, an MT touchpad in relative mode could end a touch while not resetting the oldMask used to calculate relative values. This fix allows a Magic Trackpad to behave as a relative mode device again. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
| * Use MTDev for multitouch devicesChase Douglas2011-11-11
| | | | | | | | | | | | | | | | MTDev translates all multitouch devices to the slotted evdev protocol. This provides a clean and uniform interface and reduces message handling inside the input module and X. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
| * Add experimental XI 2.1 multitouch supportChase Douglas2011-11-11
| | | | | | | | | | | | | | | | | | | | | | | | This multitouch addition only supports slotted MT evdev protocol devices. Support must be enabled at configure time using --enable-multitouch. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Amendments: XI_TouchMotion -> XI_TouchUpdate, rename mtMask to mt_mask Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Use a new "Virtual Device" boolean property to mark virtual devicesPeter Hutterer2011-11-11
| | | | | | | | | | | | | | | | | | Use udev to check for the device's sysfs path, if it contains LNXSYSTM it's a kernel-emulated device. This property can then be used to determine if there are any real devices connected, allowing the desktop environment to e.g. turn off the touchpad whenever there's a mouse attached. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | Fix relative events with swapped axesPaulo Zanoni2011-12-16
| | | | | | | | | | | | | | | | After we swap the axes, we only call valuator_mask_set for axes that are not zero, so we need to unset the axes that became zero when swapped. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | Fix absolute events with swapped axesPaulo Zanoni2011-12-15
|/ | | | | | | | | | | | | We were correctly swapping the valuator values, but we were not calling valuator_mask_unset() when needed, so the cursor kept jumping to the edges. This patch does the swapping before the main "for", so we don't need to store unswapped_{x,y} and unswapped_isset_{x,y} even when we don't need to swap. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Move misplaced #endif caused by smooth-scrolling mergePeter Hutterer2011-11-11
| | | | | | | Bad conflict resolution in xf86-input-evdev-2.6.0-30-g745fca0 Reported-by: Sebastian Glita <glseba@yahoo.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Bump to 2.6.99Peter Hutterer2011-11-09
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge branch 'smooth-scrolling'Peter Hutterer2011-11-09
|\ | | | | | | | | | | | | Conflicts: src/evdev.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Support smooth scrolling on REL_WHEEL, REL_HWHEEL and REL_DIALPeter Hutterer2011-11-09
| | | | | | | | | | | | | | | | | | | | Automatic smooth scrolling setup for these axes, with REL_WHEEL and REL_DIAL both mapping into vscrolling. REL_WHEEL is the preferred axis. Mouse wheel emulation is not yet updated for smooth scrolling. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* | Don't crop long value from EvdevBitIsSet.Peter Hutterer2011-11-04
| | | | | | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
* | emuThird: Use xf86SetIntOption, not xf86SetBoolOption for integer valuesJools Wills2011-10-31
| | | | | | | | | | | | Signed-off-by: Jools Wills <jools@oxfordinspire.co.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | type-safe inline functions for bitmask manipulationMax Schwarz2011-10-24
|/ | | | | | | | | We can't use BitIsSet/SetBit from the server (inputstr.h) since they operate on byte arrays. EvdevSetBit is added in preparation for the "smooth-scrolling on wheel emulation" patch. Signed-off-by: Max Schwarz <Max@x-quadraht.de> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Exit axis labelling if axes are neither rel nor absPeter Hutterer2011-08-15
| | | | | | | No actual effect since labels_len is always 0 anyway but let's make the return more explicit. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xf86-input-evdev: Return proper default for unknown values in ↵Terry Lambert2011-07-18
| | | | | | | | pInfo->device_control. Signed-off-by: Terry Lambert <tlambert@chromium.org> Reviewed-by: Stephane Marchesin <marcheu@chromium.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove unused misc_label and valPeter Hutterer2011-06-15
| | | | | | | | | | | | | | | evdev.c: In function 'EvdevInitAxesLabels': evdev.c:2192:11: warning: variable 'misc_label' set but not used [-Wunused-but-set-variable] obsolete with 880ad1e19afd83ac115948b67d4049e16cb12df0 emuWheel.c: In function 'EvdevWheelEmuPreInit': emuWheel.c:252:10: warning: variable 'val' set but not used [-Wunused-but-set-variable] obsolete with b0737bdbd1f6e601eb4984b6f4cb49279190984c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Print abs axes ranges on verbosity 6.Peter Hutterer2011-06-15
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Require server 1.10Peter Hutterer2011-06-15
| | | | | | | | | We require ABI 12.2 in the driver, enforce it through pkg-config. Technically ABI 12.2 is first available in 1.9.99.902 but 1.10 looks so much nicer. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Set prop_product_id undeletableDaniel Kurtz2011-06-15
| | | | | | | prop_invert was accidentally being set undeletable twice. Signed-off-by: Daniel Kurtz <djkurtz@google.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Export device node as property.Peter Hutterer2011-05-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. Server 1.11 and later standardises on this property name. 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>
* Handle touchscreens without BTN_TOUCHPeter Korsgaard2011-05-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some touchscreens (like the Lumio crystaltouch in single touch mode) send BTN_LEFT rather than BTN_TOUCH: Input driver version is 1.0.1 Input device ID: bus 0x3 vendor 0x202e product 0x5 version 0x111 Input device name: "LUMIO Inc LUMIO CrystalTouch ver 1.1C" Supported events: Event type 0 (Sync) Event type 1 (Key) Event code 272 (LeftBtn) Event code 273 (RightBtn) Event code 274 (MiddleBtn) Event type 2 (Relative) Event code 9 (Misc) Event type 3 (Absolute) Event code 0 (X) Value 650 Min 0 Max 4095 Event code 1 (Y) Value 3221 Min 0 Max 4095 Event type 4 (Misc) Event code 4 (ScanCode) Testing ... (interrupt to exit) Event: time 1305882024.934011, type 4 (Misc), code 4 (ScanCode), value 90001 Event: time 1305882024.934017, type 1 (Key), code 272 (LeftBtn), value 1 Event: time 1305882024.934029, type 3 (Absolute), code 0 (X), value 270 Event: time 1305882024.934034, type 3 (Absolute), code 1 (Y), value 1513 Event: time 1305882024.934039, type 2 (Relative), code 9 (Misc), value 1 This causes evdev to handle these device as a mouse rather than a touchscreen, which naturally doesn't work very well. We already internally translate BTN_TOUCH as BTN_LEFT, so accept this kind of devices as touchscreens by checking for devices with BTN_LEFT, absolute X/Y and NO relative X/Y axes. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add a property to toggle function key modePeter Hutterer2011-05-27
| | | | | | | | | | | | | | | | | | | | | On some keyboards, the multimedia function keys are overlaid with the F keys. This property enables clients to switch the primary mode of these F keys between function keys and multimedia keys. Some keyboards provide an Fn key to toggle between the modes. This is hardware-specific and may or may not work on any given keyboard device. The current imlementation is only hooked up to apple keyboards. The kernel provides a tweak to enable/disable. /sys/module/hid_apple/parameters/fnmode 0 .. keyboard sends Fx keys, Fn disabled 1 .. keyboard sends multimedia keys, Fn toggles to function keys 2 .. keyboard sends function keys, Fn toggles to multimedia keys If fnmode is on 0, we force it to 2. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Michel Dänzer <michel@daenzer.net>
* Export product/vendor ID through a property.Peter Hutterer2011-05-27
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Move invert variable to the block it is used in.Peter Hutterer2011-05-20
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Copy out of proximity values into current values selectivelyChase Douglas2011-04-18
| | | | | | | | | | Otherwise, an event that causes us to go into proximity with some new valuator values will retain some old valuator values from when last in proximity. This change ensures that all values posted while out of proximity are accounted for. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-29 06:40:39 +0000