libinput 0.14.1

2015-04-22 09:11:12 +10:00 · 2015-04-22 09:11:12 +10:00 · 1bd3c48c98
commit 1bd3c48c98
parent c0c551f158
9 changed files with 9 additions and 722 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,4 @@
 /libinput-0.11.0.tar.xz
 /libinput-0.12.0.tar.xz
 /libinput-0.13.0.tar.xz
 /libinput-0.14.1.tar.xz
--- a/0001-evdev-fix-crash-for-missing-ABS_X-Y.patch
+++ b/0001-evdev-fix-crash-for-missing-ABS_X-Y.patch
@ -1,35 +0,0 @@
 From 06fbf985f8d63572a0674f1904680d275fe2b2f3 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Wed, 8 Apr 2015 07:43:54 +1000
 Subject: [PATCH libinput] evdev: fix crash for missing ABS_X/Y
 libevdev_set_abs_info() is a noop if the event code isn't enabled on the
 device. This leaves ABS_X/Y on NULL, causing a crash later when dereferencing
 the absinfo.
 https://bugs.freedesktop.org/show_bug.cgi?id=89783
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 ---
 src/evdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/evdev.c b/src/evdev.c
 index a972b9d..115dc99 100644
 --- a/src/evdev.c
 +++ b/src/evdev.c
