xf86-input-evdev: Changes to 'master'
Jeremy Huddleston
jeremyhu at apple.com
Tue Dec 27 18:42:35 PST 2011
This is causing the tinderbox to fail:
http://tinderbox.x.org/builds/2011-12-27-0029/logs/xf86-input-evdev/#configure
due to missing mtdev. Can you please update xorg.modules, so jhbuild will pull in mtdev?
On Dec 22, 2011, at 2:16 PM, Peter Hutterer wrote:
> configure.ac | 15 +
> src/Makefile.am | 1
> src/emuMB.c | 3
> src/emuThird.c | 19 +-
> src/evdev.c | 426 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
> src/evdev.h | 43 +++++
> src/udev.c | 69 +++++++++
> 7 files changed, 539 insertions(+), 37 deletions(-)
>
> New commits:
> commit 5fb48757477b2effd69c8fe8722ad95b21dbf7f5
> Merge: 7909975b0b965fbf0935bf012987a5368ea0e67a e99ab2314f712df8dd705b16008755f8b3095707
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Fri Dec 23 08:16:54 2011 +1000
>
> Merge branch 'multitouch'
>
> commit e99ab2314f712df8dd705b16008755f8b3095707
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Dec 20 15:08:06 2011 +1000
>
> Don't count legacy and MT axes twice
>
> 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 at who-t.net>
>
> commit 191660189a01b9c96bb4c0fa1a2e5008ae666238
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Dec 20 14:14:16 2011 +1000
>
> Add is_blacklisted_axis() helper
>
> 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 at who-t.net>
>
> commit a1c3f8efbbff7f93e216ccdb32bd176a8ba33b09
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Dec 20 13:32:06 2011 +1000
>
> Drop now-unnecessary XI 2.1 and XI 2.2 error suppression defines
>
> Gone since inputproto 2.1.99.3
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit f3c628acc4f7399325756590cdc72e769341243c
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Dec 20 10:56:22 2011 +1000
>
> Map ABS_MT_POSITION_X/Y into ABS_X/Y
>
> 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 at who-t.net>
>
> commit fed454192ddc4ad94226040c657deb6abea3df88
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Thu Dec 15 08:55:32 2011 +1000
>
> Use xf86InitValuatorAxisStruct, the touch-specific version was dropped
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit cf93a21df1dd66118d3a1f5a0769d48f317de749
> Author: Chase Douglas <chase.douglas at canonical.com>
> Date: Tue Nov 29 18:02:58 2011 -0800
>
> Don't send pointer events for multitouch touchscreen devices
>
> Pointer events will be emulated by the server.
>
> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
>
> commit fac1a41c75a7c4bfabff34dc8ed1dff2587c6011
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Fri Nov 11 15:57:26 2011 +1000
>
> Add the required defines to compile against the inputproto
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 3175a2a96d448a0b2584a58ab3d05fbebb11fab1
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Wed Nov 2 09:53:34 2011 +1000
>
> Print to the log if we find multitouch axes.
>
> 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 at who-t.net>
>
> commit 5e9b027807cc205dc9c4efbb8360ac4b20317682
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Mon Oct 31 08:58:18 2011 +1000
>
> Replace 0/1 button values with enums
>
> BUTTON_PRESS is much harder to confuse with a button number than a simple 1.
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 2ce305129ca94394096f4d697d51eb120de2940b
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Wed Oct 26 13:21:18 2011 +1000
>
> Skip event posting for empty slots.
>
> 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 at who-t.net>
>
> commit 9411749f76c31a8054ded62a6fb767c8135b4d4e
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Wed Oct 26 13:09:30 2011 +1000
>
> Replace open_slot/close_slot with a SlotState enum
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 239e972be1f2c6a984dd6c5aecce710d0b866257
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Wed Oct 26 11:14:04 2011 +1000
>
> Simplify a condition, only the event type differs here
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 6127923fe0d50cb9b9ac4ae0a3876ba6f180137c
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Wed Oct 26 10:51:16 2011 +1000
>
> When resetting the queue, don't reset the touchMask
>
> Otherwise we segfault after the first SYN event
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit fc4f98153c2608389d87e37316036a31fb1021e7
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Wed Oct 26 09:59:34 2011 +1000
>
> MT axes are counted separately, make sure they're initialized too.
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit fabee66bcc7260ec50c3091be3f9b503eea65e61
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Oct 25 15:06:38 2011 +1000
>
> 0 is the value for "unknown/unlimited" number of touches
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 91d90a79593369ba1079d06a75f09ceaa9143768
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Oct 25 14:55:47 2011 +1000
>
> Use mtdev API to allocate/free mtdev structs
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit c1b89bda12c1897120bace941625cfa27e547458
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Oct 25 14:52:26 2011 +1000
>
> Remove duplicate line
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 907b7cad3fd892ca3349cd18e9ccdc5659027b40
> Author: Chase Douglas <chase.douglas at canonical.com>
> Date: Thu Dec 2 18:01:41 2010 -0500
>
> Ensure touchpad events are always processed with MT
>
> 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 at canonical.com>
>
> commit c9a2b4e9ce9b15e57241184df78c72ec8f6a4705
> Author: Chase Douglas <chase.douglas at canonical.com>
> Date: Mon Nov 8 14:35:02 2010 -0500
>
> Use MTDev for multitouch devices
>
> 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 at canonical.com>
>
> commit e18abd0049421a98e61c15c2d56cfe2821cf4739
> Author: Chase Douglas <chase.douglas at canonical.com>
> Date: Mon Nov 8 11:08:01 2010 -0500
>
> Add experimental XI 2.1 multitouch support
>
> 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 at canonical.com>
>
> Amendments: XI_TouchMotion -> XI_TouchUpdate, rename mtMask to mt_mask
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>
> commit 683a55e504f4fc2d1c847c54986439a0c61b2f20
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date: Tue Oct 25 09:59:50 2011 +1000
>
> Use a new "Virtual Device" boolean property to mark virtual devices
>
> 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 at who-t.net>
>
> _______________________________________________
> xorg-commit mailing list
> xorg-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg-commit
More information about the xorg-devel
mailing list