xf86-input-synaptics:master: 19 commit(s)

Peter Hutterer whot at kemper.freedesktop.org
Tue Mar 13 15:53:46 PDT 2012


Reporting from xf86-input-synaptics: xf86-input-synaptics driver

Please visit:
    http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics
Or get your own copy by using:
    git-clone git://anongit.freedesktop.org/xorg/driver/xf86-input-synaptics

19 commits against master at defc1d00...:
 include/synaptics-properties.h |    6 
 man/synaptics.man              |   34 +++
 src/eventcomm.c                |   76 ++++++--
 src/properties.c               |   53 +++++
 src/synaptics.c                |  370 ++++++++++++++++++++++++++++++++++++++---
 src/synapticsstr.h             |    7 
 src/synproto.c                 |    8 
 src/synproto.h                 |    7 
 test/fake-symbols.c            |    5 
 tools/synclient.c              |   10 +
 10 files changed, 528 insertions(+), 48 deletions(-)


commit 6c457c0c61a0834361f45a073148db7b4c9be40b
Merge: defc1d008e5674306a7e9b9cb0c750d9787990b7 fee18d8567efd2e5abf6b29eb1ae9ee0e3858013
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Mar 14 08:48:00 2012 +1000

    Merge branch 'clickpad-v3'

diffstat:
    0 files changed

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit fee18d8567efd2e5abf6b29eb1ae9ee0e3858013
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Mar 13 16:08:12 2012 +1000

    Soft buttons are only available on clickpad devices, disable them otherwise.
    
    If the clickpad support is runtime enabled/disabled, the property
    appears/disappears accordingly.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    man/synaptics.man |    2 ++
    src/properties.c  |   40 +++++++++++++++++++++++++++++++---------
    src/synaptics.c   |    3 +++
    3 files changed, 36 insertions(+), 9 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit c546779b32d8be23475b3b062e3ebc9235365c0d
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Thu Feb 9 16:56:29 2012 -0800

    Ignore motion during touch count changes on semi-mt devices
    
    Semi-mt devices do not track touches. The locations of touches are
    unknown, we only have the bounding box of two of them. When the number of
    fingers changes, the bounding box coordinates may change as well, but
    the cumulative relative motion updates at that instant are invalid.
    
    To work around this, ignore changes in cumulative relative motion if the
    touch count changes.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    src/synaptics.c |    8 ++++++++
    1 file changed, 8 insertions(+)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 405f1643e26b57ee97063e76e71179ba8e9fbc92
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Mon Feb 6 17:33:11 2012 -0800

    Add soft button areas property
    
    Some clickpad devices have button areas painted on them. Set this
    property to the area of the right and middle buttons to enable proper
    click actions when clicking in the areas.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    include/synaptics-properties.h |    3 
    man/synaptics.man              |   22 ++++
    src/properties.c               |   24 +++++
    src/synaptics.c                |  177 +++++++++++++++++++++++++++++++++++++
    src/synapticsstr.h             |    1 
    src/synproto.h                 |    2 
    tools/synclient.c              |    9 +
    7 files changed, 238 insertions(+)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit f198522064501726d76bef4e11c02cfc778bb0c5
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Thu Feb 9 11:18:25 2012 -0800

    Calculate touch data for semi-mt devices, but don't send touch events
    
    Previously, all touch data from semi-mt devices was ignored because the
    X server doesn't support them. However, the touch data must be used for
    proper clickpad handling.
    
    Instead of ignoring semi-mt device touch events, mark the device as
    being semi-mt and allow initialization of the touch state. The touches
    will then be used in calculating the cumulative_d{x,y} values that are
    needed for clickpad support.
    
    When handling the touch data for X event processing, simply skip over
    reporting the touches.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    src/eventcomm.c    |    2 +-
    src/synaptics.c    |    3 +++
    src/synapticsstr.h |    1 +
    3 files changed, 5 insertions(+), 1 deletion(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit a6361e2d2c093c4170bab63307526702fe9903ad
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Tue Feb 14 14:46:07 2012 -0800

    Disable scrolling when beginning a clickpad press
    
    There really isn't a point to scrolling while a clickpad is pressed. In
    particular, the clickpad button areas and the horizontal edge scrolling
    areas overlap, so horizontal edge scrolling must be disabled. Also,
    performing two finger scrolling while a third finger presses the button
    would require us to inhibit touch events until four touches are present.
    That is enough reason to disable two finger scrolling as well.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    src/synaptics.c |    6 ++++++
    1 file changed, 6 insertions(+)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit de75ad6b073c1a36d5a60190de5ffe6611520637
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Thu Feb 9 10:57:00 2012 -0800

    Enable clickpad click and drag with two fingers
    
    Use cumulative relative touch motion when the clickpad is pressed. If
    more than one touch is active, assume one of the touches is designated
    solely for pressing the clickpad button. Thus, decrement the number of
    reported touches.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    src/synaptics.c    |   34 +++++++++++++++++++++++++++++++++-
    src/synapticsstr.h |    3 ++-
    2 files changed, 35 insertions(+), 2 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 500243ac60ffeb5372e2edbce2f4443a07877d2e
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Thu Feb 9 10:43:08 2012 -0800

    Add cumulative_d{x,y} to SynapticsHwState
    
    These values will be used for clickpad press and drag with two fingers.
    
    While the clickpad button is not pressed, cumulative_d{x,y} will match x
    and y values. Once the clickpad button is pressed, cumulative_d{x,y}
    will be updated with the relative motion of each active touch on the
    touchpad. This allows for dragging with one finger while another finger
    stays stationary holding the clickpad button down.
    
    This is an easier and less latent approach than trying to guess which
    touch was the "dragging" touch.
    
    [fixed build error for mt off]
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    src/eventcomm.c     |   37 +++++++++++++++++++++++++++++++++++--
    src/synproto.c      |    2 ++
    src/synproto.h      |    2 ++
    test/fake-symbols.c |    5 +++++
    4 files changed, 44 insertions(+), 2 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 420e0abef663729b3ce6e9d26360e616b7270ba6
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 14:30:58 2012 +1000

    Guess the number of clickpad ClickFingers based on finger distance
    
    The actual distance should be done in cm, based on touchpad resolution etc.
    That is left as an exercise for the reader.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++---
    1 file changed, 65 insertions(+), 3 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 739cf056685772e69744f009f567e54324bc9dd0
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 15:33:56 2012 +1000

    Disable middle mouse button emulation on clickpads
    
    Because, well, really, how?
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |    5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 331dd969536aad48fae107e2215bfdd3e95db77e
Author: Chase Douglas <chase.douglas at canonical.com>
Date:   Thu Feb 9 11:26:06 2012 -0800

    Add clickpad device property
    
    Add it as a writable device property. We may not know how to probe some
    clickpads so allow the user to override it.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diffstat:
    include/synaptics-properties.h |    3 +++
    man/synaptics.man              |   10 ++++++++++
    src/eventcomm.c                |    7 +++++++
    src/properties.c               |    7 +++++++
    src/synaptics.c                |    1 +
    src/synapticsstr.h             |    1 +
    tools/synclient.c              |    1 +
    7 files changed, 30 insertions(+)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit a64e1632836067091be5ca45d0444c416bf48948
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 15:38:25 2012 +1000

    Add a BTN_EMULATED_FLAG to mark emulated buttons on clickfingers
    
    And when copying the hardware state, don't copy those buttons that were set
    through emulation.
    
    This is a temporary fix only, we should add new fields to the hw struct that
    represent the various features as they are enabled/disabled and then treat
    them accordingly.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |    6 +++---
    src/synproto.c  |    6 +++---
    src/synproto.h  |    3 +++
    3 files changed, 9 insertions(+), 6 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 70b4e983c6626b9b20bdf59324f64b3fd99c5202
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 14:29:28 2012 +1000

    Only handle ClickFingers on left button press events
    
    ClickFingers doesn't need to be handled on every state, only when the actual
    button state changes.
    
    This is a break from the previous behaviour which allowed pressing the
    button followed by a two-finger tap to trigger the ClickFinger2 action.
    Let's see if anyone complains.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |   10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit f6c1efbc6d22f41fb8a4abd2f57db173a2ac3171
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 14:20:35 2012 +1000

    Add an old_hw_state field to remember the last values
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c    |    6 ++++++
    src/synapticsstr.h |    1 +
    2 files changed, 7 insertions(+)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit bad1b75524f2fa882e9b6ac7160463fbd3b5cccf
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 13:43:04 2012 +1000

    Move resetting hw state to separate function.
    
    No functional changes.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |   24 +++++++++++++-----------
    1 file changed, 13 insertions(+), 11 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit f0381f48a9383313e65508ec710b5c690b16286a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 13:39:32 2012 +1000

    Move filtering into a separate function
    
    No functional changes.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |   16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 4eea50d513bca888d8fe13759d0cc44de67bc4c0
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 13:25:27 2012 +1000

    Move st->mt scaling to helper function
    
    No functional changes.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/eventcomm.c |   12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 5bf7018783d1a96c9fac7a9074274e9b8606604d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 9 13:22:53 2012 +1000

    Use arrays for st->mt scaling
    
    No functional changes
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/eventcomm.c |   26 ++++++++++++--------------
    1 file changed, 12 insertions(+), 14 deletions(-)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c


commit 893ac427d0a7952c0f949071296fc2255790465e
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Mar 13 11:41:53 2012 +1000

    If the middle button timeout is 0, don't even attempt to emulate.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

diffstat:
    src/synaptics.c |    3 +++
    1 file changed, 3 insertions(+)

gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=6c457c0c




More information about the xorg-commit mailing list