@@ -1444,9 +1444,9 @@ evdev_fix_android_mt(struct evdev_device *device)
 	    !libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y))
 		return;
 -	libevdev_set_abs_info(evdev, ABS_X,
 +	libevdev_enable_event_code(evdev, EV_ABS, ABS_X,
 		      libevdev_get_abs_info(evdev, ABS_MT_POSITION_X));
 -	libevdev_set_abs_info(evdev, ABS_Y,
 +	libevdev_enable_event_code(evdev, EV_ABS, ABS_Y,
 		      libevdev_get_abs_info(evdev, ABS_MT_POSITION_Y));
 }
 -- 
 2.3.4
--- a/0001-evdev-fix-inverted-mouse-normalization.patch
+++ b/0001-evdev-fix-inverted-mouse-normalization.patch
@ -1,32 +0,0 @@
 From 64b5e52868db96be9b899ba98b02d061a838304e Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Wed, 8 Apr 2015 15:52:58 +1000
 Subject: [PATCH libinput] evdev: fix inverted mouse normalization
 Regression introduced in 9f8edc5fd880e0a9c482b36e6b4120ccc056ee0b where it
 changed from delta / (dpi/default) to delta * dpi/default, causing the inverse
 effect of what the dpi setting is supposed to achieve.
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 ---
 src/evdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/evdev.c b/src/evdev.c
 index 00450bf..243cd22 100644
 --- a/src/evdev.c
 +++ b/src/evdev.c
@@ -230,8 +230,8 @@ normalize_delta(struct evdev_device *device,
 		const struct device_coords *delta,
 		struct normalized_coords *normalized)
 {
 -	normalized->x = delta->x * (double)device->dpi / DEFAULT_MOUSE_DPI;
 -	normalized->y = delta->y * (double)device->dpi / DEFAULT_MOUSE_DPI;
 +	normalized->x = delta->x * DEFAULT_MOUSE_DPI / (double)device->dpi;
 +	normalized->y = delta->y * DEFAULT_MOUSE_DPI / (double)device->dpi;
 }
 static void
 -- 
 2.3.4
--- a/0001-touchpad-Reduce-palm-detection-threshold-to-70mm.patch
+++ b/0001-touchpad-Reduce-palm-detection-threshold-to-70mm.patch
@ -1,29 +0,0 @@
 From 18feed4a85d9553b2d600f487c1f00f346f8fb53 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Tue, 14 Apr 2015 15:18:19 +1000
 Subject: [PATCH libinput] touchpad: Reduce palm detection threshold to 70mm
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 ---
 src/evdev-mt-touchpad.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
 index 68070c2..a663db9 100644
 --- a/src/evdev-mt-touchpad.c
 +++ b/src/evdev-mt-touchpad.c
@@ -1105,9 +1105,9 @@ tp_init_palmdetect(struct tp_dispatch *tp,
 		if (device->abs.absinfo_x->resolution == 1)
 			return 0;
 -		/* Enable palm detection on touchpads >= 80 mm. Anything smaller
 +		/* Enable palm detection on touchpads >= 70 mm. Anything smaller
 		   probably won't need it, until we find out it does */
 -		if (width/device->abs.absinfo_x->resolution < 80)
 +		if (width/device->abs.absinfo_x->resolution < 70)
 			return 0;
 	}
 -- 
 2.3.4
--- a/0001-touchpad-delay-fake-finger-processing-until-the-EV_S.patch
+++ b/0001-touchpad-delay-fake-finger-processing-until-the-EV_S.patch
@ -1,66 +0,0 @@
 From 82dc1fae18038d04506e154fb36af66bc66c8960 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Wed, 8 Apr 2015 17:00:50 +1000
 Subject: [PATCH libinput] touchpad: delay fake finger processing until the
 EV_SYN
 A switch from BTN_TOOL_FINGER to BTN_TOOL_DOUBLETAP sets the former to 0, then
 the latter to 1, within the same frame. In the previous code we'd end the
 first touchpoint, then start two new ones immediately after when the DOUBLETAP
 comes in. This causes bug notices in the edge scrolling code and finger
 miscounts in the tapping code (since neither processes the change, there is no
 SYN_REPORT between the two).
 Only update the state bits when we get the events, handle the fake touch
 sequence start/end on SYN_REPORT instead.
 https://bugs.freedesktop.org/show_bug.cgi?id=89949
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 ---
 src/evdev-mt-touchpad.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
 index 7d6d838..724fd32 100644
 --- a/src/evdev-mt-touchpad.c
 +++ b/src/evdev-mt-touchpad.c
@@ -317,16 +317,13 @@ tp_process_absolute_st(struct tp_dispatch *tp,
 }
 static void
 -tp_process_fake_touch(struct tp_dispatch *tp,
 -		      const struct input_event *e,
 -		      uint64_t time)
 +tp_process_fake_touches(struct tp_dispatch *tp,
 +			uint64_t time)
 {
 	struct tp_touch *t;
 	unsigned int nfake_touches;
 	unsigned int i, start;
 -	tp_fake_finger_set(tp, e->code, e->value != 0);
 -
 	nfake_touches = tp_fake_finger_count(tp);
 	start = tp->has_mt ? tp->real_touches : 0;
@@ -390,7 +387,7 @@ tp_process_key(struct tp_dispatch *tp,
 		case BTN_TOOL_DOUBLETAP:
 		case BTN_TOOL_TRIPLETAP:
 		case BTN_TOOL_QUADTAP:
 -			tp_process_fake_touch(tp, e, time);
 +			tp_fake_finger_set(tp, e->code, !!e->value);
 			break;
 		case BTN_0:
 		case BTN_1:
@@ -548,6 +545,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time)
 	struct tp_touch *first = tp_get_touch(tp, 0);
 	unsigned int i;
 +	tp_process_fake_touches(tp, time);
 	tp_unhover_touches(tp, time);
 	for (i = 0; i < tp->ntouches; i++) {
 -- 
 2.3.4
--- a/0001-touchpad-don-t-allow-taps-in-the-top-half-of-the-pal.patch
+++ b/0001-touchpad-don-t-allow-taps-in-the-top-half-of-the-pal.patch
@ -1,456 +0,0 @@
 From c03ce1cab3c19dabd12d7b0886a9ef98107a958e Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Wed, 15 Apr 2015 15:21:08 +1000
 Subject: [PATCH] touchpad: don't allow taps in the top half of the palm
 exclusion zone.
 Touches in the exclusion zone are ignored for palm detection and don't move
 the cursor. Tapping however triggers before we know whether something is a
 palm or not, so we get erroneous button clickst.
 If a tap happens in the top half of the touchpad, within the palm exclusion
 zones, ignore it for tap purposes. To avoid further complicating the state
 machine simply pretend there was a movement > threshold on that finger. This
 advances the tap state machine properly that no button events are sent for
 this finger.
 https://bugs.freedesktop.org/show_bug.cgi?id=89625
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 ---
 doc/palm-detection.dox      |   9 ++
 doc/svg/palm-detection.svg  | 213 ++++++++++++++++++++++++++++++++------------
 src/evdev-mt-touchpad-tap.c |   8 ++
 src/evdev-mt-touchpad.c     |  24 ++++-
 src/evdev-mt-touchpad.h     |   4 +
 test/touchpad.c             |  44 +++++++++
 6 files changed, 244 insertions(+), 58 deletions(-)
 diff --git a/doc/palm-detection.dox b/doc/palm-detection.dox
 index 4e839e6..a5b578b 100644
 --- a/doc/palm-detection.dox
 +++ b/doc/palm-detection.dox
@@ -23,6 +23,10 @@ screen, it is common for a finger to start inside an exclusion zone and move
 rapidly across the touchpad. libinput detects such movements and avoids palm
 detection on such touch sequences.
 +Each exclusion zone is divided into a top part and a bottom part. A touch
 +starting in the top part of the exclusion zone does not trigger a
 +tap (see @ref tapping).
 +
 In the diagram below, the exclusion zones are painted red.
 Touch 'A' starts inside the exclusion zone and moves
 almost vertically. It is considered a palm and ignored for cursor movement,
@@ -31,6 +35,11 @@ despite moving out of the exclusion zone.
 Touch 'B' starts inside the exclusion zone but moves horizontally out of the
 zone. It is considered a valid touch and controls the cursor.
 +Touch 'C' occurs in the top part of the exclusion zone. Despite being a
 +tapping motion, it does not generate an emulated button event. Touch 'D'
 +likewise occurs within the exclusion zone but in the bottom half. libinput
 +will generate a button event for this touch.
 +
 @image html palm-detection.svg
 @section trackpoint-disabling Palm detection during trackpoint use
 diff --git a/doc/svg/palm-detection.svg b/doc/svg/palm-detection.svg
 index 9fb6077..c3e45f4 100644
 --- a/doc/svg/palm-detection.svg
 +++ b/doc/svg/palm-detection.svg
@@ -2,15 +2,67 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
 +   xmlns:dc="http://purl.org/dc/elements/1.1/"
 +   xmlns:cc="http://creativecommons.org/ns#"
 +   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
 +   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
 +   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="393.62857"
    height="268.62857"
 -   id="svg2">
 +   id="svg2"
 +   inkscape:version="0.91 r13725"
 +   sodipodi:docname="palm-detection.svg">
 +  <metadata
 +     id="metadata3479">
 +    <rdf:RDF>
 +      <cc:Work
 +         rdf:about="">
 +        <dc:format>image/svg+xml</dc:format>
 +        <dc:type
 +           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
 +      </cc:Work>
 +    </rdf:RDF>
 +  </metadata>
 +  <sodipodi:namedview
 +     pagecolor="#ffffff"
 +     bordercolor="#666666"
 +     borderopacity="1"
 +     objecttolerance="10"
 +     gridtolerance="10"
 +     guidetolerance="10"
 +     inkscape:pageopacity="0"
 +     inkscape:pageshadow="2"
 +     inkscape:window-width="1920"
 +     inkscape:window-height="1136"
 +     id="namedview3477"
 +     showgrid="false"
 +     inkscape:zoom="3.5662625"
 +     inkscape:cx="199.35048"
 +     inkscape:cy="156.74673"
 +     inkscape:window-x="0"
 +     inkscape:window-y="27"
 +     inkscape:window-maximized="1"
 +     inkscape:current-layer="svg2" />
   <defs
      id="defs4">
     <marker
 +       inkscape:stockid="Arrow1Lstart"
 +       orient="auto"
 +       refY="0.0"
 +       refX="0.0"
 +       id="marker4663"
 +       style="overflow:visible"
 +       inkscape:isstock="true">
 +      <path
 +         id="path4407"
 +         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
 +         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
 +         transform="scale(0.8) translate(12.5,0)" />
 +    </marker>
 +    <marker
        refX="0"
        refY="0"
        orient="auto"
@@ -59,64 +111,111 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
     </marker>
   </defs>
 -  <g
 -     transform="translate(343.95712,-527.33359)"
 -     id="layer3"
 -     style="display:inline">
 -    <rect
 -       width="386.42856"
 -       height="261.42856"
 -       x="-340.35712"
 -       y="530.93359"
 -       id="rect2858-0"
 -       style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.20000076;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 -    <rect
 -       width="65.281105"
 -       height="254.3844"
 -       x="-336.88608"
 -       y="534.46918"
 -       id="rect12924"
 -       style="color:#000000;fill:#ff0000;fill-opacity:0.32017547;fill-rule:nonzero;stroke:none;stroke-width:3.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 -    <rect
 -       width="65.281105"
 -       height="254.3844"
 -       x="-22.72864"
 -       y="534.21661"
 -       id="rect13482"
 -       style="color:#000000;fill:#ff0000;fill-opacity:0.32017547;fill-rule:nonzero;stroke:none;stroke-width:3.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 -    <path
 -       d="m 38.928571,67.914286 c 0,0 3.508205,24.810617 9.642857,57.857144 6.134651,33.04652 23.277202,79.68584 89.642852,90.35714"
 -       transform="translate(-343.95712,527.33359)"
 -       id="path13492"
 -       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 1;stroke-dashoffset:0;marker-mid:none;marker-end:url(#Arrow1Lend-2)" />
 -    <text
 -       x="-310.74283"
 -       y="590.96222"
 -       id="text13874"
 -       xml:space="preserve"
 -       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Utopia;-inkscape-font-specification:Utopia"><tspan
 -         x="-310.74283"
 -         y="590.96222"
 -         id="tspan13876"
 -         style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial">A</tspan></text>
 -    <text
 -       x="7.8971062"
 -       y="626.08258"
 -       id="text13874-8"
 -       xml:space="preserve"
 -       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Utopia;-inkscape-font-specification:Utopia"><tspan
 -         x="7.8971062"
 -         y="626.08258"
 -         id="tspan13876-7"
 -         style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial">B</tspan></text>
 -    <path
 -       d="m 347.5,90.414286 c 0,0 -28.20972,-6.408104 -85,-6.071429 -22.06971,0.130838 -66.07143,4.285715 -66.07143,4.285715"
 -       transform="translate(-343.95712,527.33359)"
 -       id="path13903"
 -       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend-2)" />
 -  </g>
 +  <rect
 +     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.20000076;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
 +     id="rect2858-0"
 +     y="3.6000037"
 +     x="3.6000032"
 +     height="261.42856"
 +     width="386.42856" />
 +  <rect
 +     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:0.32017547;fill-rule:nonzero;stroke:none;stroke-width:3.5;marker:none;enable-background:accumulate"
 +     id="rect12924"
 +     y="7.1355872"
 +     x="7.0710421"
 +     height="254.3844"
 +     width="65.281105" />
 +  <rect
 +     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:0.32017547;fill-rule:nonzero;stroke:none;stroke-width:3.5;marker:none;enable-background:accumulate"
 +     id="rect13482"
 +     y="6.8830237"
 +     x="321.22849"
 +     height="254.3844"
 +     width="65.281105" />
 +  <path
 +     inkscape:connector-curvature="0"
 +     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6, 1;stroke-dashoffset:0;stroke-opacity:1;marker-mid:none;marker-end:url(#Arrow1Lend-2)"
 +     id="path13492"
 +     d="m 38.928571,67.914286 c 0,0 3.508205,24.810617 9.642857,57.857144 6.134651,33.04652 23.277202,79.68584 89.642852,90.35714" />
 +  <rect
 +     style="fill:#000000;fill-opacity:0.3559322;fill-rule:evenodd;stroke:none;stroke-width:3.30527353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 +     id="rect3490"
 +     width="65.272476"
 +     height="136.21509"
 +     x="7.0411549"
 +     y="7.0411549" />
 +  <text
 +     sodipodi:linespacing="100%"
 +     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:100%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
 +     xml:space="preserve"
 +     id="text13874"
 +     y="63.628628"
 +     x="33.214291"><tspan
 +       style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial"
 +       id="tspan13876"
 +       y="63.628628"
 +       x="33.214291">A</tspan></text>
 +  <rect
 +     style="fill:#000000;fill-opacity:0.3559322;fill-rule:evenodd;stroke:none;stroke-width:3.30527353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 +     id="rect3490-2"
 +     width="65.272476"
 +     height="136.21509"
 +     x="321.23563"
 +     y="6.7607527" />
 +  <text
 +     sodipodi:linespacing="100%"
 +     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:100%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
 +     xml:space="preserve"
 +     id="text13874-8"
 +     y="98.748993"
 +     x="351.85422"><tspan
 +       style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial"
 +       id="tspan13876-7"
 +       y="98.748993"
 +       x="351.85422">B</tspan></text>
 +  <path
 +     inkscape:connector-curvature="0"
 +     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend-2)"
 +     id="path13903"
 +     d="m 347.5,90.414286 c 0,0 -28.20972,-6.408104 -85,-6.071429 -22.06971,0.130838 -66.07143,4.285715 -66.07143,4.285715" />
   <g
      transform="translate(343.95712,-527.33359)"
      id="layer1"
      style="display:inline" />
 +  <text
 +     sodipodi:linespacing="100%"
 +     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:100%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
 +     xml:space="preserve"
 +     id="text13874-8-1"
 +     y="46.009491"
 +     x="342.27759"><tspan
 +       style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial"
 +       id="tspan13876-7-9"
 +       y="46.009491"
 +       x="342.27759">C</tspan></text>
 +  <text
 +     sodipodi:linespacing="100%"
 +     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:100%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
 +     xml:space="preserve"
 +     id="text13874-8-1-4"
 +     y="215.65927"
 +     x="37.970726"><tspan
 +       style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial"
 +       id="tspan13876-7-9-5"
 +       y="215.65927"
 +       x="37.970726">D</tspan></text>
 +  <circle
 +     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
 +     id="path4401"
 +     cx="-360.181"
 +     cy="24.53549"
 +     r="4.0658817"
 +     transform="scale(-1,1)" />
 +  <circle
 +     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
 +     id="path4401-9"
 +     cx="-36.452721"
 +     cy="194.8819"
 +     r="4.0658817"
 +     transform="scale(-1,1)" />
 </svg>
 diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
 index 6bd7c58..ae66c22 100644
 --- a/src/evdev-mt-touchpad-tap.c
 +++ b/src/evdev-mt-touchpad-tap.c
@@ -575,6 +575,14 @@ tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
 			t->tap.state = TAP_TOUCH_STATE_TOUCH;
 			t->tap.initial = t->point;
 			tp_tap_handle_event(tp, t, TAP_EVENT_TOUCH, time);
 +
 +			/* If we think this is a palm, pretend there's a
 +			 * motion event which will prevent tap clicks
 +			 * without requiring extra states in the FSM.
 +			 */
 +			if (tp_palm_tap_is_palm(tp, t))
 +				tp_tap_handle_event(tp, t, TAP_EVENT_MOTION, time);
 +
 		} else if (t->state == TOUCH_END) {
 			tp_tap_handle_event(tp, t, TAP_EVENT_RELEASE, time);
 			t->tap.state = TAP_TOUCH_STATE_IDLE;
 diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
 index 356133f..53d80b2 100644
 --- a/src/evdev-mt-touchpad.c
 +++ b/src/evdev-mt-touchpad.c
@@ -458,6 +458,24 @@ tp_touch_active(struct tp_dispatch *tp, struct tp_touch *t)
 		tp_edge_scroll_touch_active(tp, t);
 }
 +bool
 +tp_palm_tap_is_palm(struct tp_dispatch *tp, struct tp_touch *t)
 +{
 +	if (t->state != TOUCH_BEGIN)
 +		return false;
 +
 +	if (t->point.x > tp->palm.left_edge &&
 +	    t->point.x < tp->palm.right_edge)
 +		return false;
 +
 +	/* We're inside the left/right palm edge and in the northern half of
 +	 * the touchpad - this tap is a palm */
 +	if (t->point.y < tp->palm.vert_center)
 +		return true;
 +
 +	return false;
 +}
 +
 static void
 tp_palm_detect(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
 {
@@ -1084,13 +1102,16 @@ static int
 tp_init_palmdetect(struct tp_dispatch *tp,
 		   struct evdev_device *device)
 {
 -	int width;
 +	int width, height;
 	tp->palm.right_edge = INT_MAX;
 	tp->palm.left_edge = INT_MIN;
 +	tp->palm.vert_center = INT_MIN;
 	width = abs(device->abs.absinfo_x->maximum -
 		    device->abs.absinfo_x->minimum);
 +	height = abs(device->abs.absinfo_y->maximum -
 +		    device->abs.absinfo_y->minimum);
 	/* Apple touchpads are always big enough to warrant palm detection */
 	if (evdev_device_get_id_vendor(device) != VENDOR_ID_APPLE) {
@@ -1107,6 +1128,7 @@ tp_init_palmdetect(struct tp_dispatch *tp,
 	/* palm edges are 5% of the width on each side */
 	tp->palm.right_edge = device->abs.absinfo_x->maximum - width * 0.05;
 	tp->palm.left_edge = device->abs.absinfo_x->minimum + width * 0.05;
 +	tp->palm.vert_center = device->abs.absinfo_y->minimum + height/2;
 	return 0;
 }
 diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
 index 9980f90..6de999f 100644
 --- a/src/evdev-mt-touchpad.h
 +++ b/src/evdev-mt-touchpad.h
@@ -260,6 +260,7 @@ struct tp_dispatch {
 	struct {
 		int32_t right_edge;		/* in device coordinates */
 		int32_t left_edge;		/* in device coordinates */
 +		int32_t vert_center;		/* in device coordinates */
 	} palm;
 	struct {
@@ -385,4 +386,7 @@ tp_gesture_post_events(struct tp_dispatch *tp, uint64_t time);
 void
 tp_gesture_stop_twofinger_scroll(struct tp_dispatch *tp, uint64_t time);
 +bool
 +tp_palm_tap_is_palm(struct tp_dispatch *tp, struct tp_touch *t);
 +
 #endif
 diff --git a/test/touchpad.c b/test/touchpad.c
 index 6fa2301..882e689 100644
 --- a/test/touchpad.c
 +++ b/test/touchpad.c
@@ -2399,6 +2399,49 @@ START_TEST(touchpad_palm_detect_no_palm_moving_into_edges)
 }
 END_TEST
 +START_TEST(touchpad_palm_detect_tap)
 +{
 +	struct litest_device *dev = litest_current_device();
 +	struct libinput *li = dev->libinput;
 +
 +	if (!touchpad_has_palm_detect_size(dev))
 +		return;
 +
 +	libinput_device_config_tap_set_enabled(dev->libinput_device,
 +					       LIBINPUT_CONFIG_TAP_ENABLED);
 +
 +	litest_drain_events(li);
 +
 +	litest_touch_down(dev, 0, 95, 5);
 +	litest_touch_up(dev, 0);
 +	litest_assert_empty_queue(li);
 +
 +	litest_touch_down(dev, 0, 5, 5);
 +	litest_touch_up(dev, 0);
 +	litest_assert_empty_queue(li);
 +
 +	litest_touch_down(dev, 0, 5, 90);
 +	litest_touch_up(dev, 0);
 +	litest_assert_button_event(li,
 +				   BTN_LEFT,
 +				   LIBINPUT_BUTTON_STATE_PRESSED);
 +	litest_assert_button_event(li,
 +				   BTN_LEFT,
 +				   LIBINPUT_BUTTON_STATE_RELEASED);
 +	litest_assert_empty_queue(li);
 +
 +	litest_touch_down(dev, 0, 95, 90);
 +	litest_touch_up(dev, 0);
 +	litest_assert_button_event(li,
 +				   BTN_LEFT,
 +				   LIBINPUT_BUTTON_STATE_PRESSED);
 +	litest_assert_button_event(li,
 +				   BTN_LEFT,
 +				   LIBINPUT_BUTTON_STATE_RELEASED);
 +	litest_assert_empty_queue(li);
 +}
 +END_TEST
 +
 START_TEST(touchpad_left_handed)
 {
 	struct litest_device *dev = litest_current_device();
@@ -3448,6 +3491,7 @@ int main(int argc, char **argv) {
 	litest_add("touchpad:palm", touchpad_palm_detect_palm_becomes_pointer, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:palm", touchpad_palm_detect_palm_stays_palm, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:palm", touchpad_palm_detect_no_palm_moving_into_edges, LITEST_TOUCHPAD, LITEST_ANY);
 +	litest_add("touchpad:palm", touchpad_palm_detect_tap, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:left-handed", touchpad_left_handed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD);
 	litest_add("touchpad:left-handed", touchpad_left_handed_clickpad, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
 -- 
 2.3.4
--- a/0002-evdev-fix-handling-of-fake-MT-devices-without-ABS_X-.patch
+++ b/0002-evdev-fix-handling-of-fake-MT-devices-without-ABS_X-.patch
@ -1,94 +0,0 @@
 From a0834969d166285714bf18041044aa23a38a8413 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Wed, 8 Apr 2015 08:11:54 +1000
 Subject: [PATCH libinput] evdev: fix handling of fake MT devices without
 ABS_X/Y
 The previous code didn't handle fake MT devices without ABS_X/Y axes at all
 (like the Razer BlackWidow keyboard). Those devices usually start at ABS_MISC
 and go up to ABS_MAX, thus triggering the Android check.
 Split the condition up: if the device is not a fake MT device we check for the
 Android missing axes first and add them. Then we proceed, but now we know that
 the ABS_X axis must exist.
 https://bugs.freedesktop.org/show_bug.cgi?id=89783
 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 ---
 src/evdev.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)
 diff --git a/src/evdev.c b/src/evdev.c
 index 115dc99..1712a8d 100644
 --- a/src/evdev.c
 +++ b/src/evdev.c
@@ -1374,6 +1374,10 @@ evdev_fix_abs_resolution(struct evdev_device *device,
 		return 0;
 	}
 +	if (!libevdev_has_event_code(evdev, EV_ABS, xcode) ||
 +	    !libevdev_has_event_code(evdev, EV_ABS, ycode))
 +		return 0;
 +
 	absx = libevdev_get_abs_info(evdev, xcode);
 	absy = libevdev_get_abs_info(evdev, ycode);
@@ -1431,6 +1435,18 @@ evdev_device_get_udev_tags(struct evdev_device *device,
 	return tags;
 }
 +/* Fake MT devices have the ABS_MT_SLOT bit set because of
 +   the limited ABS_* range - they aren't MT devices, they
 +   just have too many ABS_ axes */
 +static inline bool
 +evdev_is_fake_mt_device(struct evdev_device *device)
 +{
 +	struct libevdev *evdev = device->evdev;
 +
 +	return libevdev_has_event_code(evdev, EV_ABS, ABS_MT_SLOT) &&
 +		libevdev_get_num_slots(evdev) == -1;
 +}
 +
 static inline void
 evdev_fix_android_mt(struct evdev_device *device)
 {
@@ -1441,7 +1457,8 @@ evdev_fix_android_mt(struct evdev_device *device)
 		return;
 	if (!libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) ||
 -	    !libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y))
 +	    !libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y) ||
 +	    !evdev_is_fake_mt_device(device))
 		return;
 	libevdev_enable_event_code(evdev, EV_ABS, ABS_X,
@@ -1611,10 +1628,10 @@ evdev_configure_device(struct evdev_device *device)
 		return -1;
 	}
 -	if (libevdev_has_event_code(evdev, EV_ABS, ABS_X) ||
 -	    libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X)) {
 +	if (!evdev_is_fake_mt_device(device))
 		evdev_fix_android_mt(device);
 +	if (libevdev_has_event_code(evdev, EV_ABS, ABS_X)) {
 		if (evdev_fix_abs_resolution(device,
 					     ABS_X,
 					     ABS_Y,
@@ -1624,11 +1641,7 @@ evdev_configure_device(struct evdev_device *device)
 		device->abs.absinfo_x = libevdev_get_abs_info(evdev, ABS_X);
 		device->abs.absinfo_y = libevdev_get_abs_info(evdev, ABS_Y);
 -		/* Fake MT devices have the ABS_MT_SLOT bit set because of
 -		   the limited ABS_* range - they aren't MT devices, they
 -		   just have too many ABS_ axes */
 -		if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_SLOT) &&
 -		    libevdev_get_num_slots(evdev) == -1) {
 +		if (evdev_is_fake_mt_device(device)) {
 			udev_tags &= ~EVDEV_UDEV_TAG_TOUCHSCREEN;
 		} else if (evdev_configure_mt_device(device) == -1) {
 			return -1;
 -- 
 2.3.4
--- a/libinput.spec
+++ b/libinput.spec
@ -4,8 +4,8 @@
 %global gitversion 58abea394
 Name:           libinput
-Version:        0.13.0
+Version:        0.14.1
-Release:        6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 Summary:        Input device library
 License:        MIT
@ -18,13 +18,6 @@ Source2:        commitid
 Source0:        http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
 %endif
 Patch01:        0001-evdev-fix-crash-for-missing-ABS_X-Y.patch
 Patch02:        0002-evdev-fix-handling-of-fake-MT-devices-without-ABS_X-.patch
 Patch03:        0001-evdev-fix-inverted-mouse-normalization.patch
 Patch04:        0001-touchpad-delay-fake-finger-processing-until-the-EV_S.patch
 Patch05:        0001-touchpad-Reduce-palm-detection-threshold-to-70mm.patch
 Patch06:        0001-touchpad-don-t-allow-taps-in-the-top-half-of-the-pal.patch
 BuildRequires:  git
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  libevdev-devel
@ -83,6 +76,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %{_libdir}/libinput.so.*
 %{udevdir}/libinput-device-group
 %{udevdir}/rules.d/80-libinput-device-groups.rules
 %{_bindir}/libinput-list-devices
 %{_mandir}/man1/libinput-list-devices.1*
 %files devel
 %{_includedir}/libinput.h
@ -91,6 +86,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %changelog
 * Wed Apr 22 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.14.1-1
 - libinput 0.14.1
 * Thu Apr 16 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.13.0-6
 - git add the patch...
--- a/2
+++ b/2
@ -1 +1 @@
-bb58f489b9ce99f6b89bf087b67d4a69  libinput-0.13.0.tar.xz
+18f6e1d6ab58db9a66c5ee8ca20aa876  libinput-0.14.1.tar.xz
`@ -1 +1 @@`
	`bb58f489b9ce99f6b89bf087b67d4a69 libinput-0.13.0.tar.xz`	`18f6e1d6ab58db9a66c5ee8ca20aa876 libinput-0.14.1.tar.xz`