From 4913fd7a4806e54ebe4eb7f5f3f1d2fa3b8fdbdb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 19 Sep 2014 11:10:17 +1000
Subject: [PATCH 001/121] Replace pointer acceleration with a much simpler
 linear one

We ran a userstudy, evaluating three different accel methods. Detailed results are
available at:
http://www.who-t.net/publications/hutterer2014_libinput_ptraccel_study.pdf

We found that there was little difference between the method we had in
libinput 0.6 and this three-line function. Users didn't really notice a
difference, but measured data suggests that it has slight advantages in some
use-cases.

The method proposed here is the one labeled "linear" in the paper, its profile
looks roughly like this:

        _____________
       /
  ____/
 /
/

where the x axis is the speed, y is the acceleration factor.
The first plateau is at the acceleration factor 1 (i.e. unaccelerated
movement), the second plateau is at the max acceleration factor. The threshold
in the code defines where and how long the plateau is.

Differences to the previous accel function:
- both inclines are linear rather than curved
- the second incline is less steep than the current method

From a maintainer's point-of-view, this function is significantly easier to
understand and manipulate than the previous one.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c |  2 +-
 src/evdev.c             |  2 +-
 src/filter.c            | 43 +++++++++--------------------------------
 src/filter.h            | 13 ++++---------
 4 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 86923330..76535d04 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -845,7 +845,7 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 	}
 
 	accel = create_pointer_accelator_filter(
-			pointer_accel_profile_smooth_simple);
+			pointer_accel_profile_linear);
 	if (accel == NULL)
 		return -1;
 
diff --git a/src/evdev.c b/src/evdev.c
index 4e9db2fb..de7ee16c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -865,7 +865,7 @@ configure_pointer_acceleration(struct evdev_device *device)
 {
 	device->pointer.filter =
 		create_pointer_accelator_filter(
-			pointer_accel_profile_smooth_simple);
+			pointer_accel_profile_linear);
 	if (!device->pointer.filter)
 		return -1;
 
diff --git a/src/filter.c b/src/filter.c
index d65adfb7..804058a4 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -270,41 +270,16 @@ calc_penumbral_gradient(double x)
 }
 
 double
-pointer_accel_profile_smooth_simple(struct motion_filter *filter,
-				    void *data,
-				    double velocity, /* units/ms */
-				    uint64_t time)
+pointer_accel_profile_linear(struct motion_filter *filter,
+			     void *data,
+			     double speed_in,
+			     uint64_t time)
 {
-	double threshold = DEFAULT_THRESHOLD; /* units/ms */
-	double accel = DEFAULT_ACCELERATION; /* unitless factor */
-	double smooth_accel_coefficient; /* unitless factor */
-	double factor; /* unitless factor */
+	double s1, s2;
+	const int max_accel = DEFAULT_ACCELERATION;
 
-	if (threshold < 0.1)
-		threshold = 0.1;
-	if (accel < 1.0)
-		accel = 1.0;
+	s1 = min(1, speed_in * 5);
+	s2 = 1 + (speed_in - DEFAULT_THRESHOLD) * 1.1;
 
-	/* We use units/ms as velocity but it has no real meaning unless all
-	   devices have the same resolution. For touchpads, we normalize to
-	   400dpi (15.75 units/mm), but the resolution on USB mice is all
-	   over the place. Though most mice these days have either 400
-	   dpi (15.75 units/mm), 800 dpi or 1000dpi, excluding gaming mice
-	   that can usually adjust it on the fly anyway and currently go up
-	   to 8200dpi.
-	  */
-	if (velocity < (threshold / 2.0))
-		return calc_penumbral_gradient(0.5 + velocity / threshold) * 2.0 - 1.0;
-
-	if (velocity <= threshold)
-		return 1.0;
-
-	factor = velocity/threshold;
-	if (factor >= accel)
-		return accel;
-
-	/* factor is between 1.0 and accel, scale this to 0.0 - 1.0 */
-	factor = (factor - 1.0) / (accel - 1.0);
-	smooth_accel_coefficient = calc_penumbral_gradient(factor);
-	return 1.0 + (smooth_accel_coefficient * (accel - 1.0));
+	return min(max_accel, s2 > 1 ? s2 : s1);
 }
diff --git a/src/filter.h b/src/filter.h
index 85534952..be48838c 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -65,14 +65,9 @@ create_pointer_accelator_filter(accel_profile_func_t filter);
  * Pointer acceleration profiles.
  */
 
-/*
- * Profile similar which is similar to nonaccelerated but with a smooth
- * transition between accelerated and non-accelerated.
- */
 double
-pointer_accel_profile_smooth_simple(struct motion_filter *filter,
-				    void *data,
-				    double velocity,
-				    uint64_t time);
-
+pointer_accel_profile_linear(struct motion_filter *filter,
+			     void *data,
+			     double speed_in,
+			     uint64_t time);
 #endif /* FILTER_H */

From 515a938e3aaaad60db23f3009a1b172c34641064 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 4 Jul 2014 09:29:11 +1000
Subject: [PATCH 002/121] filter: add a filter-private.h header file

To keep the implementation of a filter separate from the users of a filter.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/Makefile.am      |  1 +
 src/filter-private.h | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/filter.c         |  1 +
 src/filter.h         | 12 ------------
 4 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 src/filter-private.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 44e73d3f..5cc52a66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ libinput_la_SOURCES =			\
 	evdev-mt-touchpad-buttons.c	\
 	filter.c			\
 	filter.h			\
+	filter-private.h		\
 	path.h				\
 	path.c				\
 	udev-seat.c			\
diff --git a/src/filter-private.h b/src/filter-private.h
new file mode 100644
index 00000000..283a747b
--- /dev/null
+++ b/src/filter-private.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2012 Jonas Ådahl
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef FILTER_PRIVATE_H
+#define FILTER_PRIVATE_H
+
+#include "config.h"
+
+#include "filter.h"
+
+struct motion_filter_interface {
+	void (*filter)(struct motion_filter *filter,
+		       struct motion_params *motion,
+		       void *data, uint64_t time);
+	void (*destroy)(struct motion_filter *filter);
+};
+
+struct motion_filter {
+	struct motion_filter_interface *interface;
+};
+
+
+#endif
diff --git a/src/filter.c b/src/filter.c
index 804058a4..12bf8f6a 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -30,6 +30,7 @@
 
 #include "filter.h"
 #include "libinput-util.h"
+#include "filter-private.h"
 
 void
 filter_dispatch(struct motion_filter *filter,
diff --git a/src/filter.h b/src/filter.h
index be48838c..b79f0e34 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -40,18 +40,6 @@ filter_dispatch(struct motion_filter *filter,
 void
 filter_destroy(struct motion_filter *filter);
 
-
-struct motion_filter_interface {
-	void (*filter)(struct motion_filter *filter,
-		       struct motion_params *motion,
-		       void *data, uint64_t time);
-	void (*destroy)(struct motion_filter *filter);
-};
-
-struct motion_filter {
-	struct motion_filter_interface *interface;
-};
-
 typedef double (*accel_profile_func_t)(struct motion_filter *filter,
 				       void *data,
 				       double velocity,

From 87c88d6a8605654c1d29471c7f34804a35a25745 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 3 Jul 2014 15:32:40 +1000
Subject: [PATCH 003/121] filter: move the threshold/accel into the filter
 struct

No functional changes, prep work for the config interface.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/filter.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/filter.c b/src/filter.c
index 12bf8f6a..5e627e1a 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -84,6 +84,9 @@ struct pointer_accelerator {
 
 	struct pointer_tracker *trackers;
 	int cur_tracker;
+
+	double threshold;	/* units/ms */
+	double accel;		/* unitless factor */
 };
 
 static void
@@ -259,6 +262,9 @@ create_pointer_accelator_filter(accel_profile_func_t profile)
 		calloc(NUM_POINTER_TRACKERS, sizeof *filter->trackers);
 	filter->cur_tracker = 0;
 
+	filter->threshold = DEFAULT_THRESHOLD;
+	filter->accel = DEFAULT_ACCELERATION;
+
 	return &filter->base;
 }
 
@@ -276,11 +282,15 @@ pointer_accel_profile_linear(struct motion_filter *filter,
 			     double speed_in,
 			     uint64_t time)
 {
+	struct pointer_accelerator *accel_filter =
+		(struct pointer_accelerator *)filter;
+
 	double s1, s2;
-	const int max_accel = DEFAULT_ACCELERATION;
+	const double max_accel = accel_filter->accel; /* unitless factor */
+	const double threshold = accel_filter->threshold; /* units/ms */
 
 	s1 = min(1, speed_in * 5);
-	s2 = 1 + (speed_in - DEFAULT_THRESHOLD) * 1.1;
+	s2 = 1 + (speed_in - threshold) * 1.1;
 
 	return min(max_accel, s2 > 1 ? s2 : s1);
 }

From 198384e69ff1d5b40b2abd7ef45893b276ea2cac Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 3 Jul 2014 15:53:56 +1000
Subject: [PATCH 004/121] filter: add a configurable speed interface

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/filter-private.h |  3 +++
 src/filter.c         | 28 +++++++++++++++++++++++++++-
 src/filter.h         |  7 +++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/filter-private.h b/src/filter-private.h
index 283a747b..dcce1259 100644
--- a/src/filter-private.h
+++ b/src/filter-private.h
@@ -32,9 +32,12 @@ struct motion_filter_interface {
 		       struct motion_params *motion,
 		       void *data, uint64_t time);
 	void (*destroy)(struct motion_filter *filter);
+	bool (*set_speed)(struct motion_filter *filter,
+			  double speed);
 };
 
 struct motion_filter {
+	double speed; /* normalized [-1, 1] */
 	struct motion_filter_interface *interface;
 };
 
diff --git a/src/filter.c b/src/filter.c
index 5e627e1a..327dbce5 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -49,6 +50,19 @@ filter_destroy(struct motion_filter *filter)
 	filter->interface->destroy(filter);
 }
 
+bool
+filter_set_speed(struct motion_filter *filter,
+		 double speed)
+{
+	return filter->interface->set_speed(filter, speed);
+}
+
+double
+filter_get_speed(struct motion_filter *filter)
+{
+	return filter->speed;
+}
+
 /*
  * Default parameters for pointer acceleration profiles.
  */
@@ -237,9 +251,21 @@ accelerator_destroy(struct motion_filter *filter)
 	free(accel);
 }
 
+static bool
+accelerator_set_speed(struct motion_filter *filter,
+		      double speed)
+{
+	assert(speed >= -1.0 && speed <= 1.0);
+
+	filter->speed = speed;
+
+	return true;
+}
+
 struct motion_filter_interface accelerator_interface = {
 	accelerator_filter,
-	accelerator_destroy
+	accelerator_destroy,
+	accelerator_set_speed,
 };
 
 struct motion_filter *
diff --git a/src/filter.h b/src/filter.h
index b79f0e34..1f53e81c 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
 struct motion_params {
@@ -40,6 +41,12 @@ filter_dispatch(struct motion_filter *filter,
 void
 filter_destroy(struct motion_filter *filter);
 
+bool
+filter_set_speed(struct motion_filter *filter,
+		 double speed);
+double
+filter_get_speed(struct motion_filter *filter);
+
 typedef double (*accel_profile_func_t)(struct motion_filter *filter,
 				       void *data,
 				       double velocity,

From 25c11afd9cc83d0617a88cf4f13d3c45c7dc1a66 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 19 Sep 2014 14:25:22 +1000
Subject: [PATCH 005/121] filter: adjust acceleration curve depending on speed

The acceleration curve consists of four parts, in ascii-art like this:
        _____________
       /
  ____/
 /
/

where the x axis is the speed, y is the acceleration factor.
The first plateau is at the acceleration factor 1 (i.e. unaccelerated
movement), the second plateau is at the max acceleration factor. The threshold
in the code defines where and how long the plateau is.

This patch adjusts the curve based on a [-1, 1] range. For anything below 0,
the plateau is longer (i.e. accel kicks in at a higher speed), the second
incline is flatter (i.e. accel kicks in slower) and the max accel factor is
lower (i.e. maximum speed is slower). For anything above 0, the inverse is
true, acceleration kicks in earlier, harder and is faster in general. So the
default/min/max curves overlaid look something like this:
      ________ max
     | _______ default
    | /  _____ min
  _|_/_/
 /
/

Note that there's a limit to what ascii art can do...

Note that there are additional tweaks we can introduce later, such as
decreaseing the unaccelerated speed of the device (i.e. lowering the first
plateau).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/filter.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/filter.c b/src/filter.c
index 327dbce5..defbcae8 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -69,6 +69,7 @@ filter_get_speed(struct motion_filter *filter)
 
 #define DEFAULT_THRESHOLD 0.4			/* in units/ms */
 #define DEFAULT_ACCELERATION 2.0		/* unitless factor */
+#define DEFAULT_INCLINE 1.1			/* unitless factor */
 
 /*
  * Pointer acceleration filter constants
@@ -101,6 +102,7 @@ struct pointer_accelerator {
 
 	double threshold;	/* units/ms */
 	double accel;		/* unitless factor */
+	double incline;		/* incline of the function */
 };
 
 static void
@@ -255,10 +257,21 @@ static bool
 accelerator_set_speed(struct motion_filter *filter,
 		      double speed)
 {
+	struct pointer_accelerator *accel_filter =
+		(struct pointer_accelerator *)filter;
+
 	assert(speed >= -1.0 && speed <= 1.0);
 
-	filter->speed = speed;
+	/* delay when accel kicks in */
+	accel_filter->threshold = DEFAULT_THRESHOLD - speed/6.0;
 
+	/* adjust max accel factor */
+	accel_filter->accel = DEFAULT_ACCELERATION + speed;
+
+	/* higher speed -> faster to reach max */
+	accel_filter->incline = DEFAULT_INCLINE + speed/2.0;
+
+	filter->speed = speed;
 	return true;
 }
 
@@ -290,6 +303,7 @@ create_pointer_accelator_filter(accel_profile_func_t profile)
 
 	filter->threshold = DEFAULT_THRESHOLD;
 	filter->accel = DEFAULT_ACCELERATION;
+	filter->incline = DEFAULT_INCLINE;
 
 	return &filter->base;
 }
@@ -314,9 +328,10 @@ pointer_accel_profile_linear(struct motion_filter *filter,
 	double s1, s2;
 	const double max_accel = accel_filter->accel; /* unitless factor */
 	const double threshold = accel_filter->threshold; /* units/ms */
+	const double incline = accel_filter->incline;
 
 	s1 = min(1, speed_in * 5);
-	s2 = 1 + (speed_in - threshold) * 1.1;
+	s2 = 1 + (speed_in - threshold) * incline;
 
 	return min(max_accel, s2 > 1 ? s2 : s1);
 }

From a721292c254bfc4074ea3ee1f328260feda7c936 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Sep 2014 09:35:53 +1000
Subject: [PATCH 006/121] touchpad: use the evdev device's filter struct

We don't need a separate filter struct, we can use the parent evdev device.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 5 ++---
 src/evdev-mt-touchpad.h | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 76535d04..68268cd5 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -65,7 +65,7 @@ tp_filter_motion(struct tp_dispatch *tp,
 	motion.dy = *dy * tp->accel.y_scale_coeff;
 
 	if (motion.dx != 0.0 || motion.dy != 0.0)
-		filter_dispatch(tp->filter, &motion, tp, time);
+		filter_dispatch(tp->device->pointer.filter, &motion, tp, time);
 
 	*dx = motion.dx;
 	*dy = motion.dy;
@@ -602,7 +602,6 @@ tp_destroy(struct evdev_dispatch *dispatch)
 	tp_destroy_tap(tp);
 	tp_destroy_buttons(tp);
 
-	filter_destroy(tp->filter);
 	free(tp->touches);
 	free(tp);
 }
@@ -849,7 +848,7 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 	if (accel == NULL)
 		return -1;
 
-	tp->filter = accel;
+	tp->device->pointer.filter = accel;
 
 	return 0;
 }
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 107195f3..784155ba 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -167,8 +167,6 @@ struct tp_dispatch {
 		int32_t margin_y;
 	} hysteresis;
 
-	struct motion_filter *filter;
-
 	struct {
 		double x_scale_coeff;
 		double y_scale_coeff;

From 339f3dc979e8bba1d4cc72e7f2a2f42569f12c28 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 15 May 2014 15:46:19 +1000
Subject: [PATCH 007/121] Add a pointer acceleration API

Only exposes one knob - speed, normalized to a [-1, 1] range with 0 being the
neutral "this is what we think is normal" speed. -1 and 1 reflect the
slowest/fastest reasonable speed on this device.

Note: with this API we commit to having any pointer accelerating as a true
gliding scale. We cannot map the [-1,1] range into a discrete set of steps
as we do not communicate to the caller whether a specific value has changed
the acceleration. Without that, a caller may assume that acceleration has
changed even when it is not visible to the user.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/libinput-private.h |  9 +++++++
 src/libinput.c         | 40 ++++++++++++++++++++++++++++
 src/libinput.h         | 59 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index d3672d00..c922875a 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -109,10 +109,19 @@ struct libinput_device_config_send_events {
 	enum libinput_config_send_events_mode (*get_default_mode)(struct libinput_device *device);
 };
 
+struct libinput_device_config_accel {
+	int (*available)(struct libinput_device *device);
+	enum libinput_config_status (*set_speed)(struct libinput_device *device,
+						 double speed);
+	double (*get_speed)(struct libinput_device *device);
+	double (*get_default_speed)(struct libinput_device *device);
+};
+
 struct libinput_device_config {
 	struct libinput_device_config_tap *tap;
 	struct libinput_device_config_calibration *calibration;
 	struct libinput_device_config_send_events *sendevents;
+	struct libinput_device_config_accel *accel;
 };
 
 struct libinput_device {
diff --git a/src/libinput.c b/src/libinput.c
index 14f02574..18f34967 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1388,3 +1388,43 @@ libinput_device_config_send_events_get_default_mode(struct libinput_device *devi
 {
 	return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
 }
+
+
+LIBINPUT_EXPORT int
+libinput_device_config_accel_is_available(struct libinput_device *device)
+{
+	return device->config.accel ?
+		device->config.accel->available(device) : 0;
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_device_config_accel_set_speed(struct libinput_device *device,
+				       double speed)
+{
+	if (!libinput_device_config_accel_is_available(device))
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
+	if (speed < -1.0 || speed > 1.0)
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	return device->config.accel->set_speed(device, speed);
+}
+
+LIBINPUT_EXPORT double
+libinput_device_config_accel_get_speed(struct libinput_device *device)
+{
+	if (!libinput_device_config_accel_is_available(device))
+		return 0;
+
+	return device->config.accel->get_speed(device);
+}
+
+LIBINPUT_EXPORT double
+libinput_device_config_accel_get_default_speed(struct libinput_device *device)
+{
+	if (!libinput_device_config_accel_is_available(device))
+		return 0;
+
+	return device->config.accel->get_default_speed(device);
+}
+
diff --git a/src/libinput.h b/src/libinput.h
index 806e1abb..83e3b37a 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1783,6 +1783,65 @@ libinput_device_config_send_events_get_mode(struct libinput_device *device);
 enum libinput_config_send_events_mode
 libinput_device_config_send_events_get_default_mode(struct libinput_device *device);
 
+/**
+ * @ingroup config
+ *
+ * Check if a device uses libinput-internal pointer-acceleration.
+ *
+ * @param device The device to configure
+ *
+ * @return 0 if the device is not accelerated, nonzero if it is accelerated
+ */
+int
+libinput_device_config_accel_is_available(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Set the pointer acceleration speed of this pointer device within a range
+ * of [-1, 1], where 0 is the default acceleration for this device, -1 is
+ * the slowest acceleration and 1 is the maximum acceleration available on
+ * this device. The actual pointer acceleration mechanism is
+ * implementation-dependent, as is the number of steps available within the
+ * range. libinput picks the semantically closest acceleration step if the
+ * requested value does not match a discreet setting.
+ *
+ * @param device The device to configure
+ * @param speed The normalized speed, in a range of [-1, 1]
+ *
+ * @return A config status code
+ */
+enum libinput_config_status
+libinput_device_config_accel_set_speed(struct libinput_device *device,
+				       double speed);
+
+/**
+ * @ingroup config
+ *
+ * Get the current pointer acceleration setting for this pointer device. The
+ * returned value is normalized to a range of [-1, 1].
+ * See libinput_device_config_accel_set_speed() for details.
+ *
+ * @param device The device to configure
+ *
+ * @return The current speed, range -1 to 1
+ */
+double
+libinput_device_config_accel_get_speed(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Return the default speed setting for this device, normalized to a range
+ * of [-1, 1].
+ * See libinput_device_config_accel_set_speed() for details.
+ *
+ * @param device The device to configure
+ * @return The default speed setting for this device.
+ */
+double
+libinput_device_config_accel_get_default_speed(struct libinput_device *device);
+
 #ifdef __cplusplus
 }
 #endif

From cd6b5770b2b89c3ee174390e733aadb06f8d09a3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 19 Sep 2014 15:09:31 +1000
Subject: [PATCH 008/121] evdev: hook into pointer acceleration config
 interface

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 39 +++++++++++++++++++++++++++++++++++++++
 src/evdev.h |  1 +
 2 files changed, 40 insertions(+)

diff --git a/src/evdev.c b/src/evdev.c
index de7ee16c..a5a8372b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -860,6 +860,39 @@ evdev_device_dispatch(void *data)
 	}
 }
 
+static int
+evdev_accel_config_available(struct libinput_device *device)
+{
+	/* this function is only called if we set up ptraccel, so we can
+	   reply with a resounding "Yes" */
+	return 1;
+}
+
+static enum libinput_config_status
+evdev_accel_config_set_speed(struct libinput_device *device, double speed)
+{
+	struct evdev_device *dev = (struct evdev_device *)device;
+
+	if (!filter_set_speed(dev->pointer.filter, speed))
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static double
+evdev_accel_config_get_speed(struct libinput_device *device)
+{
+	struct evdev_device *dev = (struct evdev_device *)device;
+
+	return filter_get_speed(dev->pointer.filter);
+}
+
+static double
+evdev_accel_config_get_default_speed(struct libinput_device *device)
+{
+	return 0.0;
+}
+
 static int
 configure_pointer_acceleration(struct evdev_device *device)
 {
@@ -869,6 +902,12 @@ configure_pointer_acceleration(struct evdev_device *device)
 	if (!device->pointer.filter)
 		return -1;
 
+	device->pointer.config.available = evdev_accel_config_available;
+	device->pointer.config.set_speed = evdev_accel_config_set_speed;
+	device->pointer.config.get_speed = evdev_accel_config_get_speed;
+	device->pointer.config.get_default_speed = evdev_accel_config_get_default_speed;
+	device->base.config.accel = &device->pointer.config;
+
 	return 0;
 }
 
diff --git a/src/evdev.h b/src/evdev.h
index aecbd95a..6a1203fc 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -114,6 +114,7 @@ struct evdev_device {
 	int suspended;
 
 	struct {
+		struct libinput_device_config_accel config;
 		struct motion_filter *filter;
 	} pointer;
 

From 1dfb248ab95cf90452c6df22f114f5d0a29cd35f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 4 Jul 2014 09:44:43 +1000
Subject: [PATCH 009/121] touchpad: hook up pointer acceleration configuration

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 7 +------
 src/evdev.c             | 6 +++---
 src/evdev.h             | 3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 68268cd5..8b6f98e3 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -806,7 +806,6 @@ tp_init_slots(struct tp_dispatch *tp,
 static int
 tp_init_accel(struct tp_dispatch *tp, double diagonal)
 {
-	struct motion_filter *accel;
 	int res_x, res_y;
 
 	if (tp->has_mt) {
@@ -843,13 +842,9 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 		tp->accel.y_scale_coeff = DEFAULT_ACCEL_NUMERATOR / diagonal;
 	}
 
-	accel = create_pointer_accelator_filter(
-			pointer_accel_profile_linear);
-	if (accel == NULL)
+	if (evdev_device_init_pointer_acceleration(tp->device) == -1)
 		return -1;
 
-	tp->device->pointer.filter = accel;
-
 	return 0;
 }
 
diff --git a/src/evdev.c b/src/evdev.c
index a5a8372b..4c0669cd 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -893,8 +893,8 @@ evdev_accel_config_get_default_speed(struct libinput_device *device)
 	return 0.0;
 }
 
-static int
-configure_pointer_acceleration(struct evdev_device *device)
+int
+evdev_device_init_pointer_acceleration(struct evdev_device *device)
 {
 	device->pointer.filter =
 		create_pointer_accelator_filter(
@@ -1090,7 +1090,7 @@ evdev_configure_device(struct evdev_device *device)
 		has_keyboard = 1;
 
 	if ((has_abs || has_rel) && has_button) {
-		if (configure_pointer_acceleration(device) == -1)
+		if (evdev_device_init_pointer_acceleration(device) == -1)
 			return -1;
 
 		device->seat_caps |= EVDEV_DEVICE_POINTER;
diff --git a/src/evdev.h b/src/evdev.h
index 6a1203fc..d4b8ee63 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -177,6 +177,9 @@ evdev_device_create(struct libinput_seat *seat,
 		    const char *sysname,
 		    const char *syspath);
 
+int
+evdev_device_init_pointer_acceleration(struct evdev_device *device);
+
 struct evdev_dispatch *
 evdev_touchpad_create(struct evdev_device *device);
 

From 3b0c97c78baa08d592fd4e6452dcee3a54a3ce68 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 4 Jul 2014 08:56:44 +1000
Subject: [PATCH 010/121] tools: keep a list of devices around for run-time
 changes

Hard-coded to 50 devices, because for a debugging tool that's plenty.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 tools/event-gui.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tools/event-gui.c b/tools/event-gui.c
index 3ef30057..fcae236c 100644
--- a/tools/event-gui.c
+++ b/tools/event-gui.c
@@ -67,6 +67,8 @@ struct window {
 
 	/* l/m/r mouse buttons */
 	int l, m, r;
+
+	struct libinput_device *devices[50];
 };
 
 static int
@@ -211,11 +213,24 @@ window_init(struct window *w)
 	gtk_widget_show_all(w->win);
 }
 
+static void
+window_cleanup(struct window *w)
+{
+	struct libinput_device **dev;
+	ARRAY_FOR_EACH(w->devices, dev) {
+		if (*dev)
+			libinput_device_unref(*dev);
+	}
+}
+
 static void
 handle_event_device_notify(struct libinput_event *ev)
 {
 	struct libinput_device *dev = libinput_event_get_device(ev);
+	struct libinput *li;
+	struct window *w;
 	const char *type;
+	int i;
 
 	if (libinput_event_get_type(ev) == LIBINPUT_EVENT_DEVICE_ADDED)
 		type = "added";
@@ -232,6 +247,26 @@ handle_event_device_notify(struct libinput_event *ev)
 			error("%s: Failed to enable tapping\n",
 			      libinput_device_get_sysname(dev));
 	}
+
+	li = libinput_event_get_context(ev);
+	w = libinput_get_user_data(li);
+
+	if (libinput_event_get_type(ev) == LIBINPUT_EVENT_DEVICE_ADDED) {
+		for (i = 0; i < ARRAY_LENGTH(w->devices); i++) {
+			if (w->devices[i] == NULL) {
+				w->devices[i] = libinput_device_ref(dev);
+				break;
+			}
+		}
+	} else  {
+		for (i = 0; i < ARRAY_LENGTH(w->devices); i++) {
+			if (w->devices[i] == dev) {
+				libinput_device_unref(w->devices[i]);
+				w->devices[i] = NULL;
+				break;
+			}
+		}
+	}
 }
 
 static void
@@ -474,6 +509,7 @@ main(int argc, char *argv[])
 
 	gtk_main();
 
+	window_cleanup(&w);
 	libinput_unref(li);
 	udev_unref(udev);
 

From fb5f44f7948b72eb9788ac7ccfd837bb9e73356c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 4 Jul 2014 09:04:10 +1000
Subject: [PATCH 011/121] tools: map KEY_UP/DOWN to pointer acceleration

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 tools/event-gui.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/tools/event-gui.c b/tools/event-gui.c
index fcae236c..142990d5 100644
--- a/tools/event-gui.c
+++ b/tools/event-gui.c
@@ -223,6 +223,41 @@ window_cleanup(struct window *w)
 	}
 }
 
+static void
+change_ptraccel(struct window *w, double amount)
+{
+	struct libinput_device **dev;
+
+	ARRAY_FOR_EACH(w->devices, dev) {
+		double speed;
+		enum libinput_config_status status;
+
+		if (*dev == NULL)
+			continue;
+
+		if (!libinput_device_config_accel_is_available(*dev))
+			continue;
+
+		speed = libinput_device_config_accel_get_speed(*dev);
+		speed = clip(speed + amount, -1, 1);
+
+		status = libinput_device_config_accel_set_speed(*dev, speed);
+
+		if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) {
+			msg("%s: failed to change accel to %.2f (%s)\n",
+			    libinput_device_get_name(*dev),
+			    speed,
+			    libinput_config_status_to_str(status));
+		} else {
+			printf("%s: speed is %.2f\n",
+			       libinput_device_get_name(*dev),
+			       speed);
+		}
+
+	}
+}
+
+
 static void
 handle_event_device_notify(struct libinput_event *ev)
 {
@@ -344,9 +379,24 @@ static int
 handle_event_keyboard(struct libinput_event *ev, struct window *w)
 {
 	struct libinput_event_keyboard *k = libinput_event_get_keyboard_event(ev);
+	unsigned int key = libinput_event_keyboard_get_key(k);
 
-	if (libinput_event_keyboard_get_key(k) == KEY_ESC)
+	if (libinput_event_keyboard_get_key_state(k) ==
+	    LIBINPUT_KEY_STATE_RELEASED)
+		return 0;
+
+	switch(key) {
+	case KEY_ESC:
 		return 1;
+	case KEY_UP:
+		change_ptraccel(w, 0.1);
+		break;
+	case KEY_DOWN:
+		change_ptraccel(w, -0.1);
+		break;
+	default:
+		break;
+	}
 
 	return 0;
 }

From c481b47f1776549bbfde325fe68dceb0401b3f59 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 18 Sep 2014 15:10:19 +1000
Subject: [PATCH 012/121] Add a configuration option for natural scrolling

Natural scrolling is simply inverted scrolling, but I decided to
use the Apple terminology simply because it's easier to google for.

Add the usual quartett of config options for has/set/get/get_default/, as a
boolean option rather than an enum for scroll mode to avoid name collusion
with the (currently in the works) edge scrolling.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/libinput-private.h |  9 +++++
 src/libinput.c         | 36 +++++++++++++++++++
 src/libinput.h         | 81 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index c922875a..e71e685d 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -117,11 +117,20 @@ struct libinput_device_config_accel {
 	double (*get_default_speed)(struct libinput_device *device);
 };
 
+struct libinput_device_config_natural_scroll {
+	int (*has)(struct libinput_device *device);
+	enum libinput_config_status (*set_enabled)(struct libinput_device *device,
+						   int enabled);
+	int (*get_enabled)(struct libinput_device *device);
+	int (*get_default_enabled)(struct libinput_device *device);
+};
+
 struct libinput_device_config {
 	struct libinput_device_config_tap *tap;
 	struct libinput_device_config_calibration *calibration;
 	struct libinput_device_config_send_events *sendevents;
 	struct libinput_device_config_accel *accel;
+	struct libinput_device_config_natural_scroll *natural_scroll;
 };
 
 struct libinput_device {
diff --git a/src/libinput.c b/src/libinput.c
index 18f34967..6ac0d826 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1428,3 +1428,39 @@ libinput_device_config_accel_get_default_speed(struct libinput_device *device)
 	return device->config.accel->get_default_speed(device);
 }
 
+LIBINPUT_EXPORT int
+libinput_device_config_scroll_has_natural_scroll(struct libinput_device *device)
+{
+	if (!device->config.natural_scroll)
+		return 0;
+
+	return device->config.natural_scroll->has(device);
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_device_config_scroll_set_natural_scroll_enabled(struct libinput_device *device,
+							 int enabled)
+{
+	if (!libinput_device_config_scroll_has_natural_scroll(device))
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
+	return device->config.natural_scroll->set_enabled(device, enabled);
+}
+
+LIBINPUT_EXPORT int
+libinput_device_config_scroll_get_natural_scroll_enabled(struct libinput_device *device)
+{
+	if (!device->config.natural_scroll)
+		return 0;
+
+	return device->config.natural_scroll->get_enabled(device);
+}
+
+LIBINPUT_EXPORT int
+libinput_device_config_scroll_get_default_natural_scroll_enabled(struct libinput_device *device)
+{
+	if (!device->config.natural_scroll)
+		return 0;
+
+	return device->config.natural_scroll->get_default_enabled(device);
+}
diff --git a/src/libinput.h b/src/libinput.h
index 83e3b37a..8f1dca25 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1842,6 +1842,87 @@ libinput_device_config_accel_get_speed(struct libinput_device *device);
 double
 libinput_device_config_accel_get_default_speed(struct libinput_device *device);
 
+/**
+ * @ingroup config
+ *
+ * Return non-zero if the device supports "natural scrolling".
+ *
+ * In traditional scroll mode, the movement of fingers on a touchpad when
+ * scrolling matches the movement of the scroll bars. When the fingers move
+ * down, the scroll bar moves down, a line of text on the screen moves
+ * towards the upper end of the screen. This also matches scroll wheels on
+ * mice (wheel down, content moves up).
+ *
+ * Natural scrolling is the term coined by Apple for inverted scrolling.
+ * In this mode, the effect of scrolling movement of fingers on a touchpad
+ * resemble physical manipulation of paper. When the fingers move down, a
+ * line of text on the screen moves down (scrollbars move up). This is the
+ * opposite of scroll wheels on mice.
+ *
+ * A device supporting natural scrolling can be switched between traditional
+ * scroll mode and natural scroll mode.
+ *
+ * @param device The device to configure
+ *
+ * @return 0 if natural scrolling is not supported, non-zero if natural
+ * scrolling is supported by this device
+ *
+ * @see libinput_device_config_set_natural_scroll_enabled
+ * @see libinput_device_config_get_natural_scroll_enabled
+ * @see libinput_device_config_get_default_natural_scroll_enabled
+ */
+int
+libinput_device_config_scroll_has_natural_scroll(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Enable or disable natural scrolling on the device.
+ *
+ * @param device The device to configure
+ * @param enable non-zero to enable, zero to disable natural scrolling
+ *
+ * @return a config status code
+ *
+ * @see libinput_device_config_has_natural_scroll
+ * @see libinput_device_config_get_natural_scroll_enabled
+ * @see libinput_device_config_get_default_natural_scroll_enabled
+ */
+enum libinput_config_status
+libinput_device_config_scroll_set_natural_scroll_enabled(struct libinput_device *device,
+							 int enable);
+/**
+ * @ingroup config
+ *
+ * Get the current mode for scrolling on this device
+ *
+ * @param device The device to configure
+ *
+ * @return zero if natural scrolling is disabled, non-zero if enabled
+ *
+ * @see libinput_device_config_has_natural_scroll
+ * @see libinput_device_config_set_natural_scroll_enabled
+ * @see libinput_device_config_get_default_natural_scroll_enabled
+ */
+int
+libinput_device_config_scroll_get_natural_scroll_enabled(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Get the default mode for scrolling on this device
+ *
+ * @param device The device to configure
+ *
+ * @return zero if natural scrolling is disabled by default, non-zero if enabled
+ *
+ * @see libinput_device_config_has_natural_scroll
+ * @see libinput_device_config_set_natural_scroll_enabled
+ * @see libinput_device_config_get_natural_scroll_enabled
+ */
+int
+libinput_device_config_scroll_get_default_natural_scroll_enabled(struct libinput_device *device);
+
 #ifdef __cplusplus
 }
 #endif

From 9e29cda72bdf57852207eb3e3c47f03a60a4ea0d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 18 Sep 2014 15:51:53 +1000
Subject: [PATCH 013/121] touchpad: hook up natural scrolling configuration

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 64 +++++++++++++++++++++++++++++++++++++++++
 src/evdev-mt-touchpad.h |  5 ++++
 2 files changed, 69 insertions(+)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 8b6f98e3..56f46ece 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -492,6 +492,12 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
 	dy /= nchanged;
 
 	tp_filter_motion(tp, &dx, &dy, time);
+
+	if (tp->scroll.natural_scrolling_enabled) {
+		dx = -dx;
+		dy = -dy;
+	}
+
 	evdev_post_scroll(tp->device, time, dx, dy);
 }
 
@@ -848,6 +854,61 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 	return 0;
 }
 
+static int
+tp_scroll_config_natural_has(struct libinput_device *device)
+{
+	return 1;
+}
+
+static enum libinput_config_status
+tp_scroll_config_natural_set(struct libinput_device *device,
+			     int enabled)
+{
+	struct evdev_dispatch *dispatch;
+	struct tp_dispatch *tp = NULL;
+
+	dispatch = ((struct evdev_device *) device)->dispatch;
+	tp = container_of(dispatch, tp, base);
+
+	tp->scroll.natural_scrolling_enabled = enabled ? true : false;
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static int
+tp_scroll_config_natural_get(struct libinput_device *device)
+{
+	struct evdev_dispatch *dispatch;
+	struct tp_dispatch *tp = NULL;
+
+	dispatch = ((struct evdev_device *) device)->dispatch;
+	tp = container_of(dispatch, tp, base);
+
+	return tp->scroll.natural_scrolling_enabled ? 1 : 0;
+}
+
+static int
+tp_scroll_config_natural_get_default(struct libinput_device *device)
+{
+	/* could enable this on Apple touchpads. could do that, could
+	 * very well do that... */
+	return 0;
+}
+
+static int
+tp_init_scroll(struct tp_dispatch *tp)
+{
+
+	tp->scroll.config.has = tp_scroll_config_natural_has;
+	tp->scroll.config.set_enabled = tp_scroll_config_natural_set;
+	tp->scroll.config.get_enabled = tp_scroll_config_natural_get;
+	tp->scroll.config.get_default_enabled = tp_scroll_config_natural_get_default;
+	tp->scroll.natural_scrolling_enabled = false;
+	tp->device->base.config.natural_scroll = &tp->scroll.config;
+
+	return 0;
+}
+
 static int
 tp_init_palmdetect(struct tp_dispatch *tp,
 		   struct evdev_device *device)
@@ -903,6 +964,9 @@ tp_init(struct tp_dispatch *tp,
 	tp->hysteresis.margin_y =
 		diagonal / DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR;
 
+	if (tp_init_scroll(tp) != 0)
+		return -1;
+
 	if (tp_init_accel(tp, diagonal) != 0)
 		return -1;
 
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 784155ba..ef316f17 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -201,6 +201,11 @@ struct tp_dispatch {
 		struct evdev_device *trackpoint;
 	} buttons;				/* physical buttons */
 
+	struct {
+		struct libinput_device_config_natural_scroll config;
+		bool natural_scrolling_enabled;
+	} scroll;
+
 	enum touchpad_event queued;
 
 	struct {

From f73c28bf70d7c3941a758296f89334463e3f1d4f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 18 Sep 2014 16:14:35 +1000
Subject: [PATCH 014/121] test: add tests for natural scrolling

2-finger scrolling only, we don't have anything else yet

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/touchpad.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/test/touchpad.c b/test/touchpad.c
index 522cee65..717cb692 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -1368,6 +1368,52 @@ START_TEST(touchpad_2fg_scroll)
 }
 END_TEST
 
+START_TEST(touchpad_scroll_natural_defaults)
+{
+	struct litest_device *dev = litest_current_device();
+
+	ck_assert_int_ge(libinput_device_config_scroll_has_natural_scroll(dev->libinput_device), 1);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0);
+	ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), 0);
+}
+END_TEST
+
+START_TEST(touchpad_scroll_natural_enable_config)
+{
+	struct litest_device *dev = litest_current_device();
+	enum libinput_config_status status;
+
+	status = libinput_device_config_scroll_set_natural_scroll_enabled(dev->libinput_device, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 1);
+
+	status = libinput_device_config_scroll_set_natural_scroll_enabled(dev->libinput_device, 0);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0);
+}
+END_TEST
+
+START_TEST(touchpad_scroll_natural)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+
+	litest_drain_events(li);
+
+	libinput_device_config_scroll_set_natural_scroll_enabled(dev->libinput_device, 1);
+
+	test_2fg_scroll(dev, 0.1, 40, 0);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -10);
+	test_2fg_scroll(dev, 0.1, -40, 0);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 10);
+	test_2fg_scroll(dev, 40, 0.1, 0);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -10);
+	test_2fg_scroll(dev, -40, 0.1, 0);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, 10);
+
+}
+END_TEST
+
 START_TEST(touchpad_tap_is_available)
 {
 	struct litest_device *dev = litest_current_device();
@@ -1640,6 +1686,9 @@ int main(int argc, char **argv) {
 	litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_move_out_ignore, LITEST_TOPBUTTONPAD, LITEST_ANY);
 
 	litest_add("touchpad:scroll", touchpad_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+	litest_add("touchpad:scroll", touchpad_scroll_natural_defaults, LITEST_TOUCHPAD, LITEST_ANY);
+	litest_add("touchpad:scroll", touchpad_scroll_natural_enable_config, LITEST_TOUCHPAD, LITEST_ANY);
+	litest_add("touchpad:scroll", touchpad_scroll_natural, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 
 	litest_add("touchpad:palm", touchpad_palm_detect_at_edge, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:palm", touchpad_palm_detect_at_bottom_corners, LITEST_TOUCHPAD, LITEST_CLICKPAD);

From 5e256e4f49abf018791f52d5e01faf5d4b5b00a6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Sep 2014 16:37:36 +1000
Subject: [PATCH 015/121] Add missing doxygen @ingroup commands

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libinput.h b/src/libinput.h
index 8f1dca25..cae10f40 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1725,6 +1725,8 @@ uint32_t
 libinput_device_config_send_events_get_modes(struct libinput_device *device);
 
 /**
+ * @ingroup config
+ *
  * Set the send-event mode for this device. The mode defines when the device
  * processes and sends events to the caller.
  *
@@ -1756,6 +1758,8 @@ libinput_device_config_send_events_set_mode(struct libinput_device *device,
 					    enum libinput_config_send_events_mode mode);
 
 /**
+ * @ingroup config
+ *
  * Get the send-event mode for this device. The mode defines when the device
  * processes and sends events to the caller.
  *
@@ -1770,6 +1774,8 @@ enum libinput_config_send_events_mode
 libinput_device_config_send_events_get_mode(struct libinput_device *device);
 
 /**
+ * @ingroup config
+ *
  * Get the default send-event mode for this device. The mode defines when
  * the device processes and sends events to the caller.
  *

From e4adbff919223861bb2630eb413c1c64d02dfd57 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 16 Sep 2014 16:08:29 +1000
Subject: [PATCH 016/121] test: add helper functions for the two timers we care
 about

Rather than a random msleep() with a comment, use a helper function that
describes what we're waiting for. Also makes changing the timeouts easier in
the future.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/device.c   |  4 ++--
 test/litest.c   | 12 ++++++++++++
 test/litest.h   |  3 +++
 test/touchpad.c | 34 +++++++++++++++++-----------------
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/test/device.c b/test/device.c
index 33aae04e..3061ebc6 100644
--- a/test/device.c
+++ b/test/device.c
@@ -404,7 +404,7 @@ START_TEST(device_disable_release_tap)
 	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
 	/* tap happened before suspending, so we still expect the event */
 
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 
 	litest_assert_button_event(li,
 				   BTN_LEFT,
@@ -443,7 +443,7 @@ START_TEST(device_disable_release_tap_n_drag)
 	litest_touch_up(dev, 0);
 	litest_touch_down(dev, 0, 50, 50);
 	libinput_dispatch(li);
-	msleep(400); /* tap-n-drag timeout */
+	litest_timeout_tap();
 	libinput_dispatch(li);
 
 	status = libinput_device_config_send_events_set_mode(device,
diff --git a/test/litest.c b/test/litest.c
index e5092b8c..29820a7e 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -1123,3 +1123,15 @@ void litest_assert_scroll(struct libinput *li, unsigned int axis, int dir)
 		next_event = libinput_get_event(li);
 	}
 }
+
+void
+litest_timeout_tap(void)
+{
+	msleep(200);
+}
+
+void
+litest_timeout_softbuttons(void)
+{
+	msleep(300);
+}
diff --git a/test/litest.h b/test/litest.h
index fca6acb3..c40427db 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -158,6 +158,9 @@ struct libevdev_uinput * litest_create_uinput_abs_device(const char *name,
 							 const struct input_absinfo *abs,
 							 ...);
 
+void litest_timeout_tap(void);
+void litest_timeout_softbuttons(void);
+
 #ifndef ck_assert_notnull
 #define ck_assert_notnull(ptr) ck_assert_ptr_ne(ptr, NULL)
 #endif
diff --git a/test/touchpad.c b/test/touchpad.c
index 717cb692..c89a71cd 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -107,7 +107,7 @@ START_TEST(touchpad_1fg_tap)
 
 	litest_assert_button_event(li, BTN_LEFT,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 	litest_assert_button_event(li, BTN_LEFT,
 				   LIBINPUT_BUTTON_STATE_RELEASED);
 
@@ -162,7 +162,7 @@ START_TEST(touchpad_1fg_tap_n_drag)
 
 	ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_NONE);
 
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 
 	litest_assert_button_event(li, BTN_LEFT,
 				   LIBINPUT_BUTTON_STATE_RELEASED);
@@ -185,7 +185,7 @@ START_TEST(touchpad_1fg_tap_n_drag_timeout)
 	litest_touch_up(dev, 0);
 	litest_touch_down(dev, 0, 50, 50);
 	libinput_dispatch(li);
-	msleep(300);
+	litest_timeout_tap();
 
 	litest_assert_button_event(li, BTN_LEFT,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
@@ -219,7 +219,7 @@ START_TEST(touchpad_2fg_tap)
 
 	litest_assert_button_event(li, BTN_RIGHT,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 	litest_assert_button_event(li, BTN_RIGHT,
 				   LIBINPUT_BUTTON_STATE_RELEASED);
 
@@ -246,7 +246,7 @@ START_TEST(touchpad_2fg_tap_inverted)
 
 	litest_assert_button_event(li, BTN_RIGHT,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 	litest_assert_button_event(li, BTN_RIGHT,
 				   LIBINPUT_BUTTON_STATE_RELEASED);
 
@@ -274,7 +274,7 @@ START_TEST(touchpad_1fg_tap_click)
 	litest_event(dev, EV_KEY, BTN_LEFT, 0);
 	litest_event(dev, EV_SYN, SYN_REPORT, 0);
 	libinput_dispatch(li);
-	msleep(200);
+	litest_timeout_tap();
 
 	libinput_dispatch(li);
 
@@ -423,7 +423,7 @@ START_TEST(touchpad_no_2fg_tap_after_timeout)
 	 */
 	litest_touch_down(dev, 0, 50, 50);
 	libinput_dispatch(dev->libinput);
-	msleep(300);
+	litest_timeout_tap();
 	libinput_dispatch(dev->libinput);
 	litest_drain_events(dev->libinput);
 
@@ -577,7 +577,7 @@ START_TEST(touchpad_3fg_tap)
 
 		litest_assert_button_event(li, BTN_MIDDLE,
 					   LIBINPUT_BUTTON_STATE_PRESSED);
-		msleep(300); /* tap-n-drag timeout */
+		litest_timeout_tap();
 		litest_assert_button_event(li, BTN_MIDDLE,
 					   LIBINPUT_BUTTON_STATE_RELEASED);
 
@@ -613,7 +613,7 @@ START_TEST(touchpad_3fg_tap_btntool)
 
 	litest_assert_button_event(li, BTN_MIDDLE,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 	litest_assert_button_event(li, BTN_MIDDLE,
 				   LIBINPUT_BUTTON_STATE_RELEASED);
 
@@ -648,7 +648,7 @@ START_TEST(touchpad_3fg_tap_btntool_inverted)
 
 	litest_assert_button_event(li, BTN_MIDDLE,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
-	msleep(300); /* tap-n-drag timeout */
+	litest_timeout_tap();
 	litest_assert_button_event(li, BTN_MIDDLE,
 				   LIBINPUT_BUTTON_STATE_RELEASED);
 
@@ -750,7 +750,7 @@ START_TEST(clickpad_1fg_tap_click)
 	litest_event(dev, EV_SYN, SYN_REPORT, 0);
 	litest_touch_up(dev, 0);
 	libinput_dispatch(li);
-	msleep(200);
+	litest_timeout_tap();
 
 	libinput_dispatch(li);
 
@@ -999,7 +999,7 @@ START_TEST(clickpad_softbutton_left_1st_fg_move)
 	/* move out of the area, then wait for softbutton timer */
 	litest_touch_move_to(dev, 0, 20, 90, 90, 20, 10);
 	libinput_dispatch(li);
-	msleep(400);
+	litest_timeout_softbuttons();
 	libinput_dispatch(li);
 	litest_drain_events(li);
 
@@ -1302,13 +1302,13 @@ START_TEST(clickpad_topsoftbuttons_move_out_ignore)
 
 	litest_touch_down(dev, 0, 50, 5);
 	libinput_dispatch(li);
-	msleep(200);
+	litest_timeout_softbuttons();
 	libinput_dispatch(li);
 	litest_assert_empty_queue(li);
 
 	litest_touch_move_to(dev, 0, 50, 5, 80, 90, 20);
 	libinput_dispatch(li);
-	msleep(400);
+	litest_timeout_softbuttons();
 	libinput_dispatch(li);
 
 	litest_event(dev, EV_KEY, BTN_LEFT, 1);
@@ -1323,7 +1323,7 @@ START_TEST(clickpad_topsoftbuttons_move_out_ignore)
 END_TEST
 
 static void
-test_2fg_scroll(struct litest_device *dev, double dx, double dy, int sleep)
+test_2fg_scroll(struct litest_device *dev, double dx, double dy, int want_sleep)
 {
 	struct libinput *li = dev->libinput;
 
@@ -1334,9 +1334,9 @@ test_2fg_scroll(struct litest_device *dev, double dx, double dy, int sleep)
 	litest_touch_move_to(dev, 1, 53, 50, 53 + dx, 50 + dy, 5);
 
 	/* Avoid a small scroll being seen as a tap */
-	if (sleep) {
+	if (want_sleep) {
 		libinput_dispatch(li);
-		msleep(sleep);
+		litest_timeout_tap();
 		libinput_dispatch(li);
 	}
 

From 4dce0648f668d416d88a3835c29667cd4fdb5850 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 17 Sep 2014 10:07:38 +1000
Subject: [PATCH 017/121] test: add litest_push/pop_event_frame() helpers

For some tests we need to string multiple event sequences together into one
event frame. Use a push/pop frame approach that stops litest from sending any
EV_SYN/SYN_REPORT events, so we can merge two touches together by e.g.

litest_push_event_frame(d);
litest_touch_down(d, 0, 10, 10);
litest_touch_down(d, 1, 20, 50);
litest_pop_event_frame(d);

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/litest.c | 22 +++++++++++++++++++++-
 test/litest.h |  5 +++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/test/litest.c b/test/litest.c
index 29820a7e..e028176d 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -634,7 +634,12 @@ void
 litest_event(struct litest_device *d, unsigned int type,
 	     unsigned int code, int value)
 {
-	int ret = libevdev_uinput_write_event(d->uinput, type, code, value);
+	int ret;
+
+	if (d->skip_ev_syn && type == EV_SYN && code == SYN_REPORT)
+		return;
+
+	ret = libevdev_uinput_write_event(d->uinput, type, code, value);
 	ck_assert_int_eq(ret, 0);
 }
 
@@ -1135,3 +1140,18 @@ litest_timeout_softbuttons(void)
 {
 	msleep(300);
 }
+
+void
+litest_push_event_frame(struct litest_device *dev)
+{
+	assert(!dev->skip_ev_syn);
+	dev->skip_ev_syn = true;
+}
+
+void
+litest_pop_event_frame(struct litest_device *dev)
+{
+	assert(dev->skip_ev_syn);
+	dev->skip_ev_syn = false;
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+}
diff --git a/test/litest.h b/test/litest.h
index c40427db..26b30407 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -73,6 +73,8 @@ struct litest_device {
 	struct litest_device_interface *interface;
 
 	int ntouches_down;
+	bool skip_ev_syn;
+
 	void *private; /* device-specific data */
 };
 
@@ -161,6 +163,9 @@ struct libevdev_uinput * litest_create_uinput_abs_device(const char *name,
 void litest_timeout_tap(void);
 void litest_timeout_softbuttons(void);
 
+void litest_push_event_frame(struct litest_device *dev);
+void litest_pop_event_frame(struct litest_device *dev);
+
 #ifndef ck_assert_notnull
 #define ck_assert_notnull(ptr) ck_assert_ptr_ne(ptr, NULL)
 #endif

From cba92f9762a377120867061fe42d656d1295bc44 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Sep 2014 16:48:41 +1000
Subject: [PATCH 018/121] Add configuration option for left-handed behavior

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/libinput-private.h |  8 +++++
 src/libinput.c         | 37 ++++++++++++++++++++
 src/libinput.h         | 78 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 123 insertions(+)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index e71e685d..5a975d91 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -125,12 +125,20 @@ struct libinput_device_config_natural_scroll {
 	int (*get_default_enabled)(struct libinput_device *device);
 };
 
+struct libinput_device_config_left_handed {
+	int (*has)(struct libinput_device *device);
+	enum libinput_config_status (*set)(struct libinput_device *device, int left_handed);
+	int (*get)(struct libinput_device *device);
+	int (*get_default)(struct libinput_device *device);
+};
+
 struct libinput_device_config {
 	struct libinput_device_config_tap *tap;
 	struct libinput_device_config_calibration *calibration;
 	struct libinput_device_config_send_events *sendevents;
 	struct libinput_device_config_accel *accel;
 	struct libinput_device_config_natural_scroll *natural_scroll;
+	struct libinput_device_config_left_handed *left_handed;
 };
 
 struct libinput_device {
diff --git a/src/libinput.c b/src/libinput.c
index 6ac0d826..5780a92d 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1464,3 +1464,40 @@ libinput_device_config_scroll_get_default_natural_scroll_enabled(struct libinput
 
 	return device->config.natural_scroll->get_default_enabled(device);
 }
+
+LIBINPUT_EXPORT int
+libinput_device_config_buttons_has_left_handed(struct libinput_device *device)
+{
+	if (!device->config.left_handed)
+		return 0;
+
+	return device->config.left_handed->has(device);
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_device_config_buttons_set_left_handed(struct libinput_device *device,
+					       int left_handed)
+{
+	if (!libinput_device_config_buttons_has_left_handed(device))
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
+	return device->config.left_handed->set(device, left_handed);
+}
+
+LIBINPUT_EXPORT int
+libinput_device_config_buttons_get_left_handed(struct libinput_device *device)
+{
+	if (!libinput_device_config_buttons_has_left_handed(device))
+		return 0;
+
+	return device->config.left_handed->get(device);
+}
+
+LIBINPUT_EXPORT int
+libinput_device_config_buttons_get_default_left_handed(struct libinput_device *device)
+{
+	if (!libinput_device_config_buttons_has_left_handed(device))
+		return 0;
+
+	return device->config.left_handed->get_default(device);
+}
diff --git a/src/libinput.h b/src/libinput.h
index cae10f40..9cc6f526 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1929,6 +1929,84 @@ libinput_device_config_scroll_get_natural_scroll_enabled(struct libinput_device
 int
 libinput_device_config_scroll_get_default_natural_scroll_enabled(struct libinput_device *device);
 
+/**
+ * @ingroup config
+ *
+ * Check if a device has a button configuration that supports left-handed
+ * usage.
+ *
+ * @param device The device to configure
+ * @return Non-zero if the device can be set to left-handed, or zero
+ * otherwise
+ *
+ * @see libinput_device_config_buttons_set_left_handed
+ * @see libinput_device_config_buttons_get_left_handed
+ * @see libinput_device_config_buttons_get_default_left_handed
+ */
+int
+libinput_device_config_buttons_has_left_handed(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Set the left-handed configuration of the device. A device in left-handed
+ * mode sends a left button event instead of the right button and vice
+ * versa.
+ *
+ * The exact button behavior is device-dependent. On a mouse and most
+ * pointing devices, left and right buttons are swapped but the middle
+ * button is unmodified. On a touchpad, physical buttons (if present) are
+ * swapped. On a clickpad, the top and bottom software-emulated buttons are
+ * swapped where present, the main area of the touchpad remains a left
+ * button. Tapping and clickfinger behavior is not affected by this setting.
+ *
+ * Changing the left-handed configuration of a device may not take effect
+ * until all buttons have been logically released.
+ *
+ * @param device The device to configure
+ * @param left_handed Zero to disable, non-zero to enable left-handed mode
+ * @return A configuration status code
+ *
+ * @see libinput_device_config_buttons_has_left_handed
+ * @see libinput_device_config_buttons_get_left_handed
+ * @see libinput_device_config_buttons_get_default_left_handed
+ */
+enum libinput_config_status
+libinput_device_config_buttons_set_left_handed(struct libinput_device *device,
+					       int left_handed);
+
+/**
+ * @ingroup config
+ *
+ * Get the current left-handed configuration of the device.
+ *
+ * @param device The device to configure
+ * @return Zero if the device is in right-handed mode, non-zero if the
+ * device is in left-handed mode
+ *
+ * @see libinput_device_config_buttons_has_left_handed
+ * @see libinput_device_config_buttons_set_left_handed
+ * @see libinput_device_config_buttons_get_default_left_handed
+ */
+int
+libinput_device_config_buttons_get_left_handed(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Get the default left-handed configuration of the device.
+ *
+ * @param device The device to configure
+ * @return Zero if the device is in right-handed mode by default, or non-zero if the
+ * device is in left-handed mode by default
+ *
+ * @see libinput_device_config_buttons_has_left_handed
+ * @see libinput_device_config_buttons_set_left_handed
+ * @see libinput_device_config_buttons_get_left_handed
+ */
+int
+libinput_device_config_buttons_get_default_left_handed(struct libinput_device *device);
+
 #ifdef __cplusplus
 }
 #endif

From 3240b4287b4e7d3b4a8eddde402eb2ae5fe3bc3b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Sep 2014 13:48:06 +1000
Subject: [PATCH 019/121] evdev: hook up left-handed configuration option

Two separate flags needed, want_left_handed and left_handed to avoid switching
to left_handed while a button is still down. Since each backend has a
different way of determining whether buttons are down, let them set a function
to do exactly that. Then call that function whenever a button release event is
posted to switch the device to right/left-handed if applicable.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/evdev.h | 28 ++++++++++++++++
 2 files changed, 118 insertions(+), 3 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 4c0669cd..d8e3e5ac 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -115,8 +115,14 @@ evdev_pointer_notify_button(struct evdev_device *device,
 	down_count = update_key_down_count(device, button, state);
 
 	if ((state == LIBINPUT_BUTTON_STATE_PRESSED && down_count == 1) ||
-	    (state == LIBINPUT_BUTTON_STATE_RELEASED && down_count == 0))
+	    (state == LIBINPUT_BUTTON_STATE_RELEASED && down_count == 0)) {
 		pointer_notify_button(&device->base, time, button, state);
+
+		if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
+		    device->buttons.change_to_left_handed)
+			device->buttons.change_to_left_handed(device);
+	}
+
 }
 
 void
@@ -455,7 +461,7 @@ evdev_process_key(struct evdev_device *device,
 		evdev_pointer_notify_button(
 			device,
 			time,
-			e->code,
+			evdev_to_left_handed(device, e->code),
 			e->value ? LIBINPUT_BUTTON_STATE_PRESSED :
 				   LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
@@ -754,15 +760,93 @@ evdev_sendevents_get_default_mode(struct libinput_device *device)
 	return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
 }
 
+static int
+evdev_left_handed_has(struct libinput_device *device)
+{
+	/* This is only hooked up when we have left-handed configuration, so we
+	 * can hardcode 1 here */
+	return 1;
+}
+
+static void
+evdev_change_to_left_handed(struct evdev_device *device)
+{
+	unsigned int button;
+
+	if (device->buttons.want_left_handed == device->buttons.left_handed)
+		return;
+
+	for (button = BTN_LEFT; button < BTN_JOYSTICK; button++) {
+		if (libevdev_has_event_code(device->evdev, EV_KEY, button) &&
+		    hw_is_key_down(device, button))
+			return;
+	}
+
+	device->buttons.left_handed = device->buttons.want_left_handed;
+}
+
+static enum libinput_config_status
+evdev_left_handed_set(struct libinput_device *device, int left_handed)
+{
+	struct evdev_device *evdev_device = (struct evdev_device *)device;
+
+	evdev_device->buttons.want_left_handed = left_handed ? true : false;
+
+	evdev_device->buttons.change_to_left_handed(evdev_device);
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static int
+evdev_left_handed_get(struct libinput_device *device)
+{
+	struct evdev_device *evdev_device = (struct evdev_device *)device;
+
+	/* return the wanted configuration, even if it hasn't taken
+	 * effect yet! */
+	return evdev_device->buttons.want_left_handed;
+}
+
+static int
+evdev_left_handed_get_default(struct libinput_device *device)
+{
+	return 0;
+}
+
+int
+evdev_init_left_handed(struct evdev_device *device,
+		       void (*change_to_left_handed)(struct evdev_device *))
+{
+	device->buttons.config_left_handed.has = evdev_left_handed_has;
+	device->buttons.config_left_handed.set = evdev_left_handed_set;
+	device->buttons.config_left_handed.get = evdev_left_handed_get;
+	device->buttons.config_left_handed.get_default = evdev_left_handed_get_default;
+	device->base.config.left_handed = &device->buttons.config_left_handed;
+	device->buttons.left_handed = false;
+	device->buttons.want_left_handed = false;
+	device->buttons.change_to_left_handed = change_to_left_handed;
+
+	return 0;
+}
+
 static struct evdev_dispatch *
 fallback_dispatch_create(struct libinput_device *device)
 {
 	struct evdev_dispatch *dispatch = zalloc(sizeof *dispatch);
+	struct evdev_device *evdev_device = (struct evdev_device *)device;
+
 	if (dispatch == NULL)
 		return NULL;
 
 	dispatch->interface = &fallback_interface;
 
+	if (evdev_device->buttons.want_left_handed &&
+	    evdev_init_left_handed(evdev_device,
+				   evdev_change_to_left_handed) == -1) {
+		free(dispatch);
+		return NULL;
+	}
+
 	device->config.calibration = &dispatch->calibration;
 
 	dispatch->calibration.has_matrix = evdev_calibration_has_matrix;
@@ -1101,6 +1185,9 @@ evdev_configure_device(struct evdev_device *device)
 			 has_abs ? " absolute-motion" : "",
 			 has_rel ? " relative-motion": "",
 			 has_button ? " button" : "");
+
+		/* want left-handed config option */
+		device->buttons.want_left_handed = true;
 	}
 	if (has_keyboard) {
 		device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
@@ -1461,7 +1548,7 @@ release_pressed_keys(struct evdev_device *device)
 				evdev_pointer_notify_button(
 					device,
 					time,
-					code,
+					evdev_to_left_handed(device, code),
 					LIBINPUT_BUTTON_STATE_RELEASED);
 				break;
 			}
diff --git a/src/evdev.h b/src/evdev.h
index d4b8ee63..c0d65771 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -124,6 +124,17 @@ struct evdev_device {
 	/* Key counter used for multiplexing button events internally in
 	 * libinput. */
 	uint8_t key_count[KEY_CNT];
+
+	struct {
+		struct libinput_device_config_left_handed config_left_handed;
+		/* left-handed currently enabled */
+		bool left_handed;
+		/* set during device init if we want left_handed config,
+		 * used at runtime to delay the effect until buttons are up */
+		bool want_left_handed;
+		/* Checks if buttons are down and commits the setting */
+		void (*change_to_left_handed)(struct evdev_device *device);
+	} buttons;
 };
 
 #define EVDEV_UNHANDLED_DEVICE ((struct evdev_device *) 1)
@@ -279,4 +290,21 @@ evdev_convert_to_mm(const struct input_absinfo *absinfo, double v)
 	return value/absinfo->resolution;
 }
 
+int
+evdev_init_left_handed(struct evdev_device *device,
+		       void (*change_to_left_handed)(struct evdev_device *));
+
+static inline uint32_t
+evdev_to_left_handed(struct evdev_device *device,
+		     uint32_t button)
+{
+	if (device->buttons.left_handed) {
+		if (button == BTN_LEFT)
+			return BTN_RIGHT;
+		else if (button == BTN_RIGHT)
+			return BTN_LEFT;
+	}
+	return button;
+}
+
 #endif /* EVDEV_H */

From 837a041abd5449c7423eb6e9e95be18f831404a6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Sep 2014 14:35:42 +1000
Subject: [PATCH 020/121] touchpad: hook up left-handed configuration

Tapping and clickfinger is unaffected, physical and software buttons are
swapped. The main area of a clickpad remains as left button though.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad-buttons.c | 13 +++++++++----
 src/evdev-mt-touchpad.c         | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 21417ab9..3dcc8b0b 100644
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -661,14 +661,17 @@ tp_post_physical_buttons(struct tp_dispatch *tp, uint64_t time)
 		enum libinput_button_state state;
 
 		if ((current & 0x1) ^ (old & 0x1)) {
+			uint32_t b;
+
 			if (!!(current & 0x1))
 				state = LIBINPUT_BUTTON_STATE_PRESSED;
 			else
 				state = LIBINPUT_BUTTON_STATE_RELEASED;
 
+			b = evdev_to_left_handed(tp->device, button);
 			evdev_pointer_notify_button(tp->device,
 						    time,
-						    button,
+						    b,
 						    state);
 		}
 
@@ -758,10 +761,12 @@ tp_post_softbutton_buttons(struct tp_dispatch *tp, uint64_t time)
 		}
 
 		if ((button & MIDDLE) || ((button & LEFT) && (button & RIGHT)))
-			button = BTN_MIDDLE;
+			button = evdev_to_left_handed(tp->device, BTN_MIDDLE);
 		else if (button & RIGHT)
-			button = BTN_RIGHT;
-		else
+			button = evdev_to_left_handed(tp->device, BTN_RIGHT);
+		else if (button & LEFT)
+			button = evdev_to_left_handed(tp->device, BTN_LEFT);
+		else /* main area is always BTN_LEFT */
 			button = BTN_LEFT;
 
 		tp->buttons.active = button;
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 56f46ece..a8d12e42 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1056,6 +1056,23 @@ tp_sendevents_get_default_mode(struct libinput_device *device)
 	return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
 }
 
+static void
+tp_change_to_left_handed(struct evdev_device *device)
+{
+	struct tp_dispatch *tp = (struct tp_dispatch *)device->dispatch;
+
+	if (device->buttons.want_left_handed == device->buttons.left_handed)
+		return;
+
+	if (tp->buttons.state & 0x3) /* BTN_LEFT|BTN_RIGHT */
+		return;
+
+	/* tapping and clickfinger aren't affected by left-handed config,
+	 * so checking physical buttons is enough */
+
+	device->buttons.left_handed = device->buttons.want_left_handed;
+}
+
 struct evdev_dispatch *
 evdev_mt_touchpad_create(struct evdev_device *device)
 {
@@ -1078,5 +1095,7 @@ evdev_mt_touchpad_create(struct evdev_device *device)
 	tp->sendevents.config.get_mode = tp_sendevents_get_mode;
 	tp->sendevents.config.get_default_mode = tp_sendevents_get_default_mode;
 
+	evdev_init_left_handed(device, tp_change_to_left_handed);
+
 	return  &tp->base;
 }

From 9b9a6a75fa3ad11ee4924e5ef214525105e56ca9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Sep 2014 12:46:02 +1000
Subject: [PATCH 021/121] test: add some left-handed tests

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/pointer.c  | 128 ++++++++++++++++++++
 test/touch.c    |  23 ++++
 test/touchpad.c | 306 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 457 insertions(+)

diff --git a/test/pointer.c b/test/pointer.c
index f704372e..56b6709a 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -396,6 +396,128 @@ START_TEST(pointer_no_calibration)
 }
 END_TEST
 
+START_TEST(pointer_left_handed_defaults)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	int rc;
+
+	rc = libinput_device_config_buttons_has_left_handed(d);
+	ck_assert_int_ne(rc, 0);
+
+	rc = libinput_device_config_buttons_get_left_handed(d);
+	ck_assert_int_eq(rc, 0);
+
+	rc = libinput_device_config_buttons_get_default_left_handed(d);
+	ck_assert_int_eq(rc, 0);
+}
+END_TEST
+
+START_TEST(pointer_left_handed)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	litest_button_click(dev, BTN_RIGHT, 1);
+	litest_button_click(dev, BTN_RIGHT, 0);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	if (libevdev_has_event_code(dev->evdev,
+				    EV_KEY,
+				    BTN_MIDDLE)) {
+		litest_button_click(dev, BTN_MIDDLE, 1);
+		litest_button_click(dev, BTN_MIDDLE, 0);
+		litest_assert_button_event(li,
+					   BTN_MIDDLE,
+					   LIBINPUT_BUTTON_STATE_PRESSED);
+		litest_assert_button_event(li,
+					   BTN_MIDDLE,
+					   LIBINPUT_BUTTON_STATE_RELEASED);
+	}
+}
+END_TEST
+
+START_TEST(pointer_left_handed_during_click)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	litest_drain_events(li);
+	litest_button_click(dev, BTN_LEFT, 1);
+	libinput_dispatch(li);
+
+	/* Change while button is down, expect correct release event */
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_button_click(dev, BTN_LEFT, 0);
+
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+}
+END_TEST
+
+START_TEST(pointer_left_handed_during_click_multiple_buttons)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	litest_drain_events(li);
+	litest_button_click(dev, BTN_LEFT, 1);
+	libinput_dispatch(li);
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	/* No left-handed until all buttons were down */
+	litest_button_click(dev, BTN_RIGHT, 1);
+	litest_button_click(dev, BTN_RIGHT, 0);
+	litest_button_click(dev, BTN_LEFT, 0);
+
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+}
+END_TEST
+
 int main (int argc, char **argv) {
 
 	litest_add("pointer:motion", pointer_motion_relative, LITEST_POINTER, LITEST_ANY);
@@ -406,5 +528,11 @@ int main (int argc, char **argv) {
 
 	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH);
 
+									/* tests touchpads too */
+	litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:left-handed", pointer_left_handed, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:left-handed", pointer_left_handed_during_click, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:left-handed", pointer_left_handed_during_click_multiple_buttons, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
+
 	return litest_run(argc, argv);
 }
diff --git a/test/touch.c b/test/touch.c
index 1c0a4b6e..e51b85e7 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -401,6 +401,27 @@ START_TEST(touch_calibration_translation)
 }
 END_TEST
 
+START_TEST(touch_no_left_handed)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	enum libinput_config_status status;
+	int rc;
+
+	rc = libinput_device_config_buttons_has_left_handed(d);
+	ck_assert_int_eq(rc, 0);
+
+	rc = libinput_device_config_buttons_get_left_handed(d);
+	ck_assert_int_eq(rc, 0);
+
+	rc = libinput_device_config_buttons_get_default_left_handed(d);
+	ck_assert_int_eq(rc, 0);
+
+	status = libinput_device_config_buttons_set_left_handed(d, 0);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED);
+}
+END_TEST
+
 int
 main(int argc, char **argv)
 {
@@ -415,5 +436,7 @@ main(int argc, char **argv)
 	litest_add("touch:calibration", touch_calibration_translation, LITEST_TOUCH, LITEST_TOUCHPAD);
 	litest_add("touch:calibration", touch_calibration_translation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD);
 
+	litest_add("touch:left-handed", touch_no_left_handed, LITEST_TOUCH, LITEST_ANY);
+
 	return litest_run(argc, argv);
 }
diff --git a/test/touchpad.c b/test/touchpad.c
index c89a71cd..8cd838e7 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -1628,8 +1628,306 @@ START_TEST(touchpad_palm_detect_no_palm_moving_into_edges)
 }
 END_TEST
 
+START_TEST(touchpad_left_handed)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	litest_button_click(dev, BTN_RIGHT, 1);
+	litest_button_click(dev, BTN_RIGHT, 0);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	if (libevdev_has_event_code(dev->evdev,
+				    EV_KEY,
+				    BTN_MIDDLE)) {
+		litest_button_click(dev, BTN_MIDDLE, 1);
+		litest_button_click(dev, BTN_MIDDLE, 0);
+		litest_assert_button_event(li,
+					   BTN_MIDDLE,
+					   LIBINPUT_BUTTON_STATE_PRESSED);
+		litest_assert_button_event(li,
+					   BTN_MIDDLE,
+					   LIBINPUT_BUTTON_STATE_RELEASED);
+	}
+}
+END_TEST
+
+START_TEST(touchpad_left_handed_clickpad)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+	litest_touch_down(dev, 0, 10, 90);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+	litest_touch_up(dev, 0);
+
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	litest_drain_events(li);
+	litest_touch_down(dev, 0, 90, 90);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+	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_drain_events(li);
+	litest_touch_down(dev, 0, 50, 50);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+	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);
+}
+END_TEST
+
+START_TEST(touchpad_left_handed_clickfinger)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+	litest_touch_down(dev, 0, 10, 90);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+	litest_touch_up(dev, 0);
+
+	/* Clickfinger is unaffected by left-handed setting */
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	litest_drain_events(li);
+	litest_touch_down(dev, 0, 10, 90);
+	litest_touch_down(dev, 1, 30, 90);
+	litest_button_click(dev, BTN_LEFT, 1);
+	litest_button_click(dev, BTN_LEFT, 0);
+	litest_touch_up(dev, 0);
+	litest_touch_up(dev, 1);
+
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+}
+END_TEST
+
+START_TEST(touchpad_left_handed_tapping)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	libinput_device_config_tap_set_enabled(dev->libinput_device,
+					       LIBINPUT_CONFIG_TAP_ENABLED);
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_up(dev, 0);
+
+	libinput_dispatch(li);
+	litest_timeout_tap();
+	libinput_dispatch(li);
+
+	/* Tapping is unaffected by left-handed setting */
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+}
+END_TEST
+
+START_TEST(touchpad_left_handed_tapping_2fg)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	libinput_device_config_tap_set_enabled(dev->libinput_device,
+					       LIBINPUT_CONFIG_TAP_ENABLED);
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_down(dev, 1, 70, 50);
+	litest_touch_up(dev, 0);
+	litest_touch_up(dev, 1);
+
+	libinput_dispatch(li);
+	litest_timeout_tap();
+	libinput_dispatch(li);
+
+	/* Tapping is unaffected by left-handed setting */
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+}
+END_TEST
+
+START_TEST(touchpad_left_handed_delayed)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+
+	litest_drain_events(li);
+	litest_button_click(dev, BTN_LEFT, 1);
+	libinput_dispatch(li);
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_button_click(dev, BTN_LEFT, 0);
+
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	/* left-handed takes effect now */
+	litest_button_click(dev, BTN_RIGHT, 1);
+	litest_button_click(dev, BTN_LEFT, 1);
+	libinput_dispatch(li);
+
+	status = libinput_device_config_buttons_set_left_handed(d, 0);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_button_click(dev, BTN_RIGHT, 0);
+	litest_button_click(dev, BTN_LEFT, 0);
+
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+	litest_assert_button_event(li,
+				   BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+}
+END_TEST
+
+START_TEST(touchpad_left_handed_clickpad_delayed)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *d = dev->libinput_device;
+	struct libinput *li = dev->libinput;
+	enum libinput_config_status status;
+
+	litest_drain_events(li);
+	litest_touch_down(dev, 0, 10, 90);
+	litest_button_click(dev, BTN_LEFT, 1);
+	libinput_dispatch(li);
+
+	status = libinput_device_config_buttons_set_left_handed(d, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_button_click(dev, BTN_LEFT, 0);
+	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);
+
+	/* left-handed takes effect now */
+	litest_drain_events(li);
+	litest_touch_down(dev, 0, 90, 90);
+	litest_button_click(dev, BTN_LEFT, 1);
+	libinput_dispatch(li);
+
+	status = libinput_device_config_buttons_set_left_handed(d, 0);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_button_click(dev, BTN_LEFT, 0);
+	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);
+}
+END_TEST
+
 int main(int argc, char **argv) {
 
+
 	litest_add("touchpad:motion", touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:motion", touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 
@@ -1697,5 +1995,13 @@ int main(int argc, char **argv) {
 	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:left-handed", touchpad_left_handed, LITEST_TOUCHPAD, LITEST_CLICKPAD);
+	litest_add("touchpad:left-handed", touchpad_left_handed_clickpad, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
+	litest_add("touchpad:left-handed", touchpad_left_handed_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY);
+	litest_add("touchpad:left-handed", touchpad_left_handed_tapping, LITEST_TOUCHPAD, LITEST_ANY);
+	litest_add("touchpad:left-handed", touchpad_left_handed_tapping_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+	litest_add("touchpad:left-handed", touchpad_left_handed_delayed, LITEST_TOUCHPAD, LITEST_CLICKPAD);
+	litest_add("touchpad:left-handed", touchpad_left_handed_clickpad_delayed, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
+
 	return litest_run(argc, argv);
 }

From 80356864e16264bcc732ad17594ee9fecdb4f85b Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Fri, 3 Oct 2014 15:01:35 -0500
Subject: [PATCH 022/121] cosmetic: convert evdev_need_touch_frame from int to
 bool

We use stdbool elsewhere, so use it here too for consistency.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index d8e3e5ac..dd2228bf 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -577,11 +577,11 @@ evdev_process_absolute(struct evdev_device *device,
 	}
 }
 
-static inline int
+static inline bool
 evdev_need_touch_frame(struct evdev_device *device)
 {
 	if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
-		return 0;
+		return false;
 
 	switch (device->pending_event) {
 	case EVDEV_NONE:
@@ -593,10 +593,10 @@ evdev_need_touch_frame(struct evdev_device *device)
 	case EVDEV_ABSOLUTE_TOUCH_DOWN:
 	case EVDEV_ABSOLUTE_TOUCH_UP:
 	case EVDEV_ABSOLUTE_MOTION:
-		return 1;
+		return true;
 	}
 
-	return 0;
+	return false;
 }
 
 static void
@@ -626,7 +626,7 @@ fallback_process(struct evdev_dispatch *dispatch,
 		 struct input_event *event,
 		 uint64_t time)
 {
-	int need_frame = 0;
+	bool need_frame = false;
 
 	switch (event->type) {
 	case EV_REL:

From 416a200ed9bdeb9a182bab2c291111330bf6de61 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 30 Oct 2014 15:16:40 +1000
Subject: [PATCH 023/121] doc: update for latest doxygen

doxygen -u, no manual interference.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 doc/libinput.doxygen.in | 2359 +++++++++++++++++++++++----------------
 1 file changed, 1419 insertions(+), 940 deletions(-)

diff --git a/doc/libinput.doxygen.in b/doc/libinput.doxygen.in
index 9f931c34..865cf974 100644
--- a/doc/libinput.doxygen.in
+++ b/doc/libinput.doxygen.in
@@ -1,110 +1,129 @@
-# Doxyfile 1.8.3.1
+# Doxyfile 1.8.8
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = @PACKAGE_NAME@
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "A wrapper library for input devices"
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
 
 PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       =
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -112,179 +131,207 @@ ALWAYS_DETAILED_SEC    = NO
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip. Note that you specify absolute paths here, but also
-# relative paths, which will be relative from the directory where doxygen is
-# started.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = YES
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                =
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
 TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
 
 MARKDOWN_SUPPORT       = YES
 
-# When enabled doxygen tries to link words that correspond to documented classes,
-# or namespaces to their corresponding documentation. Such a link can be
-# prevented in individual cases by by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
 
 AUTOLINK_SUPPORT       = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES (the
-# default) will make doxygen replace the get and set methods by a property in
-# the documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
@@ -292,51 +339,61 @@ IDL_PROPERTY_SUPPORT   = YES
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
 
 INLINE_SIMPLE_STRUCTS  = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
@@ -345,342 +402,389 @@ LOOKUP_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
 # If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
 # scope will be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if section-label ... \endif
-# and \cond section-label ... \endcond blocks.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 0
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            =
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path. Do not use
-# file names with spaces, bibtex cannot handle them.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @top_srcdir@/src/libinput.h
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          =
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = NO
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
@@ -689,14 +793,16 @@ EXCLUDE                =
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       =
 
@@ -705,819 +811,1089 @@ EXCLUDE_PATTERNS       =
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
 FILTER_SOURCE_PATTERNS =
 
-# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page (index.html).
-# This can be useful if you have a project on for instance GitHub and want reuse
-# the introduction page also for the doxygen output.
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
 
 USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: NO.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If left blank doxygen will
-# generate a default style sheet. Note that it is recommended to use
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-# tag will in the future become obsolete.
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        =
 
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-# user-defined cascading style sheet that is included after the standard
-# style sheets created by doxygen. Using this option one can overrule
-# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
-# robust against future updates. Doxygen will copy the style sheet file to
-# the output directory.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra stylesheet files is of importance (e.g. the last
+# stylesheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  =
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_FILES       =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_INDEX_NUM_ENTRIES = 100
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-# identify the documentation publisher. This should be a reverse domain-name
-# style string, e.g. com.mycompany.MyDocSet.documentation.
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
 # When MathJax is enabled you can set the default output format to be used for
-# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-# SVG. The default value is HTML-CSS, which is slower, but has the best
-# compatibility.
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_FORMAT         = HTML-CSS
 
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript.
-# There are two flavours of web server based search depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools.
-# See the manual for details.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
-# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
 # script for searching. Instead the search results are written to an XML file
 # which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-# the search results. Doxygen ships with an example indexer (doxyindexer) and
-# search engine (doxysearch.cgi) which are based on the open source search engine
-# library Xapian. See the manual for configuration details.
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTERNAL_SEARCH        = NO
 
 # The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will returned the search results when EXTERNAL_SEARCH is enabled.
-# Doxygen ships with an example search engine (doxysearch) which is based on
-# the open source search engine library Xapian. See the manual for configuration
-# details.
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
 # SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHDATA_FILE        = searchdata.xml
 
-# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
 # EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
 # useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
 # projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTERNAL_SEARCH_ID     =
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
 # all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-# of to a relative location where the documentation can be found.
-# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
+# for the replacement values of the other commands the user is refered to
+# HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1525,107 +1901,130 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = YES
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = YES
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = LIBINPUT_ATTRIBUTE_PRINTF(f, a)= \
-			 LIBINPUT_ATTRIBUTE_DEPRECATED
+PREDEFINED             = LIBINPUT_ATTRIBUTE_PRINTF(f, \
+                         a)= \
+                         LIBINPUT_ATTRIBUTE_DEPRECATED
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1633,222 +2032,302 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = NO
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = Helvetica
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INTERACTIVE_SVG        = NO
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
 MSCFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+PLANTUML_JAR_PATH      =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

From 2cef5a26cdfbc5aee70cd41738ea3db889353b64 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 30 Oct 2014 15:36:16 +1000
Subject: [PATCH 024/121] Fix a documentation typo

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libinput.h b/src/libinput.h
index 9cc6f526..de6bfc84 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1780,7 +1780,7 @@ libinput_device_config_send_events_get_mode(struct libinput_device *device);
  * the device processes and sends events to the caller.
  *
  * @param device The device to configure
- * @return The current send-event mode for this device.
+ * @return The default send-event mode for this device.
  *
  * @see libinput_device_config_send_events_get_modes
  * @see libinput_device_config_send_events_set_mode

From 84d59fe8e61c3b5f1f17500b16fdd54e402a7015 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Wed, 29 Oct 2014 09:56:27 -0500
Subject: [PATCH 025/121] evdev: Log evdev event queue overflows

Log a message when the kernel event queue overflows and events are dropped.
After 10 messages logging stops to avoid flooding the logs if the condition
is persistent.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 11 +++++++++++
 src/evdev.h |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/evdev.c b/src/evdev.c
index dd2228bf..e5e7bfdd 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -924,6 +924,17 @@ evdev_device_dispatch(void *data)
 		rc = libevdev_next_event(device->evdev,
 					 LIBEVDEV_READ_FLAG_NORMAL, &ev);
 		if (rc == LIBEVDEV_READ_STATUS_SYNC) {
+			if (device->syn_drops_received < 10) {
+				device->syn_drops_received++;
+				log_info(libinput, "SYN_DROPPED event from "
+					 "\"%s\" - some input events have "
+					 "been lost.\n", device->devname);
+				if (device->syn_drops_received == 10)
+					log_info(libinput, "No longer logging "
+						 "SYN_DROPPED events for "
+						 "\"%s\"\n", device->devname);
+			}
+
 			/* send one more sync event so we handle all
 			   currently pending events before we sync up
 			   to the current state */
diff --git a/src/evdev.h b/src/evdev.h
index c0d65771..9e846238 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -135,6 +135,10 @@ struct evdev_device {
 		/* Checks if buttons are down and commits the setting */
 		void (*change_to_left_handed)(struct evdev_device *device);
 	} buttons;
+
+	/* The number of times libevdev processes a SYN_DROPPED, so we can
+	 * stop logging them to avoid flooding the logs. */
+	int syn_drops_received;
 };
 
 #define EVDEV_UNHANDLED_DEVICE ((struct evdev_device *) 1)

From de9cff09dcdf3ec65661dabbafe667483f51c29e Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Thu, 30 Oct 2014 16:34:13 -0500
Subject: [PATCH 026/121] filter: Fix typo

accelator -> accelerator

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c  | 2 +-
 src/filter.c | 2 +-
 src/filter.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index e5e7bfdd..1f51b4af 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -992,7 +992,7 @@ int
 evdev_device_init_pointer_acceleration(struct evdev_device *device)
 {
 	device->pointer.filter =
-		create_pointer_accelator_filter(
+		create_pointer_accelerator_filter(
 			pointer_accel_profile_linear);
 	if (!device->pointer.filter)
 		return -1;
diff --git a/src/filter.c b/src/filter.c
index defbcae8..205cd03b 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -282,7 +282,7 @@ struct motion_filter_interface accelerator_interface = {
 };
 
 struct motion_filter *
-create_pointer_accelator_filter(accel_profile_func_t profile)
+create_pointer_accelerator_filter(accel_profile_func_t profile)
 {
 	struct pointer_accelerator *filter;
 
diff --git a/src/filter.h b/src/filter.h
index 1f53e81c..0dc081b4 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -53,7 +53,7 @@ typedef double (*accel_profile_func_t)(struct motion_filter *filter,
 				       uint64_t time);
 
 struct motion_filter *
-create_pointer_accelator_filter(accel_profile_func_t filter);
+create_pointer_accelerator_filter(accel_profile_func_t filter);
 
 
 /*

From 58e0fe270d9f3731f18ce3a7618a69a5112029b9 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Thu, 30 Oct 2014 16:34:14 -0500
Subject: [PATCH 027/121] filter: perform speed computations with doubles

Converting to integer before the sqrt calculation can cause loss of
motion at low speed.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/filter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/filter.c b/src/filter.c
index 205cd03b..afb87ef2 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -139,8 +139,8 @@ tracker_by_offset(struct pointer_accelerator *accel, unsigned int offset)
 static double
 calculate_tracker_velocity(struct pointer_tracker *tracker, uint64_t time)
 {
-	int dx;
-	int dy;
+	double dx;
+	double dy;
 	double distance;
 
 	dx = tracker->dx;

From 79898da377ba58857be0bd104de694eb1e66f41f Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Thu, 30 Oct 2014 16:34:15 -0500
Subject: [PATCH 028/121] evdev: add DPI to evdev calculations

Assume "normal" mice are 400DPI, and that all calculations should be
normalized to this before being fed into the filter.

There isn't yet a way to configure a device's DPI.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 7 +++++--
 src/evdev.h | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 1f51b4af..3aa87a75 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -42,6 +42,8 @@
 
 #define DEFAULT_AXIS_STEP_DISTANCE 10
 #define DEFAULT_MIDDLE_BUTTON_SCROLL_TIMEOUT 200
+/* The HW DPI rate we normalize to before calculating pointer acceleration */
+#define DEFAULT_MOUSE_DPI 400
 
 enum evdev_key_type {
 	EVDEV_KEY_TYPE_NONE,
@@ -205,8 +207,8 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 	case EVDEV_NONE:
 		return;
 	case EVDEV_RELATIVE_MOTION:
-		motion.dx = device->rel.dx;
-		motion.dy = device->rel.dy;
+		motion.dx = device->rel.dx / ((double)device->dpi / DEFAULT_MOUSE_DPI);
+		motion.dy = device->rel.dy / ((double)device->dpi / DEFAULT_MOUSE_DPI);
 		device->rel.dx = 0;
 		device->rel.dy = 0;
 
@@ -1293,6 +1295,7 @@ evdev_device_create(struct libinput_seat *seat,
 	device->devname = libevdev_get_name(device->evdev);
 	device->scroll.threshold = 5.0; /* Default may be overridden */
 	device->scroll.direction = 0;
+	device->dpi = DEFAULT_MOUSE_DPI;
 
 	matrix_init_identity(&device->abs.calibration);
 	matrix_init_identity(&device->abs.usermatrix);
diff --git a/src/evdev.h b/src/evdev.h
index 9e846238..666c8dc8 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -136,6 +136,7 @@ struct evdev_device {
 		void (*change_to_left_handed)(struct evdev_device *device);
 	} buttons;
 
+	int dpi; /* HW resolution */
 	/* The number of times libevdev processes a SYN_DROPPED, so we can
 	 * stop logging them to avoid flooding the logs. */
 	int syn_drops_received;

From 6b328c314ae6cb1da591609fbf5cd38344cbb903 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 4 Nov 2014 10:28:00 +1000
Subject: [PATCH 029/121] Fix documentation for libinput_log_set_handler

user_data argument was dropped in 97a6bf10f958.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libinput.h b/src/libinput.h
index de6bfc84..5623bffb 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1084,7 +1084,8 @@ libinput_log_get_priority(const struct libinput *libinput);
  * @param format Message format in printf-style
  * @param args Message arguments
  *
- * @see libinput_set_log_priority
+ * @see libinput_log_set_priority
+ * @see libinput_log_get_priority
  * @see libinput_log_set_handler
  */
 typedef void (*libinput_log_handler)(struct libinput *libinput,
@@ -1103,10 +1104,9 @@ typedef void (*libinput_log_handler)(struct libinput *libinput,
  *
  * @param libinput A previously initialized libinput context
  * @param log_handler The log handler for library messages.
- * @param user_data Caller-specific data pointer, passed into the log
- * handler.
  *
- * @see libinput_log_set_handler
+ * @see libinput_log_set_priority
+ * @see libinput_log_get_priority
  */
 void
 libinput_log_set_handler(struct libinput *libinput,

From 15527c73bd6f08e517a7b5af487c5b9525f97e22 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 5 Nov 2014 11:23:10 +1000
Subject: [PATCH 030/121] test: drop superfluous empty line

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/device.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/device.c b/test/device.c
index 3061ebc6..0a53661e 100644
--- a/test/device.c
+++ b/test/device.c
@@ -582,7 +582,6 @@ int main (int argc, char **argv)
 	litest_add("device:sendevents", device_disable_release_tap, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("device:sendevents", device_disable_release_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("device:sendevents", device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
-
 	litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY);
 
 	return litest_run(argc, argv);

From ba30abff77c6f7ac12df1b2f9ad913ae8460c3c9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 6 Nov 2014 14:30:21 +1000
Subject: [PATCH 031/121] test: pass an enum for the axis instead of uint

Let's pretend that makes it type-safe.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/litest.c | 4 +++-
 test/litest.h | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/litest.c b/test/litest.c
index e028176d..b7866714 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -1090,7 +1090,9 @@ litest_assert_button_event(struct libinput *li, unsigned int button,
 	libinput_event_destroy(event);
 }
 
-void litest_assert_scroll(struct libinput *li, unsigned int axis, int dir)
+void litest_assert_scroll(struct libinput *li,
+			  enum libinput_pointer_axis axis,
+			  int dir)
 {
 	struct libinput_event *event, *next_event;
 	struct libinput_event_pointer *ptrev;
diff --git a/test/litest.h b/test/litest.h
index 26b30407..85755567 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -150,7 +150,9 @@ void litest_assert_empty_queue(struct libinput *li);
 void litest_assert_button_event(struct libinput *li,
 				unsigned int button,
 				enum libinput_button_state state);
-void litest_assert_scroll(struct libinput *li, unsigned int axis, int dir);
+void litest_assert_scroll(struct libinput *li,
+			  enum libinput_pointer_axis axis,
+			  int dir);
 
 struct libevdev_uinput * litest_create_uinput_device(const char *name,
 						     struct input_id *id,

From 1113a3f4f83c2cd1cd90adc82289f896f0f6f912 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:00 +0200
Subject: [PATCH 032/121] core: Make time argument to internal foo_notify_bar
 functions 64 bit

The libinput evdev code uses 64 bit timestamps internally, to avoid having to
deal with timestamp wraps. The internal foo_notify_bar functions time argument
however is only 32 bits, bump this to 64 bits to avoid truncating the timestamps
when calling these functions.

This is a preparation patch for adding internal event listeners, so that the
callbacks for these can get the full 64 bit timestamps.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput-private.h | 18 +++++++++---------
 src/libinput.c         | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 5a975d91..37945202 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -213,37 +213,37 @@ notify_removed_device(struct libinput_device *device);
 
 void
 keyboard_notify_key(struct libinput_device *device,
-		    uint32_t time,
+		    uint64_t time,
 		    uint32_t key,
 		    enum libinput_key_state state);
 
 void
 pointer_notify_motion(struct libinput_device *device,
-		      uint32_t time,
+		      uint64_t time,
 		      double dx,
 		      double dy);
 
 void
 pointer_notify_motion_absolute(struct libinput_device *device,
-			       uint32_t time,
+			       uint64_t time,
 			       double x,
 			       double y);
 
 void
 pointer_notify_button(struct libinput_device *device,
-		      uint32_t time,
+		      uint64_t time,
 		      int32_t button,
 		      enum libinput_button_state state);
 
 void
 pointer_notify_axis(struct libinput_device *device,
-		    uint32_t time,
+		    uint64_t time,
 		    enum libinput_pointer_axis axis,
 		    double value);
 
 void
 touch_notify_touch_down(struct libinput_device *device,
-			uint32_t time,
+			uint64_t time,
 			int32_t slot,
 			int32_t seat_slot,
 			double x,
@@ -251,7 +251,7 @@ touch_notify_touch_down(struct libinput_device *device,
 
 void
 touch_notify_touch_motion(struct libinput_device *device,
-			  uint32_t time,
+			  uint64_t time,
 			  int32_t slot,
 			  int32_t seat_slot,
 			  double x,
@@ -259,13 +259,13 @@ touch_notify_touch_motion(struct libinput_device *device,
 
 void
 touch_notify_touch_up(struct libinput_device *device,
-		      uint32_t time,
+		      uint64_t time,
 		      int32_t slot,
 		      int32_t seat_slot);
 
 void
 touch_notify_frame(struct libinput_device *device,
-		   uint32_t time);
+		   uint64_t time);
 
 static inline uint64_t
 libinput_now(struct libinput *libinput)
diff --git a/src/libinput.c b/src/libinput.c
index 5780a92d..3630440d 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -832,7 +832,7 @@ notify_removed_device(struct libinput_device *device)
 
 void
 keyboard_notify_key(struct libinput_device *device,
-		    uint32_t time,
+		    uint64_t time,
 		    uint32_t key,
 		    enum libinput_key_state state)
 {
@@ -859,7 +859,7 @@ keyboard_notify_key(struct libinput_device *device,
 
 void
 pointer_notify_motion(struct libinput_device *device,
-		      uint32_t time,
+		      uint64_t time,
 		      double dx,
 		      double dy)
 {
@@ -882,7 +882,7 @@ pointer_notify_motion(struct libinput_device *device,
 
 void
 pointer_notify_motion_absolute(struct libinput_device *device,
-			       uint32_t time,
+			       uint64_t time,
 			       double x,
 			       double y)
 {
@@ -905,7 +905,7 @@ pointer_notify_motion_absolute(struct libinput_device *device,
 
 void
 pointer_notify_button(struct libinput_device *device,
-		      uint32_t time,
+		      uint64_t time,
 		      int32_t button,
 		      enum libinput_button_state state)
 {
@@ -934,7 +934,7 @@ pointer_notify_button(struct libinput_device *device,
 
 void
 pointer_notify_axis(struct libinput_device *device,
-		    uint32_t time,
+		    uint64_t time,
 		    enum libinput_pointer_axis axis,
 		    double value)
 {
@@ -957,7 +957,7 @@ pointer_notify_axis(struct libinput_device *device,
 
 void
 touch_notify_touch_down(struct libinput_device *device,
-			uint32_t time,
+			uint64_t time,
 			int32_t slot,
 			int32_t seat_slot,
 			double x,
@@ -984,7 +984,7 @@ touch_notify_touch_down(struct libinput_device *device,
 
 void
 touch_notify_touch_motion(struct libinput_device *device,
-			  uint32_t time,
+			  uint64_t time,
 			  int32_t slot,
 			  int32_t seat_slot,
 			  double x,
@@ -1011,7 +1011,7 @@ touch_notify_touch_motion(struct libinput_device *device,
 
 void
 touch_notify_touch_up(struct libinput_device *device,
-		      uint32_t time,
+		      uint64_t time,
 		      int32_t slot,
 		      int32_t seat_slot)
 {
@@ -1034,7 +1034,7 @@ touch_notify_touch_up(struct libinput_device *device,
 
 void
 touch_notify_frame(struct libinput_device *device,
-		   uint32_t time)
+		   uint64_t time)
 {
 	struct libinput_event_touch *touch_event;
 

From d9631dbe215ba2c22279b863976828c25cbfa85d Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:01 +0200
Subject: [PATCH 033/121] core: Add timestamp parameter to post_device_event

This is a preparation patch for adding internal event listeners, so that the
callbacks for these can get the full 64 bit timestamps.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/libinput.c b/src/libinput.c
index 3630440d..2f172efb 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -795,6 +795,7 @@ post_base_event(struct libinput_device *device,
 
 static void
 post_device_event(struct libinput_device *device,
+		  uint64_t time,
 		  enum libinput_event_type type,
 		  struct libinput_event *event)
 {
@@ -852,7 +853,7 @@ keyboard_notify_key(struct libinput_device *device,
 		.seat_key_count = seat_key_count,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_KEYBOARD_KEY,
 			  &key_event->base);
 }
@@ -875,7 +876,7 @@ pointer_notify_motion(struct libinput_device *device,
 		.y = dy,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_POINTER_MOTION,
 			  &motion_event->base);
 }
@@ -898,7 +899,7 @@ pointer_notify_motion_absolute(struct libinput_device *device,
 		.y = y,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE,
 			  &motion_absolute_event->base);
 }
@@ -927,7 +928,7 @@ pointer_notify_button(struct libinput_device *device,
 		.seat_button_count = seat_button_count,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_POINTER_BUTTON,
 			  &button_event->base);
 }
@@ -950,7 +951,7 @@ pointer_notify_axis(struct libinput_device *device,
 		.value = value,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_POINTER_AXIS,
 			  &axis_event->base);
 }
@@ -977,7 +978,7 @@ touch_notify_touch_down(struct libinput_device *device,
 		.y = y,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_TOUCH_DOWN,
 			  &touch_event->base);
 }
@@ -1004,7 +1005,7 @@ touch_notify_touch_motion(struct libinput_device *device,
 		.y = y,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_TOUCH_MOTION,
 			  &touch_event->base);
 }
@@ -1027,7 +1028,7 @@ touch_notify_touch_up(struct libinput_device *device,
 		.seat_slot = seat_slot,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_TOUCH_UP,
 			  &touch_event->base);
 }
@@ -1046,7 +1047,7 @@ touch_notify_frame(struct libinput_device *device,
 		.time = time,
 	};
 
-	post_device_event(device,
+	post_device_event(device, time,
 			  LIBINPUT_EVENT_TOUCH_FRAME,
 			  &touch_event->base);
 }

From ad2acca72d501c57a19380f4d73e05c47396f88b Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:02 +0200
Subject: [PATCH 034/121] core: Add internal event notification mechanism

For features like e.g. disable-touchpad-while-typing, it is necessary for one
device to be able to listen into another device's events.

It is tempting to use the existing device_added / device_removed mechanism
to give e.g. the keyboard a link to the touchpad, and make the keyboard code
disable / re-enable the touchpad but this is wrong. This needs to be a setting
of the touchpad, and the policy for things like which events to count as
activity, and what sort of timeout to use to consider the device idle, belongs
in the touchpad code not in the keyboard code.

Add an event listeners mechanism so that the touchpad can listen for (e.g.)
keyboard events, and respond to these itself.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput-private.h | 19 +++++++++++++++++++
 src/libinput.c         | 28 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 37945202..c8b65d9b 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -144,12 +144,19 @@ struct libinput_device_config {
 struct libinput_device {
 	struct libinput_seat *seat;
 	struct list link;
+	struct list event_listeners;
 	void *user_data;
 	int terminated;
 	int refcount;
 	struct libinput_device_config config;
 };
 
+struct libinput_event_listener {
+	struct list link;
+	void (*notify_func)(uint64_t time, struct libinput_event *ev, void *notify_func_data);
+	void *notify_func_data;
+};
+
 typedef void (*libinput_source_dispatch_t)(void *data);
 
 
@@ -205,6 +212,18 @@ void
 libinput_device_init(struct libinput_device *device,
 		     struct libinput_seat *seat);
 
+void
+libinput_device_add_event_listener(struct libinput_device *device,
+				   struct libinput_event_listener *listener,
+				   void (*notify_func)(
+						uint64_t time,
+						struct libinput_event *event,
+						void *notify_func_data),
+				   void *notify_func_data);
+
+void
+libinput_device_remove_event_listener(struct libinput_event_listener *listener);
+
 void
 notify_added_device(struct libinput_device *device);
 
diff --git a/src/libinput.c b/src/libinput.c
index 2f172efb..f55dfad6 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -674,6 +674,7 @@ libinput_device_init(struct libinput_device *device,
 {
 	device->seat = seat;
 	device->refcount = 1;
+	list_init(&device->event_listeners);
 }
 
 LIBINPUT_EXPORT struct libinput_device *
@@ -686,6 +687,7 @@ libinput_device_ref(struct libinput_device *device)
 static void
 libinput_device_destroy(struct libinput_device *device)
 {
+	assert(list_empty(&device->event_listeners));
 	evdev_device_destroy((struct evdev_device *) device);
 }
 
@@ -732,6 +734,26 @@ libinput_dispatch(struct libinput *libinput)
 	return 0;
 }
 
+void
+libinput_device_add_event_listener(struct libinput_device *device,
+				   struct libinput_event_listener *listener,
+				   void (*notify_func)(
+						uint64_t time,
+						struct libinput_event *event,
+						void *notify_func_data),
+				   void *notify_func_data)
+{
+	listener->notify_func = notify_func;
+	listener->notify_func_data = notify_func_data;
+	list_insert(&device->event_listeners, &listener->link);
+}
+
+void
+libinput_device_remove_event_listener(struct libinput_event_listener *listener)
+{
+	list_remove(&listener->link);
+}
+
 static uint32_t
 update_seat_key_count(struct libinput_seat *seat,
 		      int32_t key,
@@ -799,7 +821,13 @@ post_device_event(struct libinput_device *device,
 		  enum libinput_event_type type,
 		  struct libinput_event *event)
 {
+	struct libinput_event_listener *listener, *tmp;
+
 	init_event_base(event, device, type);
+
+	list_for_each_safe(listener, tmp, &device->event_listeners, link)
+		listener->notify_func(time, event, listener->notify_func_data);
+
 	libinput_post_event(device->seat->libinput, event);
 }
 

From 50107eca3fc1148eadb62db5a01a2f9acb6aeb7d Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:03 +0200
Subject: [PATCH 035/121] core: Move libinput_event definition to
 libinput-private.h

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput-private.h | 5 +++++
 src/libinput.c         | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index c8b65d9b..92bd96b8 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -151,6 +151,11 @@ struct libinput_device {
 	struct libinput_device_config config;
 };
 
+struct libinput_event {
+	enum libinput_event_type type;
+	struct libinput_device *device;
+};
+
 struct libinput_event_listener {
 	struct list link;
 	void (*notify_func)(uint64_t time, struct libinput_event *ev, void *notify_func_data);
diff --git a/src/libinput.c b/src/libinput.c
index f55dfad6..35262ddd 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -42,11 +42,6 @@ struct libinput_source {
 	struct list link;
 };
 
-struct libinput_event {
-	enum libinput_event_type type;
-	struct libinput_device *device;
-};
-
 struct libinput_event_device_notify {
 	struct libinput_event base;
 };

From 7dc2ea22edcb433634df77c0eb7ff9b303a0b4ce Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:04 +0200
Subject: [PATCH 036/121] touchpad: Rewrite / fix tp_release_all_taps

Before this commit tp_release_all_taps would call tp_tap_handle_timeout, which
is a nop when in state DRAGGING. tp_clear_state then releases all touches and
calls touchpad_handle_state which moves the state to DRAGGING_WAIT, and the
button 1 release will only be done after the tap-timeout, rather then directly
as it should on tp_clear_state.

This commit fixes this by instead of calling tp_tap_handle_timeout, directly
releasing pressed buttons and switching to state DEAD or IDLE depending on
fingers_down.

Besides fixing this issue, this rewrite also makes it possible to use
tp_release_all_taps outside of tp_clear_state, which will be used to add
tap suspend / resume functionality in a follow up commit.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad-tap.c | 15 ++++++++++++++-
 src/evdev-mt-touchpad.h     |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 8f055fc1..b2894e08 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -113,6 +113,11 @@ tp_tap_notify(struct tp_dispatch *tp,
 		return;
 	}
 
+	if (state == LIBINPUT_BUTTON_STATE_PRESSED)
+		tp->tap.buttons_pressed |= (1 << nfingers);
+	else
+		tp->tap.buttons_pressed &= ~(1 << nfingers);
+
 	evdev_pointer_notify_button(tp->device,
 				    time,
 				    button,
@@ -697,5 +702,13 @@ tp_destroy_tap(struct tp_dispatch *tp)
 void
 tp_release_all_taps(struct tp_dispatch *tp, uint64_t now)
 {
-	tp_tap_handle_timeout(now, tp);
+	int i;
+
+	for (i = 1; i <= 3; i++) {
+		if (tp->tap.buttons_pressed & (1 << i))
+			tp_tap_notify(tp, NULL, now, i,
+				      LIBINPUT_BUTTON_STATE_RELEASED);
+	}
+
+	tp->tap.state = tp->nfingers_down ? TAP_STATE_DEAD : TAP_STATE_IDLE;
 }
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index ef316f17..30bc2f6f 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -213,6 +213,7 @@ struct tp_dispatch {
 		bool enabled;
 		struct libinput_timer timer;
 		enum tp_tap_state state;
+		uint32_t buttons_pressed;
 	} tap;
 
 	struct {

From cab012eefeb6f281e840a6273aeab98d265d5a9e Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:05 +0200
Subject: [PATCH 037/121] touchpad: Add tap suspend / resume

While e.g. disabling the touchpad while the trackpoint is used, we want to
stop sending tap (or scroll or motion) events. We cannot use tp_clear_state at
this time as that will also release any touchpad buttons pressed, breaking
dragging with the trackpoint using the touchpad or clickpad buttons.

Calling tp_release_all_taps() and then ensuring that we do not call
tp_tap_handle_state as long as the trackpoint is in use, is enough to disable
taps when the trackpoint is in use.

However when the trackpoint stops being used, we cannot simply start calling
tp_tap_handle_state() again, we first need to sync the tap.state to the current
reality, specifically if fingers are down it must be TAP_STATE_DEAD, so that
their releases do not trigger the log_bug_libinput on a release in
tp_tap_idle_handle_event.

Directly messing with tap.state from outside evdev-mt-touchpad-tap.c is not
good, so add tp_tap_suspend and tp_tap_resume functions for this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad-tap.c | 18 ++++++++++++++++++
 src/evdev-mt-touchpad.h     |  7 +++++++
 2 files changed, 25 insertions(+)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index b2894e08..1fa1271b 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -546,6 +546,9 @@ tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
 	struct tp_touch *t;
 	int filter_motion = 0;
 
+	if (tp->tap.suspended)
+		return 0;
+
 	/* Handle queued button pressed events from clickpads. For touchpads
 	 * with separate physical buttons, ignore button pressed events so they
 	 * don't interfere with tapping. */
@@ -712,3 +715,18 @@ tp_release_all_taps(struct tp_dispatch *tp, uint64_t now)
 
 	tp->tap.state = tp->nfingers_down ? TAP_STATE_DEAD : TAP_STATE_IDLE;
 }
+
+void
+tp_tap_suspend(struct tp_dispatch *tp, uint64_t time)
+{
+	tp->tap.suspended = true;
+	tp_release_all_taps(tp, time);
+}
+
+void
+tp_tap_resume(struct tp_dispatch *tp, uint64_t time)
+{
+	tp->tap.suspended = false;
+	/* Must restart in DEAD if fingers are down atm */
+	tp->tap.state = tp->nfingers_down ? TAP_STATE_DEAD : TAP_STATE_IDLE;
+}
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 30bc2f6f..cc04dc9c 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -211,6 +211,7 @@ struct tp_dispatch {
 	struct {
 		struct libinput_device_config_tap config;
 		bool enabled;
+		bool suspended;
 		struct libinput_timer timer;
 		enum tp_tap_state state;
 		uint32_t buttons_pressed;
@@ -281,4 +282,10 @@ void
 tp_release_all_taps(struct tp_dispatch *tp,
 		    uint64_t time);
 
+void
+tp_tap_suspend(struct tp_dispatch *tp, uint64_t time);
+
+void
+tp_tap_resume(struct tp_dispatch *tp, uint64_t time);
+
 #endif

From d79b6299639fe6df57be432664628c083c5cf057 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:07 +0200
Subject: [PATCH 038/121] touchpad: Rename consumed to filter_motion

This is what the return value in tp_tap_handle_state is called, and it better
reflects what the flag does.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index a8d12e42..092e26f8 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -527,7 +527,7 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 {
 	struct tp_touch *t = tp_current_touch(tp);
 	double dx, dy;
-	int consumed = 0;
+	int filter_motion = 0;
 
 	/* Only post (top) button events while suspended */
 	if (tp->device->suspended) {
@@ -535,10 +535,10 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 		return;
 	}
 
-	consumed |= tp_tap_handle_state(tp, time);
-	consumed |= tp_post_button_events(tp, time);
+	filter_motion |= tp_tap_handle_state(tp, time);
+	filter_motion |= tp_post_button_events(tp, time);
 
-	if (consumed) {
+	if (filter_motion) {
 		evdev_stop_scroll(tp->device, time);
 		return;
 	}

From 0210f1fee1937452d130355d6ee1a043ced46d6b Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 13:21:08 +0200
Subject: [PATCH 039/121] touchpad: Disable touchpads on trackpoint activity

Some laptops with both a clickpad and a trackpoint have such a large touchpad,
that parts of the users hands will touch the pad when using the trackpoint.
Examples of this are the Lenovo T440s and the Toshiba Tecra Z40-A.

This commit makes libinput automatically disable the touchpad while using
the trackpoint on these devices, except for the buttons, as people may want
to use the touchpad (hardware or soft) buttons while using the trackpoint.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 61 ++++++++++++++++++++++++++++++++++++++++-
 src/evdev-mt-touchpad.h |  3 ++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 092e26f8..b7a559f9 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -31,6 +31,7 @@
 
 #define DEFAULT_ACCEL_NUMERATOR 1200.0
 #define DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR 700.0
+#define DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT 500 /* ms */
 
 static inline int
 tp_hysteresis(int in, int center, int margin)
@@ -538,7 +539,7 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 	filter_motion |= tp_tap_handle_state(tp, time);
 	filter_motion |= tp_post_button_events(tp, time);
 
-	if (filter_motion) {
+	if (filter_motion || tp->sendevents.trackpoint_active) {
 		evdev_stop_scroll(tp->device, time);
 		return;
 	}
@@ -599,6 +600,16 @@ tp_process(struct evdev_dispatch *dispatch,
 	}
 }
 
+static void
+tp_destroy_sendevents(struct tp_dispatch *tp)
+{
+	libinput_timer_cancel(&tp->sendevents.trackpoint_timer);
+
+	if (tp->buttons.trackpoint)
+		libinput_device_remove_event_listener(
+					&tp->sendevents.trackpoint_listener);
+}
+
 static void
 tp_destroy(struct evdev_dispatch *dispatch)
 {
@@ -607,6 +618,7 @@ tp_destroy(struct evdev_dispatch *dispatch)
 
 	tp_destroy_tap(tp);
 	tp_destroy_buttons(tp);
+	tp_destroy_sendevents(tp);
 
 	free(tp->touches);
 	free(tp);
@@ -671,6 +683,35 @@ tp_resume(struct tp_dispatch *tp, struct evdev_device *device)
 	}
 }
 
+static void
+tp_trackpoint_timeout(uint64_t now, void *data)
+{
+	struct tp_dispatch *tp = data;
+
+	tp_tap_resume(tp, now);
+	tp->sendevents.trackpoint_active = false;
+}
+
+static void
+tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data)
+{
+	struct tp_dispatch *tp = data;
+
+	/* Buttons do not count as trackpad activity, as people may use
+	   the trackpoint buttons in combination with the touchpad. */
+	if (event->type == LIBINPUT_EVENT_POINTER_BUTTON)
+		return;
+
+	if (!tp->sendevents.trackpoint_active) {
+		evdev_stop_scroll(tp->device, time);
+		tp_tap_suspend(tp, time);
+		tp->sendevents.trackpoint_active = true;
+	}
+
+	libinput_timer_set(&tp->sendevents.trackpoint_timer,
+			   time + DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT);
+}
+
 static void
 tp_device_added(struct evdev_device *device,
 		struct evdev_device *added_device)
@@ -682,6 +723,9 @@ tp_device_added(struct evdev_device *device,
 		/* Don't send any pending releases to the new trackpoint */
 		tp->buttons.active_is_topbutton = false;
 		tp->buttons.trackpoint = added_device;
+		libinput_device_add_event_listener(&added_device->base,
+					&tp->sendevents.trackpoint_listener,
+					tp_trackpoint_event, tp);
 	}
 
 	if (tp->sendevents.current_mode !=
@@ -705,6 +749,8 @@ tp_device_removed(struct evdev_device *device,
 			tp->buttons.active = 0;
 			tp->buttons.active_is_topbutton = false;
 		}
+		libinput_device_remove_event_listener(
+					&tp->sendevents.trackpoint_listener);
 		tp->buttons.trackpoint = NULL;
 	}
 
@@ -940,6 +986,16 @@ tp_init_palmdetect(struct tp_dispatch *tp,
 	return 0;
 }
 
+static int
+tp_init_sendevents(struct tp_dispatch *tp,
+		   struct evdev_device *device)
+{
+	libinput_timer_init(&tp->sendevents.trackpoint_timer,
+			    tp->device->base.seat->libinput,
+			    tp_trackpoint_timeout, tp);
+	return 0;
+}
+
 static int
 tp_init(struct tp_dispatch *tp,
 	struct evdev_device *device)
@@ -979,6 +1035,9 @@ tp_init(struct tp_dispatch *tp,
 	if (tp_init_palmdetect(tp, device) != 0)
 		return -1;
 
+	if (tp_init_sendevents(tp, device) != 0)
+		return -1;
+
 	device->seat_caps |= EVDEV_DEVICE_POINTER;
 
 	return 0;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index cc04dc9c..2fda4efd 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -225,6 +225,9 @@ struct tp_dispatch {
 	struct {
 		struct libinput_device_config_send_events config;
 		enum libinput_config_send_events_mode current_mode;
+		bool trackpoint_active;
+		struct libinput_event_listener trackpoint_listener;
+		struct libinput_timer trackpoint_timer;
 	} sendevents;
 };
 

From 1d18a99fe65be76aad8487d6669e71e6a6759bb9 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 5 Nov 2014 10:48:59 +0100
Subject: [PATCH 040/121] touchpad: Fix log_bug_libinput calls on tap enable
 with fingers down

Before this commit the tap code deals with enabled being set to false,
by waiting for tap.state to become IDLE, and then ignoring any events from
that point on.

This causes a problem when enabled gets set to true again while fingers are
down, because when in IDLE no release events are expected, so once a release
event for one of the fingers is send, log_bug_libinput gets called.

This commit fixes this by making enabled use the same mechanism for enabled
state transitions as the tap suspend / resume code.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad-tap.c | 49 +++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 1fa1271b..0b72ace7 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -476,9 +476,6 @@ tp_tap_handle_event(struct tp_dispatch *tp,
 
 	switch(tp->tap.state) {
 	case TAP_STATE_IDLE:
-		if (!tp->tap.enabled)
-			break;
-
 		tp_tap_idle_handle_event(tp, t, event, time);
 		break;
 	case TAP_STATE_TOUCH:
@@ -540,13 +537,19 @@ tp_tap_exceeds_motion_threshold(struct tp_dispatch *tp, struct tp_touch *t)
 	return dx * dx + dy * dy > threshold * threshold;
 }
 
+static bool
+tp_tap_enabled(struct tp_dispatch *tp)
+{
+	return tp->tap.enabled && !tp->tap.suspended;
+}
+
 int
 tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
 {
 	struct tp_touch *t;
 	int filter_motion = 0;
 
-	if (tp->tap.suspended)
+	if (!tp_tap_enabled(tp))
 		return 0;
 
 	/* Handle queued button pressed events from clickpads. For touchpads
@@ -623,6 +626,26 @@ tp_tap_handle_timeout(uint64_t time, void *data)
 	}
 }
 
+static void
+tp_tap_enabled_update(struct tp_dispatch *tp, bool suspended, bool enabled, uint64_t time)
+{
+	bool was_enabled = tp_tap_enabled(tp);
+
+	tp->tap.suspended = suspended;
+	tp->tap.enabled = enabled;
+
+	if (tp_tap_enabled(tp) == was_enabled)
+		return;
+
+	if (tp_tap_enabled(tp)) {
+		/* Must restart in DEAD if fingers are down atm */
+		tp->tap.state =
+			tp->nfingers_down ? TAP_STATE_DEAD : TAP_STATE_IDLE;
+	} else {
+		tp_release_all_taps(tp, time);
+	}
+}
+
 static int
 tp_tap_config_count(struct libinput_device *device)
 {
@@ -639,13 +662,12 @@ static enum libinput_config_status
 tp_tap_config_set_enabled(struct libinput_device *device,
 			  enum libinput_config_tap_state enabled)
 {
-	struct evdev_dispatch *dispatch;
-	struct tp_dispatch *tp = NULL;
+	struct evdev_dispatch *dispatch = ((struct evdev_device *) device)->dispatch;
+	struct tp_dispatch *tp = container_of(dispatch, tp, base);
 
-	dispatch = ((struct evdev_device *) device)->dispatch;
-	tp = container_of(dispatch, tp, base);
-
-	tp->tap.enabled = (enabled == LIBINPUT_CONFIG_TAP_ENABLED);
+	tp_tap_enabled_update(tp, tp->tap.suspended,
+			      (enabled == LIBINPUT_CONFIG_TAP_ENABLED),
+			      libinput_now(device->seat->libinput));
 
 	return LIBINPUT_CONFIG_STATUS_SUCCESS;
 }
@@ -719,14 +741,11 @@ tp_release_all_taps(struct tp_dispatch *tp, uint64_t now)
 void
 tp_tap_suspend(struct tp_dispatch *tp, uint64_t time)
 {
-	tp->tap.suspended = true;
-	tp_release_all_taps(tp, time);
+	tp_tap_enabled_update(tp, true, tp->tap.enabled, time);
 }
 
 void
 tp_tap_resume(struct tp_dispatch *tp, uint64_t time)
 {
-	tp->tap.suspended = false;
-	/* Must restart in DEAD if fingers are down atm */
-	tp->tap.state = tp->nfingers_down ? TAP_STATE_DEAD : TAP_STATE_IDLE;
+	tp_tap_enabled_update(tp, false, tp->tap.enabled, time);
 }

From 20d48e418166027ce8d2bfc558d6c48129542cb2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 30 Oct 2014 15:36:52 +1000
Subject: [PATCH 041/121] Change sendevents configuration to use bitmasks

In the future, we should allow multiple sendevent modes set simultanously.
Change the API to use a bitmask instead of a single return value.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c |  8 ++++++--
 src/evdev.c             |  5 ++---
 src/libinput.c          |  8 ++++----
 src/libinput.h          | 44 +++++++++++++++++++++++++++--------------
 test/device.c           | 40 +++++++++++++++++++++++++++++++++++--
 5 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index b7a559f9..2a5cdaf5 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1047,8 +1047,7 @@ static uint32_t
 tp_sendevents_get_modes(struct libinput_device *device)
 {
 	struct evdev_device *evdev = (struct evdev_device*)device;
-	uint32_t modes = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED |
-			 LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+	uint32_t modes = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
 
 	if (evdev->tags & EVDEV_TAG_INTERNAL_TOUCHPAD)
 		modes |= LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
@@ -1078,6 +1077,11 @@ tp_sendevents_set_mode(struct libinput_device *device,
 	struct evdev_device *evdev = (struct evdev_device*)device;
 	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
 
+	/* DISABLED overrides any DISABLED_ON_ */
+	if ((mode & LIBINPUT_CONFIG_SEND_EVENTS_DISABLED) &&
+	    (mode & LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE))
+	    mode &= ~LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
+
 	if (mode == tp->sendevents.current_mode)
 		return LIBINPUT_CONFIG_STATUS_SUCCESS;
 
diff --git a/src/evdev.c b/src/evdev.c
index 3aa87a75..1e40a30a 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -717,8 +717,7 @@ struct evdev_dispatch_interface fallback_interface = {
 static uint32_t
 evdev_sendevents_get_modes(struct libinput_device *device)
 {
-	return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED |
-	       LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+	return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
 }
 
 static enum libinput_config_status
@@ -738,7 +737,7 @@ evdev_sendevents_set_mode(struct libinput_device *device,
 	case LIBINPUT_CONFIG_SEND_EVENTS_DISABLED:
 		evdev_device_suspend(evdev);
 		break;
-	default:
+	default: /* no support for combined modes yet */
 		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
 	}
 
diff --git a/src/libinput.c b/src/libinput.c
index 35262ddd..67fa2bdd 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1387,9 +1387,9 @@ libinput_device_config_send_events_get_modes(struct libinput_device *device)
 
 LIBINPUT_EXPORT enum libinput_config_status
 libinput_device_config_send_events_set_mode(struct libinput_device *device,
-					    enum libinput_config_send_events_mode mode)
+					    uint32_t mode)
 {
-	if ((libinput_device_config_send_events_get_modes(device) & mode) == 0)
+	if ((libinput_device_config_send_events_get_modes(device) & mode) != mode)
 		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
 
 	if (device->config.sendevents)
@@ -1398,7 +1398,7 @@ libinput_device_config_send_events_set_mode(struct libinput_device *device,
 		return LIBINPUT_CONFIG_STATUS_SUCCESS;
 }
 
-LIBINPUT_EXPORT enum libinput_config_send_events_mode
+LIBINPUT_EXPORT uint32_t
 libinput_device_config_send_events_get_mode(struct libinput_device *device)
 {
 	if (device->config.sendevents)
@@ -1407,7 +1407,7 @@ libinput_device_config_send_events_get_mode(struct libinput_device *device)
 		return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
 }
 
-LIBINPUT_EXPORT enum libinput_config_send_events_mode
+LIBINPUT_EXPORT uint32_t
 libinput_device_config_send_events_get_default_mode(struct libinput_device *device)
 {
 	return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
diff --git a/src/libinput.h b/src/libinput.h
index 5623bffb..049e3b82 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1689,22 +1689,31 @@ libinput_device_config_calibration_get_default_matrix(struct libinput_device *de
  */
 enum libinput_config_send_events_mode {
 	/**
-	 * Send events from this device normally.
+	 * Send events from this device normally. This is a placeholder
+	 * mode only, any device detected by libinput can be enabled. Do not
+	 * test for this value as bitmask.
 	 */
-	LIBINPUT_CONFIG_SEND_EVENTS_ENABLED = (1 << 0),
+	LIBINPUT_CONFIG_SEND_EVENTS_ENABLED = 0,
 	/**
 	 * Do not send events through this device. Depending on the device,
 	 * this may close all file descriptors on the device or it may leave
 	 * the file descriptors open and route events through a different
 	 * device.
+	 *
+	 * If this bit field is set, other disable modes may be
+	 * ignored. For example, if both @ref
+	 * LIBINPUT_CONFIG_SEND_EVENTS_DISABLED and @ref
+	 * LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE are set,
+	 * the device remains disabled when all external pointer devices are
+	 * unplugged.
 	 */
-	LIBINPUT_CONFIG_SEND_EVENTS_DISABLED = (1 << 1),
+	LIBINPUT_CONFIG_SEND_EVENTS_DISABLED = (1 << 0),
 	/**
 	 * If an external pointer device is plugged in, do not send events
 	 * from this device. This option may be available on built-in
 	 * touchpads.
 	 */
-	LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE = (1 << 2),
+	LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE = (1 << 1),
 };
 
 /**
@@ -1734,18 +1743,17 @@ libinput_device_config_send_events_get_modes(struct libinput_device *device);
  * received and processed from this device are unaffected and will be passed
  * to the caller on the next call to libinput_get_event().
  *
- * If the mode is one of @ref LIBINPUT_CONFIG_SEND_EVENTS_DISABLED or
- * @ref LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE, the device
- * may wait for or generate events until it is in a neutral state.
- * For example, this may include waiting for or generating button release
- * events.
+ * If the mode is a bitmask of @ref libinput_config_send_events_mode,
+ * the device may wait for or generate events until it is in a neutral
+ * state. For example, this may include waiting for or generating button
+ * release events.
  *
  * If the device is already suspended, this function does nothing and
  * returns success. Changing the send-event mode on a device that has been
  * removed is permitted.
  *
  * @param device The device to configure
- * @param mode The send-event mode for this device.
+ * @param mode A bitmask of send-events modes
  *
  * @return A config status code.
  *
@@ -1755,7 +1763,7 @@ libinput_device_config_send_events_get_modes(struct libinput_device *device);
  */
 enum libinput_config_status
 libinput_device_config_send_events_set_mode(struct libinput_device *device,
-					    enum libinput_config_send_events_mode mode);
+					    uint32_t mode);
 
 /**
  * @ingroup config
@@ -1763,14 +1771,20 @@ libinput_device_config_send_events_set_mode(struct libinput_device *device,
  * Get the send-event mode for this device. The mode defines when the device
  * processes and sends events to the caller.
  *
+ * If a caller enables the bits for multiple modes, some of which are
+ * subsets of another mode libinput may drop the bits that are subsets. In
+ * other words, don't expect libinput_device_config_send_events_get_mode()
+ * to always return exactly the same bitmask as passed into
+ * libinput_device_config_send_events_set_mode().
+ *
  * @param device The device to configure
- * @return The current send-event mode for this device.
+ * @return The current bitmask of the send-event mode for this device.
  *
  * @see libinput_device_config_send_events_get_modes
  * @see libinput_device_config_send_events_set_mode
  * @see libinput_device_config_send_events_get_default_mode
  */
-enum libinput_config_send_events_mode
+uint32_t
 libinput_device_config_send_events_get_mode(struct libinput_device *device);
 
 /**
@@ -1780,13 +1794,13 @@ libinput_device_config_send_events_get_mode(struct libinput_device *device);
  * the device processes and sends events to the caller.
  *
  * @param device The device to configure
- * @return The default send-event mode for this device.
+ * @return The bitmask of the send-event mode for this device.
  *
  * @see libinput_device_config_send_events_get_modes
  * @see libinput_device_config_send_events_set_mode
  * @see libinput_device_config_send_events_get_default_mode
  */
-enum libinput_config_send_events_mode
+uint32_t
 libinput_device_config_send_events_get_default_mode(struct libinput_device *device);
 
 /**
diff --git a/test/device.c b/test/device.c
index 0a53661e..0a60dd90 100644
--- a/test/device.c
+++ b/test/device.c
@@ -42,11 +42,24 @@ START_TEST(device_sendevents_config)
 
 	modes = libinput_device_config_send_events_get_modes(device);
 	ck_assert_int_eq(modes,
-			 LIBINPUT_CONFIG_SEND_EVENTS_ENABLED|
 			 LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
 }
 END_TEST
 
+START_TEST(device_sendevents_config_invalid)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *device;
+	enum libinput_config_status status;
+
+	device = dev->libinput_device;
+
+	status = libinput_device_config_send_events_set_mode(device,
+			     LIBINPUT_CONFIG_SEND_EVENTS_DISABLED | (1 << 4));
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED);
+}
+END_TEST
+
 START_TEST(device_sendevents_config_touchpad)
 {
 	struct litest_device *dev = litest_current_device();
@@ -57,12 +70,33 @@ START_TEST(device_sendevents_config_touchpad)
 
 	modes = libinput_device_config_send_events_get_modes(device);
 	ck_assert_int_eq(modes,
-			 LIBINPUT_CONFIG_SEND_EVENTS_ENABLED|
 			 LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE|
 			 LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
 }
 END_TEST
 
+START_TEST(device_sendevents_config_touchpad_superset)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *device;
+	enum libinput_config_status status;
+	uint32_t modes;
+
+	device = dev->libinput_device;
+
+	modes = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED |
+		LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
+
+	status = libinput_device_config_send_events_set_mode(device,
+							     modes);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	/* DISABLED supersedes the rest, expect the rest to be dropped */
+	modes = libinput_device_config_send_events_get_mode(device);
+	ck_assert_int_eq(modes, LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
+}
+END_TEST
+
 START_TEST(device_sendevents_config_default)
 {
 	struct litest_device *dev = litest_current_device();
@@ -568,7 +602,9 @@ END_TEST
 int main (int argc, char **argv)
 {
 	litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD);
+	litest_add("device:sendevents", device_sendevents_config_invalid, LITEST_ANY, LITEST_ANY);
 	litest_add("device:sendevents", device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_ANY);
+	litest_add("device:sendevents", device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("device:sendevents", device_sendevents_config_default, LITEST_ANY, LITEST_ANY);
 	litest_add("device:sendevents", device_disable, LITEST_POINTER, LITEST_ANY);
 	litest_add("device:sendevents", device_disable_touchpad, LITEST_TOUCHPAD, LITEST_ANY);

From 37ca93c5355e5f5883b55f23409b168c959814fe Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 5 Nov 2014 10:51:31 +1000
Subject: [PATCH 042/121] evdev: factor out resolution changing code

No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 57 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 1e40a30a..ad69a514 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1037,13 +1037,31 @@ evdev_tag_device(struct evdev_device *device)
 	udev_unref(udev);
 }
 
+static inline int
+evdev_fix_abs_resolution(struct libevdev *evdev,
+			 unsigned int code,
+			 const struct input_absinfo *absinfo)
+{
+	struct input_absinfo fixed;
+
+	if (absinfo->resolution == 0) {
+		fixed = *absinfo;
+		fixed.resolution = 1;
+		/* libevdev_set_abs_info() changes the absinfo we already
+		   have a pointer to, no need to fetch it again */
+		libevdev_set_abs_info(evdev, code, &fixed);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 static int
 evdev_configure_device(struct evdev_device *device)
 {
 	struct libinput *libinput = device->base.seat->libinput;
 	struct libevdev *evdev = device->evdev;
 	const struct input_absinfo *absinfo;
-	struct input_absinfo fixed;
 	int has_abs, has_rel, has_mt;
 	int has_button, has_keyboard, has_touch;
 	struct mt_slot *slots;
@@ -1062,22 +1080,18 @@ evdev_configure_device(struct evdev_device *device)
 	if (libevdev_has_event_type(evdev, EV_ABS)) {
 
 		if ((absinfo = libevdev_get_abs_info(evdev, ABS_X))) {
-			if (absinfo->resolution == 0) {
-				fixed = *absinfo;
-				fixed.resolution = 1;
-				libevdev_set_abs_info(evdev, ABS_X, &fixed);
+			if (evdev_fix_abs_resolution(evdev,
+						     ABS_X,
+						     absinfo))
 				device->abs.fake_resolution = 1;
-			}
 			device->abs.absinfo_x = absinfo;
 			has_abs = 1;
 		}
 		if ((absinfo = libevdev_get_abs_info(evdev, ABS_Y))) {
-			if (absinfo->resolution == 0) {
-				fixed = *absinfo;
-				fixed.resolution = 1;
-				libevdev_set_abs_info(evdev, ABS_Y, &fixed);
+			if (evdev_fix_abs_resolution(evdev,
+						     ABS_Y,
+						     absinfo))
 				device->abs.fake_resolution = 1;
-			}
 			device->abs.absinfo_y = absinfo;
 			has_abs = 1;
 		}
@@ -1087,24 +1101,17 @@ evdev_configure_device(struct evdev_device *device)
 		if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
 		    libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) {
 			absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_X);
-			if (absinfo->resolution == 0) {
-				fixed = *absinfo;
-				fixed.resolution = 1;
-				libevdev_set_abs_info(evdev,
-						      ABS_MT_POSITION_X,
-						      &fixed);
+			if (evdev_fix_abs_resolution(evdev,
+						     ABS_MT_POSITION_X,
+						     absinfo))
 				device->abs.fake_resolution = 1;
-			}
 			device->abs.absinfo_x = absinfo;
+
 			absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_Y);
-			if (absinfo->resolution == 0) {
-				fixed = *absinfo;
-				fixed.resolution = 1;
-				libevdev_set_abs_info(evdev,
-						      ABS_MT_POSITION_Y,
-						      &fixed);
+			if (evdev_fix_abs_resolution(evdev,
+						     ABS_MT_POSITION_Y,
+						     absinfo))
 				device->abs.fake_resolution = 1;
-			}
 			device->abs.absinfo_y = absinfo;
 			device->is_mt = 1;
 			has_touch = 1;

From 01cc70ff58de2c65bd5d78fb787236a5fe0ee5f7 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 5 Nov 2014 10:54:14 +1000
Subject: [PATCH 043/121] evdev: move a comment to where it belongs

And s/weston/libinput/ while we're at it

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index ad69a514..234a1d52 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1095,9 +1095,6 @@ evdev_configure_device(struct evdev_device *device)
 			device->abs.absinfo_y = absinfo;
 			has_abs = 1;
 		}
-                /* We only handle the slotted Protocol B in weston.
-                   Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
-                   require mtdev for conversion. */
 		if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
 		    libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) {
 			absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_X);
@@ -1117,6 +1114,9 @@ evdev_configure_device(struct evdev_device *device)
 			has_touch = 1;
 			has_mt = 1;
 
+			/* We only handle the slotted Protocol B in libinput.
+			   Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
+			   require mtdev for conversion. */
 			if (evdev_need_mtdev(device)) {
 				device->mtdev = mtdev_new_open(device->fd);
 				if (!device->mtdev)

From f04f58213fb50dbeeafb7f4a465bb9b3fc3632e0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 5 Nov 2014 11:01:45 +1000
Subject: [PATCH 044/121] evdev: handle fake MT devices

The kernel requires absolute axes to fit into the semantic ABS_ naming
scheme but doesn't provide enough free bits unlabelled axes. Devices with many
axes run into the ABS_MT range and look like MT devices when they're not.
See http://www.freedesktop.org/software/libevdev/doc/1.3/group__mt.html

Affected is e.g. the MS Surface 2 touch cover that has codes [41, 62]
set for min/max [-127, 127].

No special handling needed other than forcing has_mt/has_touch to be 0.
ABS_MT_* events from non-touch devices are discarded by libinput.

The has_mt/has_touch = 0 isn't needed, but looks nicer than an empty if
body.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=85836

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index 234a1d52..3346b543 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1095,7 +1095,15 @@ evdev_configure_device(struct evdev_device *device)
 			device->abs.absinfo_y = absinfo;
 			has_abs = 1;
 		}
-		if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
+
+		/* 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) {
+			has_mt = 0;
+			has_touch = 0;
+		} else if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
 		    libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) {
 			absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_X);
 			if (evdev_fix_abs_resolution(evdev,

From d2842893a828407e3c4d2459a382f8c7179b2f51 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 5 Nov 2014 11:20:36 +1000
Subject: [PATCH 045/121] test: add the MS surface touch cover device and
 fake-mt tests

In the device description, define the interfaces for touch down/move even
though we technically don't have those interfaces. Makes it easier to test.

The fake-mt tests make sure the device shows up correctly and that no touch
events are being sent for touch events.
This device is a pointer device too, the pointer tests will test it for
correct functionality of the REL_X/Y bits, no special test needed.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/Makefile.am               |   1 +
 test/litest-ms-surface-cover.c | 386 +++++++++++++++++++++++++++++++++
 test/litest.h                  |   2 +
 test/touch.c                   |  46 ++++
 4 files changed, 435 insertions(+)
 create mode 100644 test/litest-ms-surface-cover.c

diff --git a/test/Makefile.am b/test/Makefile.am
index 6a68982c..d9329617 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,6 +20,7 @@ liblitest_la_SOURCES = \
 	litest-generic-singletouch.c \
 	litest-keyboard.c \
 	litest-mouse.c \
+	litest-ms-surface-cover.c \
 	litest-synaptics.c \
 	litest-synaptics-st.c \
 	litest-synaptics-t440.c \
diff --git a/test/litest-ms-surface-cover.c b/test/litest-ms-surface-cover.c
new file mode 100644
index 00000000..bd8b1a1c
--- /dev/null
+++ b/test/litest-ms-surface-cover.c
@@ -0,0 +1,386 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "litest.h"
+#include "litest-int.h"
+
+static void
+litest_ms_surface_cover_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_MS_SURFACE_COVER);
+	litest_set_current_device(d);
+}
+
+static struct input_event down[] = {
+	{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+static struct input_event move[] = {
+	{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+/* We define down/move so that we can emulate fake touches on this device,
+   to make sure nothing crashes. */
+static struct litest_device_interface interface = {
+	.touch_down_events = down,
+	.touch_move_events = move,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_VOLUME, 0, 1023, 0, 0, 0 },
+	{ ABS_MISC, 0, 255, 0, 0, 0 },
+	{ 41, 0, 255, 0, 0, 0 },
+	{ 42, -127, 127, 0, 0, 0 },
+	{ 43, -127, 127, 0, 0, 0 },
+	{ 44, -127, 127, 0, 0, 0 },
+	{ 45, -127, 127, 0, 0, 0 },
+	{ 46, -127, 127, 0, 0, 0 },
+	{ 47, -127, 127, 0, 0, 0 },
+	/* ABS_MT range overlap starts here */
+	{ 48, -127, 127, 0, 0, 0 }, /* ABS_MT_SLOT */
+	{ 49, -127, 127, 0, 0, 0 },
+	{ 50, -127, 127, 0, 0, 0 },
+	{ 51, -127, 127, 0, 0, 0 },
+	{ 52, -127, 127, 0, 0, 0 },
+	{ 53, -127, 127, 0, 0, 0 },
+	{ 54, -127, 127, 0, 0, 0 },
+	{ 55, -127, 127, 0, 0, 0 },
+	{ 56, -127, 127, 0, 0, 0 },
+	{ 57, -127, 127, 0, 0, 0 },
+	{ 58, -127, 127, 0, 0, 0 },
+	{ 59, -127, 127, 0, 0, 0 },
+	{ 60, -127, 127, 0, 0, 0 },
+	{ 61, -127, 127, 0, 0, 0 }, /* ABS_MT_TOOL_Y */
+	{ 62, -127, 127, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x3,
+	.vendor = 0x45e,
+	.product = 0x7a9,
+};
+
+static int events[] = {
+	EV_REL, REL_X,
+	EV_REL, REL_Y,
+	EV_REL, REL_HWHEEL,
+	EV_REL, REL_DIAL,
+	EV_REL, REL_WHEEL,
+	EV_KEY, KEY_ESC,
+	EV_KEY, KEY_1,
+	EV_KEY, KEY_2,
+	EV_KEY, KEY_3,
+	EV_KEY, KEY_4,
+	EV_KEY, KEY_5,
+	EV_KEY, KEY_6,
+	EV_KEY, KEY_7,
+	EV_KEY, KEY_8,
+	EV_KEY, KEY_9,
+	EV_KEY, KEY_0,
+	EV_KEY, KEY_MINUS,
+	EV_KEY, KEY_EQUAL,
+	EV_KEY, KEY_BACKSPACE,
+	EV_KEY, KEY_TAB,
+	EV_KEY, KEY_Q,
+	EV_KEY, KEY_W,
+	EV_KEY, KEY_E,
+	EV_KEY, KEY_R,
+	EV_KEY, KEY_T,
+	EV_KEY, KEY_Y,
+	EV_KEY, KEY_U,
+	EV_KEY, KEY_I,
+	EV_KEY, KEY_O,
+	EV_KEY, KEY_P,
+	EV_KEY, KEY_LEFTBRACE,
+	EV_KEY, KEY_RIGHTBRACE,
+	EV_KEY, KEY_ENTER,
+	EV_KEY, KEY_LEFTCTRL,
+	EV_KEY, KEY_A,
+	EV_KEY, KEY_S,
+	EV_KEY, KEY_D,
+	EV_KEY, KEY_F,
+	EV_KEY, KEY_G,
+	EV_KEY, KEY_H,
+	EV_KEY, KEY_J,
+	EV_KEY, KEY_K,
+	EV_KEY, KEY_L,
+	EV_KEY, KEY_SEMICOLON,
+	EV_KEY, KEY_APOSTROPHE,
+	EV_KEY, KEY_GRAVE,
+	EV_KEY, KEY_LEFTSHIFT,
+	EV_KEY, KEY_BACKSLASH,
+	EV_KEY, KEY_Z,
+	EV_KEY, KEY_X,
+	EV_KEY, KEY_C,
+	EV_KEY, KEY_V,
+	EV_KEY, KEY_B,
+	EV_KEY, KEY_N,
+	EV_KEY, KEY_M,
+	EV_KEY, KEY_COMMA,
+	EV_KEY, KEY_DOT,
+	EV_KEY, KEY_SLASH,
+	EV_KEY, KEY_RIGHTSHIFT,
+	EV_KEY, KEY_KPASTERISK,
+	EV_KEY, KEY_LEFTALT,
+	EV_KEY, KEY_SPACE,
+	EV_KEY, KEY_CAPSLOCK,
+	EV_KEY, KEY_F1,
+	EV_KEY, KEY_F2,
+	EV_KEY, KEY_F3,
+	EV_KEY, KEY_F4,
+	EV_KEY, KEY_F5,
+	EV_KEY, KEY_F6,
+	EV_KEY, KEY_F7,
+	EV_KEY, KEY_F8,
+	EV_KEY, KEY_F9,
+	EV_KEY, KEY_F10,
+	EV_KEY, KEY_NUMLOCK,
+	EV_KEY, KEY_SCROLLLOCK,
+	EV_KEY, KEY_KP7,
+	EV_KEY, KEY_KP8,
+	EV_KEY, KEY_KP9,
+	EV_KEY, KEY_KPMINUS,
+	EV_KEY, KEY_KP4,
+	EV_KEY, KEY_KP5,
+	EV_KEY, KEY_KP6,
+	EV_KEY, KEY_KPPLUS,
+	EV_KEY, KEY_KP1,
+	EV_KEY, KEY_KP2,
+	EV_KEY, KEY_KP3,
+	EV_KEY, KEY_KP0,
+	EV_KEY, KEY_KPDOT,
+	EV_KEY, KEY_102ND,
+	EV_KEY, KEY_F11,
+	EV_KEY, KEY_F12,
+	EV_KEY, KEY_RO,
+	EV_KEY, KEY_HENKAN,
+	EV_KEY, KEY_KATAKANAHIRAGANA,
+	EV_KEY, KEY_MUHENKAN,
+	EV_KEY, KEY_KPJPCOMMA,
+	EV_KEY, KEY_KPENTER,
+	EV_KEY, KEY_RIGHTCTRL,
+	EV_KEY, KEY_KPSLASH,
+	EV_KEY, KEY_SYSRQ,
+	EV_KEY, KEY_RIGHTALT,
+	EV_KEY, KEY_HOME,
+	EV_KEY, KEY_UP,
+	EV_KEY, KEY_PAGEUP,
+	EV_KEY, KEY_LEFT,
+	EV_KEY, KEY_RIGHT,
+	EV_KEY, KEY_END,
+	EV_KEY, KEY_DOWN,
+	EV_KEY, KEY_PAGEDOWN,
+	EV_KEY, KEY_INSERT,
+	EV_KEY, KEY_DELETE,
+	EV_KEY, KEY_MUTE,
+	EV_KEY, KEY_VOLUMEDOWN,
+	EV_KEY, KEY_VOLUMEUP,
+	EV_KEY, KEY_POWER,
+	EV_KEY, KEY_KPEQUAL,
+	EV_KEY, KEY_PAUSE,
+	EV_KEY, KEY_KPCOMMA,
+	EV_KEY, KEY_HANGEUL,
+	EV_KEY, KEY_HANJA,
+	EV_KEY, KEY_YEN,
+	EV_KEY, KEY_LEFTMETA,
+	EV_KEY, KEY_RIGHTMETA,
+	EV_KEY, KEY_COMPOSE,
+	EV_KEY, KEY_STOP,
+	EV_KEY, KEY_AGAIN,
+	EV_KEY, KEY_PROPS,
+	EV_KEY, KEY_UNDO,
+	EV_KEY, KEY_FRONT,
+	EV_KEY, KEY_COPY,
+	EV_KEY, KEY_OPEN,
+	EV_KEY, KEY_PASTE,
+	EV_KEY, KEY_FIND,
+	EV_KEY, KEY_CUT,
+	EV_KEY, KEY_HELP,
+	EV_KEY, KEY_MENU,
+	EV_KEY, KEY_CALC,
+	EV_KEY, KEY_SLEEP,
+	EV_KEY, KEY_FILE,
+	EV_KEY, KEY_WWW,
+	EV_KEY, KEY_COFFEE,
+	EV_KEY, KEY_MAIL,
+	EV_KEY, KEY_BOOKMARKS,
+	EV_KEY, KEY_BACK,
+	EV_KEY, KEY_FORWARD,
+	EV_KEY, KEY_EJECTCD,
+	EV_KEY, KEY_NEXTSONG,
+	EV_KEY, KEY_PLAYPAUSE,
+	EV_KEY, KEY_PREVIOUSSONG,
+	EV_KEY, KEY_STOPCD,
+	EV_KEY, KEY_RECORD,
+	EV_KEY, KEY_REWIND,
+	EV_KEY, KEY_PHONE,
+	EV_KEY, KEY_CONFIG,
+	EV_KEY, KEY_HOMEPAGE,
+	EV_KEY, KEY_REFRESH,
+	EV_KEY, KEY_EXIT,
+	EV_KEY, KEY_EDIT,
+	EV_KEY, KEY_SCROLLUP,
+	EV_KEY, KEY_SCROLLDOWN,
+	EV_KEY, KEY_NEW,
+	EV_KEY, KEY_REDO,
+	EV_KEY, KEY_F13,
+	EV_KEY, KEY_F14,
+	EV_KEY, KEY_F15,
+	EV_KEY, KEY_F16,
+	EV_KEY, KEY_F17,
+	EV_KEY, KEY_F18,
+	EV_KEY, KEY_F19,
+	EV_KEY, KEY_F20,
+	EV_KEY, KEY_F21,
+	EV_KEY, KEY_F22,
+	EV_KEY, KEY_F23,
+	EV_KEY, KEY_F24,
+	EV_KEY, KEY_CLOSE,
+	EV_KEY, KEY_PLAY,
+	EV_KEY, KEY_FASTFORWARD,
+	EV_KEY, KEY_BASSBOOST,
+	EV_KEY, KEY_PRINT,
+	EV_KEY, KEY_CAMERA,
+	EV_KEY, KEY_CHAT,
+	EV_KEY, KEY_SEARCH,
+	EV_KEY, KEY_FINANCE,
+	EV_KEY, KEY_CANCEL,
+	EV_KEY, KEY_BRIGHTNESSDOWN,
+	EV_KEY, KEY_BRIGHTNESSUP,
+	EV_KEY, KEY_KBDILLUMTOGGLE,
+	EV_KEY, KEY_SEND,
+	EV_KEY, KEY_REPLY,
+	EV_KEY, KEY_FORWARDMAIL,
+	EV_KEY, KEY_SAVE,
+	EV_KEY, KEY_DOCUMENTS,
+	EV_KEY, KEY_UNKNOWN,
+	EV_KEY, KEY_VIDEO_NEXT,
+	EV_KEY, KEY_BRIGHTNESS_ZERO,
+	EV_KEY, BTN_0,
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_RIGHT,
+	EV_KEY, BTN_MIDDLE,
+	EV_KEY, BTN_SIDE,
+	EV_KEY, BTN_EXTRA,
+	EV_KEY, KEY_SELECT,
+	EV_KEY, KEY_GOTO,
+	EV_KEY, KEY_INFO,
+	EV_KEY, KEY_PROGRAM,
+	EV_KEY, KEY_PVR,
+	EV_KEY, KEY_SUBTITLE,
+	EV_KEY, KEY_ZOOM,
+	EV_KEY, KEY_KEYBOARD,
+	EV_KEY, KEY_PC,
+	EV_KEY, KEY_TV,
+	EV_KEY, KEY_TV2,
+	EV_KEY, KEY_VCR,
+	EV_KEY, KEY_VCR2,
+	EV_KEY, KEY_SAT,
+	EV_KEY, KEY_CD,
+	EV_KEY, KEY_TAPE,
+	EV_KEY, KEY_TUNER,
+	EV_KEY, KEY_PLAYER,
+	EV_KEY, KEY_DVD,
+	EV_KEY, KEY_AUDIO,
+	EV_KEY, KEY_VIDEO,
+	EV_KEY, KEY_MEMO,
+	EV_KEY, KEY_CALENDAR,
+	EV_KEY, KEY_RED,
+	EV_KEY, KEY_GREEN,
+	EV_KEY, KEY_YELLOW,
+	EV_KEY, KEY_BLUE,
+	EV_KEY, KEY_CHANNELUP,
+	EV_KEY, KEY_CHANNELDOWN,
+	EV_KEY, KEY_LAST,
+	EV_KEY, KEY_NEXT,
+	EV_KEY, KEY_RESTART,
+	EV_KEY, KEY_SLOW,
+	EV_KEY, KEY_SHUFFLE,
+	EV_KEY, KEY_PREVIOUS,
+	EV_KEY, KEY_VIDEOPHONE,
+	EV_KEY, KEY_GAMES,
+	EV_KEY, KEY_ZOOMIN,
+	EV_KEY, KEY_ZOOMOUT,
+	EV_KEY, KEY_ZOOMRESET,
+	EV_KEY, KEY_WORDPROCESSOR,
+	EV_KEY, KEY_EDITOR,
+	EV_KEY, KEY_SPREADSHEET,
+	EV_KEY, KEY_GRAPHICSEDITOR,
+	EV_KEY, KEY_PRESENTATION,
+	EV_KEY, KEY_DATABASE,
+	EV_KEY, KEY_NEWS,
+	EV_KEY, KEY_VOICEMAIL,
+	EV_KEY, KEY_ADDRESSBOOK,
+	EV_KEY, KEY_MESSENGER,
+	EV_KEY, KEY_DISPLAYTOGGLE,
+	EV_KEY, KEY_SPELLCHECK,
+	EV_KEY, KEY_LOGOFF,
+	EV_KEY, KEY_MEDIA_REPEAT,
+	EV_KEY, KEY_IMAGES,
+	EV_KEY, 576,
+	EV_KEY, 577,
+	EV_KEY, 578,
+	EV_KEY, 579,
+	EV_KEY, 580,
+	EV_KEY, 581,
+	EV_KEY, 582,
+	EV_KEY, 592,
+	EV_KEY, 593,
+	EV_KEY, 608,
+	EV_KEY, 609,
+	EV_KEY, 610,
+	EV_KEY, 611,
+	EV_KEY, 612,
+	EV_KEY, 613,
+	EV_LED, LED_NUML,
+	EV_LED, LED_CAPSL,
+	EV_LED, LED_SCROLLL,
+	EV_REP, REP_DELAY,
+	-1, -1,
+};
+
+struct litest_test_device litest_ms_surface_cover_device = {
+	.type = LITEST_MS_SURFACE_COVER,
+	.features = LITEST_KEYBOARD | LITEST_POINTER | LITEST_FAKE_MT,
+	.shortname = "MS surface cover",
+	.setup = litest_ms_surface_cover_setup,
+	.interface = &interface,
+
+	.name = "MICROSOFT SAM",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+};
diff --git a/test/litest.h b/test/litest.h
index 85755567..fe1001ad 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -45,6 +45,7 @@ enum litest_device_type {
 	LITEST_WACOM_TOUCH = -9,
 	LITEST_ALPS_SEMI_MT = -10,
 	LITEST_GENERIC_SINGLETOUCH = -11,
+	LITEST_MS_SURFACE_COVER = -12,
 };
 
 enum litest_device_feature {
@@ -62,6 +63,7 @@ enum litest_device_feature {
 	LITEST_TOPBUTTONPAD = 1 << 9,
 	LITEST_SEMI_MT = 1 << 10,
 	LITEST_POINTINGSTICK = 1 << 11,
+	LITEST_FAKE_MT = 1 << 12,
 };
 
 struct litest_device {
diff --git a/test/touch.c b/test/touch.c
index e51b85e7..168e2aa6 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -422,6 +422,49 @@ START_TEST(touch_no_left_handed)
 }
 END_TEST
 
+START_TEST(fake_mt_exists)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+	struct libinput_device *device;
+
+	litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED, -1);
+	event = libinput_get_event(li);
+	device = libinput_event_get_device(event);
+
+	ck_assert(!libinput_device_has_capability(device,
+						  LIBINPUT_DEVICE_CAP_TOUCH));
+
+	/* This test may need fixing if we add other fake-mt devices that
+	 * have different capabilities */
+	ck_assert(libinput_device_has_capability(device,
+						 LIBINPUT_DEVICE_CAP_POINTER));
+}
+END_TEST
+
+START_TEST(fake_mt_no_touch_events)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+
+	litest_drain_events(li);
+
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_move_to(dev, 0, 50, 50, 70, 70, 5);
+	litest_touch_up(dev, 0);
+
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_down(dev, 1, 70, 70);
+	litest_touch_move_to(dev, 0, 50, 50, 90, 40, 10);
+	litest_touch_move_to(dev, 0, 70, 70, 40, 50, 10);
+	litest_touch_up(dev, 0);
+	litest_touch_up(dev, 1);
+
+	litest_assert_empty_queue(li);
+}
+END_TEST
+
 int
 main(int argc, char **argv)
 {
@@ -438,5 +481,8 @@ main(int argc, char **argv)
 
 	litest_add("touch:left-handed", touch_no_left_handed, LITEST_TOUCH, LITEST_ANY);
 
+	litest_add("touch:fake-mt", fake_mt_exists, LITEST_FAKE_MT, LITEST_ANY);
+	litest_add("touch:fake-mt", fake_mt_no_touch_events, LITEST_FAKE_MT, LITEST_ANY);
+
 	return litest_run(argc, argv);
 }

From 00f74270e5c28e02a3e4fcbbc5d34770aff3911b Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 25 Sep 2014 13:20:47 +0200
Subject: [PATCH 046/121] litest: Add a sleep_ms parameter to
 litest_touch_move_to

In reality moving a touch from point to another takes time. In some cases
(when a timeout may trigger during the move, e.g. tap-n-drag on a touchpad),
this is important. Add a sleep_ms parameter, which will cause
litest_touch_move_to to sleep the specified amount of ms every step.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 test/device.c   |  2 +-
 test/litest.c   | 10 +++++++--
 test/litest.h   |  2 +-
 test/touchpad.c | 56 ++++++++++++++++++++++++-------------------------
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/test/device.c b/test/device.c
index 0a53661e..1faa2edf 100644
--- a/test/device.c
+++ b/test/device.c
@@ -131,7 +131,7 @@ START_TEST(device_disable_touchpad)
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 90, 90, 10);
+	litest_touch_move_to(dev, 0, 50, 50, 90, 90, 10, 0);
 	litest_touch_up(dev, 0);
 
 
diff --git a/test/litest.c b/test/litest.c
index b7866714..dc6a6306 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -762,12 +762,18 @@ litest_touch_move_to(struct litest_device *d,
 		     unsigned int slot,
 		     double x_from, double y_from,
 		     double x_to, double y_to,
-		     int steps)
+		     int steps, int sleep_ms)
 {
-	for (int i = 0; i < steps - 1; i++)
+	for (int i = 0; i < steps - 1; i++) {
 		litest_touch_move(d, slot,
 				  x_from + (x_to - x_from)/steps * i,
 				  y_from + (y_to - y_from)/steps * i);
+		if (sleep_ms) {
+			libinput_dispatch(d->libinput);
+			msleep(sleep_ms);
+			libinput_dispatch(d->libinput);
+		}
+	}
 	litest_touch_move(d, slot, x_to, y_to);
 }
 
diff --git a/test/litest.h b/test/litest.h
index 85755567..173d0f4f 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -136,7 +136,7 @@ void litest_touch_move_to(struct litest_device *d,
 			  unsigned int slot,
 			  double x_from, double y_from,
 			  double x_to, double y_to,
-			  int steps);
+			  int steps, int sleep_ms);
 void litest_button_click(struct litest_device *d,
 			 unsigned int button,
 			 bool is_press);
diff --git a/test/touchpad.c b/test/touchpad.c
index 8cd838e7..576f9ffa 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -41,7 +41,7 @@ START_TEST(touchpad_1fg_motion)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 80, 50, 5);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 50, 5, 0);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -72,8 +72,8 @@ START_TEST(touchpad_2fg_no_motion)
 
 	litest_touch_down(dev, 0, 20, 20);
 	litest_touch_down(dev, 1, 70, 20);
-	litest_touch_move_to(dev, 0, 20, 20, 80, 80, 5);
-	litest_touch_move_to(dev, 1, 70, 20, 80, 50, 5);
+	litest_touch_move_to(dev, 0, 20, 20, 80, 80, 5, 0);
+	litest_touch_move_to(dev, 1, 70, 20, 80, 50, 5, 0);
 	litest_touch_up(dev, 1);
 	litest_touch_up(dev, 0);
 
@@ -131,7 +131,7 @@ START_TEST(touchpad_1fg_tap_n_drag)
 	litest_touch_down(dev, 0, 50, 50);
 	litest_touch_up(dev, 0);
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 0);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -150,7 +150,7 @@ START_TEST(touchpad_1fg_tap_n_drag)
 
 	/* lift finger, set down again, should continue dragging */
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 0);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -400,7 +400,7 @@ START_TEST(touchpad_no_2fg_tap_after_move)
 	   -> no event
 	 */
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 90, 90, 10);
+	litest_touch_move_to(dev, 0, 50, 50, 90, 90, 10, 0);
 	litest_drain_events(dev->libinput);
 
 	litest_touch_down(dev, 1, 70, 50);
@@ -450,7 +450,7 @@ START_TEST(touchpad_no_first_fg_tap_after_move)
 	litest_touch_down(dev, 0, 50, 50);
 	litest_touch_down(dev, 1, 70, 50);
 	libinput_dispatch(dev->libinput);
-	litest_touch_move_to(dev, 1, 70, 50, 90, 90, 10);
+	litest_touch_move_to(dev, 1, 70, 50, 90, 90, 10, 0);
 	libinput_dispatch(dev->libinput);
 	litest_touch_up(dev, 0);
 	litest_touch_up(dev, 1);
@@ -516,7 +516,7 @@ START_TEST(touchpad_1fg_tap_n_drag_click)
 	litest_touch_down(dev, 0, 50, 50);
 	litest_touch_up(dev, 0);
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 80, 50, 10);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 50, 10, 0);
 
 	litest_assert_button_event(li, BTN_LEFT,
 				   LIBINPUT_BUTTON_STATE_PRESSED);
@@ -803,7 +803,7 @@ START_TEST(clickpad_click_n_drag)
 
 	/* now put a second finger down */
 	litest_touch_down(dev, 1, 70, 70);
-	litest_touch_move_to(dev, 1, 70, 70, 80, 50, 5);
+	litest_touch_move_to(dev, 1, 70, 70, 80, 50, 5, 0);
 	litest_touch_up(dev, 1);
 
 	libinput_dispatch(li);
@@ -997,14 +997,14 @@ START_TEST(clickpad_softbutton_left_1st_fg_move)
 	litest_assert_empty_queue(li);
 
 	/* move out of the area, then wait for softbutton timer */
-	litest_touch_move_to(dev, 0, 20, 90, 90, 20, 10);
+	litest_touch_move_to(dev, 0, 20, 90, 90, 20, 10, 0);
 	libinput_dispatch(li);
 	litest_timeout_softbuttons();
 	libinput_dispatch(li);
 	litest_drain_events(li);
 
 	/* move down left, expect motion */
-	litest_touch_move_to(dev, 0, 90, 20, 20, 90, 10);
+	litest_touch_move_to(dev, 0, 90, 20, 20, 90, 10, 0);
 
 	libinput_dispatch(li);
 	event = libinput_get_event(li);
@@ -1070,7 +1070,7 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move)
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 1, 20, 20);
-	litest_touch_move_to(dev, 1, 20, 20, 80, 20, 10);
+	litest_touch_move_to(dev, 1, 20, 20, 80, 20, 10, 0);
 
 	libinput_dispatch(li);
 	event = libinput_get_event(li);
@@ -1097,7 +1097,7 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move)
 
 	/* second finger down */
 	litest_touch_down(dev, 1, 20, 20);
-	litest_touch_move_to(dev, 1, 20, 20, 20, 80, 10);
+	litest_touch_move_to(dev, 1, 20, 20, 20, 80, 10, 0);
 
 	libinput_dispatch(li);
 	event = libinput_get_event(li);
@@ -1148,7 +1148,7 @@ START_TEST(clickpad_softbutton_left_to_right)
 	*/
 
 	litest_touch_down(dev, 0, 20, 90);
-	litest_touch_move_to(dev, 0, 20, 90, 90, 90, 10);
+	litest_touch_move_to(dev, 0, 20, 90, 90, 90, 10, 0);
 	litest_event(dev, EV_KEY, BTN_LEFT, 1);
 	litest_event(dev, EV_SYN, SYN_REPORT, 0);
 
@@ -1182,7 +1182,7 @@ START_TEST(clickpad_softbutton_right_to_left)
 	*/
 
 	litest_touch_down(dev, 0, 90, 90);
-	litest_touch_move_to(dev, 0, 90, 90, 20, 90, 10);
+	litest_touch_move_to(dev, 0, 90, 90, 20, 90, 10, 0);
 	litest_event(dev, EV_KEY, BTN_LEFT, 1);
 	litest_event(dev, EV_SYN, SYN_REPORT, 0);
 
@@ -1306,7 +1306,7 @@ START_TEST(clickpad_topsoftbuttons_move_out_ignore)
 	libinput_dispatch(li);
 	litest_assert_empty_queue(li);
 
-	litest_touch_move_to(dev, 0, 50, 5, 80, 90, 20);
+	litest_touch_move_to(dev, 0, 50, 5, 80, 90, 20, 0);
 	libinput_dispatch(li);
 	litest_timeout_softbuttons();
 	libinput_dispatch(li);
@@ -1330,8 +1330,8 @@ test_2fg_scroll(struct litest_device *dev, double dx, double dy, int want_sleep)
 	litest_touch_down(dev, 0, 47, 50);
 	litest_touch_down(dev, 1, 53, 50);
 
-	litest_touch_move_to(dev, 0, 47, 50, 47 + dx, 50 + dy, 5);
-	litest_touch_move_to(dev, 1, 53, 50, 53 + dx, 50 + dy, 5);
+	litest_touch_move_to(dev, 0, 47, 50, 47 + dx, 50 + dy, 5, 0);
+	litest_touch_move_to(dev, 1, 53, 50, 53 + dx, 50 + dy, 5, 0);
 
 	/* Avoid a small scroll being seen as a tap */
 	if (want_sleep) {
@@ -1482,13 +1482,13 @@ START_TEST(touchpad_palm_detect_at_edge)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 99, 50);
-	litest_touch_move_to(dev, 0, 99, 50, 99, 70, 5);
+	litest_touch_move_to(dev, 0, 99, 50, 99, 70, 5, 0);
 	litest_touch_up(dev, 0);
 
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 0, 5, 50);
-	litest_touch_move_to(dev, 0, 5, 50, 5, 70, 5);
+	litest_touch_move_to(dev, 0, 5, 50, 5, 70, 5, 0);
 	litest_touch_up(dev, 0);
 }
 END_TEST
@@ -1506,13 +1506,13 @@ START_TEST(touchpad_palm_detect_at_bottom_corners)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 99, 95);
-	litest_touch_move_to(dev, 0, 99, 95, 99, 99, 10);
+	litest_touch_move_to(dev, 0, 99, 95, 99, 99, 10, 0);
 	litest_touch_up(dev, 0);
 
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 0, 5, 95);
-	litest_touch_move_to(dev, 0, 5, 95, 5, 99, 5);
+	litest_touch_move_to(dev, 0, 5, 95, 5, 99, 5, 0);
 	litest_touch_up(dev, 0);
 }
 END_TEST
@@ -1530,13 +1530,13 @@ START_TEST(touchpad_palm_detect_at_top_corners)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 99, 5);
-	litest_touch_move_to(dev, 0, 99, 5, 99, 9, 10);
+	litest_touch_move_to(dev, 0, 99, 5, 99, 9, 10, 0);
 	litest_touch_up(dev, 0);
 
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 0, 5, 5);
-	litest_touch_move_to(dev, 0, 5, 5, 5, 9, 5);
+	litest_touch_move_to(dev, 0, 5, 5, 5, 9, 5, 0);
 	litest_touch_up(dev, 0);
 }
 END_TEST
@@ -1552,7 +1552,7 @@ START_TEST(touchpad_palm_detect_palm_stays_palm)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 99, 20);
-	litest_touch_move_to(dev, 0, 99, 20, 75, 99, 5);
+	litest_touch_move_to(dev, 0, 99, 20, 75, 99, 5, 0);
 	litest_touch_up(dev, 0);
 	litest_assert_empty_queue(li);
 }
@@ -1571,7 +1571,7 @@ START_TEST(touchpad_palm_detect_palm_becomes_pointer)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 99, 50);
-	litest_touch_move_to(dev, 0, 99, 50, 0, 70, 5);
+	litest_touch_move_to(dev, 0, 99, 50, 0, 70, 5, 0);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -1604,11 +1604,11 @@ START_TEST(touchpad_palm_detect_no_palm_moving_into_edges)
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 99, 50, 5);
+	litest_touch_move_to(dev, 0, 50, 50, 99, 50, 5, 0);
 
 	litest_drain_events(li);
 
-	litest_touch_move_to(dev, 0, 99, 50, 99, 90, 5);
+	litest_touch_move_to(dev, 0, 99, 50, 99, 90, 5, 0);
 	libinput_dispatch(li);
 
 	type = libinput_next_event_type(li);

From 83fb3a89bedae6761963e083ed7067b45b3362cb Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 26 Sep 2014 11:46:00 +0200
Subject: [PATCH 047/121] touchpad: Make motion during tap-n-drag test take
 some time

The tap code will move individual touches to a state of TAP_TOUCH_STATE_DEAD
after a timeout. In case of tap-n-drag this should not have any influence,
make the litest_touch_move_to take long enough to trigger the timeout to
verify that this does not has any influence.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 test/touchpad.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/touchpad.c b/test/touchpad.c
index 576f9ffa..8bd09f19 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -131,7 +131,7 @@ START_TEST(touchpad_1fg_tap_n_drag)
 	litest_touch_down(dev, 0, 50, 50);
 	litest_touch_up(dev, 0);
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 0);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 40);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -150,7 +150,7 @@ START_TEST(touchpad_1fg_tap_n_drag)
 
 	/* lift finger, set down again, should continue dragging */
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 0);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 40);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);

From 23031c8fd70a98ef32a80ded6299010ea5e732c2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 25 Sep 2014 15:58:04 +0200
Subject: [PATCH 048/121] touchpad: Don't send scroll events during 2 finger
 tap-n-drag

The touchpad tap code explicitly supports 2 finger tap-n-drag, this commit
adds a test-case for this, which fails due to the 2 finger scrolling code
sending scroll events during a 2 finger tap-n-drag.

And this commit fixes the test-case, by not sending scroll events while a
tap-n-drag is active.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad-tap.c | 13 ++++++++++++
 src/evdev-mt-touchpad.c     |  4 ++++
 src/evdev-mt-touchpad.h     |  3 +++
 test/touchpad.c             | 40 +++++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 0b72ace7..8aa4ec6a 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -749,3 +749,16 @@ tp_tap_resume(struct tp_dispatch *tp, uint64_t time)
 {
 	tp_tap_enabled_update(tp, false, tp->tap.enabled, time);
 }
+
+bool
+tp_tap_dragging(struct tp_dispatch *tp)
+{
+	switch (tp->tap.state) {
+	case TAP_STATE_DRAGGING:
+	case TAP_STATE_DRAGGING_2:
+	case TAP_STATE_DRAGGING_WAIT:
+		return true;
+	default:
+		return false;
+	}
+}
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index b7a559f9..85d980ce 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -508,6 +508,10 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
 	struct tp_touch *t;
 	int nfingers_down = 0;
 
+	/* No scrolling during tap-n-drag */
+	if (tp_tap_dragging(tp))
+		return 0;
+
 	/* Only count active touches for 2 finger scrolling */
 	tp_for_each_touch(tp, t) {
 		if (tp_touch_active(tp, t))
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 2fda4efd..91f6e4ae 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -291,4 +291,7 @@ tp_tap_suspend(struct tp_dispatch *tp, uint64_t time);
 void
 tp_tap_resume(struct tp_dispatch *tp, uint64_t time);
 
+bool
+tp_tap_dragging(struct tp_dispatch *tp);
+
 #endif
diff --git a/test/touchpad.c b/test/touchpad.c
index 8bd09f19..fba1d58b 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -200,6 +200,45 @@ START_TEST(touchpad_1fg_tap_n_drag_timeout)
 }
 END_TEST
 
+START_TEST(touchpad_2fg_tap_n_drag)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+
+	libinput_device_config_tap_set_enabled(dev->libinput_device,
+					       LIBINPUT_CONFIG_TAP_ENABLED);
+
+	litest_drain_events(li);
+
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_up(dev, 0);
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_down(dev, 1, 60, 50);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 40);
+	libinput_dispatch(li);
+
+	litest_assert_button_event(li, BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+
+	while (libinput_next_event_type(li) == LIBINPUT_EVENT_POINTER_MOTION) {
+		event = libinput_get_event(li);
+		libinput_event_destroy(event);
+		libinput_dispatch(li);
+	}
+	litest_assert_empty_queue(li);
+
+	litest_touch_up(dev, 0);
+	litest_touch_up(dev, 1);
+
+	/* This will wait for the DRAGGING_WAIT timeout */
+	litest_assert_button_event(li, BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	litest_assert_empty_queue(li);
+}
+END_TEST
+
 START_TEST(touchpad_2fg_tap)
 {
 	struct litest_device *dev = litest_current_device();
@@ -1934,6 +1973,7 @@ int main(int argc, char **argv) {
 	litest_add("touchpad:tap", touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:tap", touchpad_1fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY);
+	litest_add("touchpad:tap", touchpad_2fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 	litest_add("touchpad:tap", touchpad_2fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 	litest_add("touchpad:tap", touchpad_2fg_tap_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 	litest_add("touchpad:tap", touchpad_1fg_tap_click, LITEST_TOUCHPAD, LITEST_CLICKPAD);

From 6699d1b637e67780fb5034e2648f492a8440b21b Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 25 Sep 2014 16:50:44 +0200
Subject: [PATCH 049/121] touchpad: Add a test for 2fg tap-n-drag release on a
 3th finger down

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 test/touchpad.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/test/touchpad.c b/test/touchpad.c
index fba1d58b..f9031dd9 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -239,6 +239,54 @@ START_TEST(touchpad_2fg_tap_n_drag)
 }
 END_TEST
 
+START_TEST(touchpad_2fg_tap_n_drag_3fg_btntool)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+
+	libinput_device_config_tap_set_enabled(dev->libinput_device,
+					       LIBINPUT_CONFIG_TAP_ENABLED);
+
+	litest_drain_events(li);
+
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_up(dev, 0);
+	litest_touch_down(dev, 0, 50, 50);
+	litest_touch_down(dev, 1, 60, 50);
+	litest_touch_move_to(dev, 0, 50, 50, 80, 80, 5, 40);
+	libinput_dispatch(li);
+
+	litest_assert_button_event(li, BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+
+	while (libinput_next_event_type(li) == LIBINPUT_EVENT_POINTER_MOTION) {
+		event = libinput_get_event(li);
+		libinput_event_destroy(event);
+		libinput_dispatch(li);
+	}
+	litest_assert_empty_queue(li);
+
+	/* Putting down a third finger should end the drag */
+	litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1);
+	litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+	libinput_dispatch(li);
+
+	litest_assert_button_event(li, BTN_LEFT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	/* Releasing the fingers should not cause any events */
+	litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0);
+	litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+	litest_touch_up(dev, 1);
+	litest_touch_up(dev, 0);
+
+	litest_assert_empty_queue(li);
+}
+END_TEST
+
 START_TEST(touchpad_2fg_tap)
 {
 	struct litest_device *dev = litest_current_device();
@@ -1974,6 +2022,7 @@ int main(int argc, char **argv) {
 	litest_add("touchpad:tap", touchpad_1fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:tap", touchpad_2fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+	litest_add("touchpad:tap", touchpad_2fg_tap_n_drag_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD);
 	litest_add("touchpad:tap", touchpad_2fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 	litest_add("touchpad:tap", touchpad_2fg_tap_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 	litest_add("touchpad:tap", touchpad_1fg_tap_click, LITEST_TOUCHPAD, LITEST_CLICKPAD);

From 7a64815faa82014f7c45d764170541e0d1773d4d Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 11:15:27 +0100
Subject: [PATCH 050/121] touchpad: Make tap code follow state machine diagram
 part 1

According to the diagram, we should only check the tap-touch-state before
sending a button press / release when in state touch_2 or touch_3.

tp_tap_notify always checks the tap-touch-state. This is problematic when in
state tapped, or one of the follow up states, since this could cause the
button 1 release to never happen.

In practice this is never a problem since the touch passed into tp_tap_notify
is NULL when called for timeout or button events, and in the 2 affected paths
where we're dealing with a touch or release tap-touch-state always is
TAP_TOUCH_STATE_TOUCH.

However we should not rely on this and properly follow the diagram, this
commit therefor drops the touch argument to tp_tap_notify, and adds explicit
tap-touch-state checks in the places where they are present in the diagram too.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad-tap.c | 43 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 8aa4ec6a..edb123ee 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -95,16 +95,12 @@ tap_event_to_str(enum tap_event event) {
 
 static void
 tp_tap_notify(struct tp_dispatch *tp,
-	      struct tp_touch *t,
 	      uint64_t time,
 	      int nfingers,
 	      enum libinput_button_state state)
 {
 	int32_t button;
 
-	if (t && t->tap.state == TAP_TOUCH_STATE_DEAD)
-		return;
-
 	switch (nfingers) {
 	case 1: button = BTN_LEFT; break;
 	case 2: button = BTN_RIGHT; break;
@@ -174,7 +170,7 @@ tp_tap_touch_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_RELEASE:
 		tp->tap.state = TAP_STATE_TAPPED;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_PRESSED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_PRESSED);
 		tp_tap_set_timer(tp, time);
 		break;
 	case TAP_EVENT_TIMEOUT:
@@ -229,11 +225,11 @@ tp_tap_tapped_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_TIMEOUT:
 		tp->tap.state = TAP_STATE_IDLE;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	case TAP_EVENT_BUTTON:
 		tp->tap.state = TAP_STATE_DEAD;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	}
 }
@@ -251,8 +247,10 @@ tp_tap_touch2_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_RELEASE:
 		tp->tap.state = TAP_STATE_HOLD;
-		tp_tap_notify(tp, t, time, 2, LIBINPUT_BUTTON_STATE_PRESSED);
-		tp_tap_notify(tp, t, time, 2, LIBINPUT_BUTTON_STATE_RELEASED);
+		if (t->tap.state == TAP_TOUCH_STATE_TOUCH) {
+			tp_tap_notify(tp, time, 2, LIBINPUT_BUTTON_STATE_PRESSED);
+			tp_tap_notify(tp, time, 2, LIBINPUT_BUTTON_STATE_RELEASED);
+		}
 		tp_tap_clear_timer(tp);
 		break;
 	case TAP_EVENT_MOTION:
@@ -309,8 +307,10 @@ tp_tap_touch3_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_RELEASE:
 		tp->tap.state = TAP_STATE_TOUCH_2_HOLD;
-		tp_tap_notify(tp, t, time, 3, LIBINPUT_BUTTON_STATE_PRESSED);
-		tp_tap_notify(tp, t, time, 3, LIBINPUT_BUTTON_STATE_RELEASED);
+		if (t->tap.state == TAP_TOUCH_STATE_TOUCH) {
+			tp_tap_notify(tp, time, 3, LIBINPUT_BUTTON_STATE_PRESSED);
+			tp_tap_notify(tp, time, 3, LIBINPUT_BUTTON_STATE_RELEASED);
+		}
 		break;
 	case TAP_EVENT_BUTTON:
 		tp->tap.state = TAP_STATE_DEAD;
@@ -352,9 +352,9 @@ tp_tap_dragging_or_doubletap_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_RELEASE:
 		tp->tap.state = TAP_STATE_IDLE;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_PRESSED);
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_PRESSED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		tp_tap_clear_timer(tp);
 		break;
 	case TAP_EVENT_MOTION:
@@ -363,7 +363,7 @@ tp_tap_dragging_or_doubletap_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_BUTTON:
 		tp->tap.state = TAP_STATE_DEAD;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	}
 }
@@ -388,7 +388,7 @@ tp_tap_dragging_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_BUTTON:
 		tp->tap.state = TAP_STATE_DEAD;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	}
 }
@@ -409,11 +409,11 @@ tp_tap_dragging_wait_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_TIMEOUT:
 		tp->tap.state = TAP_STATE_IDLE;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	case TAP_EVENT_BUTTON:
 		tp->tap.state = TAP_STATE_DEAD;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	}
 }
@@ -430,7 +430,7 @@ tp_tap_dragging2_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_TOUCH:
 		tp->tap.state = TAP_STATE_DEAD;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	case TAP_EVENT_MOTION:
 	case TAP_EVENT_TIMEOUT:
@@ -438,7 +438,7 @@ tp_tap_dragging2_handle_event(struct tp_dispatch *tp,
 		break;
 	case TAP_EVENT_BUTTON:
 		tp->tap.state = TAP_STATE_DEAD;
-		tp_tap_notify(tp, t, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
+		tp_tap_notify(tp, time, 1, LIBINPUT_BUTTON_STATE_RELEASED);
 		break;
 	}
 }
@@ -731,8 +731,7 @@ tp_release_all_taps(struct tp_dispatch *tp, uint64_t now)
 
 	for (i = 1; i <= 3; i++) {
 		if (tp->tap.buttons_pressed & (1 << i))
-			tp_tap_notify(tp, NULL, now, i,
-				      LIBINPUT_BUTTON_STATE_RELEASED);
+			tp_tap_notify(tp, now, i, LIBINPUT_BUTTON_STATE_RELEASED);
 	}
 
 	tp->tap.state = tp->nfingers_down ? TAP_STATE_DEAD : TAP_STATE_IDLE;

From d2c44df7c337d506cc914eaf16931828547f2fd0 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 12:49:06 +0200
Subject: [PATCH 051/121] touchpad: Make tap code follow state machine diagram
 part 2

Mark touches as idle, rather then dead, on release. This causes no functional
changes since we only evert check for tap-touch-state == touch, and neither
being idle or dead == touch.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad-tap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index edb123ee..d15e9ea9 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -570,7 +570,7 @@ tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
 			tp_tap_handle_event(tp, t, TAP_EVENT_TOUCH, time);
 		} else if (t->state == TOUCH_END) {
 			tp_tap_handle_event(tp, t, TAP_EVENT_RELEASE, time);
-			t->tap.state = TAP_TOUCH_STATE_DEAD;
+			t->tap.state = TAP_TOUCH_STATE_IDLE;
 		} else if (tp->tap.state != TAP_STATE_IDLE &&
 			 tp_tap_exceeds_motion_threshold(tp, t)) {
 			struct tp_touch *tmp;

From a78a25e62eaec24d625a48d9d0dcd524f874ad7f Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 28 Sep 2014 12:51:09 +0200
Subject: [PATCH 052/121] touchpad: Make tap code follow state machine diagram
 part 3

We should only mark touches dead on a button click if we're dealing with a
clickpad.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad-tap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index d15e9ea9..a38edbe3 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -562,7 +562,8 @@ tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
 		if (!t->dirty || t->state == TOUCH_NONE)
 			continue;
 
-		if (tp->queued & TOUCHPAD_EVENT_BUTTON_PRESS)
+		if (tp->buttons.is_clickpad &&
+		    tp->queued & TOUCHPAD_EVENT_BUTTON_PRESS)
 			t->tap.state = TAP_TOUCH_STATE_DEAD;
 
 		if (t->state == TOUCH_BEGIN) {

From 33ac7436a1ff14e4170ffcee5a155b6bae4e0ae3 Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@gmail.com>
Date: Wed, 5 Nov 2014 13:32:16 +0100
Subject: [PATCH 053/121] util: introduce ratelimit helpers

This adds "struct ratelimit" and "ratelimit_test()". It's a very simple
rate-limit helper modeled after Linux' lib/ratelimit.c by Dave Young.

This comes in handy to limit log-messages in possible busy loops etc..

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput-util.c | 48 +++++++++++++++++++++++++++++++++++++++++++++
 src/libinput-util.h | 16 +++++++++++++++
 test/misc.c         | 42 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+)

diff --git a/src/libinput-util.c b/src/libinput-util.c
index eeb9786a..34d55496 100644
--- a/src/libinput-util.c
+++ b/src/libinput-util.c
@@ -65,3 +65,51 @@ list_empty(const struct list *list)
 {
 	return list->next == list;
 }
+
+void
+ratelimit_init(struct ratelimit *r, uint64_t ival_ms, unsigned int burst)
+{
+	r->interval = ival_ms;
+	r->begin = 0;
+	r->burst = burst;
+	r->num = 0;
+}
+
+/*
+ * Perform rate-limit test. Returns RATELIMIT_PASS if the rate-limited action
+ * is still allowed, RATELIMIT_THRESHOLD if the limit has been reached with
+ * this call, and RATELIMIT_EXCEEDED if you're beyond the threshold.
+ * It's safe to treat the return-value as boolean, if you're not interested in
+ * the exact state. It evaluates to "true" if the threshold hasn't been
+ * exceeded, yet.
+ *
+ * The ratelimit object must be initialized via ratelimit_init().
+ *
+ * Modelled after Linux' lib/ratelimit.c by Dave Young
+ * <hidave.darkstar@gmail.com>, which is licensed GPLv2.
+ */
+enum ratelimit_state
+ratelimit_test(struct ratelimit *r)
+{
+	struct timespec ts;
+	uint64_t mtime;
+
+	if (r->interval <= 0 || r->burst <= 0)
+		return RATELIMIT_PASS;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	mtime = ts.tv_sec * 1000 + ts.tv_nsec / 1000 / 1000;
+
+	if (r->begin <= 0 || r->begin + r->interval < mtime) {
+		/* reset counter */
+		r->begin = mtime;
+		r->num = 1;
+		return RATELIMIT_PASS;
+	} else if (r->num < r->burst) {
+		/* continue burst */
+		return (++r->num == r->burst) ? RATELIMIT_THRESHOLD
+					      : RATELIMIT_PASS;
+	}
+
+	return RATELIMIT_EXCEEDED;
+}
diff --git a/src/libinput-util.h b/src/libinput-util.h
index 51759e87..909c9dbd 100644
--- a/src/libinput-util.h
+++ b/src/libinput-util.h
@@ -280,4 +280,20 @@ matrix_to_farray6(const struct matrix *m, float out[6])
 	out[5] = m->val[1][2];
 }
 
+enum ratelimit_state {
+	RATELIMIT_EXCEEDED,
+	RATELIMIT_THRESHOLD,
+	RATELIMIT_PASS,
+};
+
+struct ratelimit {
+	uint64_t interval;
+	uint64_t begin;
+	unsigned int burst;
+	unsigned int num;
+};
+
+void ratelimit_init(struct ratelimit *r, uint64_t ival_ms, unsigned int burst);
+enum ratelimit_state ratelimit_test(struct ratelimit *r);
+
 #endif /* LIBINPUT_UTIL_H */
diff --git a/test/misc.c b/test/misc.c
index 1512180e..4ed9dce8 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -508,6 +508,46 @@ START_TEST(matrix_helpers)
 }
 END_TEST
 
+START_TEST(ratelimit_helpers)
+{
+	struct ratelimit rl;
+	unsigned int i, j;
+
+	/* 10 attempts every 100ms */
+	ratelimit_init(&rl, 100, 10);
+
+	for (j = 0; j < 3; ++j) {
+		/* a burst of 9 attempts must succeed */
+		for (i = 0; i < 9; ++i) {
+			ck_assert_int_eq(ratelimit_test(&rl),
+					 RATELIMIT_PASS);
+		}
+
+		/* the 10th attempt reaches the threshold */
+		ck_assert_int_eq(ratelimit_test(&rl), RATELIMIT_THRESHOLD);
+
+		/* ..then further attempts must fail.. */
+		ck_assert_int_eq(ratelimit_test(&rl), RATELIMIT_EXCEEDED);
+
+		/* ..regardless of how often we try. */
+		for (i = 0; i < 100; ++i) {
+			ck_assert_int_eq(ratelimit_test(&rl),
+					 RATELIMIT_EXCEEDED);
+		}
+
+		/* ..even after waiting 20ms */
+		msleep(20);
+		for (i = 0; i < 100; ++i) {
+			ck_assert_int_eq(ratelimit_test(&rl),
+					 RATELIMIT_EXCEEDED);
+		}
+
+		/* but after 100ms the counter is reset */
+		msleep(90); /* +10ms to account for time drifts */
+	}
+}
+END_TEST
+
 int main (int argc, char **argv) {
 	litest_add_no_device("events:conversion", event_conversion_device_notify);
 	litest_add_no_device("events:conversion", event_conversion_pointer);
@@ -519,5 +559,7 @@ int main (int argc, char **argv) {
 	litest_add_no_device("config:status string", config_status_string);
 
 	litest_add_no_device("misc:matrix", matrix_helpers);
+	litest_add_no_device("misc:ratelimit", ratelimit_helpers);
+
 	return litest_run(argc, argv);
 }

From 6d781f8817b409b49eae95b1c982a0c5b75f6630 Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@gmail.com>
Date: Wed, 5 Nov 2014 13:32:17 +0100
Subject: [PATCH 054/121] evdev: ratelimit SYN_DROPPED logging

Use the ratelimit helpers for SYN_DROPPED logging. This guarantees that we
will still receive SYN_DROPPED log-messages after multiple days of
runtime, even though there might have been a SYN_DROPPED flood at one
point in time.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 18 ++++++++++++------
 src/evdev.h |  4 +---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 3346b543..272d165e 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -925,15 +925,19 @@ evdev_device_dispatch(void *data)
 		rc = libevdev_next_event(device->evdev,
 					 LIBEVDEV_READ_FLAG_NORMAL, &ev);
 		if (rc == LIBEVDEV_READ_STATUS_SYNC) {
-			if (device->syn_drops_received < 10) {
-				device->syn_drops_received++;
+			switch (ratelimit_test(&device->syn_drop_limit)) {
+			case RATELIMIT_PASS:
 				log_info(libinput, "SYN_DROPPED event from "
 					 "\"%s\" - some input events have "
 					 "been lost.\n", device->devname);
-				if (device->syn_drops_received == 10)
-					log_info(libinput, "No longer logging "
-						 "SYN_DROPPED events for "
-						 "\"%s\"\n", device->devname);
+				break;
+			case RATELIMIT_THRESHOLD:
+				log_info(libinput, "SYN_DROPPED flood "
+					 "from \"%s\"\n",
+					 device->devname);
+				break;
+			case RATELIMIT_EXCEEDED:
+				break;
 			}
 
 			/* send one more sync event so we handle all
@@ -1310,6 +1314,8 @@ evdev_device_create(struct libinput_seat *seat,
 	device->scroll.threshold = 5.0; /* Default may be overridden */
 	device->scroll.direction = 0;
 	device->dpi = DEFAULT_MOUSE_DPI;
+	/* at most 5 SYN_DROPPED log-messages per 30s */
+	ratelimit_init(&device->syn_drop_limit, 30ULL * 1000, 5);
 
 	matrix_init_identity(&device->abs.calibration);
 	matrix_init_identity(&device->abs.usermatrix);
diff --git a/src/evdev.h b/src/evdev.h
index 666c8dc8..eefbb79b 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -137,9 +137,7 @@ struct evdev_device {
 	} buttons;
 
 	int dpi; /* HW resolution */
-	/* The number of times libevdev processes a SYN_DROPPED, so we can
-	 * stop logging them to avoid flooding the logs. */
-	int syn_drops_received;
+	struct ratelimit syn_drop_limit; /* ratelimit for SYN_DROPPED logging */
 };
 
 #define EVDEV_UNHANDLED_DEVICE ((struct evdev_device *) 1)

From 341eeec61139d28e18d93a196a41d790718fd731 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Nov 2014 10:57:27 +1000
Subject: [PATCH 055/121] test: fix coding style

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/litest.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/litest.c b/test/litest.c
index dc6a6306..c64e6652 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -1096,9 +1096,10 @@ litest_assert_button_event(struct libinput *li, unsigned int button,
 	libinput_event_destroy(event);
 }
 
-void litest_assert_scroll(struct libinput *li,
-			  enum libinput_pointer_axis axis,
-			  int dir)
+void
+litest_assert_scroll(struct libinput *li,
+		     enum libinput_pointer_axis axis,
+		     int dir)
 {
 	struct libinput_event *event, *next_event;
 	struct libinput_event_pointer *ptrev;

From 5d8cb733423c488b99051a8eab37f30e49d8fd75 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 7 Nov 2014 10:02:56 +1000
Subject: [PATCH 056/121] evdev: don't ignore REL_HWHEEL values over 1

Matching patch for REL_WHEEL is 09a3770961aad0973, not sure why I didn't
do both at the same time.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 272d165e..84c42b69 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -549,21 +549,12 @@ evdev_process_relative(struct evdev_device *device,
 		break;
 	case REL_HWHEEL:
 		evdev_flush_pending_event(device, time);
-		switch (e->value) {
-		case -1:
-			/* Scroll left */
-		case 1:
-			/* Scroll right */
-			pointer_notify_axis(
-				base,
-				time,
-				LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
-				e->value * DEFAULT_AXIS_STEP_DISTANCE);
-			break;
-		default:
-			break;
+		pointer_notify_axis(
+			base,
+			time,
+			LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
+			e->value * DEFAULT_AXIS_STEP_DISTANCE);
 
-		}
 	}
 }
 

From 77a2d7e8d99b5707defd4f890d0018916677e936 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 29 Oct 2014 11:05:20 +1000
Subject: [PATCH 057/121] test: rename LITEST_POINTER to LITEST_RELATIVE

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/device.c                  | 4 ++--
 test/litest-mouse.c            | 2 +-
 test/litest-ms-surface-cover.c | 2 +-
 test/litest-trackpoint.c       | 2 +-
 test/litest.h                  | 2 +-
 test/pointer.c                 | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/device.c b/test/device.c
index 7bc7ac8c..56f72c73 100644
--- a/test/device.c
+++ b/test/device.c
@@ -606,9 +606,9 @@ int main (int argc, char **argv)
 	litest_add("device:sendevents", device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("device:sendevents", device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("device:sendevents", device_sendevents_config_default, LITEST_ANY, LITEST_ANY);
-	litest_add("device:sendevents", device_disable, LITEST_POINTER, LITEST_ANY);
+	litest_add("device:sendevents", device_disable, LITEST_RELATIVE, LITEST_ANY);
 	litest_add("device:sendevents", device_disable_touchpad, LITEST_TOUCHPAD, LITEST_ANY);
-	litest_add("device:sendevents", device_disable_events_pending, LITEST_POINTER, LITEST_TOUCHPAD);
+	litest_add("device:sendevents", device_disable_events_pending, LITEST_RELATIVE, LITEST_TOUCHPAD);
 	litest_add("device:sendevents", device_double_disable, LITEST_ANY, LITEST_ANY);
 	litest_add("device:sendevents", device_double_enable, LITEST_ANY, LITEST_ANY);
 	litest_add_no_device("device:sendevents", device_reenable_syspath_changed);
diff --git a/test/litest-mouse.c b/test/litest-mouse.c
index 5eac572e..cf0a7a05 100644
--- a/test/litest-mouse.c
+++ b/test/litest-mouse.c
@@ -55,7 +55,7 @@ static int events[] = {
 
 struct litest_test_device litest_mouse_device = {
 	.type = LITEST_MOUSE,
-	.features = LITEST_POINTER | LITEST_BUTTON | LITEST_WHEEL,
+	.features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_WHEEL,
 	.shortname = "mouse",
 	.setup = litest_mouse_setup,
 	.interface = &interface,
diff --git a/test/litest-ms-surface-cover.c b/test/litest-ms-surface-cover.c
index bd8b1a1c..5b9ec233 100644
--- a/test/litest-ms-surface-cover.c
+++ b/test/litest-ms-surface-cover.c
@@ -374,7 +374,7 @@ static int events[] = {
 
 struct litest_test_device litest_ms_surface_cover_device = {
 	.type = LITEST_MS_SURFACE_COVER,
-	.features = LITEST_KEYBOARD | LITEST_POINTER | LITEST_FAKE_MT,
+	.features = LITEST_KEYBOARD | LITEST_RELATIVE | LITEST_FAKE_MT,
 	.shortname = "MS surface cover",
 	.setup = litest_ms_surface_cover_setup,
 	.interface = &interface,
diff --git a/test/litest-trackpoint.c b/test/litest-trackpoint.c
index 01ad34ea..061835fc 100644
--- a/test/litest-trackpoint.c
+++ b/test/litest-trackpoint.c
@@ -56,7 +56,7 @@ static int events[] = {
 
 struct litest_test_device litest_trackpoint_device = {
 	.type = LITEST_TRACKPOINT,
-	.features = LITEST_POINTER | LITEST_BUTTON | LITEST_POINTINGSTICK,
+	.features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_POINTINGSTICK,
 	.shortname = "trackpoint",
 	.setup = litest_trackpoint_setup,
 	.interface = &interface,
diff --git a/test/litest.h b/test/litest.h
index 5b0478b1..e0f8c6b2 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -55,7 +55,7 @@ enum litest_device_feature {
 	LITEST_CLICKPAD = 1 << 1,
 	LITEST_BUTTON = 1 << 2,
 	LITEST_KEYS = 1 << 3,
-	LITEST_POINTER = 1 << 4,
+	LITEST_RELATIVE = 1 << 4,
 	LITEST_WHEEL = 1 << 5,
 	LITEST_TOUCH = 1 << 6,
 	LITEST_SINGLE_TOUCH = 1 << 7,
diff --git a/test/pointer.c b/test/pointer.c
index 56b6709a..fb3135d4 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -520,7 +520,7 @@ END_TEST
 
 int main (int argc, char **argv) {
 
-	litest_add("pointer:motion", pointer_motion_relative, LITEST_POINTER, LITEST_ANY);
+	litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
 	litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD);
 	litest_add_no_device("pointer:button_auto_release", pointer_button_auto_release);
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
@@ -530,9 +530,9 @@ int main (int argc, char **argv) {
 
 									/* tests touchpads too */
 	litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY);
-	litest_add("pointer:left-handed", pointer_left_handed, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
-	litest_add("pointer:left-handed", pointer_left_handed_during_click, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
-	litest_add("pointer:left-handed", pointer_left_handed_during_click_multiple_buttons, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:left-handed", pointer_left_handed, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:left-handed", pointer_left_handed_during_click, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:left-handed", pointer_left_handed_during_click_multiple_buttons, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
 
 	return litest_run(argc, argv);
 }

From 529d30c7ac0981162ff8cd62317c4fd638374dcc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 29 Oct 2014 10:59:58 +1000
Subject: [PATCH 058/121] test: add QEMU tablet as test device

Re-uses the touch_down interface for now, but requires the slot is always 0.
That's easier for now than adding a new interface for abs event, at least
until we have more than one device that needs it.

This device, along with a couple of similar ones have a tendency to break in
the X.Org stack without people noticing. They're special in that they have
absolute x/y axes but relative wheels. For libinput that's not as much of a
problem as it is in X but let's add them anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/Makefile.am              |   1 +
 test/litest-qemu-usb-tablet.c | 101 ++++++++++++++++++++++++++++++++++
 test/litest.c                 |   2 +
 test/litest.h                 |   2 +
 test/pointer.c                |   2 +-
 5 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 test/litest-qemu-usb-tablet.c

diff --git a/test/Makefile.am b/test/Makefile.am
index d9329617..c810a5dc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,6 +21,7 @@ liblitest_la_SOURCES = \
 	litest-keyboard.c \
 	litest-mouse.c \
 	litest-ms-surface-cover.c \
+	litest-qemu-usb-tablet.c \
 	litest-synaptics.c \
 	litest-synaptics-st.c \
 	litest-synaptics-t440.c \
diff --git a/test/litest-qemu-usb-tablet.c b/test/litest-qemu-usb-tablet.c
new file mode 100644
index 00000000..4f03e241
--- /dev/null
+++ b/test/litest-qemu-usb-tablet.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "litest.h"
+#include "litest-int.h"
+#include <assert.h>
+
+static void
+litest_qemu_tablet_touch_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_QEMU_TABLET);
+	litest_set_current_device(d);
+}
+
+static void touch_down(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_move(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_up(struct litest_device *d, unsigned int slot)
+{
+	assert(slot == 0);
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static struct litest_device_interface interface = {
+	.touch_down = touch_down,
+	.touch_move = touch_move,
+	.touch_up = touch_up,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_X, 0, 32767, 0, 0, 0 },
+	{ ABS_Y, 0, 32767, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x03,
+	.vendor = 0x627,
+	.product = 0x01,
+};
+
+static int events[] = {
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_RIGHT,
+	EV_KEY, BTN_MIDDLE,
+	EV_REL, REL_WHEEL,
+	-1, -1,
+};
+
+struct litest_test_device litest_qemu_tablet_device = {
+	.type = LITEST_QEMU_TABLET,
+	.features = LITEST_WHEEL | LITEST_BUTTON | LITEST_ABSOLUTE,
+	.shortname = "qemu tablet",
+	.setup = litest_qemu_tablet_touch_setup,
+	.interface = &interface,
+
+	.name = "QEMU 0.12.1 QEMU USB Tablet",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+};
diff --git a/test/litest.c b/test/litest.c
index c64e6652..2ea82a87 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -87,6 +87,7 @@ extern struct litest_test_device litest_mouse_device;
 extern struct litest_test_device litest_wacom_touch_device;
 extern struct litest_test_device litest_alps_device;
 extern struct litest_test_device litest_generic_singletouch_device;
+extern struct litest_test_device litest_qemu_tablet_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -99,6 +100,7 @@ struct litest_test_device* devices[] = {
 	&litest_wacom_touch_device,
 	&litest_alps_device,
 	&litest_generic_singletouch_device,
+	&litest_qemu_tablet_device,
 	NULL,
 };
 
diff --git a/test/litest.h b/test/litest.h
index e0f8c6b2..f39382f3 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -46,6 +46,7 @@ enum litest_device_type {
 	LITEST_ALPS_SEMI_MT = -10,
 	LITEST_GENERIC_SINGLETOUCH = -11,
 	LITEST_MS_SURFACE_COVER = -12,
+	LITEST_QEMU_TABLET = -13,
 };
 
 enum litest_device_feature {
@@ -64,6 +65,7 @@ enum litest_device_feature {
 	LITEST_SEMI_MT = 1 << 10,
 	LITEST_POINTINGSTICK = 1 << 11,
 	LITEST_FAKE_MT = 1 << 12,
+	LITEST_ABSOLUTE = 1 << 13,
 };
 
 struct litest_device {
diff --git a/test/pointer.c b/test/pointer.c
index fb3135d4..43875268 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -526,7 +526,7 @@ int main (int argc, char **argv) {
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
 	litest_add_no_device("pointer:seat button count", pointer_seat_button_count);
 
-	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH);
+	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE);
 
 									/* tests touchpads too */
 	litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY);

From 35bdd7d8c27e66be379f2a3e9db2d0f2b72538e4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 29 Oct 2014 11:58:09 +1000
Subject: [PATCH 059/121] test: add test for absolute pointer motion

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/pointer.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/test/pointer.c b/test/pointer.c
index 43875268..52d812f4 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -101,6 +101,44 @@ START_TEST(pointer_motion_relative)
 }
 END_TEST
 
+static void
+test_absolute_event(struct litest_device *dev, double x, double y)
+{
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+	struct libinput_event_pointer *ptrev;
+	double ex, ey;
+
+	litest_touch_down(dev, 0, x, y);
+	libinput_dispatch(li);
+
+	event = libinput_get_event(li);
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE);
+
+	ptrev = libinput_event_get_pointer_event(event);
+	ck_assert(ptrev != NULL);
+
+	ex = libinput_event_pointer_get_absolute_x_transformed(ptrev, 100);
+	ey = libinput_event_pointer_get_absolute_y_transformed(ptrev, 100);
+	ck_assert_int_eq(ex + 0.5, x);
+	ck_assert_int_eq(ey + 0.5, y);
+
+	libinput_event_destroy(event);
+}
+
+START_TEST(pointer_motion_absolute)
+{
+	struct litest_device *dev = litest_current_device();
+
+	litest_drain_events(dev->libinput);
+
+	test_absolute_event(dev, 0, 100);
+	test_absolute_event(dev, 100, 0);
+	test_absolute_event(dev, 50, 50);
+}
+END_TEST
+
 static void
 test_button_event(struct litest_device *dev, unsigned int button, int state)
 {
@@ -521,6 +559,7 @@ END_TEST
 int main (int argc, char **argv) {
 
 	litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
+	litest_add("pointer:motion", pointer_motion_absolute, LITEST_ABSOLUTE, LITEST_ANY);
 	litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD);
 	litest_add_no_device("pointer:button_auto_release", pointer_button_auto_release);
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);

From a0b3af0d91c9e44f223a54054e03dd1e48b1a91d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 29 Oct 2014 12:08:20 +1000
Subject: [PATCH 060/121] test: add Xen Virtual Pointer device

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/Makefile.am                  |   1 +
 test/litest-xen-virtual-pointer.c | 106 ++++++++++++++++++++++++++++++
 test/litest.c                     |   2 +
 test/litest.h                     |   1 +
 4 files changed, 110 insertions(+)
 create mode 100644 test/litest-xen-virtual-pointer.c

diff --git a/test/Makefile.am b/test/Makefile.am
index c810a5dc..27499e7f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -27,6 +27,7 @@ liblitest_la_SOURCES = \
 	litest-synaptics-t440.c \
 	litest-trackpoint.c \
 	litest-wacom-touch.c \
+	litest-xen-virtual-pointer.c \
 	litest.c
 
 run_tests = \
diff --git a/test/litest-xen-virtual-pointer.c b/test/litest-xen-virtual-pointer.c
new file mode 100644
index 00000000..25891a7d
--- /dev/null
+++ b/test/litest-xen-virtual-pointer.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "litest.h"
+#include "litest-int.h"
+#include <assert.h>
+
+static void
+litest_xen_virtual_pointer_touch_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_XEN_VIRTUAL_POINTER);
+	litest_set_current_device(d);
+}
+
+static void touch_down(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_move(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_up(struct litest_device *d, unsigned int slot)
+{
+	assert(slot == 0);
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static struct litest_device_interface interface = {
+	.touch_down = touch_down,
+	.touch_move = touch_move,
+	.touch_up = touch_up,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_X, 0, 800, 0, 0, 0 },
+	{ ABS_Y, 0, 800, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x01,
+	.vendor = 0x5853,
+	.product = 0xfffe,
+};
+
+static int events[] = {
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_RIGHT,
+	EV_KEY, BTN_MIDDLE,
+	EV_KEY, BTN_SIDE,
+	EV_KEY, BTN_EXTRA,
+	EV_KEY, BTN_FORWARD,
+	EV_KEY, BTN_BACK,
+	EV_KEY, BTN_TASK,
+	EV_REL, REL_WHEEL,
+	-1, -1,
+};
+
+struct litest_test_device litest_xen_virtual_pointer_device = {
+	.type = LITEST_XEN_VIRTUAL_POINTER,
+	.features = LITEST_WHEEL | LITEST_BUTTON | LITEST_ABSOLUTE,
+	.shortname = "xen pointer",
+	.setup = litest_xen_virtual_pointer_touch_setup,
+	.interface = &interface,
+
+	.name = "Xen Virtual Pointer",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+};
diff --git a/test/litest.c b/test/litest.c
index 2ea82a87..45915ede 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -88,6 +88,7 @@ extern struct litest_test_device litest_wacom_touch_device;
 extern struct litest_test_device litest_alps_device;
 extern struct litest_test_device litest_generic_singletouch_device;
 extern struct litest_test_device litest_qemu_tablet_device;
+extern struct litest_test_device litest_xen_virtual_pointer_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -101,6 +102,7 @@ struct litest_test_device* devices[] = {
 	&litest_alps_device,
 	&litest_generic_singletouch_device,
 	&litest_qemu_tablet_device,
+	&litest_xen_virtual_pointer_device,
 	NULL,
 };
 
diff --git a/test/litest.h b/test/litest.h
index f39382f3..88c76d4c 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -47,6 +47,7 @@ enum litest_device_type {
 	LITEST_GENERIC_SINGLETOUCH = -11,
 	LITEST_MS_SURFACE_COVER = -12,
 	LITEST_QEMU_TABLET = -13,
+	LITEST_XEN_VIRTUAL_POINTER = -14,
 };
 
 enum litest_device_feature {

From 1bd5d324638469970c6ef266fb6a37a1e4064750 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 6 Nov 2014 16:10:15 +1000
Subject: [PATCH 061/121] test: add VMWare Virtual USB Mouse device

Yes, the name has VMware twice, not a typo.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/Makefile.am                       |   1 +
 test/litest-vmware-virtual-usb-mouse.c | 115 +++++++++++++++++++++++++
 test/litest.c                          |   2 +
 test/litest.h                          |   1 +
 4 files changed, 119 insertions(+)
 create mode 100644 test/litest-vmware-virtual-usb-mouse.c

diff --git a/test/Makefile.am b/test/Makefile.am
index 27499e7f..0abd695d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,6 +28,7 @@ liblitest_la_SOURCES = \
 	litest-trackpoint.c \
 	litest-wacom-touch.c \
 	litest-xen-virtual-pointer.c \
+	litest-vmware-virtual-usb-mouse.c \
 	litest.c
 
 run_tests = \
diff --git a/test/litest-vmware-virtual-usb-mouse.c b/test/litest-vmware-virtual-usb-mouse.c
new file mode 100644
index 00000000..c4ed3684
--- /dev/null
+++ b/test/litest-vmware-virtual-usb-mouse.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "litest.h"
+#include "litest-int.h"
+#include <assert.h>
+
+static void
+litest_vmware_virtmouse_touch_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_VMWARE_VIRTMOUSE);
+	litest_set_current_device(d);
+}
+
+static void touch_down(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_move(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_up(struct litest_device *d, unsigned int slot)
+{
+	assert(slot == 0);
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static struct litest_device_interface interface = {
+	.touch_down = touch_down,
+	.touch_move = touch_move,
+	.touch_up = touch_up,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_X, 0, 32767, 0, 0, 0 },
+	{ ABS_Y, 0, 32767, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x03,
+	.vendor = 0xe0f,
+	.product = 0x03,
+};
+
+static int events[] = {
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_RIGHT,
+	EV_KEY, BTN_MIDDLE,
+	EV_KEY, BTN_SIDE,
+	EV_KEY, BTN_EXTRA,
+	EV_KEY, BTN_FORWARD,
+	EV_KEY, BTN_BACK,
+	EV_KEY, BTN_TASK,
+	EV_KEY, 280,
+	EV_KEY, 281,
+	EV_KEY, 282,
+	EV_KEY, 283,
+	EV_KEY, 284,
+	EV_KEY, 285,
+	EV_KEY, 286,
+	EV_KEY, 287,
+	EV_REL, REL_WHEEL,
+	EV_REL, REL_HWHEEL,
+	-1, -1,
+};
+
+struct litest_test_device litest_vmware_virtmouse_device = {
+	.type = LITEST_VMWARE_VIRTMOUSE,
+	.features = LITEST_WHEEL | LITEST_BUTTON | LITEST_ABSOLUTE,
+	.shortname = "vmware virtmouse",
+	.setup = litest_vmware_virtmouse_touch_setup,
+	.interface = &interface,
+
+	.name = "VMware VMware Virtual USB Mouse",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+};
diff --git a/test/litest.c b/test/litest.c
index 45915ede..334ce345 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -89,6 +89,7 @@ extern struct litest_test_device litest_alps_device;
 extern struct litest_test_device litest_generic_singletouch_device;
 extern struct litest_test_device litest_qemu_tablet_device;
 extern struct litest_test_device litest_xen_virtual_pointer_device;
+extern struct litest_test_device litest_vmware_virtmouse_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -103,6 +104,7 @@ struct litest_test_device* devices[] = {
 	&litest_generic_singletouch_device,
 	&litest_qemu_tablet_device,
 	&litest_xen_virtual_pointer_device,
+	&litest_vmware_virtmouse_device,
 	NULL,
 };
 
diff --git a/test/litest.h b/test/litest.h
index 88c76d4c..716c6aff 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -48,6 +48,7 @@ enum litest_device_type {
 	LITEST_MS_SURFACE_COVER = -12,
 	LITEST_QEMU_TABLET = -13,
 	LITEST_XEN_VIRTUAL_POINTER = -14,
+	LITEST_VMWARE_VIRTMOUSE = -15,
 };
 
 enum litest_device_feature {

From d7a1addcdde245dbb506528287fda5df7d3de5b7 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Nov 2014 11:03:46 +1000
Subject: [PATCH 062/121] test: rename a parameter to litest_assert_scroll()

This doesn't test for direction only, it tests for the minimum distance we
expect in the scroll event. Rename accordingly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/litest.c | 8 ++++----
 test/litest.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/litest.c b/test/litest.c
index 334ce345..69c386f5 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -1105,7 +1105,7 @@ litest_assert_button_event(struct libinput *li, unsigned int button,
 void
 litest_assert_scroll(struct libinput *li,
 		     enum libinput_pointer_axis axis,
-		     int dir)
+		     int minimum_movement)
 {
 	struct libinput_event *event, *next_event;
 	struct libinput_event_pointer *ptrev;
@@ -1123,14 +1123,14 @@ litest_assert_scroll(struct libinput *li,
 
 		if (next_event) {
 			/* Normal scroll event, check dir */
-			if (dir > 0) {
+			if (minimum_movement > 0) {
 				ck_assert_int_ge(
 					libinput_event_pointer_get_axis_value(ptrev),
-					dir);
+					minimum_movement);
 			} else {
 				ck_assert_int_le(
 					libinput_event_pointer_get_axis_value(ptrev),
-					dir);
+					minimum_movement);
 			}
 		} else {
 			/* Last scroll event, must be 0 */
diff --git a/test/litest.h b/test/litest.h
index 716c6aff..8132d517 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -158,7 +158,7 @@ void litest_assert_button_event(struct libinput *li,
 				enum libinput_button_state state);
 void litest_assert_scroll(struct libinput *li,
 			  enum libinput_pointer_axis axis,
-			  int dir);
+			  int minimum_movement);
 
 struct libevdev_uinput * litest_create_uinput_device(const char *name,
 						     struct input_id *id,

From ffad279751446a74b2f1298c46442796464e961a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Nov 2014 08:39:58 +1000
Subject: [PATCH 063/121] evdev: move scroll flag setting/check into a helper
 function

Much more readable, especially with the upcoming patches.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 84c42b69..222d6b1c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1491,6 +1491,26 @@ evdev_device_get_size(struct evdev_device *device,
 	return 0;
 }
 
+static inline bool
+evdev_is_scrolling(const struct evdev_device *device,
+		   enum libinput_pointer_axis axis)
+{
+	assert(axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL ||
+	       axis == LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+	return (device->scroll.direction & (1 << axis)) != 0;
+}
+
+static inline void
+evdev_start_scrolling(struct evdev_device *device,
+		      enum libinput_pointer_axis axis)
+{
+	assert(axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL ||
+	       axis == LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+	device->scroll.direction |= (1 << axis);
+}
+
 void
 evdev_post_scroll(struct evdev_device *device,
 		  uint64_t time,
@@ -1498,13 +1518,16 @@ evdev_post_scroll(struct evdev_device *device,
 		  double dy)
 {
 	if (dy <= -device->scroll.threshold || dy >= device->scroll.threshold)
-		device->scroll.direction |= (1 << LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+		evdev_start_scrolling(device,
+				      LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
 
 	if (dx <= -device->scroll.threshold || dx >= device->scroll.threshold)
-		device->scroll.direction |= (1 << LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+		evdev_start_scrolling(device,
+				      LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
 
 	if (dy != 0.0 &&
-	    (device->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))) {
+	    evdev_is_scrolling(device,
+			       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
 		pointer_notify_axis(&device->base,
 				    time,
 				    LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
@@ -1512,7 +1535,8 @@ evdev_post_scroll(struct evdev_device *device,
 	}
 
 	if (dx != 0.0 &&
-	    (device->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))) {
+	    evdev_is_scrolling(device,
+			       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) {
 		pointer_notify_axis(&device->base,
 				    time,
 				    LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,

From 697d25e9e224e350b7e0de00fdee2535d981993b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Nov 2014 08:44:11 +1000
Subject: [PATCH 064/121] evdev: use fabs(x) instead of (x <= -a || x >= a)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 222d6b1c..89a39ca8 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1517,11 +1517,11 @@ evdev_post_scroll(struct evdev_device *device,
 		  double dx,
 		  double dy)
 {
-	if (dy <= -device->scroll.threshold || dy >= device->scroll.threshold)
+	if (fabs(dy) >= device->scroll.threshold)
 		evdev_start_scrolling(device,
 				      LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
 
-	if (dx <= -device->scroll.threshold || dx >= device->scroll.threshold)
+	if (fabs(dx) >= device->scroll.threshold)
 		evdev_start_scrolling(device,
 				      LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
 

From ea122ce38da9fcc58dab7963a9cb681f94f8be7a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Nov 2014 09:24:37 +1000
Subject: [PATCH 065/121] touchpad: explicitly init scroll settings

No effect, we're just initializing with the same value we did before. What is
important here is the comment, the touchpad scroll threshold is in mm
for touchpads providing a resolution.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 3d8f414b..bbad713c 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -956,6 +956,9 @@ tp_init_scroll(struct tp_dispatch *tp)
 	tp->scroll.natural_scrolling_enabled = false;
 	tp->device->base.config.natural_scroll = &tp->scroll.config;
 
+	/* In mm for touchpads with valid resolution, see tp_init_accel() */
+	tp->device->scroll.threshold = 5.0;
+
 	return 0;
 }
 

From 2bbf4a0117624e005747d58aaadbed2a0af0a6d4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 7 Nov 2014 16:08:34 +1000
Subject: [PATCH 066/121] evdev: use distance triggers to start scrolling

The previous code used delta/event as scroll trigger which roughly translates
to speed, but depends on the sampling rate of the device.

For slow two-finger motion, a user may move the height of the touchpad without
ever triggering scrolling. Change the _initial_ trigger to a cumulative
trigger, i.e. once the user moved past the threshold distance, scrolling
starts regardless of the speed.

Once scrolling is engaged, the original trigger of threshold/event is
required to engange the second scroll direction.

Note that except for really slow movements, it's very easy to engage both
scroll directions on a touchpad. This is intentional, libinput does not have
enough semantic knowledge to know if horizontal scrolling is needed. So we
provide some direction locking but not much, it's up to the
client/toolkit/widget to decide if both scroll directions should be handled.
Add a comment to clarify that in the public doc.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c     | 45 ++++++++++++++++++++++++++++++++++++++++-----
 src/evdev.h     |  2 ++
 src/libinput.h  |  6 ++++++
 test/touchpad.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 89a39ca8..94daea8d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1517,14 +1517,47 @@ evdev_post_scroll(struct evdev_device *device,
 		  double dx,
 		  double dy)
 {
-	if (fabs(dy) >= device->scroll.threshold)
-		evdev_start_scrolling(device,
+	double trigger_horiz, trigger_vert;
+
+	if (!evdev_is_scrolling(device,
+				LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+		device->scroll.buildup_vertical += dy;
+	if (!evdev_is_scrolling(device,
+				LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+		device->scroll.buildup_horizontal += dx;
+
+	trigger_vert = device->scroll.buildup_vertical;
+	trigger_horiz = device->scroll.buildup_horizontal;
+
+	/* If we're not scrolling yet, use a distance trigger: moving
+	   past a certain distance starts scrolling */
+	if (!evdev_is_scrolling(device,
+				LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL) &&
+	    !evdev_is_scrolling(device,
+				LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
+		if (fabs(trigger_vert) >= device->scroll.threshold)
+			evdev_start_scrolling(device,
+					      LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+		if (fabs(trigger_horiz) >= device->scroll.threshold)
+			evdev_start_scrolling(device,
+					      LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+	/* We're already scrolling in one direction. Require some
+	   trigger speed to start scrolling in the other direction */
+	} else if (!evdev_is_scrolling(device,
+			       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
+		if (fabs(dy) >= device->scroll.threshold)
+			evdev_start_scrolling(device,
 				      LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-
-	if (fabs(dx) >= device->scroll.threshold)
-		evdev_start_scrolling(device,
+	} else if (!evdev_is_scrolling(device,
+				LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) {
+		if (fabs(dx) >= device->scroll.threshold)
+			evdev_start_scrolling(device,
 				      LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+	}
 
+	/* We use the trigger to enable, but the delta from this event for
+	 * the actual scroll movement. Otherwise we get a jump once
+	 * scrolling engages */
 	if (dy != 0.0 &&
 	    evdev_is_scrolling(device,
 			       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
@@ -1559,6 +1592,8 @@ evdev_stop_scroll(struct evdev_device *device, uint64_t time)
 				    LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
 				    0);
 
+	device->scroll.buildup_horizontal = 0;
+	device->scroll.buildup_vertical = 0;
 	device->scroll.direction = 0;
 }
 
diff --git a/src/evdev.h b/src/evdev.h
index eefbb79b..279a3aee 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -104,6 +104,8 @@ struct evdev_device {
 		bool middle_button_scroll_active;
 		double threshold;
 		uint32_t direction;
+		double buildup_vertical;
+		double buildup_horizontal;
 	} scroll;
 
 	enum evdev_event_type pending_event;
diff --git a/src/libinput.h b/src/libinput.h
index 049e3b82..f416afd8 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -195,6 +195,12 @@ enum libinput_button_state {
  * @ingroup device
  *
  * Axes on a device that are not x or y coordinates.
+ *
+ * The two scroll axes @ref LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL and
+ * @ref LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL are engaged separately,
+ * depending on the device. libinput provides some scroll direction locking
+ * but it is up to the caller to determine which axis is needed and
+ * appropriate in the current interaction
  */
 enum libinput_pointer_axis {
 	LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL = 0,
diff --git a/test/touchpad.c b/test/touchpad.c
index f9031dd9..2b79aafe 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -1455,6 +1455,50 @@ START_TEST(touchpad_2fg_scroll)
 }
 END_TEST
 
+START_TEST(touchpad_2fg_scroll_slow_distance)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+	struct libinput_event_pointer *ptrev;
+
+	litest_drain_events(li);
+
+	litest_touch_down(dev, 0, 20, 30);
+	litest_touch_down(dev, 1, 40, 30);
+	litest_touch_move_to(dev, 0, 20, 30, 20, 50, 60, 10);
+	litest_touch_move_to(dev, 1, 40, 30, 40, 50, 60, 10);
+	litest_touch_up(dev, 1);
+	litest_touch_up(dev, 0);
+	libinput_dispatch(li);
+
+	event = libinput_get_event(li);
+	ck_assert_notnull(event);
+
+	/* last event is value 0, tested elsewhere */
+	while (libinput_next_event_type(li) != LIBINPUT_EVENT_NONE) {
+		ck_assert_int_eq(libinput_event_get_type(event),
+				 LIBINPUT_EVENT_POINTER_AXIS);
+		ptrev = libinput_event_get_pointer_event(event);
+
+		ck_assert_int_eq(libinput_event_pointer_get_axis(ptrev),
+				 LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+		ck_assert(libinput_event_pointer_get_axis_value(ptrev) > 0.0);
+
+		/* this is to verify we test the right thing, if the value
+		   is greater than scroll.threshold we triggered the wrong
+		   condition */
+		ck_assert(libinput_event_pointer_get_axis_value(ptrev) < 5.0);
+
+		libinput_event_destroy(event);
+		event = libinput_get_event(li);
+	}
+
+	litest_assert_empty_queue(li);
+	libinput_event_destroy(event);
+}
+END_TEST
+
 START_TEST(touchpad_scroll_natural_defaults)
 {
 	struct litest_device *dev = litest_current_device();
@@ -2073,6 +2117,7 @@ int main(int argc, char **argv) {
 	litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_move_out_ignore, LITEST_TOPBUTTONPAD, LITEST_ANY);
 
 	litest_add("touchpad:scroll", touchpad_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
+	litest_add("touchpad:scroll", touchpad_2fg_scroll_slow_distance, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 	litest_add("touchpad:scroll", touchpad_scroll_natural_defaults, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:scroll", touchpad_scroll_natural_enable_config, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:scroll", touchpad_scroll_natural, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);

From 5ba5c32813924b05372a2b74b2352ce27fcc3c9e Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 10 Nov 2014 11:59:12 +0100
Subject: [PATCH 067/121] Fix
 libinput_device_config_send_events_get_default_mode docs

Fix libinput_device_config_send_events_get_default_mode docs referring to
itself, instead make it refer to libinput_device_config_send_events_get_mode.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libinput.h b/src/libinput.h
index f416afd8..69a7e525 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1804,7 +1804,7 @@ libinput_device_config_send_events_get_mode(struct libinput_device *device);
  *
  * @see libinput_device_config_send_events_get_modes
  * @see libinput_device_config_send_events_set_mode
- * @see libinput_device_config_send_events_get_default_mode
+ * @see libinput_device_config_send_events_get_mode
  */
 uint32_t
 libinput_device_config_send_events_get_default_mode(struct libinput_device *device);

From 0ce30935d7076207316d503c5fdf9825433f1ffd Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 12:27:35 +0100
Subject: [PATCH 068/121] Add libinput_device_has_button function

In some cases the compositor will want to know which buttons a device has.

E.g. for scrolling we want the compositor to be able to set a button to change
a relative device (e.g. a trackball) into scroll mode, so that it sends
scroll-axis events instead of pointer motion events.

In order for the compositor to be able to present a sane UI for this, it needs
to know which buttons a device has.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c    |  9 +++++++++
 src/evdev.h    |  3 +++
 src/libinput.c |  6 ++++++
 src/libinput.h | 14 ++++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/src/evdev.c b/src/evdev.c
index 94daea8d..146c1b70 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1491,6 +1491,15 @@ evdev_device_get_size(struct evdev_device *device,
 	return 0;
 }
 
+int
+evdev_device_has_button(struct evdev_device *device, uint32_t code)
+{
+	if (!(device->seat_caps & EVDEV_DEVICE_POINTER))
+		return -1;
+
+	return libevdev_has_event_code(device->evdev, EV_KEY, code);
+}
+
 static inline bool
 evdev_is_scrolling(const struct evdev_device *device,
 		   enum libinput_pointer_axis axis)
diff --git a/src/evdev.h b/src/evdev.h
index 279a3aee..49a01494 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -239,6 +239,9 @@ evdev_device_get_size(struct evdev_device *device,
 		      double *w,
 		      double *h);
 
+int
+evdev_device_has_button(struct evdev_device *device, uint32_t code);
+
 double
 evdev_device_transform_x(struct evdev_device *device,
 			 double x,
diff --git a/src/libinput.c b/src/libinput.c
index 67fa2bdd..a293f0ff 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1254,6 +1254,12 @@ libinput_device_get_size(struct libinput_device *device,
 				     height);
 }
 
+LIBINPUT_EXPORT int
+libinput_device_has_button(struct libinput_device *device, uint32_t code)
+{
+	return evdev_device_has_button((struct evdev_device *)device, code);
+}
+
 LIBINPUT_EXPORT struct libinput_event *
 libinput_event_device_notify_get_base_event(struct libinput_event_device_notify *event)
 {
diff --git a/src/libinput.h b/src/libinput.h
index 69a7e525..8bb37800 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1440,6 +1440,20 @@ libinput_device_get_size(struct libinput_device *device,
 			 double *width,
 			 double *height);
 
+/**
+ * @ingroup device
+ *
+ * Check if a @ref LIBINPUT_DEVICE_CAP_POINTER device has a button with the
+ * passed in code (see linux/input.h).
+ *
+ * @param device A current input device
+ * @param code button code to check for
+ *
+ * @return 1 if the device supports this button code, 0 if it does not, -1
+ * on error.
+ */
+int
+libinput_device_has_button(struct libinput_device *device, uint32_t code);
 
 /**
  * @defgroup config Device configuration

From 71f703c50cbd894d42e10dfbed2cb370b7928ef2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 3 Nov 2014 14:52:59 +0100
Subject: [PATCH 069/121] Add configuration option to select scroll mode

Add a configuration option to allow selecting between 2-finger / edge / none
scrolling (for touchpads).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput-private.h |  13 +++
 src/libinput.c         |  85 ++++++++++++++++++
 src/libinput.h         | 197 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 295 insertions(+)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 92bd96b8..53101609 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -132,6 +132,18 @@ struct libinput_device_config_left_handed {
 	int (*get_default)(struct libinput_device *device);
 };
 
+struct libinput_device_config_scroll_mode {
+	uint32_t (*get_modes)(struct libinput_device *device);
+	enum libinput_config_status (*set_mode)(struct libinput_device *device,
+						enum libinput_config_scroll_mode mode);
+	enum libinput_config_scroll_mode (*get_mode)(struct libinput_device *device);
+	enum libinput_config_scroll_mode (*get_default_mode)(struct libinput_device *device);
+	enum libinput_config_status (*set_button)(struct libinput_device *device,
+						  uint32_t button);
+	uint32_t (*get_button)(struct libinput_device *device);
+	uint32_t (*get_default_button)(struct libinput_device *device);
+};
+
 struct libinput_device_config {
 	struct libinput_device_config_tap *tap;
 	struct libinput_device_config_calibration *calibration;
@@ -139,6 +151,7 @@ struct libinput_device_config {
 	struct libinput_device_config_accel *accel;
 	struct libinput_device_config_natural_scroll *natural_scroll;
 	struct libinput_device_config_left_handed *left_handed;
+	struct libinput_device_config_scroll_mode *scroll_mode;
 };
 
 struct libinput_device {
diff --git a/src/libinput.c b/src/libinput.c
index a293f0ff..202c239a 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1531,3 +1531,88 @@ libinput_device_config_buttons_get_default_left_handed(struct libinput_device *d
 
 	return device->config.left_handed->get_default(device);
 }
+
+LIBINPUT_EXPORT uint32_t
+libinput_device_config_scroll_get_modes(struct libinput_device *device)
+{
+	if (device->config.scroll_mode)
+		return device->config.scroll_mode->get_modes(device);
+	else
+		return 0;
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_device_config_scroll_set_mode(struct libinput_device *device,
+				       enum libinput_config_scroll_mode mode)
+{
+	if ((libinput_device_config_scroll_get_modes(device) & mode) != mode)
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
+	/* Check mode is a single valid mode */
+	switch (mode) {
+	case LIBINPUT_CONFIG_SCROLL_NO_SCROLL:
+	case LIBINPUT_CONFIG_SCROLL_2FG:
+	case LIBINPUT_CONFIG_SCROLL_EDGE:
+	case LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN:
+		break;
+	default:
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+	}
+
+	if (device->config.scroll_mode)
+		return device->config.scroll_mode->set_mode(device, mode);
+	else /* mode must be _NO_SCROLL to get here */
+		return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+LIBINPUT_EXPORT enum libinput_config_scroll_mode
+libinput_device_config_scroll_get_mode(struct libinput_device *device)
+{
+	if (device->config.scroll_mode)
+		return device->config.scroll_mode->get_mode(device);
+	else
+		return LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+}
+
+LIBINPUT_EXPORT enum libinput_config_scroll_mode
+libinput_device_config_scroll_get_default_mode(struct libinput_device *device)
+{
+	if (device->config.scroll_mode)
+		return device->config.scroll_mode->get_default_mode(device);
+	else
+		return LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_device_config_scroll_set_button(struct libinput_device *device,
+					 uint32_t button)
+{
+	if ((libinput_device_config_scroll_get_modes(device) &
+	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
+	if (!libinput_device_has_button(device, button))
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	return device->config.scroll_mode->set_button(device, button);
+}
+
+LIBINPUT_EXPORT uint32_t
+libinput_device_config_scroll_get_button(struct libinput_device *device)
+{
+	if ((libinput_device_config_scroll_get_modes(device) &
+	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
+		return 0;
+
+	return device->config.scroll_mode->get_button(device);
+}
+
+LIBINPUT_EXPORT uint32_t
+libinput_device_config_scroll_get_default_button(struct libinput_device *device)
+{
+	if ((libinput_device_config_scroll_get_modes(device) &
+	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
+		return 0;
+
+	return device->config.scroll_mode->get_default_button(device);
+}
diff --git a/src/libinput.h b/src/libinput.h
index 8bb37800..1536b97c 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -2041,6 +2041,203 @@ libinput_device_config_buttons_get_left_handed(struct libinput_device *device);
 int
 libinput_device_config_buttons_get_default_left_handed(struct libinput_device *device);
 
+/**
+ * The scroll mode of a device selects when to generate scroll axis events
+ * instead of pointer motion events.
+ */
+enum libinput_config_scroll_mode {
+	/**
+	 * Never send scroll events instead of pointer motion events.
+	 * Note scroll wheels, etc. will still send scroll events.
+	 */
+	LIBINPUT_CONFIG_SCROLL_NO_SCROLL = 0,
+	/**
+	 * Send scroll events when 2 fingers are down on the device.
+	 */
+	LIBINPUT_CONFIG_SCROLL_2FG = (1 << 0),
+	/**
+	 * Send scroll events when a finger is moved along the bottom or
+	 * right edge of a device.
+	 */
+	LIBINPUT_CONFIG_SCROLL_EDGE = (1 << 1),
+	/**
+	 * Send scroll events when a button is down and the device moves
+	 * along a scroll-capable axis.
+	 */
+	LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN = (1 << 2),
+};
+
+/**
+ * @ingroup config
+ *
+ * Check which scroll modes a device supports. The mode defines when to
+ * generate scroll axis events instead of pointer motion events.
+ *
+ * @param device The device to configure
+ *
+ * @return A bitmask of possible modes.
+ *
+ * @see libinput_device_config_scroll_set_mode
+ * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_set_button
+ * @see libinput_device_config_scroll_get_button
+ * @see libinput_device_config_scroll_get_default_button
+ */
+uint32_t
+libinput_device_config_scroll_get_modes(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Set the scroll mode for this device. The mode defines when to
+ * generate scroll axis events instead of pointer motion events.
+ *
+ * @note Setting @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN enables
+ * the scroll mode, but scrolling is only activated when the configured
+ * button is held down. If no button is set, i.e.
+ * libinput_device_config_scroll_get_button() returns 0, scrolling
+ * cannot activate.
+ *
+ * @param device The device to configure
+ * @param mode The scroll mode for this device.
+ *
+ * @return A config status code.
+ *
+ * @see libinput_device_config_scroll_get_modes
+ * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_set_button
+ * @see libinput_device_config_scroll_get_button
+ * @see libinput_device_config_scroll_get_default_button
+ */
+enum libinput_config_status
+libinput_device_config_scroll_set_mode(struct libinput_device *device,
+				       enum libinput_config_scroll_mode mode);
+
+/**
+ * @ingroup config
+ *
+ * Get the scroll mode for this device. The mode defines when to
+ * generate scroll axis events instead of pointer motion events.
+ *
+ * @param device The device to configure
+ * @return The current scroll mode for this device.
+ *
+ * @see libinput_device_config_scroll_get_modes
+ * @see libinput_device_config_scroll_set_mode
+ * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_set_button
+ * @see libinput_device_config_scroll_get_button
+ * @see libinput_device_config_scroll_get_default_button
+ */
+enum libinput_config_scroll_mode
+libinput_device_config_scroll_get_mode(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Get the default scroll mode for this device. The mode defines when to
+ * generate scroll axis events instead of pointer motion events.
+ *
+ * @param device The device to configure
+ * @return The default scroll mode for this device.
+ *
+ * @see libinput_device_config_scroll_get_modes
+ * @see libinput_device_config_scroll_set_mode
+ * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_set_button
+ * @see libinput_device_config_scroll_get_button
+ * @see libinput_device_config_scroll_get_default_button
+ */
+enum libinput_config_scroll_mode
+libinput_device_config_scroll_get_default_mode(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Set the button for the @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode
+ * for this device.
+ *
+ * When the current scroll mode is set to @ref
+ * LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN, no button press/release events
+ * will be send for the configured button.
+ *
+ * When the configured button is pressed, any motion events along a
+ * scroll-capable axis are turned into scroll axis events.
+ *
+ * @note Setting the button does not change the scroll mode. To change the
+ * scroll mode call libinput_device_config_scroll_set_mode().
+ *
+ * @param device The device to configure
+ * @param button The button which when pressed switches to sending scroll events
+ *
+ * @return a config status code
+ * @retval LIBINPUT_CONFIG_STATUS_SUCCESS on success
+ * @retval LIBINPUT_CONFIG_STATUS_UNSUPPORTED if @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN is not supported
+ * @retval LIBINPUT_CONFIG_STATUS_INVALID the given button does not
+ * exist on this device
+ *
+ * @see libinput_device_config_scroll_get_modes
+ * @see libinput_device_config_scroll_set_mode
+ * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_get_button
+ * @see libinput_device_config_scroll_get_default_button
+ */
+enum libinput_config_status
+libinput_device_config_scroll_set_button(struct libinput_device *device,
+					 uint32_t button);
+
+/**
+ * @ingroup config
+ *
+ * Get the button for the @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode for
+ * this device.
+ *
+ * If @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN scroll mode is not supported,
+ * or no button is set, this function returns 0.
+ *
+ * @note The return value is independent of the currently selected
+ * scroll-mode. For button scrolling to activate, a device must have the
+ * @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode enabled, and a non-zero
+ * button set as scroll button.
+ *
+ * @param device The device to configure
+ * @return The button which when pressed switches to sending scroll events
+ *
+ * @see libinput_device_config_scroll_get_modes
+ * @see libinput_device_config_scroll_set_mode
+ * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_set_button
+ * @see libinput_device_config_scroll_get_default_button
+ */
+uint32_t
+libinput_device_config_scroll_get_button(struct libinput_device *device);
+
+/**
+ * @ingroup config
+ *
+ * Get the default button for LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode
+ * for this device.
+ *
+ * If @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN scroll mode is not supported,
+ * or no default button is set, this function returns 0.
+ *
+ * @param device The device to configure
+ * @return The default button for LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode
+ *
+ * @see libinput_device_config_scroll_get_modes
+ * @see libinput_device_config_scroll_set_mode
+ * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_set_button
+ * @see libinput_device_config_scroll_get_button
+ */
+uint32_t
+libinput_device_config_scroll_get_default_button(struct libinput_device *device);
+
 #ifdef __cplusplus
 }
 #endif

From 2ca425dc287171c001c3a58544d0e014346176a4 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 12:47:51 +0100
Subject: [PATCH 070/121] evdev: Add evdev_any_button_down helper function

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 146c1b70..14da3690 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -570,6 +570,19 @@ evdev_process_absolute(struct evdev_device *device,
 	}
 }
 
+static inline bool
+evdev_any_button_down(struct evdev_device *device)
+{
+	unsigned int button;
+
+	for (button = BTN_LEFT; button < BTN_JOYSTICK; button++) {
+		if (libevdev_has_event_code(device->evdev, EV_KEY, button) &&
+		    hw_is_key_down(device, button))
+			return true;
+	}
+	return false;
+}
+
 static inline bool
 evdev_need_touch_frame(struct evdev_device *device)
 {
@@ -763,16 +776,11 @@ evdev_left_handed_has(struct libinput_device *device)
 static void
 evdev_change_to_left_handed(struct evdev_device *device)
 {
-	unsigned int button;
-
 	if (device->buttons.want_left_handed == device->buttons.left_handed)
 		return;
 
-	for (button = BTN_LEFT; button < BTN_JOYSTICK; button++) {
-		if (libevdev_has_event_code(device->evdev, EV_KEY, button) &&
-		    hw_is_key_down(device, button))
-			return;
-	}
+	if (evdev_any_button_down(device))
+		return;
 
 	device->buttons.left_handed = device->buttons.want_left_handed;
 }

From ebe34d1c18ef5fc975a7d63bcb8c2f3c6bcda519 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 13:39:51 +0100
Subject: [PATCH 071/121] evdev: Hookup scroll mode configuration

Keep the default behavior of middle button scrolling on trackpoints, this
allows turning off middle button scrolling on trackpoints, as well as turning
on button scrolling on trackballs.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=85535
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 165 ++++++++++++++++++++++++++++++++++++++++++++--------
 src/evdev.h |  13 ++++-
 2 files changed, 153 insertions(+), 25 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 14da3690..cc5b19cc 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -123,6 +123,10 @@ evdev_pointer_notify_button(struct evdev_device *device,
 		if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
 		    device->buttons.change_to_left_handed)
 			device->buttons.change_to_left_handed(device);
+
+		if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
+		    device->scroll.change_scroll_mode)
+			device->scroll.change_scroll_mode(device);
 	}
 
 }
@@ -213,9 +217,9 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 		device->rel.dy = 0;
 
 		/* Use unaccelerated deltas for pointing stick scroll */
-		if (device->scroll.has_middle_button_scroll &&
-		    hw_is_key_down(device, BTN_MIDDLE)) {
-			if (device->scroll.middle_button_scroll_active)
+		if (device->scroll.mode == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
+		    hw_is_key_down(device, device->scroll.button)) {
+			if (device->scroll.button_scroll_active)
 				evdev_post_scroll(device, time,
 						  motion.dx, motion.dy);
 			break;
@@ -364,31 +368,33 @@ get_key_type(uint16_t code)
 }
 
 static void
-evdev_middle_button_scroll_timeout(uint64_t time, void *data)
+evdev_button_scroll_timeout(uint64_t time, void *data)
 {
 	struct evdev_device *device = data;
 
-	device->scroll.middle_button_scroll_active = true;
+	device->scroll.button_scroll_active = true;
 }
 
 static void
-evdev_middle_button_scroll_button(struct evdev_device *device,
-				 uint64_t time, int is_press)
+evdev_button_scroll_button(struct evdev_device *device,
+			   uint64_t time, int is_press)
 {
 	if (is_press) {
 		libinput_timer_set(&device->scroll.timer,
 				time + DEFAULT_MIDDLE_BUTTON_SCROLL_TIMEOUT);
 	} else {
 		libinput_timer_cancel(&device->scroll.timer);
-		if (device->scroll.middle_button_scroll_active) {
+		if (device->scroll.button_scroll_active) {
 			evdev_stop_scroll(device, time);
-			device->scroll.middle_button_scroll_active = false;
+			device->scroll.button_scroll_active = false;
 		} else {
 			/* If the button is released quickly enough emit the
 			 * button press/release events. */
-			evdev_pointer_notify_button(device, time, BTN_MIDDLE,
+			evdev_pointer_notify_button(device, time,
+					device->scroll.button,
 					LIBINPUT_BUTTON_STATE_PRESSED);
-			evdev_pointer_notify_button(device, time, BTN_MIDDLE,
+			evdev_pointer_notify_button(device, time,
+					device->scroll.button,
 					LIBINPUT_BUTTON_STATE_RELEASED);
 		}
 	}
@@ -454,10 +460,9 @@ evdev_process_key(struct evdev_device *device,
 				   LIBINPUT_KEY_STATE_RELEASED);
 		break;
 	case EVDEV_KEY_TYPE_BUTTON:
-		if (device->scroll.has_middle_button_scroll &&
-		    e->code == BTN_MIDDLE) {
-			evdev_middle_button_scroll_button(device, time,
-							  e->value);
+		if (device->scroll.mode == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
+		    e->code == device->scroll.button) {
+			evdev_button_scroll_button(device, time, e->value);
 			break;
 		}
 		evdev_pointer_notify_button(
@@ -829,6 +834,115 @@ evdev_init_left_handed(struct evdev_device *device,
 	return 0;
 }
 
+static uint32_t
+evdev_scroll_get_modes(struct libinput_device *device)
+{
+	return LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
+}
+
+static void
+evdev_change_scroll_mode(struct evdev_device *device)
+{
+	if (device->scroll.want_mode == device->scroll.mode &&
+	    device->scroll.want_button == device->scroll.button)
+		return;
+
+	if (evdev_any_button_down(device))
+		return;
+
+	device->scroll.mode = device->scroll.want_mode;
+	device->scroll.button = device->scroll.want_button;
+}
+
+static enum libinput_config_status
+evdev_scroll_set_mode(struct libinput_device *device,
+		      enum libinput_config_scroll_mode mode)
+{
+	struct evdev_device *evdev = (struct evdev_device*)device;
+
+	evdev->scroll.want_mode = mode;
+	evdev->scroll.change_scroll_mode(evdev);
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static enum libinput_config_scroll_mode
+evdev_scroll_get_mode(struct libinput_device *device)
+{
+	struct evdev_device *evdev = (struct evdev_device *)device;
+
+	/* return the wanted configuration, even if it hasn't taken
+	 * effect yet! */
+	return evdev->scroll.want_mode;
+}
+
+static enum libinput_config_scroll_mode
+evdev_scroll_get_default_mode(struct libinput_device *device)
+{
+	struct evdev_device *evdev = (struct evdev_device *)device;
+
+	if (libevdev_has_property(evdev->evdev, INPUT_PROP_POINTING_STICK))
+		return LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
+	else
+		return LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+}
+
+static enum libinput_config_status
+evdev_scroll_set_button(struct libinput_device *device,
+			uint32_t button)
+{
+	struct evdev_device *evdev = (struct evdev_device*)device;
+
+	evdev->scroll.want_button = button;
+	evdev->scroll.change_scroll_mode(evdev);
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static uint32_t
+evdev_scroll_get_button(struct libinput_device *device)
+{
+	struct evdev_device *evdev = (struct evdev_device *)device;
+
+	/* return the wanted configuration, even if it hasn't taken
+	 * effect yet! */
+	return evdev->scroll.want_button;
+}
+
+static uint32_t
+evdev_scroll_get_default_button(struct libinput_device *device)
+{
+	struct evdev_device *evdev = (struct evdev_device *)device;
+
+	if (libevdev_has_property(evdev->evdev, INPUT_PROP_POINTING_STICK))
+		return BTN_MIDDLE;
+	else
+		return 0;
+}
+
+static int
+evdev_init_button_scroll(struct evdev_device *device,
+			 void (*change_scroll_mode)(struct evdev_device *))
+{
+	libinput_timer_init(&device->scroll.timer, device->base.seat->libinput,
+			    evdev_button_scroll_timeout, device);
+	device->scroll.config.get_modes = evdev_scroll_get_modes;
+	device->scroll.config.set_mode = evdev_scroll_set_mode;
+	device->scroll.config.get_mode = evdev_scroll_get_mode;
+	device->scroll.config.get_default_mode = evdev_scroll_get_default_mode;
+	device->scroll.config.set_button = evdev_scroll_set_button;
+	device->scroll.config.get_button = evdev_scroll_get_button;
+	device->scroll.config.get_default_button = evdev_scroll_get_default_button;
+	device->base.config.scroll_mode = &device->scroll.config;
+	device->scroll.mode = evdev_scroll_get_default_mode((struct libinput_device *)device);
+	device->scroll.want_mode = device->scroll.mode;
+	device->scroll.button = evdev_scroll_get_default_button((struct libinput_device *)device);
+	device->scroll.want_button = device->scroll.button;
+	device->scroll.change_scroll_mode = change_scroll_mode;
+
+	return 0;
+}
+
 static struct evdev_dispatch *
 fallback_dispatch_create(struct libinput_device *device)
 {
@@ -847,6 +961,13 @@ fallback_dispatch_create(struct libinput_device *device)
 		return NULL;
 	}
 
+	if (evdev_device->scroll.want_button &&
+	    evdev_init_button_scroll(evdev_device,
+				     evdev_change_scroll_mode) == -1) {
+		free(dispatch);
+		return NULL;
+	}
+
 	device->config.calibration = &dispatch->calibration;
 
 	dispatch->calibration.has_matrix = evdev_calibration_has_matrix;
@@ -1158,14 +1279,6 @@ evdev_configure_device(struct evdev_device *device)
 		}
 	}
 
-	if (libevdev_has_property(evdev, INPUT_PROP_POINTING_STICK)) {
-		libinput_timer_init(&device->scroll.timer,
-				    device->base.seat->libinput,
-				    evdev_middle_button_scroll_timeout,
-				    device);
-		device->scroll.has_middle_button_scroll = true;
-	}
-
 	if (libevdev_has_event_code(evdev, EV_REL, REL_X) ||
 	    libevdev_has_event_code(evdev, EV_REL, REL_Y))
 		has_rel = 1;
@@ -1219,6 +1332,12 @@ evdev_configure_device(struct evdev_device *device)
 		/* want left-handed config option */
 		device->buttons.want_left_handed = true;
 	}
+
+	if (has_rel && has_button) {
+		/* want button scrolling config option */
+		device->scroll.want_button = 1;
+	}
+
 	if (has_keyboard) {
 		device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
 		log_info(libinput,
diff --git a/src/evdev.h b/src/evdev.h
index 49a01494..a1613b49 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -100,8 +100,17 @@ struct evdev_device {
 
 	struct {
 		struct libinput_timer timer;
-		bool has_middle_button_scroll;
-		bool middle_button_scroll_active;
+		struct libinput_device_config_scroll_mode config;
+		/* Currently enabled mode, button */
+		enum libinput_config_scroll_mode mode;
+		uint32_t button;
+		/* set during device init, used at runtime to delay changes
+		 * until all buttons are up */
+		enum libinput_config_scroll_mode want_mode;
+		uint32_t want_button;
+		/* Checks if buttons are down and commits the setting */
+		void (*change_scroll_mode)(struct evdev_device *device);
+		bool button_scroll_active;
 		double threshold;
 		uint32_t direction;
 		double buildup_vertical;

From 35143dbbd15ab4781cfd586935f68bb969524086 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 4 Nov 2014 09:54:07 +0100
Subject: [PATCH 072/121] touchpad: s/config/config_natural/

To avoid confusion with scroll mode configuration.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 10 +++++-----
 src/evdev-mt-touchpad.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index bbad713c..512131bd 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -949,12 +949,12 @@ static int
 tp_init_scroll(struct tp_dispatch *tp)
 {
 
-	tp->scroll.config.has = tp_scroll_config_natural_has;
-	tp->scroll.config.set_enabled = tp_scroll_config_natural_set;
-	tp->scroll.config.get_enabled = tp_scroll_config_natural_get;
-	tp->scroll.config.get_default_enabled = tp_scroll_config_natural_get_default;
+	tp->scroll.config_natural.has = tp_scroll_config_natural_has;
+	tp->scroll.config_natural.set_enabled = tp_scroll_config_natural_set;
+	tp->scroll.config_natural.get_enabled = tp_scroll_config_natural_get;
+	tp->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default;
 	tp->scroll.natural_scrolling_enabled = false;
-	tp->device->base.config.natural_scroll = &tp->scroll.config;
+	tp->device->base.config.natural_scroll = &tp->scroll.config_natural;
 
 	/* In mm for touchpads with valid resolution, see tp_init_accel() */
 	tp->device->scroll.threshold = 5.0;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 91f6e4ae..baa51a36 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -202,7 +202,7 @@ struct tp_dispatch {
 	} buttons;				/* physical buttons */
 
 	struct {
-		struct libinput_device_config_natural_scroll config;
+		struct libinput_device_config_natural_scroll config_natural;
 		bool natural_scrolling_enabled;
 	} scroll;
 

From cb9d9667372b82f917b16b7f399d398849e34e38 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 11:35:26 +0100
Subject: [PATCH 073/121] test: s/test_2fg_scroll/test_trackpoint_scroll/

Fix copy and paste error, causing the function to test trackpoint scrolling
to be named test_2fg_scroll.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/trackpoint.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/trackpoint.c b/test/trackpoint.c
index d4dfe415..eb9ddfbe 100644
--- a/test/trackpoint.c
+++ b/test/trackpoint.c
@@ -50,7 +50,7 @@ START_TEST(trackpoint_middlebutton)
 END_TEST
 
 static void
-test_2fg_scroll(struct litest_device *dev, double dx, double dy)
+test_trackpoint_scroll(struct litest_device *dev, double dx, double dy)
 {
 	struct libinput *li = dev->libinput;
 
@@ -76,19 +76,19 @@ START_TEST(trackpoint_scroll)
 
 	litest_drain_events(li);
 
-	test_2fg_scroll(dev, 1, 6);
+	test_trackpoint_scroll(dev, 1, 6);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 6);
-	test_2fg_scroll(dev, 1, -7);
+	test_trackpoint_scroll(dev, 1, -7);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -7);
-	test_2fg_scroll(dev, 8, 1);
+	test_trackpoint_scroll(dev, 8, 1);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, 8);
-	test_2fg_scroll(dev, -9, 1);
+	test_trackpoint_scroll(dev, -9, 1);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -9);
 
 	/* scroll smaller than the threshold should not generate events */
-	test_2fg_scroll(dev, 1, 1);
+	test_trackpoint_scroll(dev, 1, 1);
 	/* long middle press without movement should not generate events */
-	test_2fg_scroll(dev, 0, 0);
+	test_trackpoint_scroll(dev, 0, 0);
 
 	litest_assert_empty_queue(li);
 }

From cb66ca1692ab487ee1417dda56e8c21ae6cf0264 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 14:23:12 +0100
Subject: [PATCH 074/121] test: Add trackpoint middle button scrolling disable
 test

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/trackpoint.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/test/trackpoint.c b/test/trackpoint.c
index eb9ddfbe..2e2caba0 100644
--- a/test/trackpoint.c
+++ b/test/trackpoint.c
@@ -60,6 +60,12 @@ test_trackpoint_scroll(struct litest_device *dev, double dx, double dy)
 	msleep(300);
 	libinput_dispatch(li);
 
+	/* Send two deltas, as the first one may be eaten up by an
+	 * acceleration filter. */
+	litest_event(dev, EV_REL, REL_X, dx);
+	litest_event(dev, EV_REL, REL_Y, dy);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+
 	litest_event(dev, EV_REL, REL_X, dx);
 	litest_event(dev, EV_REL, REL_Y, dy);
 	litest_event(dev, EV_SYN, SYN_REPORT, 0);
@@ -94,9 +100,43 @@ START_TEST(trackpoint_scroll)
 }
 END_TEST
 
+START_TEST(trackpoint_middlebutton_noscroll)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+
+	/* Disable middle button scrolling */
+	libinput_device_config_scroll_set_mode(dev->libinput_device,
+					LIBINPUT_CONFIG_SCROLL_NO_SCROLL);
+
+	litest_drain_events(li);
+
+	/* A long middle button click + motion should get reported normally now */
+	test_trackpoint_scroll(dev, 0, 10);
+
+	litest_assert_button_event(li, BTN_MIDDLE, 1);
+
+	event = libinput_get_event(li);
+	ck_assert(event != NULL);
+	ck_assert_int_eq(libinput_event_get_type(event), LIBINPUT_EVENT_POINTER_MOTION);
+	libinput_event_destroy(event);
+
+	litest_assert_button_event(li, BTN_MIDDLE, 0);
+
+	litest_assert_empty_queue(li);
+
+	/* Restore default scroll behavior */
+	libinput_device_config_scroll_set_mode(dev->libinput_device,
+		libinput_device_config_scroll_get_default_mode(
+			dev->libinput_device));
+}
+END_TEST
+
 int main(int argc, char **argv) {
 
 	litest_add("trackpoint:middlebutton", trackpoint_middlebutton, LITEST_POINTINGSTICK, LITEST_ANY);
+	litest_add("trackpoint:middlebutton", trackpoint_middlebutton_noscroll, LITEST_POINTINGSTICK, LITEST_ANY);
 	litest_add("trackpoint:scroll", trackpoint_scroll, LITEST_POINTINGSTICK, LITEST_ANY);
 
 	return litest_run(argc, argv);

From 365141ec60a0e5cd3ead7897b7605c6dbb619e29 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 16:32:53 +0100
Subject: [PATCH 075/121] test: Add litest_button_scroll helper function

Turn test_trackpoint_scroll into a generic helper function for testing
"button scrolling".

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/litest.c     | 34 ++++++++++++++++++++++++++++++++++
 test/litest.h     |  4 ++++
 test/trackpoint.c | 40 +++++++---------------------------------
 3 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/test/litest.c b/test/litest.c
index 69c386f5..e2ec90d6 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -797,6 +797,34 @@ litest_button_click(struct litest_device *d, unsigned int button, bool is_press)
 		litest_event(d, ev->type, ev->code, ev->value);
 }
 
+void
+litest_button_scroll(struct litest_device *dev,
+		     unsigned int button,
+		     double dx, double dy)
+{
+	struct libinput *li = dev->libinput;
+
+	litest_button_click(dev, button, 1);
+
+	libinput_dispatch(li);
+	litest_timeout_buttonscroll();
+	libinput_dispatch(li);
+
+	/* Send two deltas, as the first one may be eaten up by an
+	 * acceleration filter. */
+	litest_event(dev, EV_REL, REL_X, dx);
+	litest_event(dev, EV_REL, REL_Y, dy);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+
+	litest_event(dev, EV_REL, REL_X, dx);
+	litest_event(dev, EV_REL, REL_Y, dy);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+
+	litest_button_click(dev, button, 0);
+
+	libinput_dispatch(li);
+}
+
 void
 litest_keyboard_key(struct litest_device *d, unsigned int key, bool is_press)
 {
@@ -1156,6 +1184,12 @@ litest_timeout_softbuttons(void)
 	msleep(300);
 }
 
+void
+litest_timeout_buttonscroll(void)
+{
+	msleep(300);
+}
+
 void
 litest_push_event_frame(struct litest_device *dev)
 {
diff --git a/test/litest.h b/test/litest.h
index 8132d517..99c6ae3b 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -146,6 +146,9 @@ void litest_touch_move_to(struct litest_device *d,
 void litest_button_click(struct litest_device *d,
 			 unsigned int button,
 			 bool is_press);
+void litest_button_scroll(struct litest_device *d,
+			 unsigned int button,
+			 double dx, double dy);
 void litest_keyboard_key(struct litest_device *d,
 			 unsigned int key,
 			 bool is_press);
@@ -170,6 +173,7 @@ struct libevdev_uinput * litest_create_uinput_abs_device(const char *name,
 
 void litest_timeout_tap(void);
 void litest_timeout_softbuttons(void);
+void litest_timeout_buttonscroll(void);
 
 void litest_push_event_frame(struct litest_device *dev);
 void litest_pop_event_frame(struct litest_device *dev);
diff --git a/test/trackpoint.c b/test/trackpoint.c
index 2e2caba0..3d965d44 100644
--- a/test/trackpoint.c
+++ b/test/trackpoint.c
@@ -49,32 +49,6 @@ START_TEST(trackpoint_middlebutton)
 }
 END_TEST
 
-static void
-test_trackpoint_scroll(struct litest_device *dev, double dx, double dy)
-{
-	struct libinput *li = dev->libinput;
-
-	litest_button_click(dev, BTN_MIDDLE, 1);
-
-	libinput_dispatch(li);
-	msleep(300);
-	libinput_dispatch(li);
-
-	/* Send two deltas, as the first one may be eaten up by an
-	 * acceleration filter. */
-	litest_event(dev, EV_REL, REL_X, dx);
-	litest_event(dev, EV_REL, REL_Y, dy);
-	litest_event(dev, EV_SYN, SYN_REPORT, 0);
-
-	litest_event(dev, EV_REL, REL_X, dx);
-	litest_event(dev, EV_REL, REL_Y, dy);
-	litest_event(dev, EV_SYN, SYN_REPORT, 0);
-
-	litest_button_click(dev, BTN_MIDDLE, 0);
-
-	libinput_dispatch(li);
-}
-
 START_TEST(trackpoint_scroll)
 {
 	struct litest_device *dev = litest_current_device();
@@ -82,19 +56,19 @@ START_TEST(trackpoint_scroll)
 
 	litest_drain_events(li);
 
-	test_trackpoint_scroll(dev, 1, 6);
+	litest_button_scroll(dev, BTN_MIDDLE, 1, 6);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 6);
-	test_trackpoint_scroll(dev, 1, -7);
+	litest_button_scroll(dev, BTN_MIDDLE, 1, -7);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -7);
-	test_trackpoint_scroll(dev, 8, 1);
+	litest_button_scroll(dev, BTN_MIDDLE, 8, 1);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, 8);
-	test_trackpoint_scroll(dev, -9, 1);
+	litest_button_scroll(dev, BTN_MIDDLE, -9, 1);
 	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -9);
 
 	/* scroll smaller than the threshold should not generate events */
-	test_trackpoint_scroll(dev, 1, 1);
+	litest_button_scroll(dev, BTN_MIDDLE, 1, 1);
 	/* long middle press without movement should not generate events */
-	test_trackpoint_scroll(dev, 0, 0);
+	litest_button_scroll(dev, BTN_MIDDLE, 0, 0);
 
 	litest_assert_empty_queue(li);
 }
@@ -113,7 +87,7 @@ START_TEST(trackpoint_middlebutton_noscroll)
 	litest_drain_events(li);
 
 	/* A long middle button click + motion should get reported normally now */
-	test_trackpoint_scroll(dev, 0, 10);
+	litest_button_scroll(dev, BTN_MIDDLE, 0, 10);
 
 	litest_assert_button_event(li, BTN_MIDDLE, 1);
 

From d90b75e9237b40b6428b2f65416a1c64ff8c0573 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 6 Nov 2014 16:35:13 +0100
Subject: [PATCH 076/121] test: Add button scroll test to pointer tests

Non trackpoint button scrolling is mainly intended for use with trackballs,
but we can test it just as well with any relative pointer device.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/pointer.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/test/pointer.c b/test/pointer.c
index 52d812f4..116f1856 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -556,6 +556,45 @@ START_TEST(pointer_left_handed_during_click_multiple_buttons)
 }
 END_TEST
 
+START_TEST(pointer_scroll_button)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+
+	/* Make left button switch to scrolling mode */
+	libinput_device_config_scroll_set_mode(dev->libinput_device,
+					LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN);
+	libinput_device_config_scroll_set_button(dev->libinput_device,
+					BTN_LEFT);
+
+	litest_drain_events(li);
+
+	litest_button_scroll(dev, BTN_LEFT, 1, 6);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 6);
+	litest_button_scroll(dev, BTN_LEFT, 1, -7);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -7);
+	litest_button_scroll(dev, BTN_LEFT, 8, 1);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, 8);
+	litest_button_scroll(dev, BTN_LEFT, -9, 1);
+	litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -9);
+
+	/* scroll smaller than the threshold should not generate events */
+	litest_button_scroll(dev, BTN_LEFT, 1, 1);
+	/* left press without movement should not generate events */
+	litest_button_scroll(dev, BTN_LEFT, 0, 0);
+
+	litest_assert_empty_queue(li);
+
+	/* Restore default scroll behavior */
+	libinput_device_config_scroll_set_mode(dev->libinput_device,
+		libinput_device_config_scroll_get_default_mode(
+			dev->libinput_device));
+	libinput_device_config_scroll_set_button(dev->libinput_device,
+		libinput_device_config_scroll_get_default_button(
+			dev->libinput_device));
+}
+END_TEST
+
 int main (int argc, char **argv) {
 
 	litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
@@ -563,6 +602,7 @@ int main (int argc, char **argv) {
 	litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD);
 	litest_add_no_device("pointer:button_auto_release", pointer_button_auto_release);
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
+	litest_add("pointer:scroll", pointer_scroll_button, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
 	litest_add_no_device("pointer:seat button count", pointer_seat_button_count);
 
 	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE);

From 81ae792013bad8a53b3cbe495c3a95ac463a0de4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 11:55:42 +1000
Subject: [PATCH 077/121] evdev: add missing break

No effect, was the last case statement in the switch.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index cc5b19cc..8b0b1c06 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -559,7 +559,7 @@ evdev_process_relative(struct evdev_device *device,
 			time,
 			LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
 			e->value * DEFAULT_AXIS_STEP_DISTANCE);
-
+		break;
 	}
 }
 

From 028513a0a723e97941c39c4aeb17433198723913 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 13:26:21 +1000
Subject: [PATCH 078/121] evdev: fix indentation on an if condition

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index 8b0b1c06..a5397929 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1228,7 +1228,7 @@ evdev_configure_device(struct evdev_device *device)
 			has_mt = 0;
 			has_touch = 0;
 		} else 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)) {
 			absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_X);
 			if (evdev_fix_abs_resolution(evdev,
 						     ABS_MT_POSITION_X,

From 617bab373132ac7532a1476b5a9f30dc053f28cb Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 4 Nov 2014 10:43:39 +0100
Subject: [PATCH 079/121] touchpad: Hookup scroll-mode configuration

Default to 2fg scrolling for now, once we have edge-scrolling we can default
to edge-scrolling on touchpads which cannot detect more than 1 touch.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 60 ++++++++++++++++++++++++++++++++++++++---
 src/evdev-mt-touchpad.h |  2 ++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 512131bd..8266c983 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -508,6 +508,9 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
 	struct tp_touch *t;
 	int nfingers_down = 0;
 
+	if (tp->scroll.mode != LIBINPUT_CONFIG_SCROLL_2FG)
+		return 0;
+
 	/* No scrolling during tap-n-drag */
 	if (tp_tap_dragging(tp))
 		return 0;
@@ -945,6 +948,50 @@ tp_scroll_config_natural_get_default(struct libinput_device *device)
 	return 0;
 }
 
+static uint32_t
+tp_scroll_config_scroll_mode_get_modes(struct libinput_device *device)
+{
+	struct evdev_device *evdev = (struct evdev_device*)device;
+	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
+	uint32_t modes = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+
+	if (tp->ntouches >= 2)
+		modes |= LIBINPUT_CONFIG_SCROLL_2FG;
+
+	return modes;
+}
+
+static enum libinput_config_status
+tp_scroll_config_scroll_mode_set_mode(struct libinput_device *device,
+		        enum libinput_config_scroll_mode mode)
+{
+	struct evdev_device *evdev = (struct evdev_device*)device;
+	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
+
+	if (mode == tp->scroll.mode)
+		return LIBINPUT_CONFIG_STATUS_SUCCESS;
+
+	evdev_stop_scroll(evdev, libinput_now(device->seat->libinput));
+	tp->scroll.mode = mode;
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static enum libinput_config_scroll_mode
+tp_scroll_config_scroll_mode_get_mode(struct libinput_device *device)
+{
+	struct evdev_device *evdev = (struct evdev_device*)device;
+	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
+
+	return tp->scroll.mode;
+}
+
+static enum libinput_config_scroll_mode
+tp_scroll_config_scroll_mode_get_default_mode(struct libinput_device *device)
+{
+	return LIBINPUT_CONFIG_SCROLL_2FG;
+}
+
 static int
 tp_init_scroll(struct tp_dispatch *tp)
 {
@@ -956,6 +1003,13 @@ tp_init_scroll(struct tp_dispatch *tp)
 	tp->scroll.natural_scrolling_enabled = false;
 	tp->device->base.config.natural_scroll = &tp->scroll.config_natural;
 
+	tp->scroll.config_mode.get_modes = tp_scroll_config_scroll_mode_get_modes;
+	tp->scroll.config_mode.set_mode = tp_scroll_config_scroll_mode_set_mode;
+	tp->scroll.config_mode.get_mode = tp_scroll_config_scroll_mode_get_mode;
+	tp->scroll.config_mode.get_default_mode = tp_scroll_config_scroll_mode_get_default_mode;
+	tp->scroll.mode = tp_scroll_config_scroll_mode_get_default_mode(&tp->device->base);
+	tp->device->base.config.scroll_mode = &tp->scroll.config_mode;
+
 	/* In mm for touchpads with valid resolution, see tp_init_accel() */
 	tp->device->scroll.threshold = 5.0;
 
@@ -1027,9 +1081,6 @@ tp_init(struct tp_dispatch *tp,
 	tp->hysteresis.margin_y =
 		diagonal / DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR;
 
-	if (tp_init_scroll(tp) != 0)
-		return -1;
-
 	if (tp_init_accel(tp, diagonal) != 0)
 		return -1;
 
@@ -1045,6 +1096,9 @@ tp_init(struct tp_dispatch *tp,
 	if (tp_init_sendevents(tp, device) != 0)
 		return -1;
 
+	if (tp_init_scroll(tp) != 0)
+		return -1;
+
 	device->seat_caps |= EVDEV_DEVICE_POINTER;
 
 	return 0;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index baa51a36..4d7b8a90 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -203,7 +203,9 @@ struct tp_dispatch {
 
 	struct {
 		struct libinput_device_config_natural_scroll config_natural;
+		struct libinput_device_config_scroll_mode config_mode;
 		bool natural_scrolling_enabled;
+		enum libinput_config_scroll_mode mode;
 	} scroll;
 
 	enum touchpad_event queued;

From c7bf6fb0e27a70f315ea9dcab79e9b62595f616e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 11:22:17 +1000
Subject: [PATCH 080/121] Allow for a 0 button on button scrolling

This effectively disables the button scrolling, but since 0 is the default
button for most devices, we should allow setting the default button.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/libinput.c | 2 +-
 src/libinput.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libinput.c b/src/libinput.c
index 202c239a..3f5370fa 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1591,7 +1591,7 @@ libinput_device_config_scroll_set_button(struct libinput_device *device,
 	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
 		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
 
-	if (!libinput_device_has_button(device, button))
+	if (button && !libinput_device_has_button(device, button))
 		return LIBINPUT_CONFIG_STATUS_INVALID;
 
 	return device->config.scroll_mode->set_button(device, button);
diff --git a/src/libinput.h b/src/libinput.h
index 1536b97c..3b39c964 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -2169,6 +2169,8 @@ libinput_device_config_scroll_get_default_mode(struct libinput_device *device);
  * @note Setting the button does not change the scroll mode. To change the
  * scroll mode call libinput_device_config_scroll_set_mode().
  *
+ * If the button is 0, button scrolling is effectively disabled.
+ *
  * @param device The device to configure
  * @param button The button which when pressed switches to sending scroll events
  *

From 3178a3ae75111b18f9667582a3c338ac33c78cd4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 11:16:24 +1000
Subject: [PATCH 081/121] tools: print config options for each device on
 DEVICE_ADDED

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 tools/event-debug.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tools/event-debug.c b/tools/event-debug.c
index fb22f3bd..00882bfa 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -257,6 +257,7 @@ print_device_notify(struct libinput_event *ev)
 	struct libinput_device *dev = libinput_event_get_device(ev);
 	struct libinput_seat *seat = libinput_device_get_seat(dev);
 	double w, h;
+	uint32_t scroll_modes;
 
 	printf("%s	%s",
 	       libinput_seat_get_physical_name(seat),
@@ -265,7 +266,28 @@ print_device_notify(struct libinput_event *ev)
 	if (libinput_device_get_size(dev, &w, &h) == 0)
 		printf("\tsize %.2f/%.2fmm", w, h);
 
+	if (libinput_device_config_tap_get_finger_count((dev)))
+	    printf(" tap");
+	if (libinput_device_config_buttons_has_left_handed((dev)))
+	    printf(" left");
+	if (libinput_device_config_scroll_has_natural_scroll((dev)))
+	    printf(" scroll-nat");
+	if (libinput_device_config_calibration_has_matrix((dev)))
+	    printf(" calib");
+
+	scroll_modes = libinput_device_config_scroll_get_modes(dev);
+	if (scroll_modes != LIBINPUT_CONFIG_SCROLL_NO_SCROLL) {
+		printf(" scroll");
+		if (scroll_modes & LIBINPUT_CONFIG_SCROLL_2FG)
+			printf("-2fg");
+		if (scroll_modes & LIBINPUT_CONFIG_SCROLL_EDGE)
+			printf("-edge");
+		if (scroll_modes & LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN)
+			printf("-button");
+	}
+
 	printf("\n");
+
 }
 
 static void

From b7c324ba32922c1b6279b0240993a0099685cc60 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 11:33:51 +1000
Subject: [PATCH 082/121] tools: print the device name on DEVICE_ADDED

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 tools/event-debug.c | 3 ++-
 tools/event-gui.c   | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/event-debug.c b/tools/event-debug.c
index 00882bfa..1d9c8a06 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -259,7 +259,8 @@ print_device_notify(struct libinput_event *ev)
 	double w, h;
 	uint32_t scroll_modes;
 
-	printf("%s	%s",
+	printf("%-30s	%s	%s",
+	       libinput_device_get_name(dev),
 	       libinput_seat_get_physical_name(seat),
 	       libinput_seat_get_logical_name(seat));
 
diff --git a/tools/event-gui.c b/tools/event-gui.c
index 142990d5..b6d21b66 100644
--- a/tools/event-gui.c
+++ b/tools/event-gui.c
@@ -272,7 +272,10 @@ handle_event_device_notify(struct libinput_event *ev)
 	else
 		type = "removed";
 
-	msg("%s %s\n", libinput_device_get_sysname(dev), type);
+	msg("%s %-30s %s\n",
+	    libinput_device_get_sysname(dev),
+	    libinput_device_get_name(dev),
+	    type);
 
 	if (libinput_device_config_tap_get_finger_count(dev) > 0) {
 		enum libinput_config_status status;

From 8630a8e0c28de32dde34d01a97b703ed3840a285 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 10:49:47 +1000
Subject: [PATCH 083/121] evdev: move calibration/sendevents config init into
 helpers

no functional changes

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index a5397929..89c68028 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -943,6 +943,31 @@ evdev_init_button_scroll(struct evdev_device *device,
 	return 0;
 }
 
+static void
+evdev_init_calibration(struct evdev_device *device,
+		       struct evdev_dispatch *dispatch)
+{
+	device->base.config.calibration = &dispatch->calibration;
+
+	dispatch->calibration.has_matrix = evdev_calibration_has_matrix;
+	dispatch->calibration.set_matrix = evdev_calibration_set_matrix;
+	dispatch->calibration.get_matrix = evdev_calibration_get_matrix;
+	dispatch->calibration.get_default_matrix = evdev_calibration_get_default_matrix;
+}
+
+static void
+evdev_init_sendevents(struct evdev_device *device,
+		      struct evdev_dispatch *dispatch)
+{
+	device->base.config.sendevents = &dispatch->sendevents.config;
+
+	dispatch->sendevents.current_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
+	dispatch->sendevents.config.get_modes = evdev_sendevents_get_modes;
+	dispatch->sendevents.config.set_mode = evdev_sendevents_set_mode;
+	dispatch->sendevents.config.get_mode = evdev_sendevents_get_mode;
+	dispatch->sendevents.config.get_default_mode = evdev_sendevents_get_default_mode;
+}
+
 static struct evdev_dispatch *
 fallback_dispatch_create(struct libinput_device *device)
 {
@@ -968,20 +993,8 @@ fallback_dispatch_create(struct libinput_device *device)
 		return NULL;
 	}
 
-	device->config.calibration = &dispatch->calibration;
-
-	dispatch->calibration.has_matrix = evdev_calibration_has_matrix;
-	dispatch->calibration.set_matrix = evdev_calibration_set_matrix;
-	dispatch->calibration.get_matrix = evdev_calibration_get_matrix;
-	dispatch->calibration.get_default_matrix = evdev_calibration_get_default_matrix;
-
-	device->config.sendevents = &dispatch->sendevents.config;
-
-	dispatch->sendevents.current_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
-	dispatch->sendevents.config.get_modes = evdev_sendevents_get_modes;
-	dispatch->sendevents.config.set_mode = evdev_sendevents_set_mode;
-	dispatch->sendevents.config.get_mode = evdev_sendevents_get_mode;
-	dispatch->sendevents.config.get_default_mode = evdev_sendevents_get_default_mode;
+	evdev_init_calibration(evdev_device, dispatch);
+	evdev_init_sendevents(evdev_device, dispatch);
 
 	return dispatch;
 }

From 044b11ec3595d88b2dd762bea95dcb8fbd53a86e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 11:01:10 +1000
Subject: [PATCH 084/121] evdev: move natural scrolling configuration into
 evdev

We're about to add natural scroll support to other devices as well, let's
share the code.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 57 +++--------------------------------------
 src/evdev-mt-touchpad.h |  2 --
 src/evdev.c             | 49 +++++++++++++++++++++++++++++++++++
 src/evdev.h             |  6 +++++
 4 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 8266c983..9265a8a9 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -494,11 +494,6 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
 
 	tp_filter_motion(tp, &dx, &dy, time);
 
-	if (tp->scroll.natural_scrolling_enabled) {
-		dx = -dx;
-		dy = -dy;
-	}
-
 	evdev_post_scroll(tp->device, time, dx, dy);
 }
 
@@ -907,47 +902,6 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 	return 0;
 }
 
-static int
-tp_scroll_config_natural_has(struct libinput_device *device)
-{
-	return 1;
-}
-
-static enum libinput_config_status
-tp_scroll_config_natural_set(struct libinput_device *device,
-			     int enabled)
-{
-	struct evdev_dispatch *dispatch;
-	struct tp_dispatch *tp = NULL;
-
-	dispatch = ((struct evdev_device *) device)->dispatch;
-	tp = container_of(dispatch, tp, base);
-
-	tp->scroll.natural_scrolling_enabled = enabled ? true : false;
-
-	return LIBINPUT_CONFIG_STATUS_SUCCESS;
-}
-
-static int
-tp_scroll_config_natural_get(struct libinput_device *device)
-{
-	struct evdev_dispatch *dispatch;
-	struct tp_dispatch *tp = NULL;
-
-	dispatch = ((struct evdev_device *) device)->dispatch;
-	tp = container_of(dispatch, tp, base);
-
-	return tp->scroll.natural_scrolling_enabled ? 1 : 0;
-}
-
-static int
-tp_scroll_config_natural_get_default(struct libinput_device *device)
-{
-	/* could enable this on Apple touchpads. could do that, could
-	 * very well do that... */
-	return 0;
-}
-
 static uint32_t
 tp_scroll_config_scroll_mode_get_modes(struct libinput_device *device)
 {
@@ -993,15 +947,10 @@ tp_scroll_config_scroll_mode_get_default_mode(struct libinput_device *device)
 }
 
 static int
-tp_init_scroll(struct tp_dispatch *tp)
+tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device)
 {
 
-	tp->scroll.config_natural.has = tp_scroll_config_natural_has;
-	tp->scroll.config_natural.set_enabled = tp_scroll_config_natural_set;
-	tp->scroll.config_natural.get_enabled = tp_scroll_config_natural_get;
-	tp->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default;
-	tp->scroll.natural_scrolling_enabled = false;
-	tp->device->base.config.natural_scroll = &tp->scroll.config_natural;
+	evdev_init_natural_scroll(device);
 
 	tp->scroll.config_mode.get_modes = tp_scroll_config_scroll_mode_get_modes;
 	tp->scroll.config_mode.set_mode = tp_scroll_config_scroll_mode_set_mode;
@@ -1096,7 +1045,7 @@ tp_init(struct tp_dispatch *tp,
 	if (tp_init_sendevents(tp, device) != 0)
 		return -1;
 
-	if (tp_init_scroll(tp) != 0)
+	if (tp_init_scroll(tp, device) != 0)
 		return -1;
 
 	device->seat_caps |= EVDEV_DEVICE_POINTER;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 4d7b8a90..4ca810f5 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -202,9 +202,7 @@ struct tp_dispatch {
 	} buttons;				/* physical buttons */
 
 	struct {
-		struct libinput_device_config_natural_scroll config_natural;
 		struct libinput_device_config_scroll_mode config_mode;
-		bool natural_scrolling_enabled;
 		enum libinput_config_scroll_mode mode;
 	} scroll;
 
diff --git a/src/evdev.c b/src/evdev.c
index 89c68028..d0ddc374 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -968,6 +968,50 @@ evdev_init_sendevents(struct evdev_device *device,
 	dispatch->sendevents.config.get_default_mode = evdev_sendevents_get_default_mode;
 }
 
+static int
+evdev_scroll_config_natural_has(struct libinput_device *device)
+{
+	return 1;
+}
+
+static enum libinput_config_status
+evdev_scroll_config_natural_set(struct libinput_device *device,
+				int enabled)
+{
+	struct evdev_device *dev = (struct evdev_device *)device;
+
+	dev->scroll.natural_scrolling_enabled = enabled ? true : false;
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static int
+evdev_scroll_config_natural_get(struct libinput_device *device)
+{
+	struct evdev_device *dev = (struct evdev_device *)device;
+
+	return dev->scroll.natural_scrolling_enabled ? 1 : 0;
+}
+
+static int
+evdev_scroll_config_natural_get_default(struct libinput_device *device)
+{
+	/* could enable this on Apple touchpads. could do that, could
+	 * very well do that... */
+	return 0;
+}
+
+void
+evdev_init_natural_scroll(struct evdev_device *device)
+{
+	device->scroll.config_natural.has = evdev_scroll_config_natural_has;
+	device->scroll.config_natural.set_enabled = evdev_scroll_config_natural_set;
+	device->scroll.config_natural.get_enabled = evdev_scroll_config_natural_get;
+	device->scroll.config_natural.get_default_enabled = evdev_scroll_config_natural_get_default;
+	device->scroll.natural_scrolling_enabled = false;
+	device->base.config.natural_scroll = &device->scroll.config_natural;
+}
+
 static struct evdev_dispatch *
 fallback_dispatch_create(struct libinput_device *device)
 {
@@ -1668,6 +1712,11 @@ evdev_post_scroll(struct evdev_device *device,
 {
 	double trigger_horiz, trigger_vert;
 
+	if (device->scroll.natural_scrolling_enabled) {
+		dx = -dx;
+		dy = -dy;
+	}
+
 	if (!evdev_is_scrolling(device,
 				LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
 		device->scroll.buildup_vertical += dy;
diff --git a/src/evdev.h b/src/evdev.h
index a1613b49..b8191cce 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -115,6 +115,9 @@ struct evdev_device {
 		uint32_t direction;
 		double buildup_vertical;
 		double buildup_horizontal;
+
+		struct libinput_device_config_natural_scroll config_natural;
+		bool natural_scrolling_enabled;
 	} scroll;
 
 	enum evdev_event_type pending_event;
@@ -284,6 +287,9 @@ evdev_pointer_notify_button(struct evdev_device *device,
 			    int button,
 			    enum libinput_button_state state);
 
+void
+evdev_init_natural_scroll(struct evdev_device *device);
+
 void
 evdev_post_scroll(struct evdev_device *device,
 		  uint64_t time,

From 805f482423b5cc11a65818ff6adfcbddad8d2228 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 11:38:38 +1000
Subject: [PATCH 085/121] evdev: enable natural scrolling for all pointer
 devices

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 51 ++++++++++++++++++++++++++++++++-------------------
 src/evdev.h |  2 ++
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index d0ddc374..bd742a6b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -525,12 +525,25 @@ evdev_process_absolute_motion(struct evdev_device *device,
 	}
 }
 
+static void
+evdev_notify_axis(struct evdev_device *device,
+		  uint64_t time,
+		  enum libinput_pointer_axis axis,
+		  double value)
+{
+	if (device->scroll.natural_scrolling_enabled)
+		value *= -1;
+
+	pointer_notify_axis(&device->base,
+			    time,
+			    axis,
+			    value);
+}
+
 static inline void
 evdev_process_relative(struct evdev_device *device,
 		       struct input_event *e, uint64_t time)
 {
-	struct libinput_device *base = &device->base;
-
 	switch (e->code) {
 	case REL_X:
 		if (device->pending_event != EVDEV_RELATIVE_MOTION)
@@ -546,16 +559,16 @@ evdev_process_relative(struct evdev_device *device,
 		break;
 	case REL_WHEEL:
 		evdev_flush_pending_event(device, time);
-		pointer_notify_axis(
-			base,
+		evdev_notify_axis(
+			device,
 			time,
 			LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
 			-1 * e->value * DEFAULT_AXIS_STEP_DISTANCE);
 		break;
 	case REL_HWHEEL:
 		evdev_flush_pending_event(device, time);
-		pointer_notify_axis(
-			base,
+		evdev_notify_axis(
+			device,
 			time,
 			LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
 			e->value * DEFAULT_AXIS_STEP_DISTANCE);
@@ -1037,6 +1050,9 @@ fallback_dispatch_create(struct libinput_device *device)
 		return NULL;
 	}
 
+	if (evdev_device->scroll.natural_scrolling_enabled)
+		evdev_init_natural_scroll(evdev_device);
+
 	evdev_init_calibration(evdev_device, dispatch);
 	evdev_init_sendevents(evdev_device, dispatch);
 
@@ -1388,6 +1404,8 @@ evdev_configure_device(struct evdev_device *device)
 
 		/* want left-handed config option */
 		device->buttons.want_left_handed = true;
+		/* want natural-scroll config option */
+		device->scroll.natural_scrolling_enabled = true;
 	}
 
 	if (has_rel && has_button) {
@@ -1712,11 +1730,6 @@ evdev_post_scroll(struct evdev_device *device,
 {
 	double trigger_horiz, trigger_vert;
 
-	if (device->scroll.natural_scrolling_enabled) {
-		dx = -dx;
-		dy = -dy;
-	}
-
 	if (!evdev_is_scrolling(device,
 				LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
 		device->scroll.buildup_vertical += dy;
@@ -1759,19 +1772,19 @@ evdev_post_scroll(struct evdev_device *device,
 	if (dy != 0.0 &&
 	    evdev_is_scrolling(device,
 			       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
-		pointer_notify_axis(&device->base,
-				    time,
-				    LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
-				    dy);
+		evdev_notify_axis(device,
+				  time,
+				  LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
+				  dy);
 	}
 
 	if (dx != 0.0 &&
 	    evdev_is_scrolling(device,
 			       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) {
-		pointer_notify_axis(&device->base,
-				    time,
-				    LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
-				    dx);
+		evdev_notify_axis(device,
+				  time,
+				  LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
+				  dx);
 	}
 }
 
diff --git a/src/evdev.h b/src/evdev.h
index b8191cce..35da3195 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -117,6 +117,8 @@ struct evdev_device {
 		double buildup_horizontal;
 
 		struct libinput_device_config_natural_scroll config_natural;
+		/* set during device init if we want natural scrolling,
+		 * used at runtime to enable/disable the feature */
 		bool natural_scrolling_enabled;
 	} scroll;
 

From b1005b748109ce0bb3728ab338ade16ded4c1009 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Nov 2014 12:03:48 +1000
Subject: [PATCH 086/121] test: add natural scrolling tests for pointers

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/pointer.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/test/pointer.c b/test/pointer.c
index 116f1856..487cd160 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -280,6 +280,9 @@ test_wheel_event(struct litest_device *dev, int which, int amount)
 	const int scroll_step = 10;
 	int expected = amount * scroll_step;
 
+	if (libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device))
+		expected *= -1;
+
 	/* mouse scroll wheels are 'upside down' */
 	if (which == REL_WHEEL)
 		amount *= -1;
@@ -325,6 +328,56 @@ START_TEST(pointer_scroll_wheel)
 }
 END_TEST
 
+START_TEST(pointer_scroll_natural_defaults)
+{
+	struct litest_device *dev = litest_current_device();
+
+	ck_assert_int_ge(libinput_device_config_scroll_has_natural_scroll(dev->libinput_device), 1);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0);
+	ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), 0);
+}
+END_TEST
+
+START_TEST(pointer_scroll_natural_enable_config)
+{
+	struct litest_device *dev = litest_current_device();
+	enum libinput_config_status status;
+
+	status = libinput_device_config_scroll_set_natural_scroll_enabled(dev->libinput_device, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 1);
+
+	status = libinput_device_config_scroll_set_natural_scroll_enabled(dev->libinput_device, 0);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0);
+}
+END_TEST
+
+START_TEST(pointer_scroll_natural_wheel)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *device = dev->libinput_device;
+
+	litest_drain_events(dev->libinput);
+
+	libinput_device_config_scroll_set_natural_scroll_enabled(device, 1);
+
+	test_wheel_event(dev, REL_WHEEL, -1);
+	test_wheel_event(dev, REL_WHEEL, 1);
+
+	test_wheel_event(dev, REL_WHEEL, -5);
+	test_wheel_event(dev, REL_WHEEL, 6);
+
+	if (libevdev_has_event_code(dev->evdev, EV_REL, REL_HWHEEL)) {
+		test_wheel_event(dev, REL_HWHEEL, -1);
+		test_wheel_event(dev, REL_HWHEEL, 1);
+
+		test_wheel_event(dev, REL_HWHEEL, -5);
+		test_wheel_event(dev, REL_HWHEEL, 6);
+	}
+}
+END_TEST
+
 START_TEST(pointer_seat_button_count)
 {
 	const int num_devices = 4;
@@ -603,6 +656,9 @@ int main (int argc, char **argv) {
 	litest_add_no_device("pointer:button_auto_release", pointer_button_auto_release);
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
 	litest_add("pointer:scroll", pointer_scroll_button, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
+	litest_add("pointer:scroll", pointer_scroll_natural_defaults, LITEST_WHEEL, LITEST_ANY);
+	litest_add("pointer:scroll", pointer_scroll_natural_enable_config, LITEST_WHEEL, LITEST_ANY);
+	litest_add("pointer:scroll", pointer_scroll_natural_wheel, LITEST_WHEEL, LITEST_ANY);
 	litest_add_no_device("pointer:seat button count", pointer_seat_button_count);
 
 	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE);

From 84a1a3e08189f7190bcbf47c07d1e9a0c5f1a184 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Nov 2014 11:44:02 +1000
Subject: [PATCH 087/121] doc: add a few missing @ref tags

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 97 +++++++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/src/libinput.h b/src/libinput.h
index 3b39c964..092b0e77 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -430,12 +430,12 @@ libinput_event_keyboard_get_base_event(struct libinput_event_keyboard *event);
 /**
  * @ingroup event_keyboard
  *
- * For the key of a LIBINPUT_EVENT_KEYBOARD_KEY event, return the total number
+ * For the key of a @ref LIBINPUT_EVENT_KEYBOARD_KEY event, return the total number
  * of keys pressed on all devices on the associated seat after the event was
  * triggered.
  *
  " @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_KEYBOARD_KEY. For other events, this function returns 0.
+ * @ref LIBINPUT_EVENT_KEYBOARD_KEY. For other events, this function returns 0.
  *
  * @return the seat wide pressed key count for the key of this event
  */
@@ -462,14 +462,14 @@ libinput_event_pointer_get_time(struct libinput_event_pointer *event);
  * @ingroup event_pointer
  *
  * Return the delta between the last event and the current event. For pointer
- * events that are not of type LIBINPUT_EVENT_POINTER_MOTION, this function
- * returns 0.
+ * events that are not of type @ref LIBINPUT_EVENT_POINTER_MOTION, this
+ * function returns 0.
  *
  * If a device employs pointer acceleration, the delta returned by this
  * function is the accelerated delta.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_MOTION.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION.
  *
  * @return the relative x movement since the last event
  */
@@ -480,14 +480,14 @@ libinput_event_pointer_get_dx(struct libinput_event_pointer *event);
  * @ingroup event_pointer
  *
  * Return the delta between the last event and the current event. For pointer
- * events that are not of type LIBINPUT_EVENT_POINTER_MOTION, this function
- * returns 0.
+ * events that are not of type @ref LIBINPUT_EVENT_POINTER_MOTION, this
+ * function returns 0.
  *
  * If a device employs pointer acceleration, the delta returned by this
  * function is the accelerated delta.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_MOTION.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION.
  *
  * @return the relative y movement since the last event
  */
@@ -502,10 +502,10 @@ libinput_event_pointer_get_dy(struct libinput_event_pointer *event);
  * coordinate, use libinput_event_pointer_get_absolute_x_transformed().
  *
  * For pointer events that are not of type
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, this function returns 0.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, this function returns 0.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
  *
  * @return the current absolute x coordinate
  */
@@ -520,10 +520,10 @@ libinput_event_pointer_get_absolute_x(struct libinput_event_pointer *event);
  * coordinate, use libinput_event_pointer_get_absolute_y_transformed().
  *
  * For pointer events that are not of type
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, this function returns 0.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, this function returns 0.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
  *
  * @return the current absolute y coordinate
  */
@@ -537,11 +537,11 @@ libinput_event_pointer_get_absolute_y(struct libinput_event_pointer *event);
  * screen coordinates.
  *
  * For pointer events that are not of type
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, the return value of this function is
- * undefined.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, the return value of this
+ * function is undefined.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
  *
  * @param event The libinput pointer event
  * @param width The current output screen width
@@ -559,11 +559,11 @@ libinput_event_pointer_get_absolute_x_transformed(
  * screen coordinates.
  *
  * For pointer events that are not of type
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, the return value of this function is
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, the return value of this function is
  * undefined.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
+ * @ref LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE.
  *
  * @param event The libinput pointer event
  * @param height The current output screen height
@@ -578,11 +578,11 @@ libinput_event_pointer_get_absolute_y_transformed(
  * @ingroup event_pointer
  *
  * Return the button that triggered this event.
- * For pointer events that are not of type LIBINPUT_EVENT_POINTER_BUTTON,
- * this function returns 0.
+ * For pointer events that are not of type @ref
+ * LIBINPUT_EVENT_POINTER_BUTTON, this function returns 0.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_BUTTON.
+ * @ref LIBINPUT_EVENT_POINTER_BUTTON.
  *
  * @return the button triggering this event
  */
@@ -593,11 +593,11 @@ libinput_event_pointer_get_button(struct libinput_event_pointer *event);
  * @ingroup event_pointer
  *
  * Return the button state that triggered this event.
- * For pointer events that are not of type LIBINPUT_EVENT_POINTER_BUTTON,
- * this function returns 0.
+ * For pointer events that are not of type @ref
+ * LIBINPUT_EVENT_POINTER_BUTTON, this function returns 0.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_BUTTON.
+ * @ref LIBINPUT_EVENT_POINTER_BUTTON.
  *
  * @return the button state triggering this event
  */
@@ -607,12 +607,13 @@ libinput_event_pointer_get_button_state(struct libinput_event_pointer *event);
 /**
  * @ingroup event_pointer
  *
- * For the button of a LIBINPUT_EVENT_POINTER_BUTTON event, return the total
- * number of buttons pressed on all devices on the associated seat after the
- * the event was triggered.
+ * For the button of a @ref LIBINPUT_EVENT_POINTER_BUTTON event, return the
+ * total number of buttons pressed on all devices on the associated seat
+ * after the the event was triggered.
  *
  " @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_BUTTON. For other events, this function returns 0.
+ * @ref LIBINPUT_EVENT_POINTER_BUTTON. For other events, this function
+ * returns 0.
  *
  * @return the seat wide pressed button count for the key of this event
  */
@@ -624,11 +625,11 @@ libinput_event_pointer_get_seat_button_count(
  * @ingroup event_pointer
  *
  * Return the axis that triggered this event.
- * For pointer events that are not of type LIBINPUT_EVENT_POINTER_AXIS,
+ * For pointer events that are not of type @ref LIBINPUT_EVENT_POINTER_AXIS,
  * this function returns 0.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_AXIS.
+ * @ref LIBINPUT_EVENT_POINTER_AXIS.
  *
  * @return the axis triggering this event
  */
@@ -640,18 +641,18 @@ libinput_event_pointer_get_axis(struct libinput_event_pointer *event);
  *
  * Return the axis value of the given axis. The interpretation of the value
  * is dependent on the axis. For the two scrolling axes
- * LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL and
- * LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, the value of the event is in
+ * @ref LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL and
+ * @ref LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, the value of the event is in
  * relative scroll units, with the positive direction being down or right,
  * respectively. The dimension of a scroll unit is equal to one unit of
  * motion in the respective axis, where applicable (e.g. touchpad two-finger
  * scrolling).
  *
- * For pointer events that are not of type LIBINPUT_EVENT_POINTER_AXIS,
+ * For pointer events that are not of type @ref LIBINPUT_EVENT_POINTER_AXIS,
  * this function returns 0.
  *
  * @note It is an application bug to call this function for events other than
- * LIBINPUT_EVENT_POINTER_AXIS.
+ * @ref LIBINPUT_EVENT_POINTER_AXIS.
  *
  * @return the axis value of this event
  */
@@ -690,8 +691,8 @@ libinput_event_touch_get_time(struct libinput_event_touch *event);
  * If the touch event has no assigned slot, for example if it is from a
  * single touch device, this function returns -1.
  *
- * @note this function should not be called for LIBINPUT_EVENT_TOUCH_CANCEL or
- * LIBINPUT_EVENT_TOUCH_FRAME.
+ * @note this function should not be called for @ref
+ * LIBINPUT_EVENT_TOUCH_CANCEL or @ref LIBINPUT_EVENT_TOUCH_FRAME.
  *
  * @return The slot of this touch event
  */
@@ -707,8 +708,8 @@ libinput_event_touch_get_slot(struct libinput_event_touch *event);
  * Events from single touch devices will be represented as one individual
  * touch point per device.
  *
- * @note this function should not be called for LIBINPUT_EVENT_TOUCH_CANCEL or
- * LIBINPUT_EVENT_TOUCH_FRAME.
+ * @note this function should not be called for @ref
+ * LIBINPUT_EVENT_TOUCH_CANCEL or @ref LIBINPUT_EVENT_TOUCH_FRAME.
  *
  * @return The seat slot of the touch event
  */
@@ -722,8 +723,8 @@ libinput_event_touch_get_seat_slot(struct libinput_event_touch *event);
  * the top left corner of the device. To get the corresponding output screen
  * coordinate, use libinput_event_touch_get_x_transformed().
  *
- * @note this function should only be called for LIBINPUT_EVENT_TOUCH_DOWN and
- * LIBINPUT_EVENT_TOUCH_MOTION.
+ * @note this function should only be called for @ref
+ * LIBINPUT_EVENT_TOUCH_DOWN and @ref LIBINPUT_EVENT_TOUCH_MOTION.
  *
  * @param event The libinput touch event
  * @return the current absolute x coordinate
@@ -738,10 +739,10 @@ libinput_event_touch_get_x(struct libinput_event_touch *event);
  * the top left corner of the device. To get the corresponding output screen
  * coordinate, use libinput_event_touch_get_y_transformed().
  *
- * For LIBINPUT_EVENT_TOUCH_UP 0 is returned.
+ * For @ref LIBINPUT_EVENT_TOUCH_UP 0 is returned.
  *
- * @note this function should only be called for LIBINPUT_EVENT_TOUCH_DOWN and
- * LIBINPUT_EVENT_TOUCH_MOTION.
+ * @note this function should only be called for @ref LIBINPUT_EVENT_TOUCH_DOWN and
+ * @ref LIBINPUT_EVENT_TOUCH_MOTION.
  *
  * @param event The libinput touch event
  * @return the current absolute y coordinate
@@ -755,8 +756,8 @@ libinput_event_touch_get_y(struct libinput_event_touch *event);
  * Return the current absolute x coordinate of the touch event, transformed to
  * screen coordinates.
  *
- * @note this function should only be called for LIBINPUT_EVENT_TOUCH_DOWN and
- * LIBINPUT_EVENT_TOUCH_MOTION.
+ * @note this function should only be called for @ref
+ * LIBINPUT_EVENT_TOUCH_DOWN and @ref LIBINPUT_EVENT_TOUCH_MOTION.
  *
  * @param event The libinput touch event
  * @param width The current output screen width
@@ -772,8 +773,8 @@ libinput_event_touch_get_x_transformed(struct libinput_event_touch *event,
  * Return the current absolute y coordinate of the touch event, transformed to
  * screen coordinates.
  *
- * @note this function should only be called for LIBINPUT_EVENT_TOUCH_DOWN and
- * LIBINPUT_EVENT_TOUCH_MOTION.
+ * @note this function should only be called for @ref
+ * LIBINPUT_EVENT_TOUCH_DOWN and @ref LIBINPUT_EVENT_TOUCH_MOTION.
  *
  * @param event The libinput touch event
  * @param height The current output screen height
@@ -916,8 +917,8 @@ libinput_path_add_device(struct libinput *libinput,
  * libinput_path_add_device().
  *
  * Events already processed from this input device are kept in the queue,
- * the LIBINPUT_EVENT_DEVICE_REMOVED event marks the end of events for this
- * device.
+ * the @ref LIBINPUT_EVENT_DEVICE_REMOVED event marks the end of events for
+ * this device.
  *
  * If no matching device exists, this function does nothing.
  *

From 67ac4501a795bf28a421907a8eabc6b56dd8114a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Nov 2014 14:26:10 +1000
Subject: [PATCH 088/121] touchpad: print the device name on error

A little bit easier to recognize.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad-buttons.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 3dcc8b0b..cfd6588d 100644
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -565,12 +565,12 @@ tp_init_buttons(struct tp_dispatch *tp,
 		if (tp->buttons.is_clickpad)
 			log_bug_kernel(libinput,
 				       "%s: clickpad advertising right button\n",
-				       device->sysname);
+				       device->devname);
 	} else {
 		if (!tp->buttons.is_clickpad)
 			log_bug_kernel(libinput,
 				       "%s: non clickpad without right button?\n",
-				       device->sysname);
+				       device->devname);
 	}
 
 	absinfo_x = device->abs.absinfo_x;

From bded6ac1d1f4aa93a5ecd8d681730734392aae8c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Nov 2014 12:08:22 +1000
Subject: [PATCH 089/121] Drop unused libinput_device->terminated field

Unused since commit 56f7dde "Port udev-seat to be used in libinput"

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput-private.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 53101609..8c75d1f0 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -159,7 +159,6 @@ struct libinput_device {
 	struct list link;
 	struct list event_listeners;
 	void *user_data;
-	int terminated;
 	int refcount;
 	struct libinput_device_config config;
 };

From 96493d6c26466885b26dcfe5e25d447c62740d88 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 21 Nov 2014 16:20:42 +1000
Subject: [PATCH 090/121] evdev: fix leaking file descriptor

If zalloc fails, we need to close the fd.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index bd742a6b..fed66cb6 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1462,7 +1462,7 @@ evdev_device_create(struct libinput_seat *seat,
 		    const char *syspath)
 {
 	struct libinput *libinput = seat->libinput;
-	struct evdev_device *device;
+	struct evdev_device *device = NULL;
 	int rc;
 	int fd;
 	int unhandled_device = 0;
@@ -1480,7 +1480,7 @@ evdev_device_create(struct libinput_seat *seat,
 
 	device = zalloc(sizeof *device);
 	if (device == NULL)
-		return NULL;
+		goto err;
 
 	libinput_device_init(&device->base, seat);
 	libinput_seat_ref(seat);
@@ -1543,7 +1543,8 @@ evdev_device_create(struct libinput_seat *seat,
 err:
 	if (fd >= 0)
 		close_restricted(libinput, fd);
-	evdev_device_destroy(device);
+	if (device)
+		evdev_device_destroy(device);
 
 	return unhandled_device ? EVDEV_UNHANDLED_DEVICE :  NULL;
 }

From 92d178f167302665d51b3dba79d18de4c1881bdb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 12:16:28 +1000
Subject: [PATCH 091/121] Rename scroll_mode to scroll_method

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c |  40 +++++++--------
 src/evdev-mt-touchpad.h |   4 +-
 src/evdev.c             |  56 ++++++++++-----------
 src/evdev.h             |  10 ++--
 src/libinput-private.h  |  14 +++---
 src/libinput.c          |  50 +++++++++----------
 src/libinput.h          | 106 ++++++++++++++++++++--------------------
 test/pointer.c          |   6 +--
 test/trackpoint.c       |   6 +--
 tools/event-debug.c     |  12 ++---
 10 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 9265a8a9..c3d1d9ef 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -503,7 +503,7 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
 	struct tp_touch *t;
 	int nfingers_down = 0;
 
-	if (tp->scroll.mode != LIBINPUT_CONFIG_SCROLL_2FG)
+	if (tp->scroll.method != LIBINPUT_CONFIG_SCROLL_2FG)
 		return 0;
 
 	/* No scrolling during tap-n-drag */
@@ -903,45 +903,45 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 }
 
 static uint32_t
-tp_scroll_config_scroll_mode_get_modes(struct libinput_device *device)
+tp_scroll_config_scroll_method_get_methods(struct libinput_device *device)
 {
 	struct evdev_device *evdev = (struct evdev_device*)device;
 	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
-	uint32_t modes = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+	uint32_t methods = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
 
 	if (tp->ntouches >= 2)
-		modes |= LIBINPUT_CONFIG_SCROLL_2FG;
+		methods |= LIBINPUT_CONFIG_SCROLL_2FG;
 
-	return modes;
+	return methods;
 }
 
 static enum libinput_config_status
-tp_scroll_config_scroll_mode_set_mode(struct libinput_device *device,
-		        enum libinput_config_scroll_mode mode)
+tp_scroll_config_scroll_method_set_method(struct libinput_device *device,
+		        enum libinput_config_scroll_method method)
 {
 	struct evdev_device *evdev = (struct evdev_device*)device;
 	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
 
-	if (mode == tp->scroll.mode)
+	if (method == tp->scroll.method)
 		return LIBINPUT_CONFIG_STATUS_SUCCESS;
 
 	evdev_stop_scroll(evdev, libinput_now(device->seat->libinput));
-	tp->scroll.mode = mode;
+	tp->scroll.method = method;
 
 	return LIBINPUT_CONFIG_STATUS_SUCCESS;
 }
 
-static enum libinput_config_scroll_mode
-tp_scroll_config_scroll_mode_get_mode(struct libinput_device *device)
+static enum libinput_config_scroll_method
+tp_scroll_config_scroll_method_get_method(struct libinput_device *device)
 {
 	struct evdev_device *evdev = (struct evdev_device*)device;
 	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
 
-	return tp->scroll.mode;
+	return tp->scroll.method;
 }
 
-static enum libinput_config_scroll_mode
-tp_scroll_config_scroll_mode_get_default_mode(struct libinput_device *device)
+static enum libinput_config_scroll_method
+tp_scroll_config_scroll_method_get_default_method(struct libinput_device *device)
 {
 	return LIBINPUT_CONFIG_SCROLL_2FG;
 }
@@ -952,12 +952,12 @@ tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device)
 
 	evdev_init_natural_scroll(device);
 
-	tp->scroll.config_mode.get_modes = tp_scroll_config_scroll_mode_get_modes;
-	tp->scroll.config_mode.set_mode = tp_scroll_config_scroll_mode_set_mode;
-	tp->scroll.config_mode.get_mode = tp_scroll_config_scroll_mode_get_mode;
-	tp->scroll.config_mode.get_default_mode = tp_scroll_config_scroll_mode_get_default_mode;
-	tp->scroll.mode = tp_scroll_config_scroll_mode_get_default_mode(&tp->device->base);
-	tp->device->base.config.scroll_mode = &tp->scroll.config_mode;
+	tp->scroll.config_method.get_methods = tp_scroll_config_scroll_method_get_methods;
+	tp->scroll.config_method.set_method = tp_scroll_config_scroll_method_set_method;
+	tp->scroll.config_method.get_method = tp_scroll_config_scroll_method_get_method;
+	tp->scroll.config_method.get_default_method = tp_scroll_config_scroll_method_get_default_method;
+	tp->scroll.method = tp_scroll_config_scroll_method_get_default_method(&tp->device->base);
+	tp->device->base.config.scroll_method = &tp->scroll.config_method;
 
 	/* In mm for touchpads with valid resolution, see tp_init_accel() */
 	tp->device->scroll.threshold = 5.0;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 4ca810f5..11c4d495 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -202,8 +202,8 @@ struct tp_dispatch {
 	} buttons;				/* physical buttons */
 
 	struct {
-		struct libinput_device_config_scroll_mode config_mode;
-		enum libinput_config_scroll_mode mode;
+		struct libinput_device_config_scroll_method config_method;
+		enum libinput_config_scroll_method method;
 	} scroll;
 
 	enum touchpad_event queued;
diff --git a/src/evdev.c b/src/evdev.c
index fed66cb6..36c68593 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -125,8 +125,8 @@ evdev_pointer_notify_button(struct evdev_device *device,
 			device->buttons.change_to_left_handed(device);
 
 		if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
-		    device->scroll.change_scroll_mode)
-			device->scroll.change_scroll_mode(device);
+		    device->scroll.change_scroll_method)
+			device->scroll.change_scroll_method(device);
 	}
 
 }
@@ -217,7 +217,7 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 		device->rel.dy = 0;
 
 		/* Use unaccelerated deltas for pointing stick scroll */
-		if (device->scroll.mode == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
+		if (device->scroll.method == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
 		    hw_is_key_down(device, device->scroll.button)) {
 			if (device->scroll.button_scroll_active)
 				evdev_post_scroll(device, time,
@@ -460,7 +460,7 @@ evdev_process_key(struct evdev_device *device,
 				   LIBINPUT_KEY_STATE_RELEASED);
 		break;
 	case EVDEV_KEY_TYPE_BUTTON:
-		if (device->scroll.mode == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
+		if (device->scroll.method == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
 		    e->code == device->scroll.button) {
 			evdev_button_scroll_button(device, time, e->value);
 			break;
@@ -848,49 +848,49 @@ evdev_init_left_handed(struct evdev_device *device,
 }
 
 static uint32_t
-evdev_scroll_get_modes(struct libinput_device *device)
+evdev_scroll_get_methods(struct libinput_device *device)
 {
 	return LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
 }
 
 static void
-evdev_change_scroll_mode(struct evdev_device *device)
+evdev_change_scroll_method(struct evdev_device *device)
 {
-	if (device->scroll.want_mode == device->scroll.mode &&
+	if (device->scroll.want_method == device->scroll.method &&
 	    device->scroll.want_button == device->scroll.button)
 		return;
 
 	if (evdev_any_button_down(device))
 		return;
 
-	device->scroll.mode = device->scroll.want_mode;
+	device->scroll.method = device->scroll.want_method;
 	device->scroll.button = device->scroll.want_button;
 }
 
 static enum libinput_config_status
-evdev_scroll_set_mode(struct libinput_device *device,
-		      enum libinput_config_scroll_mode mode)
+evdev_scroll_set_method(struct libinput_device *device,
+			enum libinput_config_scroll_method method)
 {
 	struct evdev_device *evdev = (struct evdev_device*)device;
 
-	evdev->scroll.want_mode = mode;
-	evdev->scroll.change_scroll_mode(evdev);
+	evdev->scroll.want_method = method;
+	evdev->scroll.change_scroll_method(evdev);
 
 	return LIBINPUT_CONFIG_STATUS_SUCCESS;
 }
 
-static enum libinput_config_scroll_mode
-evdev_scroll_get_mode(struct libinput_device *device)
+static enum libinput_config_scroll_method
+evdev_scroll_get_method(struct libinput_device *device)
 {
 	struct evdev_device *evdev = (struct evdev_device *)device;
 
 	/* return the wanted configuration, even if it hasn't taken
 	 * effect yet! */
-	return evdev->scroll.want_mode;
+	return evdev->scroll.want_method;
 }
 
-static enum libinput_config_scroll_mode
-evdev_scroll_get_default_mode(struct libinput_device *device)
+static enum libinput_config_scroll_method
+evdev_scroll_get_default_method(struct libinput_device *device)
 {
 	struct evdev_device *evdev = (struct evdev_device *)device;
 
@@ -907,7 +907,7 @@ evdev_scroll_set_button(struct libinput_device *device,
 	struct evdev_device *evdev = (struct evdev_device*)device;
 
 	evdev->scroll.want_button = button;
-	evdev->scroll.change_scroll_mode(evdev);
+	evdev->scroll.change_scroll_method(evdev);
 
 	return LIBINPUT_CONFIG_STATUS_SUCCESS;
 }
@@ -935,23 +935,23 @@ evdev_scroll_get_default_button(struct libinput_device *device)
 
 static int
 evdev_init_button_scroll(struct evdev_device *device,
-			 void (*change_scroll_mode)(struct evdev_device *))
+			 void (*change_scroll_method)(struct evdev_device *))
 {
 	libinput_timer_init(&device->scroll.timer, device->base.seat->libinput,
 			    evdev_button_scroll_timeout, device);
-	device->scroll.config.get_modes = evdev_scroll_get_modes;
-	device->scroll.config.set_mode = evdev_scroll_set_mode;
-	device->scroll.config.get_mode = evdev_scroll_get_mode;
-	device->scroll.config.get_default_mode = evdev_scroll_get_default_mode;
+	device->scroll.config.get_methods = evdev_scroll_get_methods;
+	device->scroll.config.set_method = evdev_scroll_set_method;
+	device->scroll.config.get_method = evdev_scroll_get_method;
+	device->scroll.config.get_default_method = evdev_scroll_get_default_method;
 	device->scroll.config.set_button = evdev_scroll_set_button;
 	device->scroll.config.get_button = evdev_scroll_get_button;
 	device->scroll.config.get_default_button = evdev_scroll_get_default_button;
-	device->base.config.scroll_mode = &device->scroll.config;
-	device->scroll.mode = evdev_scroll_get_default_mode((struct libinput_device *)device);
-	device->scroll.want_mode = device->scroll.mode;
+	device->base.config.scroll_method = &device->scroll.config;
+	device->scroll.method = evdev_scroll_get_default_method((struct libinput_device *)device);
+	device->scroll.want_method = device->scroll.method;
 	device->scroll.button = evdev_scroll_get_default_button((struct libinput_device *)device);
 	device->scroll.want_button = device->scroll.button;
-	device->scroll.change_scroll_mode = change_scroll_mode;
+	device->scroll.change_scroll_method = change_scroll_method;
 
 	return 0;
 }
@@ -1045,7 +1045,7 @@ fallback_dispatch_create(struct libinput_device *device)
 
 	if (evdev_device->scroll.want_button &&
 	    evdev_init_button_scroll(evdev_device,
-				     evdev_change_scroll_mode) == -1) {
+				     evdev_change_scroll_method) == -1) {
 		free(dispatch);
 		return NULL;
 	}
diff --git a/src/evdev.h b/src/evdev.h
index 35da3195..cc01b3ca 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -100,16 +100,16 @@ struct evdev_device {
 
 	struct {
 		struct libinput_timer timer;
-		struct libinput_device_config_scroll_mode config;
-		/* Currently enabled mode, button */
-		enum libinput_config_scroll_mode mode;
+		struct libinput_device_config_scroll_method config;
+		/* Currently enabled method, button */
+		enum libinput_config_scroll_method method;
 		uint32_t button;
 		/* set during device init, used at runtime to delay changes
 		 * until all buttons are up */
-		enum libinput_config_scroll_mode want_mode;
+		enum libinput_config_scroll_method want_method;
 		uint32_t want_button;
 		/* Checks if buttons are down and commits the setting */
-		void (*change_scroll_mode)(struct evdev_device *device);
+		void (*change_scroll_method)(struct evdev_device *device);
 		bool button_scroll_active;
 		double threshold;
 		uint32_t direction;
diff --git a/src/libinput-private.h b/src/libinput-private.h
index 8c75d1f0..29d3a073 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -132,12 +132,12 @@ struct libinput_device_config_left_handed {
 	int (*get_default)(struct libinput_device *device);
 };
 
-struct libinput_device_config_scroll_mode {
-	uint32_t (*get_modes)(struct libinput_device *device);
-	enum libinput_config_status (*set_mode)(struct libinput_device *device,
-						enum libinput_config_scroll_mode mode);
-	enum libinput_config_scroll_mode (*get_mode)(struct libinput_device *device);
-	enum libinput_config_scroll_mode (*get_default_mode)(struct libinput_device *device);
+struct libinput_device_config_scroll_method {
+	uint32_t (*get_methods)(struct libinput_device *device);
+	enum libinput_config_status (*set_method)(struct libinput_device *device,
+						  enum libinput_config_scroll_method method);
+	enum libinput_config_scroll_method (*get_method)(struct libinput_device *device);
+	enum libinput_config_scroll_method (*get_default_method)(struct libinput_device *device);
 	enum libinput_config_status (*set_button)(struct libinput_device *device,
 						  uint32_t button);
 	uint32_t (*get_button)(struct libinput_device *device);
@@ -151,7 +151,7 @@ struct libinput_device_config {
 	struct libinput_device_config_accel *accel;
 	struct libinput_device_config_natural_scroll *natural_scroll;
 	struct libinput_device_config_left_handed *left_handed;
-	struct libinput_device_config_scroll_mode *scroll_mode;
+	struct libinput_device_config_scroll_method *scroll_method;
 };
 
 struct libinput_device {
diff --git a/src/libinput.c b/src/libinput.c
index 3f5370fa..aa12bfc8 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1533,23 +1533,23 @@ libinput_device_config_buttons_get_default_left_handed(struct libinput_device *d
 }
 
 LIBINPUT_EXPORT uint32_t
-libinput_device_config_scroll_get_modes(struct libinput_device *device)
+libinput_device_config_scroll_get_methods(struct libinput_device *device)
 {
-	if (device->config.scroll_mode)
-		return device->config.scroll_mode->get_modes(device);
+	if (device->config.scroll_method)
+		return device->config.scroll_method->get_methods(device);
 	else
 		return 0;
 }
 
 LIBINPUT_EXPORT enum libinput_config_status
-libinput_device_config_scroll_set_mode(struct libinput_device *device,
-				       enum libinput_config_scroll_mode mode)
+libinput_device_config_scroll_set_method(struct libinput_device *device,
+					 enum libinput_config_scroll_method method)
 {
-	if ((libinput_device_config_scroll_get_modes(device) & mode) != mode)
+	if ((libinput_device_config_scroll_get_methods(device) & method) != method)
 		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
 
-	/* Check mode is a single valid mode */
-	switch (mode) {
+	/* Check method is a single valid method */
+	switch (method) {
 	case LIBINPUT_CONFIG_SCROLL_NO_SCROLL:
 	case LIBINPUT_CONFIG_SCROLL_2FG:
 	case LIBINPUT_CONFIG_SCROLL_EDGE:
@@ -1559,26 +1559,26 @@ libinput_device_config_scroll_set_mode(struct libinput_device *device,
 		return LIBINPUT_CONFIG_STATUS_INVALID;
 	}
 
-	if (device->config.scroll_mode)
-		return device->config.scroll_mode->set_mode(device, mode);
-	else /* mode must be _NO_SCROLL to get here */
+	if (device->config.scroll_method)
+		return device->config.scroll_method->set_method(device, method);
+	else /* method must be _NO_SCROLL to get here */
 		return LIBINPUT_CONFIG_STATUS_SUCCESS;
 }
 
-LIBINPUT_EXPORT enum libinput_config_scroll_mode
-libinput_device_config_scroll_get_mode(struct libinput_device *device)
+LIBINPUT_EXPORT enum libinput_config_scroll_method
+libinput_device_config_scroll_get_method(struct libinput_device *device)
 {
-	if (device->config.scroll_mode)
-		return device->config.scroll_mode->get_mode(device);
+	if (device->config.scroll_method)
+		return device->config.scroll_method->get_method(device);
 	else
 		return LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
 }
 
-LIBINPUT_EXPORT enum libinput_config_scroll_mode
-libinput_device_config_scroll_get_default_mode(struct libinput_device *device)
+LIBINPUT_EXPORT enum libinput_config_scroll_method
+libinput_device_config_scroll_get_default_method(struct libinput_device *device)
 {
-	if (device->config.scroll_mode)
-		return device->config.scroll_mode->get_default_mode(device);
+	if (device->config.scroll_method)
+		return device->config.scroll_method->get_default_method(device);
 	else
 		return LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
 }
@@ -1587,32 +1587,32 @@ LIBINPUT_EXPORT enum libinput_config_status
 libinput_device_config_scroll_set_button(struct libinput_device *device,
 					 uint32_t button)
 {
-	if ((libinput_device_config_scroll_get_modes(device) &
+	if ((libinput_device_config_scroll_get_methods(device) &
 	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
 		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
 
 	if (button && !libinput_device_has_button(device, button))
 		return LIBINPUT_CONFIG_STATUS_INVALID;
 
-	return device->config.scroll_mode->set_button(device, button);
+	return device->config.scroll_method->set_button(device, button);
 }
 
 LIBINPUT_EXPORT uint32_t
 libinput_device_config_scroll_get_button(struct libinput_device *device)
 {
-	if ((libinput_device_config_scroll_get_modes(device) &
+	if ((libinput_device_config_scroll_get_methods(device) &
 	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
 		return 0;
 
-	return device->config.scroll_mode->get_button(device);
+	return device->config.scroll_method->get_button(device);
 }
 
 LIBINPUT_EXPORT uint32_t
 libinput_device_config_scroll_get_default_button(struct libinput_device *device)
 {
-	if ((libinput_device_config_scroll_get_modes(device) &
+	if ((libinput_device_config_scroll_get_methods(device) &
 	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
 		return 0;
 
-	return device->config.scroll_mode->get_default_button(device);
+	return device->config.scroll_method->get_default_button(device);
 }
diff --git a/src/libinput.h b/src/libinput.h
index 092b0e77..01ded185 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -2043,10 +2043,10 @@ int
 libinput_device_config_buttons_get_default_left_handed(struct libinput_device *device);
 
 /**
- * The scroll mode of a device selects when to generate scroll axis events
+ * The scroll method of a device selects when to generate scroll axis events
  * instead of pointer motion events.
  */
-enum libinput_config_scroll_mode {
+enum libinput_config_scroll_method {
 	/**
 	 * Never send scroll events instead of pointer motion events.
 	 * Note scroll wheels, etc. will still send scroll events.
@@ -2071,104 +2071,104 @@ enum libinput_config_scroll_mode {
 /**
  * @ingroup config
  *
- * Check which scroll modes a device supports. The mode defines when to
+ * Check which scroll methods a device supports. The method defines when to
  * generate scroll axis events instead of pointer motion events.
  *
  * @param device The device to configure
  *
- * @return A bitmask of possible modes.
+ * @return A bitmask of possible methods.
  *
- * @see libinput_device_config_scroll_set_mode
- * @see libinput_device_config_scroll_get_mode
- * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_set_method
+ * @see libinput_device_config_scroll_get_method
+ * @see libinput_device_config_scroll_get_default_method
  * @see libinput_device_config_scroll_set_button
  * @see libinput_device_config_scroll_get_button
  * @see libinput_device_config_scroll_get_default_button
  */
 uint32_t
-libinput_device_config_scroll_get_modes(struct libinput_device *device);
+libinput_device_config_scroll_get_methods(struct libinput_device *device);
 
 /**
  * @ingroup config
  *
- * Set the scroll mode for this device. The mode defines when to
+ * Set the scroll method for this device. The method defines when to
  * generate scroll axis events instead of pointer motion events.
  *
  * @note Setting @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN enables
- * the scroll mode, but scrolling is only activated when the configured
+ * the scroll method, but scrolling is only activated when the configured
  * button is held down. If no button is set, i.e.
  * libinput_device_config_scroll_get_button() returns 0, scrolling
  * cannot activate.
  *
  * @param device The device to configure
- * @param mode The scroll mode for this device.
+ * @param method The scroll method for this device.
  *
  * @return A config status code.
  *
- * @see libinput_device_config_scroll_get_modes
- * @see libinput_device_config_scroll_get_mode
- * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_get_methods
+ * @see libinput_device_config_scroll_get_method
+ * @see libinput_device_config_scroll_get_default_method
  * @see libinput_device_config_scroll_set_button
  * @see libinput_device_config_scroll_get_button
  * @see libinput_device_config_scroll_get_default_button
  */
 enum libinput_config_status
-libinput_device_config_scroll_set_mode(struct libinput_device *device,
-				       enum libinput_config_scroll_mode mode);
+libinput_device_config_scroll_set_method(struct libinput_device *device,
+					 enum libinput_config_scroll_method method);
 
 /**
  * @ingroup config
  *
- * Get the scroll mode for this device. The mode defines when to
+ * Get the scroll method for this device. The method defines when to
  * generate scroll axis events instead of pointer motion events.
  *
  * @param device The device to configure
- * @return The current scroll mode for this device.
+ * @return The current scroll method for this device.
  *
- * @see libinput_device_config_scroll_get_modes
- * @see libinput_device_config_scroll_set_mode
- * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_get_methods
+ * @see libinput_device_config_scroll_set_method
+ * @see libinput_device_config_scroll_get_default_method
  * @see libinput_device_config_scroll_set_button
  * @see libinput_device_config_scroll_get_button
  * @see libinput_device_config_scroll_get_default_button
  */
-enum libinput_config_scroll_mode
-libinput_device_config_scroll_get_mode(struct libinput_device *device);
+enum libinput_config_scroll_method
+libinput_device_config_scroll_get_method(struct libinput_device *device);
 
 /**
  * @ingroup config
  *
- * Get the default scroll mode for this device. The mode defines when to
+ * Get the default scroll method for this device. The method defines when to
  * generate scroll axis events instead of pointer motion events.
  *
  * @param device The device to configure
- * @return The default scroll mode for this device.
+ * @return The default scroll method for this device.
  *
- * @see libinput_device_config_scroll_get_modes
- * @see libinput_device_config_scroll_set_mode
- * @see libinput_device_config_scroll_get_mode
+ * @see libinput_device_config_scroll_get_methods
+ * @see libinput_device_config_scroll_set_method
+ * @see libinput_device_config_scroll_get_method
  * @see libinput_device_config_scroll_set_button
  * @see libinput_device_config_scroll_get_button
  * @see libinput_device_config_scroll_get_default_button
  */
-enum libinput_config_scroll_mode
-libinput_device_config_scroll_get_default_mode(struct libinput_device *device);
+enum libinput_config_scroll_method
+libinput_device_config_scroll_get_default_method(struct libinput_device *device);
 
 /**
  * @ingroup config
  *
- * Set the button for the @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode
+ * Set the button for the @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN method
  * for this device.
  *
- * When the current scroll mode is set to @ref
+ * When the current scroll method is set to @ref
  * LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN, no button press/release events
  * will be send for the configured button.
  *
  * When the configured button is pressed, any motion events along a
  * scroll-capable axis are turned into scroll axis events.
  *
- * @note Setting the button does not change the scroll mode. To change the
- * scroll mode call libinput_device_config_scroll_set_mode().
+ * @note Setting the button does not change the scroll method. To change the
+ * scroll method call libinput_device_config_scroll_set_method().
  *
  * If the button is 0, button scrolling is effectively disabled.
  *
@@ -2181,10 +2181,10 @@ libinput_device_config_scroll_get_default_mode(struct libinput_device *device);
  * @retval LIBINPUT_CONFIG_STATUS_INVALID the given button does not
  * exist on this device
  *
- * @see libinput_device_config_scroll_get_modes
- * @see libinput_device_config_scroll_set_mode
- * @see libinput_device_config_scroll_get_mode
- * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_get_methods
+ * @see libinput_device_config_scroll_set_method
+ * @see libinput_device_config_scroll_get_method
+ * @see libinput_device_config_scroll_get_default_method
  * @see libinput_device_config_scroll_get_button
  * @see libinput_device_config_scroll_get_default_button
  */
@@ -2195,24 +2195,24 @@ libinput_device_config_scroll_set_button(struct libinput_device *device,
 /**
  * @ingroup config
  *
- * Get the button for the @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode for
+ * Get the button for the @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN method for
  * this device.
  *
- * If @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN scroll mode is not supported,
+ * If @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN scroll method is not supported,
  * or no button is set, this function returns 0.
  *
  * @note The return value is independent of the currently selected
- * scroll-mode. For button scrolling to activate, a device must have the
- * @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode enabled, and a non-zero
+ * scroll-method. For button scrolling to activate, a device must have the
+ * @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN method enabled, and a non-zero
  * button set as scroll button.
  *
  * @param device The device to configure
  * @return The button which when pressed switches to sending scroll events
  *
- * @see libinput_device_config_scroll_get_modes
- * @see libinput_device_config_scroll_set_mode
- * @see libinput_device_config_scroll_get_mode
- * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_get_methods
+ * @see libinput_device_config_scroll_set_method
+ * @see libinput_device_config_scroll_get_method
+ * @see libinput_device_config_scroll_get_default_method
  * @see libinput_device_config_scroll_set_button
  * @see libinput_device_config_scroll_get_default_button
  */
@@ -2222,19 +2222,19 @@ libinput_device_config_scroll_get_button(struct libinput_device *device);
 /**
  * @ingroup config
  *
- * Get the default button for LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode
+ * Get the default button for LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN method
  * for this device.
  *
- * If @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN scroll mode is not supported,
+ * If @ref LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN scroll method is not supported,
  * or no default button is set, this function returns 0.
  *
  * @param device The device to configure
- * @return The default button for LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN mode
+ * @return The default button for LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN method
  *
- * @see libinput_device_config_scroll_get_modes
- * @see libinput_device_config_scroll_set_mode
- * @see libinput_device_config_scroll_get_mode
- * @see libinput_device_config_scroll_get_default_mode
+ * @see libinput_device_config_scroll_get_methods
+ * @see libinput_device_config_scroll_set_method
+ * @see libinput_device_config_scroll_get_method
+ * @see libinput_device_config_scroll_get_default_method
  * @see libinput_device_config_scroll_set_button
  * @see libinput_device_config_scroll_get_button
  */
diff --git a/test/pointer.c b/test/pointer.c
index 487cd160..206accd5 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -615,7 +615,7 @@ START_TEST(pointer_scroll_button)
 	struct libinput *li = dev->libinput;
 
 	/* Make left button switch to scrolling mode */
-	libinput_device_config_scroll_set_mode(dev->libinput_device,
+	libinput_device_config_scroll_set_method(dev->libinput_device,
 					LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN);
 	libinput_device_config_scroll_set_button(dev->libinput_device,
 					BTN_LEFT);
@@ -639,8 +639,8 @@ START_TEST(pointer_scroll_button)
 	litest_assert_empty_queue(li);
 
 	/* Restore default scroll behavior */
-	libinput_device_config_scroll_set_mode(dev->libinput_device,
-		libinput_device_config_scroll_get_default_mode(
+	libinput_device_config_scroll_set_method(dev->libinput_device,
+		libinput_device_config_scroll_get_default_method(
 			dev->libinput_device));
 	libinput_device_config_scroll_set_button(dev->libinput_device,
 		libinput_device_config_scroll_get_default_button(
diff --git a/test/trackpoint.c b/test/trackpoint.c
index 3d965d44..1d1a10a0 100644
--- a/test/trackpoint.c
+++ b/test/trackpoint.c
@@ -81,7 +81,7 @@ START_TEST(trackpoint_middlebutton_noscroll)
 	struct libinput_event *event;
 
 	/* Disable middle button scrolling */
-	libinput_device_config_scroll_set_mode(dev->libinput_device,
+	libinput_device_config_scroll_set_method(dev->libinput_device,
 					LIBINPUT_CONFIG_SCROLL_NO_SCROLL);
 
 	litest_drain_events(li);
@@ -101,8 +101,8 @@ START_TEST(trackpoint_middlebutton_noscroll)
 	litest_assert_empty_queue(li);
 
 	/* Restore default scroll behavior */
-	libinput_device_config_scroll_set_mode(dev->libinput_device,
-		libinput_device_config_scroll_get_default_mode(
+	libinput_device_config_scroll_set_method(dev->libinput_device,
+		libinput_device_config_scroll_get_default_method(
 			dev->libinput_device));
 }
 END_TEST
diff --git a/tools/event-debug.c b/tools/event-debug.c
index 1d9c8a06..2a48e2db 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -257,7 +257,7 @@ print_device_notify(struct libinput_event *ev)
 	struct libinput_device *dev = libinput_event_get_device(ev);
 	struct libinput_seat *seat = libinput_device_get_seat(dev);
 	double w, h;
-	uint32_t scroll_modes;
+	uint32_t scroll_methods;
 
 	printf("%-30s	%s	%s",
 	       libinput_device_get_name(dev),
@@ -276,14 +276,14 @@ print_device_notify(struct libinput_event *ev)
 	if (libinput_device_config_calibration_has_matrix((dev)))
 	    printf(" calib");
 
-	scroll_modes = libinput_device_config_scroll_get_modes(dev);
-	if (scroll_modes != LIBINPUT_CONFIG_SCROLL_NO_SCROLL) {
+	scroll_methods = libinput_device_config_scroll_get_methods(dev);
+	if (scroll_methods != LIBINPUT_CONFIG_SCROLL_NO_SCROLL) {
 		printf(" scroll");
-		if (scroll_modes & LIBINPUT_CONFIG_SCROLL_2FG)
+		if (scroll_methods & LIBINPUT_CONFIG_SCROLL_2FG)
 			printf("-2fg");
-		if (scroll_modes & LIBINPUT_CONFIG_SCROLL_EDGE)
+		if (scroll_methods & LIBINPUT_CONFIG_SCROLL_EDGE)
 			printf("-edge");
-		if (scroll_modes & LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN)
+		if (scroll_methods & LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN)
 			printf("-button");
 	}
 

From 8d24cd530425f3860c4a55a987b9d74f029c8d91 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Nov 2014 13:36:32 +1000
Subject: [PATCH 092/121] path: keep the udev context around

We need it for each device anyway, keep the ref around. Makes error handling a
bit easier, we don't need to handle failing udev_new() and reduce the danger
of mis-refcounting it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/path.c | 31 ++++++++++++++++++-------------
 src/path.h |  1 +
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/path.c b/src/path.c
index 37527512..f986afda 100644
--- a/src/path.c
+++ b/src/path.c
@@ -110,22 +110,18 @@ path_seat_get_named(struct path_input *input,
 }
 
 static int
-path_get_udev_properties(const char *path,
+path_get_udev_properties(struct udev *udev,
+			 const char *path,
 			 char **sysname,
 			 char **syspath,
 			 char **seat_name,
 			 char **seat_logical_name)
 {
-	struct udev *udev = NULL;
 	struct udev_device *device = NULL;
 	struct stat st;
 	const char *seat;
 	int rc = -1;
 
-	udev = udev_new();
-	if (!udev)
-		goto out;
-
 	if (stat(path, &st) < 0)
 		goto out;
 
@@ -147,8 +143,6 @@ path_get_udev_properties(const char *path,
 out:
 	if (device)
 		udev_device_unref(device);
-	if (udev)
-		udev_unref(udev);
 	return rc;
 }
 
@@ -160,8 +154,12 @@ path_device_enable(struct path_input *input, const char *devnode)
 	char *sysname = NULL, *syspath = NULL;
 	char *seat_name = NULL, *seat_logical_name = NULL;
 
-	if (path_get_udev_properties(devnode, &sysname, &syspath,
-				     &seat_name, &seat_logical_name) == -1) {
+	if (path_get_udev_properties(input->udev,
+				     devnode,
+				     &sysname,
+				     &syspath,
+				     &seat_name,
+				     &seat_logical_name) == -1) {
 		log_info(&input->base,
 			 "failed to obtain sysname for device '%s'.\n",
 			 devnode);
@@ -229,6 +227,8 @@ path_input_destroy(struct libinput *input)
 	struct path_input *path_input = (struct path_input*)input;
 	struct path_device *dev, *tmp;
 
+	udev_unref(path_input->udev);
+
 	list_for_each_safe(dev, tmp, &path_input->path_list, link) {
 		free(dev->path);
 		free(dev);
@@ -247,20 +247,25 @@ libinput_path_create_context(const struct libinput_interface *interface,
 			     void *user_data)
 {
 	struct path_input *input;
+	struct udev *udev;
 
 	if (!interface)
 		return NULL;
 
-	input = zalloc(sizeof *input);
-	if (!input)
+	udev = udev_new();
+	if (!udev)
 		return NULL;
 
-	if (libinput_init(&input->base, interface,
+	input = zalloc(sizeof *input);
+	if (!input ||
+	    libinput_init(&input->base, interface,
 			  &interface_backend, user_data) != 0) {
+		udev_unref(udev);
 		free(input);
 		return NULL;
 	}
 
+	input->udev = udev;
 	list_init(&input->path_list);
 
 	return &input->base;
diff --git a/src/path.h b/src/path.h
index 779d8232..999601b4 100644
--- a/src/path.h
+++ b/src/path.h
@@ -28,6 +28,7 @@
 
 struct path_input {
 	struct libinput base;
+	struct udev *udev;
 	struct list path_list;
 };
 

From 5f703f48b07dcdc1a5457f9153bd74836e880a2e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 15:26:40 +1000
Subject: [PATCH 093/121] path: split out creating a device into a helper
 function

No functional changes

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/path.c | 57 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/path.c b/src/path.c
index f986afda..59007754 100644
--- a/src/path.c
+++ b/src/path.c
@@ -236,6 +236,37 @@ path_input_destroy(struct libinput *input)
 
 }
 
+static struct libinput_device *
+path_create_device(struct libinput *libinput,
+		   const char *path)
+{
+	struct path_input *input = (struct path_input*)libinput;
+	struct path_device *dev;
+	struct libinput_device *device;
+
+	dev = zalloc(sizeof *dev);
+	if (!dev)
+		return NULL;
+
+	dev->path = strdup(path);
+	if (!dev->path) {
+		free(dev);
+		return NULL;
+	}
+
+	list_insert(&input->path_list, &dev->link);
+
+	device = path_device_enable(input, dev->path);
+
+	if (!device) {
+		list_remove(&dev->link);
+		free(dev->path);
+		free(dev);
+	}
+
+	return device;
+}
+
 static const struct libinput_interface_backend interface_backend = {
 	.resume = path_input_enable,
 	.suspend = path_input_disable,
@@ -275,36 +306,12 @@ LIBINPUT_EXPORT struct libinput_device *
 libinput_path_add_device(struct libinput *libinput,
 			 const char *path)
 {
-	struct path_input *input = (struct path_input*)libinput;
-	struct path_device *dev;
-	struct libinput_device *device;
-
 	if (libinput->interface_backend != &interface_backend) {
 		log_bug_client(libinput, "Mismatching backends.\n");
 		return NULL;
 	}
 
-	dev = zalloc(sizeof *dev);
-	if (!dev)
-		return NULL;
-
-	dev->path = strdup(path);
-	if (!dev->path) {
-		free(dev);
-		return NULL;
-	}
-
-	list_insert(&input->path_list, &dev->link);
-
-	device = path_device_enable(input, dev->path);
-
-	if (!device) {
-		list_remove(&dev->link);
-		free(dev->path);
-		free(dev);
-	}
-
-	return device;
+	return path_create_device(libinput, path);
 }
 
 LIBINPUT_EXPORT void

From 429d206bea8196b21bc4cf69f957c47e58265983 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Nov 2014 13:50:57 +1000
Subject: [PATCH 094/121] path: store the udev device instead of just the
 devnode

Long-term plan to use more of udev_device here is to better protect us against
re-opening a different device that happens to have the same devnode.

This now also prints an error message for invalid devices, the log tests are
adjusted.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/path.c | 109 +++++++++++++++++++++++------------------------------
 src/path.h |   2 +-
 test/log.c |   8 ++--
 3 files changed, 53 insertions(+), 66 deletions(-)

diff --git a/src/path.c b/src/path.c
index 59007754..c0c33638 100644
--- a/src/path.c
+++ b/src/path.c
@@ -109,62 +109,26 @@ path_seat_get_named(struct path_input *input,
 	return NULL;
 }
 
-static int
-path_get_udev_properties(struct udev *udev,
-			 const char *path,
-			 char **sysname,
-			 char **syspath,
-			 char **seat_name,
-			 char **seat_logical_name)
-{
-	struct udev_device *device = NULL;
-	struct stat st;
-	const char *seat;
-	int rc = -1;
-
-	if (stat(path, &st) < 0)
-		goto out;
-
-	device = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
-	if (!device)
-		goto out;
-
-	*sysname = strdup(udev_device_get_sysname(device));
-	*syspath = strdup(udev_device_get_syspath(device));
-
-	seat = udev_device_get_property_value(device, "ID_SEAT");
-	*seat_name = strdup(seat ? seat : default_seat);
-
-	seat = udev_device_get_property_value(device, "WL_SEAT");
-	*seat_logical_name = strdup(seat ? seat : default_seat_name);
-
-	rc = 0;
-
-out:
-	if (device)
-		udev_device_unref(device);
-	return rc;
-}
-
 static struct libinput_device *
-path_device_enable(struct path_input *input, const char *devnode)
+path_device_enable(struct path_input *input,
+		   struct udev_device *udev_device)
 {
 	struct path_seat *seat;
 	struct evdev_device *device = NULL;
 	char *sysname = NULL, *syspath = NULL;
 	char *seat_name = NULL, *seat_logical_name = NULL;
+	const char *seat_prop;
+	const char *devnode;
 
-	if (path_get_udev_properties(input->udev,
-				     devnode,
-				     &sysname,
-				     &syspath,
-				     &seat_name,
-				     &seat_logical_name) == -1) {
-		log_info(&input->base,
-			 "failed to obtain sysname for device '%s'.\n",
-			 devnode);
-		return NULL;
-	}
+	sysname = strdup(udev_device_get_sysname(udev_device));
+	syspath = strdup(udev_device_get_syspath(udev_device));
+
+	seat_prop = udev_device_get_property_value(udev_device, "ID_SEAT");
+	seat_name = strdup(seat_prop ? seat_prop : default_seat);
+
+	seat_prop = udev_device_get_property_value(udev_device, "WL_SEAT");
+	seat_logical_name = strdup(seat_prop ? seat_prop : default_seat_name);
+	devnode = udev_device_get_devnode(udev_device);
 
 	seat = path_seat_get_named(input, seat_name, seat_logical_name);
 
@@ -212,7 +176,7 @@ path_input_enable(struct libinput *libinput)
 	struct path_device *dev;
 
 	list_for_each(dev, &input->path_list, link) {
-		if (path_device_enable(input, dev->path) == NULL) {
+		if (path_device_enable(input, dev->udev_device) == NULL) {
 			path_input_disable(libinput);
 			return -1;
 		}
@@ -230,7 +194,7 @@ path_input_destroy(struct libinput *input)
 	udev_unref(path_input->udev);
 
 	list_for_each_safe(dev, tmp, &path_input->path_list, link) {
-		free(dev->path);
+		udev_device_unref(dev->udev_device);
 		free(dev);
 	}
 
@@ -238,7 +202,7 @@ path_input_destroy(struct libinput *input)
 
 static struct libinput_device *
 path_create_device(struct libinput *libinput,
-		   const char *path)
+		   struct udev_device *udev_device)
 {
 	struct path_input *input = (struct path_input*)libinput;
 	struct path_device *dev;
@@ -248,19 +212,15 @@ path_create_device(struct libinput *libinput,
 	if (!dev)
 		return NULL;
 
-	dev->path = strdup(path);
-	if (!dev->path) {
-		free(dev);
-		return NULL;
-	}
+	dev->udev_device = udev_device_ref(udev_device);
 
 	list_insert(&input->path_list, &dev->link);
 
-	device = path_device_enable(input, dev->path);
+	device = path_device_enable(input, udev_device);
 
 	if (!device) {
+		udev_device_unref(dev->udev_device);
 		list_remove(&dev->link);
-		free(dev->path);
 		free(dev);
 	}
 
@@ -302,16 +262,40 @@ libinput_path_create_context(const struct libinput_interface *interface,
 	return &input->base;
 }
 
+static inline struct udev_device *
+udev_device_from_devnode(struct udev *udev, const char *devnode)
+{
+	struct stat st;
+
+	if (stat(devnode, &st) < 0)
+		return NULL;
+
+	return udev_device_new_from_devnum(udev, 'c', st.st_rdev);
+}
+
 LIBINPUT_EXPORT struct libinput_device *
 libinput_path_add_device(struct libinput *libinput,
 			 const char *path)
 {
+	struct path_input *input = (struct path_input *)libinput;
+	struct udev *udev = input->udev;
+	struct udev_device *udev_device;
+	struct libinput_device *device;
+
 	if (libinput->interface_backend != &interface_backend) {
 		log_bug_client(libinput, "Mismatching backends.\n");
 		return NULL;
 	}
 
-	return path_create_device(libinput, path);
+	udev_device = udev_device_from_devnode(udev, path);
+	if (!udev_device) {
+		log_bug_client(libinput, "Invalid path %s\n", path);
+		return NULL;
+	}
+
+	device = path_create_device(libinput, udev_device);
+	udev_device_unref(udev_device);
+	return device;
 }
 
 LIBINPUT_EXPORT void
@@ -329,9 +313,10 @@ libinput_path_remove_device(struct libinput_device *device)
 	}
 
 	list_for_each(dev, &input->path_list, link) {
-		if (strcmp(evdev->devnode, dev->path) == 0) {
+		const char *devnode = udev_device_get_devnode(dev->udev_device);
+		if (strcmp(evdev->devnode, devnode) == 0) {
 			list_remove(&dev->link);
-			free(dev->path);
+			udev_device_unref(dev->udev_device);
 			free(dev);
 			break;
 		}
diff --git a/src/path.h b/src/path.h
index 999601b4..973146ab 100644
--- a/src/path.h
+++ b/src/path.h
@@ -34,7 +34,7 @@ struct path_input {
 
 struct path_device {
 	struct list link;
-	char *path;
+	struct udev_device *udev_device;
 };
 
 struct path_seat {
diff --git a/test/log.c b/test/log.c
index 6ce5e7f4..a56af151 100644
--- a/test/log.c
+++ b/test/log.c
@@ -125,11 +125,13 @@ START_TEST(log_priority)
 
 	libinput_path_add_device(li, "/tmp");
 
-	ck_assert_int_eq(log_handler_called, 0);
+	ck_assert_int_eq(log_handler_called, 1);
 
 	libinput_log_set_priority(li, LIBINPUT_LOG_PRIORITY_INFO);
-	libinput_path_add_device(li, "/tmp");
-	ck_assert_int_gt(log_handler_called, 0);
+	/* event0 is usually Lid Switch which prints an info that
+	   we don't handle it */
+	libinput_path_add_device(li, "/dev/input/event0");
+	ck_assert_int_gt(log_handler_called, 1);
 
 	log_handler_called = 0;
 

From 0f8aa6d46cea1166242cc388125af91bf2f704c1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Nov 2014 13:55:48 +1000
Subject: [PATCH 095/121] evdev: use a udev_device instead of separate
 sysname/syspath/devnode

Using a udev_device instead of the various bits separately safes us
re-initializing udev contexts whenever we need to compare the device. And
having the actual udev device makes it a bit easier to ensure that we're not
re-initializing a different device as a current one.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c     | 85 +++++++++++++++++++------------------------------
 src/evdev.h     |  9 ++----
 src/path.c      | 11 ++-----
 src/udev-seat.c | 16 ++++------
 4 files changed, 45 insertions(+), 76 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 36c68593..94bf3604 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -240,7 +240,8 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 		if (device->mt.slots[slot].seat_slot != -1) {
 			log_bug_kernel(libinput,
 				       "%s: Driver sent multiple touch down for the "
-				       "same slot", device->devnode);
+				       "same slot",
+				       udev_device_get_devnode(device->udev_device));
 			break;
 		}
 
@@ -292,7 +293,8 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 		if (device->abs.seat_slot != -1) {
 			log_bug_kernel(libinput,
 				       "%s: Driver sent multiple touch down for the "
-				       "same slot", device->devnode);
+				       "same slot",
+				       udev_device_get_devnode(device->udev_device));
 			break;
 		}
 
@@ -1218,20 +1220,9 @@ evdev_need_mtdev(struct evdev_device *device)
 static void
 evdev_tag_device(struct evdev_device *device)
 {
-	struct udev *udev;
-	struct udev_device *udev_device = NULL;
-
-	udev = udev_new();
-	if (!udev)
-		return;
-
-	udev_device = udev_device_new_from_syspath(udev, device->syspath);
-	if (udev_device) {
-		if (device->dispatch->interface->tag_device)
-			device->dispatch->interface->tag_device(device, udev_device);
-		udev_device_unref(udev_device);
-	}
-	udev_unref(udev);
+	if (device->dispatch->interface->tag_device)
+		device->dispatch->interface->tag_device(device,
+							device->udev_device);
 }
 
 static inline int
@@ -1266,6 +1257,7 @@ evdev_configure_device(struct evdev_device *device)
 	int active_slot;
 	int slot;
 	unsigned int i;
+	const char *devnode = udev_device_get_devnode(device->udev_device);
 
 	has_rel = 0;
 	has_abs = 0;
@@ -1364,7 +1356,7 @@ evdev_configure_device(struct evdev_device *device)
 			device->dispatch = evdev_mt_touchpad_create(device);
 			log_info(libinput,
 				 "input device '%s', %s is a touchpad\n",
-				 device->devname, device->devnode);
+				 device->devname, devnode);
 			return device->dispatch == NULL ? -1 : 0;
 		}
 
@@ -1397,7 +1389,7 @@ evdev_configure_device(struct evdev_device *device)
 
 		log_info(libinput,
 			 "input device '%s', %s is a pointer caps =%s%s%s\n",
-			 device->devname, device->devnode,
+			 device->devname, devnode,
 			 has_abs ? " absolute-motion" : "",
 			 has_rel ? " relative-motion": "",
 			 has_button ? " button" : "");
@@ -1417,13 +1409,13 @@ evdev_configure_device(struct evdev_device *device)
 		device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
 		log_info(libinput,
 			 "input device '%s', %s is a keyboard\n",
-			 device->devname, device->devnode);
+			 device->devname, devnode);
 	}
 	if (has_touch && !has_button) {
 		device->seat_caps |= EVDEV_DEVICE_TOUCH;
 		log_info(libinput,
 			 "input device '%s', %s is a touch device\n",
-			 device->devname, device->devnode);
+			 device->devname, devnode);
 	}
 
 	return 0;
@@ -1457,15 +1449,14 @@ evdev_notify_added_device(struct evdev_device *device)
 
 struct evdev_device *
 evdev_device_create(struct libinput_seat *seat,
-		    const char *devnode,
-		    const char *sysname,
-		    const char *syspath)
+		    struct udev_device *udev_device)
 {
 	struct libinput *libinput = seat->libinput;
 	struct evdev_device *device = NULL;
 	int rc;
 	int fd;
 	int unhandled_device = 0;
+	const char *devnode = udev_device_get_devnode(udev_device);
 
 	/* Use non-blocking mode so that we can loop on read on
 	 * evdev_device_data() until all events on the fd are
@@ -1494,9 +1485,7 @@ evdev_device_create(struct libinput_seat *seat,
 	device->seat_caps = 0;
 	device->is_mt = 0;
 	device->mtdev = NULL;
-	device->devnode = strdup(devnode);
-	device->sysname = strdup(sysname);
-	device->syspath = strdup(syspath);
+	device->udev_device = udev_device_ref(udev_device);
 	device->rel.dx = 0;
 	device->rel.dy = 0;
 	device->abs.seat_slot = -1;
@@ -1565,7 +1554,7 @@ evdev_device_get_output(struct evdev_device *device)
 const char *
 evdev_device_get_sysname(struct evdev_device *device)
 {
-	return device->sysname;
+	return udev_device_get_sysname(device->udev_device);
 }
 
 const char *
@@ -1919,32 +1908,25 @@ evdev_device_suspend(struct evdev_device *device)
 }
 
 static int
-evdev_device_compare_syspath(struct evdev_device *device, int fd)
+evdev_device_compare_syspath(struct udev_device *udev_device, int fd)
 {
-	struct udev *udev = NULL;
-	struct udev_device *udev_device = NULL;
-	const char *syspath;
+	struct udev *udev = udev_device_get_udev(udev_device);
+	struct udev_device *udev_device_new;
 	struct stat st;
 	int rc = 1;
 
-	udev = udev_new();
-	if (!udev)
-		goto out;
-
 	if (fstat(fd, &st) < 0)
 		goto out;
 
-	udev_device = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
-	if (!device)
+	udev_device_new = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
+	if (!udev_device_new)
 		goto out;
 
-	syspath = udev_device_get_syspath(udev_device);
-	rc = strcmp(syspath, device->syspath);
+	rc = strcmp(udev_device_get_syspath(udev_device_new),
+		    udev_device_get_syspath(udev_device));
 out:
-	if (udev_device)
-		udev_device_unref(udev_device);
-	if (udev)
-		udev_unref(udev);
+	if (udev_device_new)
+		udev_device_unref(udev_device_new);
 	return rc;
 }
 
@@ -1953,19 +1935,21 @@ evdev_device_resume(struct evdev_device *device)
 {
 	struct libinput *libinput = device->base.seat->libinput;
 	int fd;
+	const char *devnode;
 
 	if (device->fd != -1)
 		return 0;
 
-	if (device->syspath == NULL)
+	if (device->was_removed)
 		return -ENODEV;
 
-	fd = open_restricted(libinput, device->devnode, O_RDWR | O_NONBLOCK);
+	devnode = udev_device_get_devnode(device->udev_device);
+	fd = open_restricted(libinput, devnode, O_RDWR | O_NONBLOCK);
 
 	if (fd < 0)
 		return -errno;
 
-	if (evdev_device_compare_syspath(device, fd)) {
+	if (evdev_device_compare_syspath(device->udev_device, fd)) {
 		close_restricted(libinput, fd);
 		return -ENODEV;
 	}
@@ -2008,10 +1992,9 @@ evdev_device_remove(struct evdev_device *device)
 
 	evdev_device_suspend(device);
 
-	/* A device may be removed while suspended. Free the syspath to
+	/* A device may be removed while suspended, mark it to
 	 * skip re-opening a different device with the same node */
-	free(device->syspath);
-	device->syspath = NULL;
+	device->was_removed = true;
 
 	list_remove(&device->base.link);
 
@@ -2031,9 +2014,7 @@ evdev_device_destroy(struct evdev_device *device)
 	filter_destroy(device->pointer.filter);
 	libinput_seat_unref(device->base.seat);
 	libevdev_free(device->evdev);
+	udev_device_unref(device->udev_device);
 	free(device->mt.slots);
-	free(device->devnode);
-	free(device->sysname);
-	free(device->syspath);
 	free(device);
 }
diff --git a/src/evdev.h b/src/evdev.h
index cc01b3ca..e4144ecb 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -68,11 +68,10 @@ struct evdev_device {
 
 	struct evdev_dispatch *dispatch;
 	struct libevdev *evdev;
+	struct udev_device *udev_device;
 	char *output_name;
-	char *devnode;
-	char *sysname;
-	char *syspath;
 	const char *devname;
+	bool was_removed;
 	int fd;
 	struct {
 		const struct input_absinfo *absinfo_x, *absinfo_y;
@@ -203,9 +202,7 @@ struct evdev_dispatch {
 
 struct evdev_device *
 evdev_device_create(struct libinput_seat *seat,
-		    const char *devnode,
-		    const char *sysname,
-		    const char *syspath);
+		    struct udev_device *device);
 
 int
 evdev_device_init_pointer_acceleration(struct evdev_device *device);
diff --git a/src/path.c b/src/path.c
index c0c33638..b04c015a 100644
--- a/src/path.c
+++ b/src/path.c
@@ -115,14 +115,10 @@ path_device_enable(struct path_input *input,
 {
 	struct path_seat *seat;
 	struct evdev_device *device = NULL;
-	char *sysname = NULL, *syspath = NULL;
 	char *seat_name = NULL, *seat_logical_name = NULL;
 	const char *seat_prop;
 	const char *devnode;
 
-	sysname = strdup(udev_device_get_sysname(udev_device));
-	syspath = strdup(udev_device_get_syspath(udev_device));
-
 	seat_prop = udev_device_get_property_value(udev_device, "ID_SEAT");
 	seat_name = strdup(seat_prop ? seat_prop : default_seat);
 
@@ -144,7 +140,7 @@ path_device_enable(struct path_input *input,
 		}
 	}
 
-	device = evdev_device_create(&seat->base, devnode, sysname, syspath);
+	device = evdev_device_create(&seat->base, udev_device);
 	libinput_seat_unref(&seat->base);
 
 	if (device == EVDEV_UNHANDLED_DEVICE) {
@@ -161,8 +157,6 @@ path_device_enable(struct path_input *input,
 	}
 
 out:
-	free(sysname);
-	free(syspath);
 	free(seat_name);
 	free(seat_logical_name);
 
@@ -313,8 +307,7 @@ libinput_path_remove_device(struct libinput_device *device)
 	}
 
 	list_for_each(dev, &input->path_list, link) {
-		const char *devnode = udev_device_get_devnode(dev->udev_device);
-		if (strcmp(evdev->devnode, devnode) == 0) {
+		if (dev->udev_device == evdev->udev_device) {
 			list_remove(&dev->link);
 			udev_device_unref(dev->udev_device);
 			free(dev);
diff --git a/src/udev-seat.c b/src/udev-seat.c
index f2be66e3..49c8f47e 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -46,8 +46,6 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
 {
 	struct evdev_device *device;
 	const char *devnode;
-	const char *sysname;
-	const char *syspath;
 	const char *device_seat, *seat_name, *output_name;
 	const char *calibration_values;
 	float calibration[6];
@@ -61,8 +59,6 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
 		return 0;
 
 	devnode = udev_device_get_devnode(udev_device);
-	sysname = udev_device_get_sysname(udev_device);
-	syspath = udev_device_get_syspath(udev_device);
 
 	/* Search for matching logical seat */
 	seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
@@ -79,7 +75,7 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
 			return -1;
 	}
 
-	device = evdev_device_create(&seat->base, devnode, sysname, syspath);
+	device = evdev_device_create(&seat->base, udev_device);
 	libinput_seat_unref(&seat->base);
 
 	if (device == EVDEV_UNHANDLED_DEVICE) {
@@ -123,18 +119,20 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
 static void
 device_removed(struct udev_device *udev_device, struct udev_input *input)
 {
-	const char *devnode;
 	struct evdev_device *device, *next;
 	struct udev_seat *seat;
+	const char *syspath;
 
-	devnode = udev_device_get_devnode(udev_device);
+	syspath = udev_device_get_syspath(udev_device);
 	list_for_each(seat, &input->base.seat_list, base.link) {
 		list_for_each_safe(device, next,
 				   &seat->base.devices_list, base.link) {
-			if (!strcmp(device->devnode, devnode)) {
+			if (!strcmp(syspath,
+				    udev_device_get_syspath(device->udev_device))) {
 				log_info(&input->base,
 					 "input device %s, %s removed\n",
-					 device->devname, device->devnode);
+					 device->devname,
+					 udev_device_get_devnode(device->udev_device));
 				evdev_device_remove(device);
 				break;
 			}

From 9f225f8ea5c014a02612d34455554eab546830ee Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 21 Nov 2014 16:18:57 +1000
Subject: [PATCH 096/121] evdev: remove a race condition opening the wrong
 device

Potential race condition:
- udev notifies us that a udev_device became available
- we go for a coffee and chat to the neighbours on the way
- the device is unplugged
- a new device is plugged in, gets the same devnode
- we finish our coffee and come back
- open(udev_device_get_devnode())
- new device is now opened as the old device

To avoid the above race, we compare the syspath of the device at the open fd
with the syspath of the device we originally wanted. If they differ, we fail.

evdev_compare_syspath was simply moved up.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 94bf3604..908a8bad 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1447,6 +1447,29 @@ evdev_notify_added_device(struct evdev_device *device)
 	notify_added_device(&device->base);
 }
 
+static int
+evdev_device_compare_syspath(struct udev_device *udev_device, int fd)
+{
+	struct udev *udev = udev_device_get_udev(udev_device);
+	struct udev_device *udev_device_new;
+	struct stat st;
+	int rc = 1;
+
+	if (fstat(fd, &st) < 0)
+		goto out;
+
+	udev_device_new = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
+	if (!udev_device_new)
+		goto out;
+
+	rc = strcmp(udev_device_get_syspath(udev_device_new),
+		    udev_device_get_syspath(udev_device));
+out:
+	if (udev_device_new)
+		udev_device_unref(udev_device_new);
+	return rc;
+}
+
 struct evdev_device *
 evdev_device_create(struct libinput_seat *seat,
 		    struct udev_device *udev_device)
@@ -1469,6 +1492,9 @@ evdev_device_create(struct libinput_seat *seat,
 		return NULL;
 	}
 
+	if (evdev_device_compare_syspath(udev_device, fd) != 0)
+		goto err;
+
 	device = zalloc(sizeof *device);
 	if (device == NULL)
 		goto err;
@@ -1907,29 +1933,6 @@ evdev_device_suspend(struct evdev_device *device)
 	return 0;
 }
 
-static int
-evdev_device_compare_syspath(struct udev_device *udev_device, int fd)
-{
-	struct udev *udev = udev_device_get_udev(udev_device);
-	struct udev_device *udev_device_new;
-	struct stat st;
-	int rc = 1;
-
-	if (fstat(fd, &st) < 0)
-		goto out;
-
-	udev_device_new = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
-	if (!udev_device_new)
-		goto out;
-
-	rc = strcmp(udev_device_get_syspath(udev_device_new),
-		    udev_device_get_syspath(udev_device));
-out:
-	if (udev_device_new)
-		udev_device_unref(udev_device_new);
-	return rc;
-}
-
 int
 evdev_device_resume(struct evdev_device *device)
 {

From 4c5e55a962119c6bc19373b76c5496b3320be99d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 14:12:16 +1000
Subject: [PATCH 097/121] udev: optionally pass the seat name into
 device_added()

Prep work for changing seat names on devices. No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/udev-seat.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/udev-seat.c b/src/udev-seat.c
index 49c8f47e..c69d175d 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -42,11 +42,13 @@ static struct udev_seat *
 udev_seat_get_named(struct udev_input *input, const char *seat_name);
 
 static int
-device_added(struct udev_device *udev_device, struct udev_input *input)
+device_added(struct udev_device *udev_device,
+	     struct udev_input *input,
+	     const char *seat_name)
 {
 	struct evdev_device *device;
 	const char *devnode;
-	const char *device_seat, *seat_name, *output_name;
+	const char *device_seat, *output_name;
 	const char *calibration_values;
 	float calibration[6];
 	struct udev_seat *seat;
@@ -61,7 +63,8 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
 	devnode = udev_device_get_devnode(udev_device);
 
 	/* Search for matching logical seat */
-	seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
+	if (!seat_name)
+		seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
 	if (!seat_name)
 		seat_name = default_seat_name;
 
@@ -161,7 +164,7 @@ udev_input_add_devices(struct udev_input *input, struct udev *udev)
 			continue;
 		}
 
-		if (device_added(device, input) < 0) {
+		if (device_added(device, input, NULL) < 0) {
 			udev_device_unref(device);
 			udev_enumerate_unref(e);
 			return -1;
@@ -193,7 +196,7 @@ evdev_udev_handler(void *data)
 		goto out;
 
 	if (!strcmp(action, "add"))
-		device_added(udev_device, input);
+		device_added(udev_device, input, NULL);
 	else if (!strcmp(action, "remove"))
 		device_removed(udev_device, input);
 

From ff2b0cb84b6968e9772c92180b947ba80187f9fe Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 14:16:48 +1000
Subject: [PATCH 098/121] path: optionally pass the seat name into
 path_device_enable()

Prep work for changing seat names on devices. No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/path.c | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/path.c b/src/path.c
index b04c015a..11b736cf 100644
--- a/src/path.c
+++ b/src/path.c
@@ -111,7 +111,8 @@ path_seat_get_named(struct path_input *input,
 
 static struct libinput_device *
 path_device_enable(struct path_input *input,
-		   struct udev_device *udev_device)
+		   struct udev_device *udev_device,
+		   const char *seat_logical_name_override)
 {
 	struct path_seat *seat;
 	struct evdev_device *device = NULL;
@@ -119,12 +120,24 @@ path_device_enable(struct path_input *input,
 	const char *seat_prop;
 	const char *devnode;
 
+	devnode = udev_device_get_devnode(udev_device);
+
 	seat_prop = udev_device_get_property_value(udev_device, "ID_SEAT");
 	seat_name = strdup(seat_prop ? seat_prop : default_seat);
 
-	seat_prop = udev_device_get_property_value(udev_device, "WL_SEAT");
-	seat_logical_name = strdup(seat_prop ? seat_prop : default_seat_name);
-	devnode = udev_device_get_devnode(udev_device);
+	if (seat_logical_name_override) {
+		seat_logical_name = strdup(seat_logical_name_override);
+	} else {
+		seat_prop = udev_device_get_property_value(udev_device, "WL_SEAT");
+		seat_logical_name = strdup(seat_prop ? seat_prop : default_seat_name);
+	}
+
+	if (!seat_logical_name) {
+		log_error(&input->base,
+			  "failed to create seat name for device '%s'.\n",
+			  devnode);
+		goto out;
+	}
 
 	seat = path_seat_get_named(input, seat_name, seat_logical_name);
 
@@ -170,7 +183,7 @@ path_input_enable(struct libinput *libinput)
 	struct path_device *dev;
 
 	list_for_each(dev, &input->path_list, link) {
-		if (path_device_enable(input, dev->udev_device) == NULL) {
+		if (path_device_enable(input, dev->udev_device, NULL) == NULL) {
 			path_input_disable(libinput);
 			return -1;
 		}
@@ -196,7 +209,8 @@ path_input_destroy(struct libinput *input)
 
 static struct libinput_device *
 path_create_device(struct libinput *libinput,
-		   struct udev_device *udev_device)
+		   struct udev_device *udev_device,
+		   const char *seat_name)
 {
 	struct path_input *input = (struct path_input*)libinput;
 	struct path_device *dev;
@@ -210,7 +224,7 @@ path_create_device(struct libinput *libinput,
 
 	list_insert(&input->path_list, &dev->link);
 
-	device = path_device_enable(input, udev_device);
+	device = path_device_enable(input, udev_device, seat_name);
 
 	if (!device) {
 		udev_device_unref(dev->udev_device);
@@ -287,7 +301,7 @@ libinput_path_add_device(struct libinput *libinput,
 		return NULL;
 	}
 
-	device = path_create_device(libinput, udev_device);
+	device = path_create_device(libinput, udev_device, NULL);
 	udev_device_unref(udev_device);
 	return device;
 }

From d546c284c87796ca816b208103b9ef5c33a6099d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 13:43:59 +1000
Subject: [PATCH 099/121] Add libinput_device_set_seat_logical_name() to change
 seats at runtime

The seat of a device is currently immutable, but a device may (in a
multi-pointer case) move between different logical seats. Moving it between
seats is akin to removing it and re-plugging it, so let's do exactly that.

The physical seat name stays immutable.

Pro:
- device handling after changing a seat remains identical as handling any
  other device.
Con:
- tracking a device across seat changes is difficult
- this is not an atomic operation, if re-adding the device fails it stays
  removed from the original seat and is now dead

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/libinput-private.h |  2 ++
 src/libinput.c         | 13 +++++++++++++
 src/libinput.h         | 26 ++++++++++++++++++++++++++
 src/path.c             | 20 ++++++++++++++++++++
 src/udev-seat.c        | 19 +++++++++++++++++++
 5 files changed, 80 insertions(+)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 29d3a073..4a9bd540 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -36,6 +36,8 @@ struct libinput_interface_backend {
 	int (*resume)(struct libinput *libinput);
 	void (*suspend)(struct libinput *libinput);
 	void (*destroy)(struct libinput *libinput);
+	int (*device_change_seat)(struct libinput_device *device,
+				  const char *seat_name);
 };
 
 struct libinput {
diff --git a/src/libinput.c b/src/libinput.c
index aa12bfc8..c318eeec 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1213,6 +1213,19 @@ libinput_device_get_seat(struct libinput_device *device)
 	return device->seat;
 }
 
+LIBINPUT_EXPORT int
+libinput_device_set_seat_logical_name(struct libinput_device *device,
+				      const char *name)
+{
+	struct libinput *libinput = device->seat->libinput;
+
+	if (name == NULL)
+		return -1;
+
+	return libinput->interface_backend->device_change_seat(device,
+							       name);
+}
+
 LIBINPUT_EXPORT void
 libinput_device_led_update(struct libinput_device *device,
 			   enum libinput_led leds)
diff --git a/src/libinput.h b/src/libinput.h
index 01ded185..26d94ff4 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1370,6 +1370,32 @@ libinput_device_get_output_name(struct libinput_device *device);
 struct libinput_seat *
 libinput_device_get_seat(struct libinput_device *device);
 
+/**
+ * @ingroup device
+ *
+ * Change the logical seat associated with this device by removing the
+ * device and adding it to the new seat.
+ *
+ * This command is identical to physically unplugging the device, then
+ * re-plugging it as member of the new seat,
+ * @ref LIBINPUT_EVENT_DEVICE_REMOVED and @ref LIBINPUT_EVENT_DEVICE_ADDED
+ * events are sent accordingly. Those events mark the end of the lifetime
+ * of this device and the start of a new device.
+ *
+ * If the logical seat name already exists in the device's physical seat,
+ * the device is added to this seat. Otherwise, a new seat is created.
+ *
+ * @note This change applies to this device until removal or @ref
+ * libinput_suspend(), whichever happens earlier.
+ *
+ * @param device A previously obtained device
+ * @param name The new logical seat name
+ * @return 0 on success, non-zero on error
+ */
+int
+libinput_device_set_seat_logical_name(struct libinput_device *device,
+				      const char *name);
+
 /**
  * @ingroup device
  *
diff --git a/src/path.c b/src/path.c
index 11b736cf..dd70efc6 100644
--- a/src/path.c
+++ b/src/path.c
@@ -235,10 +235,30 @@ path_create_device(struct libinput *libinput,
 	return device;
 }
 
+static int
+path_device_change_seat(struct libinput_device *device,
+			const char *seat_name)
+{
+	struct libinput *libinput = device->seat->libinput;
+	struct evdev_device *evdev_device = (struct evdev_device *)device;
+	struct udev_device *udev_device = NULL;
+	int rc = -1;
+
+	udev_device = evdev_device->udev_device;
+	udev_device_ref(udev_device);
+	libinput_path_remove_device(device);
+
+	if (path_create_device(libinput, udev_device, seat_name) != NULL)
+		rc = 0;
+	udev_device_unref(udev_device);
+	return rc;
+}
+
 static const struct libinput_interface_backend interface_backend = {
 	.resume = path_input_enable,
 	.suspend = path_input_disable,
 	.destroy = path_input_destroy,
+	.device_change_seat = path_device_change_seat,
 };
 
 LIBINPUT_EXPORT struct libinput *
diff --git a/src/udev-seat.c b/src/udev-seat.c
index c69d175d..f7a3df34 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -332,10 +332,29 @@ udev_seat_get_named(struct udev_input *input, const char *seat_name)
 	return NULL;
 }
 
+static int
+udev_device_change_seat(struct libinput_device *device,
+			const char *seat_name)
+{
+	struct libinput *libinput = device->seat->libinput;
+	struct udev_input *input = (struct udev_input *)libinput;
+	struct evdev_device *evdev_device = (struct evdev_device *)device;
+	struct udev_device *udev_device = evdev_device->udev_device;
+	int rc;
+
+	udev_device_ref(udev_device);
+	device_removed(udev_device, input);
+	rc = device_added(udev_device, input, seat_name);
+	udev_device_unref(udev_device);
+
+	return rc;
+}
+
 static const struct libinput_interface_backend interface_backend = {
 	.resume = udev_input_enable,
 	.suspend = udev_input_disable,
 	.destroy = udev_input_destroy,
+	.device_change_seat = udev_device_change_seat,
 };
 
 LIBINPUT_EXPORT struct libinput *

From 348cff570194e0852794cab7b673447709311fcc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 19 Nov 2014 15:42:54 +1000
Subject: [PATCH 100/121] test: add seat changing tests

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 test/path.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-
 test/udev.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 147 insertions(+), 2 deletions(-)

diff --git a/test/path.c b/test/path.c
index ecb78397..3a2bf2f8 100644
--- a/test/path.c
+++ b/test/path.c
@@ -162,6 +162,74 @@ START_TEST(path_added_seat)
 }
 END_TEST
 
+START_TEST(path_seat_change)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_event *event;
+	struct libinput_device *device;
+	struct libinput_seat *seat1, *seat2;
+	const char *seat1_name;
+	const char *seat2_name = "new seat";
+	int rc;
+
+	libinput_dispatch(li);
+
+	event = libinput_get_event(li);
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_DEVICE_ADDED);
+
+	device = libinput_event_get_device(event);
+	libinput_device_ref(device);
+
+	seat1 = libinput_device_get_seat(device);
+	libinput_seat_ref(seat1);
+
+	seat1_name = libinput_seat_get_logical_name(seat1);
+	libinput_event_destroy(event);
+
+	litest_drain_events(li);
+
+	rc = libinput_device_set_seat_logical_name(device,
+						   seat2_name);
+	ck_assert_int_eq(rc, 0);
+
+	libinput_dispatch(li);
+
+	event = libinput_get_event(li);
+	ck_assert(event != NULL);
+
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_DEVICE_REMOVED);
+
+	ck_assert(libinput_event_get_device(event) == device);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	ck_assert(event != NULL);
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_DEVICE_ADDED);
+	ck_assert(libinput_event_get_device(event) != device);
+	libinput_device_unref(device);
+
+	device = libinput_event_get_device(event);
+	seat2 = libinput_device_get_seat(device);
+
+	ck_assert_str_ne(libinput_seat_get_logical_name(seat2),
+			 seat1_name);
+	ck_assert_str_eq(libinput_seat_get_logical_name(seat2),
+			 seat2_name);
+	libinput_event_destroy(event);
+
+	libinput_seat_unref(seat1);
+
+	/* litest: swap the new device in, so cleanup works */
+	libinput_device_unref(dev->libinput_device);
+	libinput_device_ref(device);
+	dev->libinput_device = device;
+}
+END_TEST
+
 START_TEST(path_added_device)
 {
 	struct litest_device *dev = litest_current_device();
@@ -805,7 +873,8 @@ main(int argc, char **argv)
 	litest_add_no_device("path:suspend", path_add_device_suspend_resume);
 	litest_add_no_device("path:suspend", path_add_device_suspend_resume_fail);
 	litest_add_no_device("path:suspend", path_add_device_suspend_resume_remove_device);
-	litest_add_for_device("path:seat events", path_added_seat, LITEST_SYNAPTICS_CLICKPAD);
+	litest_add_for_device("path:seat", path_added_seat, LITEST_SYNAPTICS_CLICKPAD);
+	litest_add_for_device("path:seat", path_seat_change, LITEST_SYNAPTICS_CLICKPAD);
 	litest_add("path:device events", path_added_device, LITEST_ANY, LITEST_ANY);
 	litest_add("path:device events", path_device_sysname, LITEST_ANY, LITEST_ANY);
 	litest_add_for_device("path:device events", path_add_device, LITEST_SYNAPTICS_CLICKPAD);
diff --git a/test/udev.c b/test/udev.c
index 95206635..f5d2c883 100644
--- a/test/udev.c
+++ b/test/udev.c
@@ -175,6 +175,81 @@ START_TEST(udev_added_seat_default)
 }
 END_TEST
 
+/**
+ * This test only works if there's at least one device in the system that is
+ * assigned the default seat. Should cover the 99% case.
+ */
+START_TEST(udev_change_seat)
+{
+	struct libinput *li;
+	struct udev *udev;
+	struct libinput_event *event;
+	struct libinput_device *device;
+	struct libinput_seat *seat1, *seat2;
+	const char *seat1_name;
+	const char *seat2_name = "new seat";
+	int rc;
+
+	udev = udev_new();
+	ck_assert(udev != NULL);
+
+	li = libinput_udev_create_context(&simple_interface, NULL, udev);
+	ck_assert(li != NULL);
+	ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0);
+	libinput_dispatch(li);
+
+	event = libinput_get_event(li);
+	ck_assert(event != NULL);
+
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_DEVICE_ADDED);
+
+	device = libinput_event_get_device(event);
+	libinput_device_ref(device);
+
+	seat1 = libinput_device_get_seat(device);
+	libinput_seat_ref(seat1);
+
+	seat1_name = libinput_seat_get_logical_name(seat1);
+	libinput_event_destroy(event);
+
+	litest_drain_events(li);
+
+	rc = libinput_device_set_seat_logical_name(device,
+						   seat2_name);
+	ck_assert_int_eq(rc, 0);
+
+	libinput_dispatch(li);
+
+	event = libinput_get_event(li);
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_DEVICE_REMOVED);
+
+	ck_assert(libinput_event_get_device(event) == device);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	ck_assert_int_eq(libinput_event_get_type(event),
+			 LIBINPUT_EVENT_DEVICE_ADDED);
+	ck_assert(libinput_event_get_device(event) != device);
+	libinput_device_unref(device);
+
+	device = libinput_event_get_device(event);
+	seat2 = libinput_device_get_seat(device);
+
+	ck_assert_str_ne(libinput_seat_get_logical_name(seat2),
+			 seat1_name);
+	ck_assert_str_eq(libinput_seat_get_logical_name(seat2),
+			 seat2_name);
+	libinput_event_destroy(event);
+
+	libinput_seat_unref(seat1);
+
+	libinput_unref(li);
+	udev_unref(udev);
+}
+END_TEST
+
 START_TEST(udev_double_suspend)
 {
 	struct libinput *li;
@@ -414,7 +489,8 @@ main(int argc, char **argv)
 	litest_add_no_device("udev:create", udev_create_seat0);
 	litest_add_no_device("udev:create", udev_create_empty_seat);
 
-	litest_add_no_device("udev:seat events", udev_added_seat_default);
+	litest_add_no_device("udev:seat", udev_added_seat_default);
+	litest_add_no_device("udev:seat", udev_change_seat);
 
 	litest_add_for_device("udev:suspend", udev_double_suspend, LITEST_SYNAPTICS_CLICKPAD);
 	litest_add_for_device("udev:suspend", udev_double_resume, LITEST_SYNAPTICS_CLICKPAD);

From 26080263e6ee7c3cd179a395fd6de1c224aba036 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 24 Nov 2014 12:16:04 +0100
Subject: [PATCH 101/121] touchpad: Move 2 finger scrolling functions to above
 tp_process_state()

This is purely a code move, this is a preparation patch for adding edge
scrolling support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 118 ++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index c3d1d9ef..7a1c32d0 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -398,6 +398,65 @@ tp_palm_detect(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
 	t->palm.y = t->y;
 }
 
+static void
+tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
+{
+	struct tp_touch *t;
+	int nchanged = 0;
+	double dx = 0, dy =0;
+	double tmpx, tmpy;
+
+	tp_for_each_touch(tp, t) {
+		if (tp_touch_active(tp, t) && t->dirty) {
+			nchanged++;
+			tp_get_delta(t, &tmpx, &tmpy);
+
+			dx += tmpx;
+			dy += tmpy;
+		}
+		/* Stop spurious MOTION events at the end of scrolling */
+		t->is_pointer = false;
+	}
+
+	if (nchanged == 0)
+		return;
+
+	dx /= nchanged;
+	dy /= nchanged;
+
+	tp_filter_motion(tp, &dx, &dy, time);
+
+	evdev_post_scroll(tp->device, time, dx, dy);
+}
+
+static int
+tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
+{
+	struct tp_touch *t;
+	int nfingers_down = 0;
+
+	if (tp->scroll.method != LIBINPUT_CONFIG_SCROLL_2FG)
+		return 0;
+
+	/* No scrolling during tap-n-drag */
+	if (tp_tap_dragging(tp))
+		return 0;
+
+	/* Only count active touches for 2 finger scrolling */
+	tp_for_each_touch(tp, t) {
+		if (tp_touch_active(tp, t))
+			nfingers_down++;
+	}
+
+	if (nfingers_down != 2) {
+		evdev_stop_scroll(tp->device, time);
+		return 0;
+	}
+
+	tp_post_twofinger_scroll(tp, time);
+	return 1;
+}
+
 static void
 tp_process_state(struct tp_dispatch *tp, uint64_t time)
 {
@@ -466,65 +525,6 @@ tp_post_process_state(struct tp_dispatch *tp, uint64_t time)
 	tp->queued = TOUCHPAD_EVENT_NONE;
 }
 
-static void
-tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
-{
-	struct tp_touch *t;
-	int nchanged = 0;
-	double dx = 0, dy =0;
-	double tmpx, tmpy;
-
-	tp_for_each_touch(tp, t) {
-		if (tp_touch_active(tp, t) && t->dirty) {
-			nchanged++;
-			tp_get_delta(t, &tmpx, &tmpy);
-
-			dx += tmpx;
-			dy += tmpy;
-		}
-		/* Stop spurious MOTION events at the end of scrolling */
-		t->is_pointer = false;
-	}
-
-	if (nchanged == 0)
-		return;
-
-	dx /= nchanged;
-	dy /= nchanged;
-
-	tp_filter_motion(tp, &dx, &dy, time);
-
-	evdev_post_scroll(tp->device, time, dx, dy);
-}
-
-static int
-tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
-{
-	struct tp_touch *t;
-	int nfingers_down = 0;
-
-	if (tp->scroll.method != LIBINPUT_CONFIG_SCROLL_2FG)
-		return 0;
-
-	/* No scrolling during tap-n-drag */
-	if (tp_tap_dragging(tp))
-		return 0;
-
-	/* Only count active touches for 2 finger scrolling */
-	tp_for_each_touch(tp, t) {
-		if (tp_touch_active(tp, t))
-			nfingers_down++;
-	}
-
-	if (nfingers_down != 2) {
-		evdev_stop_scroll(tp->device, time);
-		return 0;
-	}
-
-	tp_post_twofinger_scroll(tp, time);
-	return 1;
-}
-
 static void
 tp_post_events(struct tp_dispatch *tp, uint64_t time)
 {

From 8b6572bfae15c19fdb9ea0121ed6f397bb3ffead Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 24 Nov 2014 12:16:05 +0100
Subject: [PATCH 102/121] touchpad: Add code to get the touchpad model /
 manufacturer

This is useful to know in some cases, it is e.g. necessary to figure out
which percentage of a touchpads range to use as edge for edge-scrolling.

Note this is a slightly cleaned up copy of the same code in
xf86-input-synaptics.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 36 ++++++++++++++++++++++++++++++++++++
 src/evdev-mt-touchpad.h | 10 ++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 7a1c32d0..6d4b5835 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1146,6 +1146,40 @@ tp_change_to_left_handed(struct evdev_device *device)
 	device->buttons.left_handed = device->buttons.want_left_handed;
 }
 
+struct model_lookup_t {
+	uint16_t vendor;
+	uint16_t product_start;
+	uint16_t product_end;
+	enum touchpad_model model;
+};
+
+static struct model_lookup_t model_lookup_table[] = {
+	{ 0x0002, 0x0007, 0x0007, MODEL_SYNAPTICS },
+	{ 0x0002, 0x0008, 0x0008, MODEL_ALPS },
+	{ 0x0002, 0x000e, 0x000e, MODEL_ELANTECH },
+	{ 0x05ac,      0, 0x0222, MODEL_APPLETOUCH },
+	{ 0x05ac, 0x0223, 0x0228, MODEL_UNIBODY_MACBOOK },
+	{ 0x05ac, 0x0229, 0x022b, MODEL_APPLETOUCH },
+	{ 0x05ac, 0x022c, 0xffff, MODEL_UNIBODY_MACBOOK },
+	{ 0, 0, 0, 0 }
+};
+
+static enum touchpad_model
+tp_get_model(struct evdev_device *device)
+{
+	struct model_lookup_t *lookup;
+	uint16_t vendor  = libevdev_get_id_vendor(device->evdev);
+	uint16_t product = libevdev_get_id_product(device->evdev);
+
+	for (lookup = model_lookup_table; lookup->vendor; lookup++) {
+		if (lookup->vendor == vendor &&
+		    lookup->product_start <= product &&
+		    product <= lookup->product_end)
+			return lookup->model;
+	}
+	return MODEL_UNKNOWN;
+}
+
 struct evdev_dispatch *
 evdev_mt_touchpad_create(struct evdev_device *device)
 {
@@ -1155,6 +1189,8 @@ evdev_mt_touchpad_create(struct evdev_device *device)
 	if (!tp)
 		return NULL;
 
+	tp->model = tp_get_model(device);
+
 	if (tp_init(tp, device) != 0) {
 		tp_destroy(&tp->base);
 		return NULL;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 11c4d495..7f3ce493 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -42,6 +42,15 @@ enum touchpad_event {
 	TOUCHPAD_EVENT_BUTTON_RELEASE	= (1 << 2),
 };
 
+enum touchpad_model {
+	MODEL_UNKNOWN = 0,
+	MODEL_SYNAPTICS,
+	MODEL_ALPS,
+	MODEL_APPLETOUCH,
+	MODEL_ELANTECH,
+	MODEL_UNIBODY_MACBOOK
+};
+
 enum touch_state {
 	TOUCH_NONE = 0,
 	TOUCH_BEGIN,
@@ -156,6 +165,7 @@ struct tp_dispatch {
 	unsigned int slot;			/* current slot */
 	bool has_mt;
 	bool semi_mt;
+	enum touchpad_model model;
 
 	unsigned int real_touches;		/* number of slots */
 	unsigned int ntouches;			/* no slots inc. fakes */

From 6a4ceed2b91f5bbd28991d61615b17dc4a707fe3 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 24 Nov 2014 12:16:06 +0100
Subject: [PATCH 103/121] touchpad: Add edge-scrolling support

Add edge-scrolling support for non multi-touch touchpads as well as for
users who prefer edge-scrolling (as long as they don't have a clickpad).

Note the percentage to use of the width / height as scroll-edge differs from
one manufacturer to the next, the various per model percentages were taken
from xf86-input-synaptics.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=85635
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 doc/touchpad-edge-scrolling-state-machine.svg | 262 ++++++++++++
 src/Makefile.am                               |   1 +
 src/evdev-mt-touchpad-edge-scroll.c           | 374 ++++++++++++++++++
 src/evdev-mt-touchpad.c                       |  95 ++++-
 src/evdev-mt-touchpad.h                       |  46 +++
 5 files changed, 767 insertions(+), 11 deletions(-)
 create mode 100644 doc/touchpad-edge-scrolling-state-machine.svg
 create mode 100644 src/evdev-mt-touchpad-edge-scroll.c

diff --git a/doc/touchpad-edge-scrolling-state-machine.svg b/doc/touchpad-edge-scrolling-state-machine.svg
new file mode 100644
index 00000000..7a82d88c
--- /dev/null
+++ b/doc/touchpad-edge-scrolling-state-machine.svg
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1490px" height="1399px" version="1.1">
+  <defs/>
+  <g transform="translate(0.5,0.5)">
+    <ellipse cx="261" cy="143" rx="63" ry="45.5" fill="#ccccff" stroke="#000000" stroke-width="2" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="261" y="126">NONE</text>
+      <text x="261" y="140">on-entry:</text>
+      <text x="261" y="154">edge = none</text>
+      <text x="261" y="168">threshold = def</text>
+    </g>
+    <rect x="30" y="386" width="150" height="101" rx="6" ry="6" fill="#ccffcc" stroke="#000000" stroke-width="2" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="105" y="419">EDGE_NEW</text>
+      <text x="105" y="433">on-entry:</text>
+      <text x="105" y="447">edge = get_edge()</text>
+      <text x="105" y="461">set_timer()</text>
+    </g>
+    <rect x="348" y="386" width="130" height="100" rx="6" ry="6" fill="#ccffcc" stroke="#000000" stroke-width="2" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="413" y="419">AREA</text>
+      <text x="413" y="433">on-entry:</text>
+      <text x="413" y="447">edge = none</text>
+      <text x="413" y="461">set_pointer()</text>
+    </g>
+    <path d="M 237 7 C 239 4 243 2 246 2 L 275 2 C 278 2 282 4 284 7 L 301 30 C 301 31 301 33 301 34 L 284 57 C 282 60 278 62 275 62 L 246 62 C 243 62 239 60 237 57 L 220 34 C 220 33 220 31 220 30 L 237 7 Z" fill="#ffd966" stroke="#000000" stroke-width="2" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="261" y="36">release</text>
+    </g>
+    <path d="M 237 222 C 239 219 243 217 246 217 L 276 217 C 279 217 283 219 285 222 L 303 245 C 303 246 303 248 303 249 L 285 272 C 283 275 279 277 276 277 L 246 277 C 243 277 239 275 237 272 L 219 249 C 219 248 219 246 219 245 L 237 222 Z" fill="#ffd966" stroke="#000000" stroke-width="2" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="261" y="251">touch</text>
+    </g>
+    <path d="M 261 188 L 261 211" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 261 216 L 258 209 L 261 211 L 265 209 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 218 535 C 223 531 229 528 235 528 L 285 528 C 291 528 297 531 302 535 L 331 570 C 332 571 332 574 331 575 L 302 610 C 297 614 291 617 285 617 L 235 617 C 229 617 223 614 218 610 L 189 575 C 188 574 188 571 189 570 L 218 535 Z" fill="#ffd966" stroke="#000000" stroke-width="2" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="260" y="563">touch,</text>
+      <text x="260" y="577">edge &amp;= get_edge()</text>
+    </g>
+    <path d="M 220 526 L 158 487" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 224 529 L 217 528 L 220 526 L 220 522 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 105 617 L 105 650" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 105 656 L 101 649 L 105 650 L 108 649 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 478 436 L 498 436 Q 508 436 508 426 L 508 42 Q 508 32 498 32 L 307 32" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 302 32 L 309 29 L 307 32 L 309 36 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 261 62 L 261 71 Q 261 80 261 85 L 261 91" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 261 96 L 257 89 L 261 91 L 264 89 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <ellipse cx="1133" cy="67" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <path d="M 1133 82 L 1133 110 Q 1133 120 1133 130 L 1133 155" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 147 L 1133 156 L 1138 147" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <rect x="1083" y="12" width="100" height="40" fill="none" stroke="none" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1133" y="36">tp_edge_scroll_post_events()</text>
+    </g>
+    <path d="M 1133 212 L 1193 242 L 1133 272 L 1073 242 Z" fill="#ffffc0" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1133" y="246">dirty?</text>
+    </g>
+    <path d="M 1193 242 L 1278 242 Q 1288 242 1298 242 L 1456 242" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1448 247 L 1457 242 L 1448 238" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1225" y="223" width="18" height="18" stroke-width="0"/>
+      <text x="1226" y="236">no</text>
+    </g>
+    <path d="M 1133 272 L 1133 285 Q 1133 295 1133 305 L 1133 316" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 308 L 1133 317 L 1138 308" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1150" y="292" width="24" height="18" stroke-width="0"/>
+      <text x="1150" y="302">yes</text>
+    </g>
+    <ellipse cx="1473" cy="242" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1473" cy="242" rx="15" ry="15" fill="transparent" stroke="#ff0000" pointer-events="none"/>
+    <rect x="1033" y="97" width="200" height="70" rx="28" ry="28" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1133" y="115">current = buttons.state &amp; 0x01</text>
+      <text x="1133" y="129">old = buttons.old_state &amp; 0x01</text>
+      <text x="1133" y="143">button = 0</text>
+      <text x="1133" y="157">is_top = 0</text>
+    </g>
+    <path d="M 1133 167 L 1133 180 Q 1133 190 1133 200 L 1133 210" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 202 L 1133 211 L 1138 202" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <rect x="1237" y="436" width="188" height="50" rx="20" ry="20" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1331" y="458">notify_axis(last_axis, 0.0)</text>
+      <text x="1331" y="472">last_axis = -1</text>
+    </g>
+    <path d="M 1134 516 L 1194 552 L 1134 587 L 1073 552 Z" fill="#ffffc0" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1134" y="556">edge == right</text>
+    </g>
+    <path d="M 1194 552 L 1268 552 Q 1278 552 1278 553 L 1278 554 Q 1278 554 1268 554 L 1250 554" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1258 550 L 1249 554 L 1258 559" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1202" y="559" width="24" height="18" stroke-width="0"/>
+      <text x="1203" y="569">yes</text>
+    </g>
+    <rect x="1248" y="534" width="160" height="40" rx="16" ry="16" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1328" y="551">axis = scroll_vertical</text>
+      <text x="1328" y="565">delta = dy</text>
+    </g>
+    <path d="M 1408 554 L 1468 554 Q 1478 554 1478 564 L 1478 952 Q 1478 962 1468 962 L 1233 962" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1241 958 L 1232 962 L 1241 967" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1133 318 L 1196 352 L 1133 387 L 1071 352 Z" fill="#ffffc0" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1133" y="356">edge == none</text>
+    </g>
+    <path d="M 1134 386 L 1134 441 Q 1134 451 1134 461 L 1134 514" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 506 L 1134 515 L 1138 506" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1135" y="449" width="18" height="18" stroke-width="0"/>
+      <text x="1136" y="458">no</text>
+    </g>
+    <path d="M 1133 657 L 1194 692 L 1133 727 L 1072 692 Z" fill="#ffffc0" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1133" y="696">edge == bottom</text>
+    </g>
+    <path d="M 1194 692 L 1208 692 Q 1218 692 1228 692 L 1249 692" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1241 697 L 1250 692 L 1241 688" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1213" y="700" width="24" height="18" stroke-width="0"/>
+      <text x="1214" y="709">yes</text>
+    </g>
+    <path d="M 1134 587 L 1133 587 Q 1133 587 1133 597 L 1133 647 Q 1133 657 1133 656 L 1133 655" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 647 L 1133 656 L 1138 647" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1135" y="607" width="18" height="18" stroke-width="0"/>
+      <text x="1135" y="621">no</text>
+    </g>
+    <rect x="1251" y="672" width="160" height="40" rx="16" ry="16" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1331" y="689">axis = scroll_horizontal</text>
+      <text x="1331" y="703">delta = dx</text>
+    </g>
+    <path d="M 1133 727 L 1133 727 Q 1134 727 1134 737 L 1134 807 Q 1134 817 1134 816 L 1134 815" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 807 L 1134 816 L 1138 807" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1135" y="756" width="18" height="18" stroke-width="0"/>
+      <text x="1136" y="770">no</text>
+    </g>
+    <rect x="1036" y="917" width="195" height="90" rx="36" ry="36" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1134" y="966">get_delta()</text>
+    </g>
+    <path d="M 1134 1007 L 1134 1037 Q 1134 1047 1134 1057 L 1134 1070" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 1062 L 1134 1071 L 1138 1062" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1411 692 L 1468 692 Q 1478 692 1478 702 L 1478 952 Q 1478 962 1468 962 L 1233 962" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1241 958 L 1232 962 L 1241 967" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <rect x="1031" y="1197" width="205" height="90" rx="36" ry="36" fill="#ffffc0" stroke="#ff0000" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1134" y="1232">notify_axis(axis, delta)</text>
+      <text x="1134" y="1246">last_axis = axis</text>
+      <text x="1134" y="1260">emit(scroll_event_posted)</text>
+    </g>
+    <path d="M 1134 1072 L 1200 1107 L 1134 1142 L 1067 1107 Z" fill="#ffffc0" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1134" y="1111">delta &lt; threshold</text>
+    </g>
+    <path d="M 1200 1107 L 1318 1107 Q 1328 1107 1338 1107 L 1456 1107" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1448 1112 L 1457 1107 L 1448 1103" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1259" y="1118" width="24" height="18" stroke-width="0"/>
+      <text x="1260" y="1131">yes</text>
+    </g>
+    <path d="M 1134 1142 L 1134 1160 Q 1134 1170 1134 1180 L 1134 1195" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1129 1187 L 1134 1196 L 1138 1187" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1135" y="1150" width="18" height="18" stroke-width="0"/>
+      <text x="1136" y="1159">no</text>
+    </g>
+    <ellipse cx="1473" cy="1107" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1473" cy="1107" rx="15" ry="15" fill="transparent" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1473" cy="352" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1473" cy="352" rx="15" ry="15" fill="transparent" stroke="#ff0000" pointer-events="none"/>
+    <path d="M 1331 318 L 1394 352 L 1331 387 L 1269 352 Z" fill="#ffffc0" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="1331" y="356">last_axis != -1</text>
+    </g>
+    <rect x="30" y="657" width="150" height="101" rx="6" ry="6" fill="#ccffcc" stroke="#000000" stroke-width="2" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="105" y="697">EDGE</text>
+      <text x="105" y="711">on-entry:</text>
+      <text x="105" y="725">threshold = 0.01</text>
+    </g>
+    <path d="M 30 707 L 18 707 Q 8 707 8 697 L 8 42 Q 8 32 18 32 L 214 32" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 219 32 L 212 36 L 214 32 L 212 29 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 30 436 L 18 436 Q 8 436 8 426 L 8 42 Q 8 32 18 32 L 214 32" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 219 32 L 212 36 L 214 32 L 212 29 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 64 535 C 68 531 74 528 80 528 L 130 528 C 136 528 142 531 146 535 L 175 570 C 176 571 176 574 175 575 L 146 610 C 142 614 136 617 130 617 L 80 617 C 74 617 68 614 64 610 L 35 575 C 34 574 34 571 35 570 L 64 535 Z" fill="#ffd966" stroke="#000000" stroke-width="2" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="105" y="563">timeout ||</text>
+      <text x="105" y="577">scroll_event_posted</text>
+    </g>
+    <path d="M 105 487 L 105 522" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 105 527 L 102 520 L 105 522 L 109 520 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 260 528 L 261 472" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 261 467 L 264 474 L 261 472 L 257 474 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1196 352 L 1222 352 Q 1232 352 1242 352 L 1266 352" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1258 357 L 1267 352 L 1258 348" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1224" y="360" width="24" height="18" stroke-width="0"/>
+      <text x="1224" y="369">yes</text>
+    </g>
+    <path d="M 1331 387 L 1331 401 Q 1331 411 1331 421 L 1331 434" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1327 426 L 1331 435 L 1336 426" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1333" y="394" width="24" height="18" stroke-width="0"/>
+      <text x="1333" y="403">yes</text>
+    </g>
+    <path d="M 1394 352 L 1408 352 Q 1418 352 1428 352 L 1456 352" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1448 357 L 1457 352 L 1448 348" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="1417" y="360" width="18" height="18" stroke-width="0"/>
+      <text x="1418" y="369">no</text>
+    </g>
+    <ellipse cx="1473" cy="461" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1473" cy="461" rx="15" ry="15" fill="transparent" stroke="#ff0000" pointer-events="none"/>
+    <path d="M 1425 461 L 1438 461 Q 1448 461 1452 461 L 1456 461" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1448 466 L 1457 461 L 1448 457" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <ellipse cx="1134" cy="832" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1134" cy="832" rx="15" ry="15" fill="transparent" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1134" cy="1382" rx="11" ry="11" fill="#000000" stroke="#ff0000" pointer-events="none"/>
+    <ellipse cx="1134" cy="1382" rx="15" ry="15" fill="transparent" stroke="#ff0000" pointer-events="none"/>
+    <path d="M 1134 1287 L 1134 1365" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 1130 1359 L 1134 1366 L 1137 1359" fill="none" stroke="#ff0000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 261 277 L 261 299" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 261 304 L 258 297 L 261 299 L 265 297 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 208 337 L 115 337 Q 105 337 105 347 L 105 376 Q 105 386 105 382 L 105 378" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 105 385 L 100 376 L 105 378 L 109 376 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="174" y="345" width="24" height="18" stroke-width="0"/>
+      <text x="175" y="354">yes</text>
+    </g>
+    <path d="M 314 337 L 403 337 Q 413 337 413 347 L 413 376 Q 413 386 413 382 L 413 378" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 413 385 L 408 376 L 413 378 L 417 376 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="350" y="345" width="18" height="18" stroke-width="0"/>
+      <text x="350" y="354">no</text>
+    </g>
+    <path d="M 261 305 L 314 337 L 261 369 L 208 337 Z" fill="#ffd966" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="261" y="341">get_edge()</text>
+    </g>
+    <path d="M 261 406 L 309 436 L 261 466 L 213 436 Z" fill="#ffd966" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" text-anchor="middle" font-size="12px">
+      <text x="261" y="440">edge</text>
+    </g>
+    <path d="M 309 436 L 319 436 Q 328 436 334 436 L 340 436" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 347 436 L 338 441 L 340 436 L 338 432 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="311" y="444" width="18" height="18" stroke-width="0"/>
+      <text x="311" y="453">no</text>
+    </g>
+    <path d="M 213 436 L 211 436 Q 208 436 198 436 L 188 436" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <path d="M 181 436 L 190 432 L 188 436 L 190 441 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/>
+    <g fill="#000000" font-family="Helvetica" font-size="11px">
+      <rect fill="#ffffff" stroke="none" x="189" y="444" width="24" height="18" stroke-width="0"/>
+      <text x="190" y="453">yes</text>
+    </g>
+  </g>
+</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index 5cc52a66..027e08ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ libinput_la_SOURCES =			\
 	evdev-mt-touchpad.h		\
 	evdev-mt-touchpad-tap.c		\
 	evdev-mt-touchpad-buttons.c	\
+	evdev-mt-touchpad-edge-scroll.c	\
 	filter.c			\
 	filter.h			\
 	filter-private.h		\
diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c
new file mode 100644
index 00000000..1dca0eab
--- /dev/null
+++ b/src/evdev-mt-touchpad-edge-scroll.c
@@ -0,0 +1,374 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <limits.h>
+#include <math.h>
+#include <string.h>
+#include <unistd.h>
+#include "linux/input.h"
+
+#include "evdev-mt-touchpad.h"
+
+#define DEFAULT_SCROLL_LOCK_TIMEOUT 300 /* ms */
+/* Use a reasonably large threshold until locked into scrolling mode, to
+   avoid accidentally locking in scrolling mode when trying to use the entire
+   touchpad to move the pointer. The user can wait for the timeout to trigger
+   to do a small scroll. */
+/* In mm for touchpads with valid resolution, see tp_init_accel() */
+#define DEFAULT_SCROLL_THRESHOLD 10.0
+
+enum scroll_event {
+	SCROLL_EVENT_TOUCH,
+	SCROLL_EVENT_MOTION,
+	SCROLL_EVENT_RELEASE,
+	SCROLL_EVENT_TIMEOUT,
+	SCROLL_EVENT_POSTED,
+};
+
+static uint32_t
+tp_touch_get_edge(struct tp_dispatch *tp, struct tp_touch *touch)
+{
+	uint32_t edge = EDGE_NONE;
+
+	if (tp->scroll.method != LIBINPUT_CONFIG_SCROLL_EDGE)
+		return EDGE_NONE;
+
+	if (touch->x > tp->scroll.right_edge)
+		edge |= EDGE_RIGHT;
+
+	if (touch->y > tp->scroll.bottom_edge)
+		edge |= EDGE_BOTTOM;
+
+	return edge;
+}
+
+static void
+tp_edge_scroll_set_state(struct tp_dispatch *tp,
+			 struct tp_touch *t,
+			 enum tp_edge_scroll_touch_state state)
+{
+	libinput_timer_cancel(&t->scroll.timer);
+
+	t->scroll.state = state;
+
+	switch (state) {
+	case EDGE_SCROLL_TOUCH_STATE_NONE:
+		t->scroll.edge = EDGE_NONE;
+		t->scroll.threshold = DEFAULT_SCROLL_THRESHOLD;
+		break;
+	case EDGE_SCROLL_TOUCH_STATE_EDGE_NEW:
+		t->scroll.edge = tp_touch_get_edge(tp, t);
+		libinput_timer_set(&t->scroll.timer,
+				   t->millis + DEFAULT_SCROLL_LOCK_TIMEOUT);
+		break;
+	case EDGE_SCROLL_TOUCH_STATE_EDGE:
+		t->scroll.threshold = 0.01; /* Do not allow 0.0 events */
+		break;
+	case EDGE_SCROLL_TOUCH_STATE_AREA:
+		t->scroll.edge = EDGE_NONE;
+		tp_set_pointer(tp, t);
+		break;
+	}
+}
+
+static void
+tp_edge_scroll_handle_none(struct tp_dispatch *tp,
+			   struct tp_touch *t,
+			   enum scroll_event event)
+{
+	struct libinput *libinput = tp->device->base.seat->libinput;
+
+	switch (event) {
+	case SCROLL_EVENT_TOUCH:
+		if (tp_touch_get_edge(tp, t)) {
+			tp_edge_scroll_set_state(tp, t,
+					EDGE_SCROLL_TOUCH_STATE_EDGE_NEW);
+		} else {
+			tp_edge_scroll_set_state(tp, t,
+					EDGE_SCROLL_TOUCH_STATE_AREA);
+		}
+		break;
+	case SCROLL_EVENT_MOTION:
+	case SCROLL_EVENT_RELEASE:
+	case SCROLL_EVENT_TIMEOUT:
+	case SCROLL_EVENT_POSTED:
+		log_bug_libinput(libinput,
+				 "unexpect scroll event in none state\n");
+		break;
+	}
+}
+
+static void
+tp_edge_scroll_handle_edge_new(struct tp_dispatch *tp,
+			       struct tp_touch *t,
+			       enum scroll_event event)
+{
+	struct libinput *libinput = tp->device->base.seat->libinput;
+
+	switch (event) {
+	case SCROLL_EVENT_TOUCH:
+		log_bug_libinput(libinput,
+				 "unexpect scroll event in edge new state\n");
+		break;
+	case SCROLL_EVENT_MOTION:
+		t->scroll.edge &= tp_touch_get_edge(tp, t);
+		if (!t->scroll.edge)
+			tp_edge_scroll_set_state(tp, t,
+					EDGE_SCROLL_TOUCH_STATE_AREA);
+		break;
+	case SCROLL_EVENT_RELEASE:
+		tp_edge_scroll_set_state(tp, t, EDGE_SCROLL_TOUCH_STATE_NONE);
+		break;
+	case SCROLL_EVENT_TIMEOUT:
+	case SCROLL_EVENT_POSTED:
+		tp_edge_scroll_set_state(tp, t, EDGE_SCROLL_TOUCH_STATE_EDGE);
+		break;
+	}
+}
+
+static void
+tp_edge_scroll_handle_edge(struct tp_dispatch *tp,
+			   struct tp_touch *t,
+			   enum scroll_event event)
+{
+	struct libinput *libinput = tp->device->base.seat->libinput;
+
+	switch (event) {
+	case SCROLL_EVENT_TOUCH:
+	case SCROLL_EVENT_TIMEOUT:
+		log_bug_libinput(libinput,
+				 "unexpect scroll event in edge state\n");
+		break;
+	case SCROLL_EVENT_MOTION:
+		/* If started at the bottom right, decide in which dir to scroll */
+		if (t->scroll.edge == (EDGE_RIGHT | EDGE_BOTTOM)) {
+			t->scroll.edge &= tp_touch_get_edge(tp, t);
+			if (!t->scroll.edge)
+				tp_edge_scroll_set_state(tp, t,
+						EDGE_SCROLL_TOUCH_STATE_AREA);
+		}
+		break;
+	case SCROLL_EVENT_RELEASE:
+		tp_edge_scroll_set_state(tp, t, EDGE_SCROLL_TOUCH_STATE_NONE);
+		break;
+	case SCROLL_EVENT_POSTED:
+		break;
+	}
+}
+
+static void
+tp_edge_scroll_handle_area(struct tp_dispatch *tp,
+			   struct tp_touch *t,
+			   enum scroll_event event)
+{
+	struct libinput *libinput = tp->device->base.seat->libinput;
+
+	switch (event) {
+	case SCROLL_EVENT_TOUCH:
+	case SCROLL_EVENT_TIMEOUT:
+	case SCROLL_EVENT_POSTED:
+		log_bug_libinput(libinput,
+				 "unexpect scroll event in area state\n");
+		break;
+	case SCROLL_EVENT_MOTION:
+		break;
+	case SCROLL_EVENT_RELEASE:
+		tp_edge_scroll_set_state(tp, t, EDGE_SCROLL_TOUCH_STATE_NONE);
+		break;
+	}
+}
+
+static void
+tp_edge_scroll_handle_event(struct tp_dispatch *tp,
+			    struct tp_touch *t,
+			    enum scroll_event event)
+{
+	switch (t->scroll.state) {
+	case EDGE_SCROLL_TOUCH_STATE_NONE:
+		tp_edge_scroll_handle_none(tp, t, event);
+		break;
+	case EDGE_SCROLL_TOUCH_STATE_EDGE_NEW:
+		tp_edge_scroll_handle_edge_new(tp, t, event);
+		break;
+	case EDGE_SCROLL_TOUCH_STATE_EDGE:
+		tp_edge_scroll_handle_edge(tp, t, event);
+		break;
+	case EDGE_SCROLL_TOUCH_STATE_AREA:
+		tp_edge_scroll_handle_area(tp, t, event);
+		break;
+	}
+}
+
+static void
+tp_edge_scroll_handle_timeout(uint64_t now, void *data)
+{
+	struct tp_touch *t = data;
+
+	tp_edge_scroll_handle_event(t->tp, t, SCROLL_EVENT_TIMEOUT);
+}
+
+int
+tp_edge_scroll_init(struct tp_dispatch *tp, struct evdev_device *device)
+{
+	struct tp_touch *t;
+	int width, height;
+	int edge_width, edge_height;
+
+	width = device->abs.absinfo_x->maximum - device->abs.absinfo_x->minimum;
+	height = device->abs.absinfo_y->maximum - device->abs.absinfo_y->minimum;
+
+	switch (tp->model) {
+	case MODEL_ALPS:
+		edge_width = width * .15;
+		edge_height = height * .15;
+		break;
+	case MODEL_APPLETOUCH: /* unibody are all clickpads, so N/A */
+		edge_width = width * .085;
+		edge_height = height * .085;
+		break;
+	default:
+		/* For elantech and synaptics, note for lenovo #40 series,
+		 * e.g. the T440s min/max are the absolute edges, not the
+		 * recommended ones as usual with synaptics. But these are
+		 * clickpads, so N/A.
+		 */
+		edge_width = width * .04;
+		edge_height = height * .054;
+	}
+
+	tp->scroll.right_edge = device->abs.absinfo_x->maximum - edge_width;
+	tp->scroll.bottom_edge = device->abs.absinfo_y->maximum - edge_height;
+
+	tp_for_each_touch(tp, t) {
+		t->scroll.direction = -1;
+		t->scroll.threshold = DEFAULT_SCROLL_THRESHOLD;
+		libinput_timer_init(&t->scroll.timer,
+				    device->base.seat->libinput,
+				    tp_edge_scroll_handle_timeout, t);
+	}
+
+	return 0;
+}
+
+void
+tp_destroy_edge_scroll(struct tp_dispatch *tp)
+{
+	struct tp_touch *t;
+
+	tp_for_each_touch(tp, t)
+		libinput_timer_cancel(&t->scroll.timer);
+}
+
+void
+tp_edge_scroll_handle_state(struct tp_dispatch *tp, uint64_t time)
+{
+	struct tp_touch *t;
+
+	tp_for_each_touch(tp, t) {
+		if (!t->dirty)
+			continue;
+
+		switch (t->state) {
+		case TOUCH_NONE:
+			break;
+		case TOUCH_BEGIN:
+			tp_edge_scroll_handle_event(tp, t, SCROLL_EVENT_TOUCH);
+			break;
+		case TOUCH_UPDATE:
+			tp_edge_scroll_handle_event(tp, t, SCROLL_EVENT_MOTION);
+			break;
+		case TOUCH_END:
+			tp_edge_scroll_handle_event(tp, t, SCROLL_EVENT_RELEASE);
+			break;
+		}
+	}
+}
+
+int
+tp_edge_scroll_post_events(struct tp_dispatch *tp, uint64_t time)
+{
+	struct libinput_device *device = &tp->device->base;
+	struct tp_touch *t;
+	enum libinput_pointer_axis axis;
+	double dx, dy, *delta;
+
+	tp_for_each_touch(tp, t) {
+		if (!t->dirty)
+			continue;
+
+		switch (t->scroll.edge) {
+			case EDGE_NONE:
+				if (t->scroll.direction != -1) {
+					/* Send stop scroll event */
+					pointer_notify_axis(device, time,
+						t->scroll.direction, 0.0);
+					t->scroll.direction = -1;
+				}
+				continue;
+			case EDGE_RIGHT:
+				axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
+				delta = &dy;
+				break;
+			case EDGE_BOTTOM:
+				axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
+				delta = &dx;
+				break;
+			default: /* EDGE_RIGHT | EDGE_BOTTOM */
+				continue; /* Don't know direction yet, skip */
+		}
+
+		tp_get_delta(t, &dx, &dy);
+		tp_filter_motion(tp, &dx, &dy, time);
+
+		if (fabs(*delta) < t->scroll.threshold)
+			continue;
+
+		pointer_notify_axis(device, time, axis, *delta);
+		t->scroll.direction = axis;
+
+		tp_edge_scroll_handle_event(tp, t, SCROLL_EVENT_POSTED);
+	}
+
+	return 0; /* Edge touches are suppressed by edge_scroll_touch_active */
+}
+
+void
+tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time)
+{
+	struct libinput_device *device = &tp->device->base;
+	struct tp_touch *t;
+
+	tp_for_each_touch(tp, t) {
+		if (t->scroll.direction != -1) {
+			pointer_notify_axis(device, time,
+					    t->scroll.direction, 0.0);
+			t->scroll.direction = -1;
+		}
+	}
+}
+
+int
+tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t)
+{
+	return t->scroll.state == EDGE_SCROLL_TOUCH_STATE_AREA;
+}
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 6d4b5835..8f76ddb8 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -56,7 +56,7 @@ tp_motion_history_offset(struct tp_touch *t, int offset)
 	return &t->history.samples[offset_index];
 }
 
-static void
+void
 tp_filter_motion(struct tp_dispatch *tp,
 	         double *dx, double *dy, uint64_t time)
 {
@@ -339,7 +339,9 @@ tp_touch_active(struct tp_dispatch *tp, struct tp_touch *t)
 {
 	return (t->state == TOUCH_BEGIN || t->state == TOUCH_UPDATE) &&
 		!t->palm.is_palm &&
-		!t->pinned.is_pinned && tp_button_touch_active(tp, t);
+		!t->pinned.is_pinned &&
+		tp_button_touch_active(tp, t) &&
+		tp_edge_scroll_touch_active(tp, t);
 }
 
 void
@@ -430,15 +432,12 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
 }
 
 static int
-tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
+tp_twofinger_scroll_post_events(struct tp_dispatch *tp, uint64_t time)
 {
 	struct tp_touch *t;
 	int nfingers_down = 0;
 
-	if (tp->scroll.method != LIBINPUT_CONFIG_SCROLL_2FG)
-		return 0;
-
-	/* No scrolling during tap-n-drag */
+	/* No 2fg scrolling during tap-n-drag */
 	if (tp_tap_dragging(tp))
 		return 0;
 
@@ -457,6 +456,60 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
 	return 1;
 }
 
+static void
+tp_scroll_handle_state(struct tp_dispatch *tp, uint64_t time)
+{
+	/* Note this must be always called, so that it knows the state of
+	 * touches when the scroll-mode changes.
+	 */
+	tp_edge_scroll_handle_state(tp, time);
+}
+
+static int
+tp_post_scroll_events(struct tp_dispatch *tp, uint64_t time)
+{
+	struct libinput *libinput = tp->device->base.seat->libinput;
+
+	switch (tp->scroll.method) {
+	case LIBINPUT_CONFIG_SCROLL_NO_SCROLL:
+		break;
+	case LIBINPUT_CONFIG_SCROLL_2FG:
+		return tp_twofinger_scroll_post_events(tp, time);
+	case LIBINPUT_CONFIG_SCROLL_EDGE:
+		return tp_edge_scroll_post_events(tp, time);
+	case LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN:
+		log_bug_libinput(libinput, "Unexpected scroll mode\n");
+		break;
+	}
+	return 0;
+}
+
+static void
+tp_stop_scroll_events(struct tp_dispatch *tp, uint64_t time)
+{
+	struct libinput *libinput = tp->device->base.seat->libinput;
+
+	switch (tp->scroll.method) {
+	case LIBINPUT_CONFIG_SCROLL_NO_SCROLL:
+		break;
+	case LIBINPUT_CONFIG_SCROLL_2FG:
+		evdev_stop_scroll(tp->device, time);
+		break;
+	case LIBINPUT_CONFIG_SCROLL_EDGE:
+		tp_edge_scroll_stop_events(tp, time);
+		break;
+	case LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN:
+		log_bug_libinput(libinput, "Unexpected scroll mode\n");
+		break;
+	}
+}
+
+static void
+tp_destroy_scroll(struct tp_dispatch *tp)
+{
+	tp_destroy_edge_scroll(tp);
+}
+
 static void
 tp_process_state(struct tp_dispatch *tp, uint64_t time)
 {
@@ -490,6 +543,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time)
 	}
 
 	tp_button_handle_state(tp, time);
+	tp_scroll_handle_state(tp, time);
 
 	/*
 	 * We have a physical button down event on a clickpad. To avoid
@@ -525,6 +579,7 @@ tp_post_process_state(struct tp_dispatch *tp, uint64_t time)
 	tp->queued = TOUCHPAD_EVENT_NONE;
 }
 
+
 static void
 tp_post_events(struct tp_dispatch *tp, uint64_t time)
 {
@@ -542,7 +597,7 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 	filter_motion |= tp_post_button_events(tp, time);
 
 	if (filter_motion || tp->sendevents.trackpoint_active) {
-		evdev_stop_scroll(tp->device, time);
+		tp_stop_scroll_events(tp, time);
 		return;
 	}
 
@@ -621,6 +676,7 @@ tp_destroy(struct evdev_dispatch *dispatch)
 	tp_destroy_tap(tp);
 	tp_destroy_buttons(tp);
 	tp_destroy_sendevents(tp);
+	tp_destroy_scroll(tp);
 
 	free(tp->touches);
 	free(tp);
@@ -912,6 +968,9 @@ tp_scroll_config_scroll_method_get_methods(struct libinput_device *device)
 	if (tp->ntouches >= 2)
 		methods |= LIBINPUT_CONFIG_SCROLL_2FG;
 
+	if (!tp->buttons.is_clickpad)
+		methods |= LIBINPUT_CONFIG_SCROLL_EDGE;
+
 	return methods;
 }
 
@@ -925,7 +984,7 @@ tp_scroll_config_scroll_method_set_method(struct libinput_device *device,
 	if (method == tp->scroll.method)
 		return LIBINPUT_CONFIG_STATUS_SUCCESS;
 
-	evdev_stop_scroll(evdev, libinput_now(device->seat->libinput));
+	tp_stop_scroll_events(tp, libinput_now(device->seat->libinput));
 	tp->scroll.method = method;
 
 	return LIBINPUT_CONFIG_STATUS_SUCCESS;
@@ -940,15 +999,29 @@ tp_scroll_config_scroll_method_get_method(struct libinput_device *device)
 	return tp->scroll.method;
 }
 
+static enum libinput_config_scroll_method
+tp_scroll_get_default_method(struct tp_dispatch *tp)
+{
+	if (tp->ntouches >= 2)
+		return LIBINPUT_CONFIG_SCROLL_2FG;
+	else
+		return LIBINPUT_CONFIG_SCROLL_EDGE;
+}
+
 static enum libinput_config_scroll_method
 tp_scroll_config_scroll_method_get_default_method(struct libinput_device *device)
 {
-	return LIBINPUT_CONFIG_SCROLL_2FG;
+	struct evdev_device *evdev = (struct evdev_device*)device;
+	struct tp_dispatch *tp = (struct tp_dispatch*)evdev->dispatch;
+
+	return tp_scroll_get_default_method(tp);
 }
 
 static int
 tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device)
 {
+	if (tp_edge_scroll_init(tp, device) != 0)
+		return -1;
 
 	evdev_init_natural_scroll(device);
 
@@ -956,7 +1029,7 @@ tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device)
 	tp->scroll.config_method.set_method = tp_scroll_config_scroll_method_set_method;
 	tp->scroll.config_method.get_method = tp_scroll_config_scroll_method_get_method;
 	tp->scroll.config_method.get_default_method = tp_scroll_config_scroll_method_get_default_method;
-	tp->scroll.method = tp_scroll_config_scroll_method_get_default_method(&tp->device->base);
+	tp->scroll.method = tp_scroll_get_default_method(tp);
 	tp->device->base.config.scroll_method = &tp->scroll.config_method;
 
 	/* In mm for touchpads with valid resolution, see tp_init_accel() */
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 7f3ce493..b2603b44 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -103,6 +103,20 @@ enum tp_tap_touch_state {
 	TAP_TOUCH_STATE_DEAD,		/**< exceeded motion/timeout */
 };
 
+/* For edge scrolling, so we only care about right and bottom */
+enum tp_edge {
+	EDGE_NONE = 0,
+	EDGE_RIGHT = (1 << 0),
+	EDGE_BOTTOM = (1 << 1),
+};
+
+enum tp_edge_scroll_touch_state {
+	EDGE_SCROLL_TOUCH_STATE_NONE,
+	EDGE_SCROLL_TOUCH_STATE_EDGE_NEW,
+	EDGE_SCROLL_TOUCH_STATE_EDGE,
+	EDGE_SCROLL_TOUCH_STATE_AREA,
+};
+
 struct tp_motion {
 	int32_t x;
 	int32_t y;
@@ -150,6 +164,14 @@ struct tp_touch {
 		enum tp_tap_touch_state state;
 	} tap;
 
+	struct {
+		enum tp_edge_scroll_touch_state state;
+		uint32_t edge;
+		int direction;
+		double threshold;
+		struct libinput_timer timer;
+	} scroll;
+
 	struct {
 		bool is_palm;
 		int32_t x, y;  /* first coordinates if is_palm == true */
@@ -214,6 +236,8 @@ struct tp_dispatch {
 	struct {
 		struct libinput_device_config_scroll_method config_method;
 		enum libinput_config_scroll_method method;
+		int32_t right_edge;
+		int32_t bottom_edge;
 	} scroll;
 
 	enum touchpad_event queued;
@@ -250,6 +274,10 @@ tp_get_delta(struct tp_touch *t, double *dx, double *dy);
 void
 tp_set_pointer(struct tp_dispatch *tp, struct tp_touch *t);
 
+void
+tp_filter_motion(struct tp_dispatch *tp,
+	         double *dx, double *dy, uint64_t time);
+
 int
 tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time);
 
@@ -304,4 +332,22 @@ tp_tap_resume(struct tp_dispatch *tp, uint64_t time);
 bool
 tp_tap_dragging(struct tp_dispatch *tp);
 
+int
+tp_edge_scroll_init(struct tp_dispatch *tp, struct evdev_device *device);
+
+void
+tp_destroy_edge_scroll(struct tp_dispatch *tp);
+
+void
+tp_edge_scroll_handle_state(struct tp_dispatch *tp, uint64_t time);
+
+int
+tp_edge_scroll_post_events(struct tp_dispatch *tp, uint64_t time);
+
+void
+tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time);
+
+int
+tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t);
+
 #endif

From 7ae555a4a2b981bf47ffa0936183d878e0697b52 Mon Sep 17 00:00:00 2001
From: "Krzysztof A. Sobiecki" <sobkas@gmail.com>
Date: Tue, 25 Nov 2014 02:33:53 +0100
Subject: [PATCH 104/121] Ignore devices that have joystick buttons

This patch allows libinput to ignore devices that have joystick buttons.

Signed-off-by: Krzysztof Sobiecki <sobkas@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/evdev.c b/src/evdev.c
index 908a8bad..baa1c514 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1266,6 +1266,15 @@ evdev_configure_device(struct evdev_device *device)
 	has_keyboard = 0;
 	has_touch = 0;
 
+        for (i = BTN_JOYSTICK; i < BTN_DIGI; i++) {
+                if (libevdev_has_event_code(evdev, EV_KEY, i)) {
+                        log_info(libinput,
+                                 "input device '%s', %s is a joystick, ignoring\n",
+                                 device->devname, devnode);
+                        return -1;
+                }
+        }
+
 	if (libevdev_has_event_type(evdev, EV_ABS)) {
 
 		if ((absinfo = libevdev_get_abs_info(evdev, ABS_X))) {

From 5f65526618c2e23c968a7e088d8d18686a85a622 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Tue, 25 Nov 2014 11:53:23 -0600
Subject: [PATCH 105/121] evdev: Fix uninitialized variable warning

The early exit path in evdev_device_compare_syspath() expects
udev_device_new to be initialized to NULL, but it wasn't.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index baa1c514..5d178fad 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1460,7 +1460,7 @@ static int
 evdev_device_compare_syspath(struct udev_device *udev_device, int fd)
 {
 	struct udev *udev = udev_device_get_udev(udev_device);
-	struct udev_device *udev_device_new;
+	struct udev_device *udev_device_new = NULL;
 	struct stat st;
 	int rc = 1;
 

From d7106544ea1200d06ee940464e63e4c21ba450e7 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 1 Dec 2014 13:21:26 +1000
Subject: [PATCH 106/121] test: move device ID test to test/device.c

More appropriate here, they were in misc because this file didn't exist yet
when they were added.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/device.c | 20 ++++++++++++++++++++
 test/misc.c   | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/device.c b/test/device.c
index 56f72c73..6843824a 100644
--- a/test/device.c
+++ b/test/device.c
@@ -599,6 +599,25 @@ START_TEST(device_disable_topsoftbutton)
 }
 END_TEST
 
+START_TEST(device_ids)
+{
+	struct litest_device *dev = litest_current_device();
+	const char *name;
+	unsigned int pid, vid;
+
+	name = libevdev_get_name(dev->evdev);
+	pid = libevdev_get_id_product(dev->evdev);
+	vid = libevdev_get_id_vendor(dev->evdev);
+
+	ck_assert_str_eq(name,
+			 libinput_device_get_name(dev->libinput_device));
+	ck_assert_int_eq(pid,
+			 libinput_device_get_id_product(dev->libinput_device));
+	ck_assert_int_eq(vid,
+			 libinput_device_get_id_vendor(dev->libinput_device));
+}
+END_TEST
+
 int main (int argc, char **argv)
 {
 	litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD);
@@ -619,6 +638,7 @@ int main (int argc, char **argv)
 	litest_add("device:sendevents", device_disable_release_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("device:sendevents", device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
 	litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY);
+	litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY);
 
 	return litest_run(argc, argv);
 }
diff --git a/test/misc.c b/test/misc.c
index 4ed9dce8..21ecf190 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -391,25 +391,6 @@ START_TEST(context_ref_counting)
 }
 END_TEST
 
-START_TEST(device_ids)
-{
-	struct litest_device *dev = litest_current_device();
-	const char *name;
-	unsigned int pid, vid;
-
-	name = libevdev_get_name(dev->evdev);
-	pid = libevdev_get_id_product(dev->evdev);
-	vid = libevdev_get_id_vendor(dev->evdev);
-
-	ck_assert_str_eq(name,
-			 libinput_device_get_name(dev->libinput_device));
-	ck_assert_int_eq(pid,
-			 libinput_device_get_id_product(dev->libinput_device));
-	ck_assert_int_eq(vid,
-			 libinput_device_get_id_vendor(dev->libinput_device));
-}
-END_TEST
-
 START_TEST(config_status_string)
 {
 	const char *strs[3];
@@ -555,7 +536,6 @@ int main (int argc, char **argv) {
 	litest_add_no_device("events:conversion", event_conversion_key);
 	litest_add_no_device("events:conversion", event_conversion_touch);
 	litest_add_no_device("context:refcount", context_ref_counting);
-	litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY);
 	litest_add_no_device("config:status string", config_status_string);
 
 	litest_add_no_device("misc:matrix", matrix_helpers);

From 188d20b2012e73a29b7995eb911605ebdc3ae4a2 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Tue, 25 Nov 2014 11:46:42 -0600
Subject: [PATCH 107/121] evdev: Query mouse DPI from udev

Instead of using a hard coded mouse DPI value, we query it from udev.
If it's not present or the property is obviously broken we fall back
to default.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c         | 26 ++++++++++++++++++++-
 src/libinput-util.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
 src/libinput-util.h |  2 ++
 test/misc.c         | 42 ++++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index 5d178fad..e4d79c26 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1225,6 +1225,30 @@ evdev_tag_device(struct evdev_device *device)
 							device->udev_device);
 }
 
+static inline int
+evdev_read_dpi_prop(struct evdev_device *device)
+{
+	struct libinput *libinput = device->base.seat->libinput;
+	const char *mouse_dpi;
+	int dpi = DEFAULT_MOUSE_DPI;
+
+	mouse_dpi = udev_device_get_property_value(device->udev_device,
+						   "MOUSE_DPI");
+	if (mouse_dpi) {
+		dpi = parse_mouse_dpi_property(mouse_dpi);
+		if (!dpi) {
+			log_error(libinput, "Mouse DPI property for '%s' is "
+					    "present but invalid, using %d "
+					    "DPI instead\n",
+					    device->devname,
+					    DEFAULT_MOUSE_DPI);
+			dpi = DEFAULT_MOUSE_DPI;
+		}
+	}
+
+	return dpi;
+}
+
 static inline int
 evdev_fix_abs_resolution(struct libevdev *evdev,
 			 unsigned int code,
@@ -1530,7 +1554,7 @@ evdev_device_create(struct libinput_seat *seat,
 	device->devname = libevdev_get_name(device->evdev);
 	device->scroll.threshold = 5.0; /* Default may be overridden */
 	device->scroll.direction = 0;
-	device->dpi = DEFAULT_MOUSE_DPI;
+	device->dpi = evdev_read_dpi_prop(device);
 	/* at most 5 SYN_DROPPED log-messages per 30s */
 	ratelimit_init(&device->syn_drop_limit, 30ULL * 1000, 5);
 
diff --git a/src/libinput-util.c b/src/libinput-util.c
index 34d55496..923e1162 100644
--- a/src/libinput-util.c
+++ b/src/libinput-util.c
@@ -28,7 +28,9 @@
 
 #include "config.h"
 
+#include <ctype.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -113,3 +115,56 @@ ratelimit_test(struct ratelimit *r)
 
 	return RATELIMIT_EXCEEDED;
 }
+
+/* Helper function to parse the mouse DPI tag from udev.
+ * The tag is of the form:
+ * MOUSE_DPI=400 *1000 2000
+ * or
+ * MOUSE_DPI=400@125 *1000@125 2000@125
+ * Where the * indicates the default value and @number indicates device poll
+ * rate.
+ * Numbers should be in ascending order, and if rates are present they should
+ * be present for all entries.
+ *
+ * When parsing the mouse DPI property, if we find an error we just return 0
+ * since it's obviously invalid, the caller will treat that as an error and
+ * use a reasonable default instead. If the property contains multiple DPI
+ * settings but none flagged as default, we return the last because we're
+ * lazy and that's a silly way to set the property anyway.
+ */
+int
+parse_mouse_dpi_property(const char *prop)
+{
+	bool is_default = false;
+	int nread, dpi = 0, rate;
+
+	while (*prop != 0) {
+		if (*prop == ' ') {
+			prop++;
+			continue;
+		}
+		if (*prop == '*') {
+			prop++;
+			is_default = true;
+			if (!isdigit(prop[0]))
+				return 0;
+		}
+
+		/* While we don't do anything with the rate right now we
+		 * will validate that, if it's present, it is non-zero and
+		 * positive
+		 */
+		rate = 1;
+		nread = 0;
+		sscanf(prop, "%d@%d%n", &dpi, &rate, &nread);
+		if (!nread)
+			sscanf(prop, "%d%n", &dpi, &nread);
+		if (!nread || dpi <= 0 || rate <= 0 || prop[nread] == '@')
+			return 0;
+
+		if (is_default)
+			break;
+		prop += nread;
+	}
+	return dpi;
+}
diff --git a/src/libinput-util.h b/src/libinput-util.h
index 909c9dbd..68258414 100644
--- a/src/libinput-util.h
+++ b/src/libinput-util.h
@@ -296,4 +296,6 @@ struct ratelimit {
 void ratelimit_init(struct ratelimit *r, uint64_t ival_ms, unsigned int burst);
 enum ratelimit_state ratelimit_test(struct ratelimit *r);
 
+int parse_mouse_dpi_property(const char *prop);
+
 #endif /* LIBINPUT_UTIL_H */
diff --git a/test/misc.c b/test/misc.c
index 21ecf190..4d4c22ca 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -529,6 +529,47 @@ START_TEST(ratelimit_helpers)
 }
 END_TEST
 
+struct parser_test {
+	char *tag;
+	int expected_dpi;
+};
+
+START_TEST(dpi_parser)
+{
+	struct parser_test tests[] = {
+		{ "450 *1800 3200", 1800 },
+		{ "*450 1800 3200", 450 },
+		{ "450 1800 *3200", 3200 },
+		{ "450 1800 3200", 3200 },
+		{ "450 1800 failboat", 0 },
+		{ "450 1800 *failboat", 0 },
+		{ "0 450 1800 *3200", 0 },
+		{ "450@37 1800@12 *3200@6", 3200 },
+		{ "450@125 1800@125   *3200@125  ", 3200 },
+		{ "450@125 *1800@125  3200@125", 1800 },
+		{ "*this @string fails", 0 },
+		{ "12@34 *45@", 0 },
+		{ "12@a *45@", 0 },
+		{ "12@a *45@25", 0 },
+		{ "                                      * 12, 450, 800", 0 },
+		{ "                                      *12, 450, 800", 12 },
+		{ "*12, *450, 800", 12 },
+		{ "*-23412, 450, 800", 0 },
+		{ "112@125, 450@125, 800@125, 900@-125", 0 },
+		{ "", 0 },
+		{ "   ", 0 },
+		{ "* ", 0 },
+		{ NULL }
+	};
+	int i, dpi;
+
+	for (i = 0; tests[i].tag != NULL; i++) {
+		dpi = parse_mouse_dpi_property(tests[i].tag);
+		ck_assert_int_eq(dpi, tests[i].expected_dpi);
+	}
+}
+END_TEST
+
 int main (int argc, char **argv) {
 	litest_add_no_device("events:conversion", event_conversion_device_notify);
 	litest_add_no_device("events:conversion", event_conversion_pointer);
@@ -540,6 +581,7 @@ int main (int argc, char **argv) {
 
 	litest_add_no_device("misc:matrix", matrix_helpers);
 	litest_add_no_device("misc:ratelimit", ratelimit_helpers);
+	litest_add_no_device("misc:dpi parser", dpi_parser);
 
 	return litest_run(argc, argv);
 }

From 4f84bad9eb5ee1f4ef2928d928016d9daeeaf9e1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 28 Nov 2014 10:00:30 +1000
Subject: [PATCH 108/121] filter: fix a comment, 400 isn't hard-coded anymore

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/filter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/filter.h b/src/filter.h
index 0dc081b4..9b126183 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 
 struct motion_params {
-	double dx, dy; /* in units/ms @ 400dpi */
+	double dx, dy; /* in units/ms @ DEFAULT_MOUSE_DPI resolution */
 };
 
 struct motion_filter;

From 7e3cc15819f5599ee2014dc8381ef1bcb4c2ac73 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 28 Nov 2014 10:08:02 +1000
Subject: [PATCH 109/121] Move DEFAULT_MOUSE_DPI to filter.h

The filter code is what relies on some default dpi configuration to apply
pointer acceleration and expects the input coordinates to be pre-scaled to
that resolution.

Let's move the define here so we can use it from the touchpad code too.

No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 13 +++++--------
 src/evdev.c             |  2 --
 src/filter.h            |  3 +++
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 8f76ddb8..e29b2527 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -932,17 +932,14 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 
 	/*
 	 * Not all touchpads report the same amount of units/mm (resolution).
-	 * Normalize motion events to a resolution of 15.74 units/mm
-	 * (== 400 dpi) as base (unaccelerated) speed. This also evens out any
-	 * differences in x and y resolution, so that a circle on the
+	 * Normalize motion events to the default mouse DPI as base
+	 * (unaccelerated) speed. This also evens out any differences in x
+	 * and y resolution, so that a circle on the
 	 * touchpad does not turn into an elipse on the screen.
-	 *
-	 * We pick 400dpi as thats one of the many default resolutions
-	 * for USB mice, so we end up with a similar base speed on the device.
 	 */
 	if (res_x > 1 && res_y > 1) {
-		tp->accel.x_scale_coeff = (400/25.4) / res_x;
-		tp->accel.y_scale_coeff = (400/25.4) / res_y;
+		tp->accel.x_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_x;
+		tp->accel.y_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_y;
 	} else {
 	/*
 	 * For touchpads where the driver does not provide resolution, fall
diff --git a/src/evdev.c b/src/evdev.c
index e4d79c26..19b861f4 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -42,8 +42,6 @@
 
 #define DEFAULT_AXIS_STEP_DISTANCE 10
 #define DEFAULT_MIDDLE_BUTTON_SCROLL_TIMEOUT 200
-/* The HW DPI rate we normalize to before calculating pointer acceleration */
-#define DEFAULT_MOUSE_DPI 400
 
 enum evdev_key_type {
 	EVDEV_KEY_TYPE_NONE,
diff --git a/src/filter.h b/src/filter.h
index 9b126183..e96212a3 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -28,6 +28,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+/* The HW DPI rate we normalize to before calculating pointer acceleration */
+#define DEFAULT_MOUSE_DPI 400
+
 struct motion_params {
 	double dx, dy; /* in units/ms @ DEFAULT_MOUSE_DPI resolution */
 };

From 3c7e3a19735b64eaa7937035d026b62c5fccbf5c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 28 Nov 2014 10:09:21 +1000
Subject: [PATCH 110/121] Change default DPI to 1000

400 used to be the default DPI for many mice but it it's not anymore. A survey
of mice shows that 400 is still common as one of the pre-configured settings
in switchable multi-resolution gaming mice, but devices with a single
resolution mostly favor 1000 dpi.

Let's make that switch now so that any future changes to the pointer
acceleration code assumes that resolution as a default.

For the touchpad, this has a bad side-effect, caused by our expectation of
mouse vs touchpad behaviours: our acceleration code ignores device type and
provides the same acceleration for the same physical movement. Unfortunately,
we expect touchpads to be significantly slower than mice.

The previous 400 DPI worked because it caused an acceptable slowdown on input.
e.g. on the T440 with a res of 42 units/mm, the scale coefficient was 0.37.
For 1000 DPI as default, this now results in 0.94, i.e. speeding up the
touchpad by a factor of 2.5. That is way too fast.

Adding touchpad-specific filter code is a bigger project, so let's just add a
fixme for now and scale the coefficient back to what it was before the
DPI default change. Effect: touchpad behaves as before.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev-mt-touchpad.c | 13 +++++++++++++
 src/filter.h            |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index e29b2527..67a8d68a 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -940,6 +940,19 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
 	if (res_x > 1 && res_y > 1) {
 		tp->accel.x_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_x;
 		tp->accel.y_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_y;
+
+		/* FIXME: once normalized, touchpads see the same
+		   acceleration as mice. that is technically correct but
+		   subjectively wrong, we expect a touchpad to be a lot
+		   slower than a mouse.
+		   For now, apply a magic factor here until this is
+		   fixed in the actual filter code.
+		 */
+		{
+			const double MAGIC = 0.4;
+			tp->accel.x_scale_coeff *= MAGIC;
+			tp->accel.y_scale_coeff *= MAGIC;
+		}
 	} else {
 	/*
 	 * For touchpads where the driver does not provide resolution, fall
diff --git a/src/filter.h b/src/filter.h
index e96212a3..bffeb5f9 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 
 /* The HW DPI rate we normalize to before calculating pointer acceleration */
-#define DEFAULT_MOUSE_DPI 400
+#define DEFAULT_MOUSE_DPI 1000
 
 struct motion_params {
 	double dx, dy; /* in units/ms @ DEFAULT_MOUSE_DPI resolution */

From 8b7ef91c1a190fcd8363b0e128520f8d24de4bde Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 31 Oct 2014 10:53:53 +1000
Subject: [PATCH 111/121] Add a function to retrieve the udev_device handle
 from a libinput device

The libinput device abstracts a number of things but sometimes the underlying
device is important. The udev device provides the necessary handle to access
that underlying device and various sysfs properties that may be necessary.

A function returning the device node would've done the same thing but is more
prone to race conditions than the udev_device.

https://bugs.freedesktop.org/show_bug.cgi?id=85573

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/evdev.c    |  6 ++++++
 src/evdev.h    |  3 +++
 src/libinput.c |  6 ++++++
 src/libinput.h | 18 ++++++++++++++++++
 test/device.c  | 13 +++++++++++++
 5 files changed, 46 insertions(+)

diff --git a/src/evdev.c b/src/evdev.c
index 19b861f4..c2d10d7e 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1632,6 +1632,12 @@ evdev_device_get_id_vendor(struct evdev_device *device)
 	return libevdev_get_id_vendor(device->evdev);
 }
 
+struct udev_device *
+evdev_device_get_udev_device(struct evdev_device *device)
+{
+	return udev_device_ref(device->udev_device);
+}
+
 void
 evdev_device_set_default_calibration(struct evdev_device *device,
 				     const float calibration[6])
diff --git a/src/evdev.h b/src/evdev.h
index e4144ecb..033d4558 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -234,6 +234,9 @@ evdev_device_get_id_product(struct evdev_device *device);
 unsigned int
 evdev_device_get_id_vendor(struct evdev_device *device);
 
+struct udev_device *
+evdev_device_get_udev_device(struct evdev_device *device);
+
 void
 evdev_device_set_default_calibration(struct evdev_device *device,
 				     const float calibration[6]);
diff --git a/src/libinput.c b/src/libinput.c
index c318eeec..96b255a9 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1226,6 +1226,12 @@ libinput_device_set_seat_logical_name(struct libinput_device *device,
 							       name);
 }
 
+LIBINPUT_EXPORT struct udev_device *
+libinput_device_get_udev_device(struct libinput_device *device)
+{
+	return evdev_device_get_udev_device((struct evdev_device *)device);
+}
+
 LIBINPUT_EXPORT void
 libinput_device_led_update(struct libinput_device *device,
 			   enum libinput_led leds)
diff --git a/src/libinput.h b/src/libinput.h
index 26d94ff4..d567df44 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1396,6 +1396,24 @@ int
 libinput_device_set_seat_logical_name(struct libinput_device *device,
 				      const char *name);
 
+/**
+ * Return a udev handle to the device that is this libinput device, if any.
+ * The returned handle has a refcount of at least 1, the caller must call
+ * udev_device_unref() once to release the associated resources.
+ *
+ * Some devices may not have a udev device, or the udev device may be
+ * unobtainable. This function returns NULL if no udev device was available.
+ *
+ * Calling this function multiple times for the same device may not
+ * return the same udev handle each time.
+ *
+ * @param device A previously obtained device
+ * @return A udev handle to the device with a refcount of >= 1 or NULL.
+ * @retval NULL This device is not represented by a udev device
+ */
+struct udev_device *
+libinput_device_get_udev_device(struct libinput_device *device);
+
 /**
  * @ingroup device
  *
diff --git a/test/device.c b/test/device.c
index 6843824a..84984f4c 100644
--- a/test/device.c
+++ b/test/device.c
@@ -618,6 +618,17 @@ START_TEST(device_ids)
 }
 END_TEST
 
+START_TEST(device_get_udev_handle)
+{
+	struct litest_device *dev = litest_current_device();
+	struct udev_device *udev_device;
+
+	udev_device = libinput_device_get_udev_device(dev->libinput_device);
+	ck_assert_notnull(udev_device);
+	udev_device_unref(udev_device);
+}
+END_TEST
+
 int main (int argc, char **argv)
 {
 	litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD);
@@ -640,5 +651,7 @@ int main (int argc, char **argv)
 	litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY);
 	litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY);
 
+	litest_add("device:udev", device_get_udev_handle, LITEST_ANY, LITEST_ANY);
+
 	return litest_run(argc, argv);
 }

From 56b5f846ac7f8243da4ba2f288654becf1014c46 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 1 Dec 2014 16:00:13 +1000
Subject: [PATCH 112/121] Add
 libinput_device_get_context/libinput_seat_get_context

Allow retrieval of the libinput context from the seat and the device.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 src/libinput.c | 12 ++++++++++++
 src/libinput.h | 22 ++++++++++++++++++++++
 test/device.c  | 12 ++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/src/libinput.c b/src/libinput.c
index 96b255a9..0d380fa8 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -651,6 +651,12 @@ libinput_seat_get_user_data(struct libinput_seat *seat)
 	return seat->user_data;
 }
 
+LIBINPUT_EXPORT struct libinput *
+libinput_seat_get_context(struct libinput_seat *seat)
+{
+	return seat->libinput;
+}
+
 LIBINPUT_EXPORT const char *
 libinput_seat_get_physical_name(struct libinput_seat *seat)
 {
@@ -1177,6 +1183,12 @@ libinput_device_get_user_data(struct libinput_device *device)
 	return device->user_data;
 }
 
+LIBINPUT_EXPORT struct libinput *
+libinput_device_get_context(struct libinput_device *device)
+{
+	return libinput_seat_get_context(device->seat);
+}
+
 LIBINPUT_EXPORT const char *
 libinput_device_get_sysname(struct libinput_device *device)
 {
diff --git a/src/libinput.h b/src/libinput.h
index d567df44..db56da7f 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1199,6 +1199,17 @@ libinput_seat_set_user_data(struct libinput_seat *seat, void *user_data);
 void *
 libinput_seat_get_user_data(struct libinput_seat *seat);
 
+/**
+ * @ingroup seat
+ *
+ * Get the libinput context from the seat.
+ *
+ * @param seat A previously obtained seat
+ * @return The libinput context for this seat.
+ */
+struct libinput *
+libinput_seat_get_context(struct libinput_seat *seat);
+
 /**
  * @ingroup seat
  *
@@ -1288,6 +1299,17 @@ libinput_device_set_user_data(struct libinput_device *device, void *user_data);
 void *
 libinput_device_get_user_data(struct libinput_device *device);
 
+/**
+ * @ingroup device
+ *
+ * Get the libinput context from the device.
+ *
+ * @param device A previously obtained device
+ * @return The libinput context for this device.
+ */
+struct libinput *
+libinput_device_get_context(struct libinput_device *device);
+
 /**
  * @ingroup device
  *
diff --git a/test/device.c b/test/device.c
index 84984f4c..28cdb06c 100644
--- a/test/device.c
+++ b/test/device.c
@@ -629,6 +629,17 @@ START_TEST(device_get_udev_handle)
 }
 END_TEST
 
+START_TEST(device_context)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_seat *seat;
+
+	ck_assert(dev->libinput == libinput_device_get_context(dev->libinput_device));
+	seat = libinput_device_get_seat(dev->libinput_device);
+	ck_assert(dev->libinput == libinput_seat_get_context(seat));
+}
+END_TEST
+
 int main (int argc, char **argv)
 {
 	litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD);
@@ -650,6 +661,7 @@ int main (int argc, char **argv)
 	litest_add("device:sendevents", device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
 	litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY);
 	litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY);
+	litest_add_for_device("device:context", device_context, LITEST_SYNAPTICS_CLICKPAD);
 
 	litest_add("device:udev", device_get_udev_handle, LITEST_ANY, LITEST_ANY);
 

From 1cd5e81fbc4b39f8551e877456d6bddbba70fa0b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 3 Dec 2014 11:57:35 +1000
Subject: [PATCH 113/121] Document relative motion normalization

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/src/libinput.h b/src/libinput.h
index db56da7f..5608eaa3 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -124,6 +124,10 @@ extern "C" {
  * <dd>Assigns the logical seat for this device. See
  * libinput_seat_get_logical_name()
  * context. Defaults to "default".</dd>
+ * <dt>MOUSE_DPI</dt>
+ * <dd>HW resolution and sampling frequency of a relative pointer device.
+ * See @ref motion_normalization for details.
+ * </dd>
  * </dl>
  *
  * Below is an example udev rule to assign "seat1" to a device from vendor
@@ -135,6 +139,57 @@ extern "C" {
  *
  */
 
+/**
+ * @page motion_normalization Normalization of relative motion
+ *
+ * Most relative input devices generate input in so-called "mickeys". A
+ * mickey is in device-specific units that depend on the resolution
+ * of the sensor. Most optical mice use sensors with 1000dpi resolution, but
+ * some devices range from 100dpi to well above 8000dpi.
+ *
+ * Without a physical reference point, a relative coordinate cannot be
+ * interpreted correctly. A delta of 10 mickeys may be a millimeter of
+ * physical movement or 10 millimeters, depending on the sensor. This
+ * affects pointer acceleration in libinput and interpretation of relative
+ * coordinates in callers.
+ *
+ * libinput normalizes all relative input to a physical resolution of
+ * 1000dpi, the same delta from two different devices thus represents the
+ * same physical movement of those two devices (within sensor error
+ * margins).
+ *
+ * Devices usually do not advertise their resolution and libinput relies on
+ * the udev property MOUSE_DPI for this information.
+ *
+ * The format of the property for single-resolution mice is:
+ * @code
+ *      MOUSE_DPI=resolution@frequency
+ * @endcode
+ *
+ * The resolution is in dots per inch, the frequency in Hz.
+ * The format of the property for multi-resolution mice may list multiple
+ * resolutions and frequencies:
+ * @code
+ *      MOUSE_DPI=r1@f1 *r2@f2 r3@f3
+ * @endcode
+ *
+ * The default frequency must be pre-fixed with an asterisk.
+ *
+ * For example, these two properties are valid:
+ * @code
+ *      MOUSE_DPI=800@125
+ *      MOUSE_DPI=400@125 800@125 *1000@500 5500@500
+ * @endcode
+ *
+ * The behavior for a malformed property is undefined.
+ *
+ * If the property is unset, libinput assumes the resolution is 1000dpi.
+ *
+ * Note that HW does not usually provide information about the resolution
+ * changes, libinput will thus not detect when a resolution changes to the
+ * non-default value.
+ */
+
 /**
  * Log priority for internal logging messages.
  */
@@ -468,6 +523,9 @@ libinput_event_pointer_get_time(struct libinput_event_pointer *event);
  * If a device employs pointer acceleration, the delta returned by this
  * function is the accelerated delta.
  *
+ * Relative motion deltas are normalized to represent those of a device with
+ * 1000dpi resolution. See @ref motion_normalization for more details.
+ *
  * @note It is an application bug to call this function for events other than
  * @ref LIBINPUT_EVENT_POINTER_MOTION.
  *
@@ -486,6 +544,9 @@ libinput_event_pointer_get_dx(struct libinput_event_pointer *event);
  * If a device employs pointer acceleration, the delta returned by this
  * function is the accelerated delta.
  *
+ * Relative motion deltas are normalized to represent those of a device with
+ * 1000dpi resolution. See @ref motion_normalization for more details.
+ *
  * @note It is an application bug to call this function for events other than
  * @ref LIBINPUT_EVENT_POINTER_MOTION.
  *

From 5d1c275bbc49e874740ae1acfe0809e2bd019de8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 3 Dec 2014 14:28:12 +1000
Subject: [PATCH 114/121] Add missing @ingroup tag

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libinput.h b/src/libinput.h
index 5608eaa3..be4a2225 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -2170,6 +2170,8 @@ int
 libinput_device_config_buttons_get_default_left_handed(struct libinput_device *device);
 
 /**
+ * @ingroup config
+ *
  * The scroll method of a device selects when to generate scroll axis events
  * instead of pointer motion events.
  */

From 06720852fc09aaeea897ba4926924161dd54c68b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 4 Dec 2014 11:08:01 +1000
Subject: [PATCH 115/121] touchpad: drop unused device arg from tp_clear_state

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 67a8d68a..aa9c8197 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -683,7 +683,7 @@ tp_destroy(struct evdev_dispatch *dispatch)
 }
 
 static void
-tp_clear_state(struct tp_dispatch *tp, struct evdev_device *device)
+tp_clear_state(struct tp_dispatch *tp)
 {
 	uint64_t now = libinput_now(tp->device->base.seat->libinput);
 	struct tp_touch *t;
@@ -712,7 +712,7 @@ tp_clear_state(struct tp_dispatch *tp, struct evdev_device *device)
 static void
 tp_suspend(struct tp_dispatch *tp, struct evdev_device *device)
 {
-	tp_clear_state(tp, device);
+	tp_clear_state(tp);
 
 	/* On devices with top softwarebuttons we don't actually suspend the
 	 * device, to keep the "trackpoint" buttons working. tp_post_events()
@@ -732,7 +732,7 @@ tp_resume(struct tp_dispatch *tp, struct evdev_device *device)
 {
 	if (tp->buttons.has_topbuttons) {
 		/* tap state-machine is offline while suspended, reset state */
-		tp_clear_state(tp, device);
+		tp_clear_state(tp);
 		/* restore original topbutton area size */
 		tp_init_softbuttons(tp, device, 1.0);
 		evdev_notify_resumed_device(device);

From 1fa07bbafb7438fde081f430da9633ce1be46f81 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 4 Dec 2014 16:50:32 +1000
Subject: [PATCH 116/121] Always check for INVALID configs first

Always check for invalid input first, then check if the input is supported by
the actual device.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libinput.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libinput.c b/src/libinput.c
index 0d380fa8..60505f67 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1462,12 +1462,12 @@ LIBINPUT_EXPORT enum libinput_config_status
 libinput_device_config_accel_set_speed(struct libinput_device *device,
 				       double speed)
 {
-	if (!libinput_device_config_accel_is_available(device))
-		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
-
 	if (speed < -1.0 || speed > 1.0)
 		return LIBINPUT_CONFIG_STATUS_INVALID;
 
+	if (!libinput_device_config_accel_is_available(device))
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
 	return device->config.accel->set_speed(device, speed);
 }
 
@@ -1576,9 +1576,6 @@ LIBINPUT_EXPORT enum libinput_config_status
 libinput_device_config_scroll_set_method(struct libinput_device *device,
 					 enum libinput_config_scroll_method method)
 {
-	if ((libinput_device_config_scroll_get_methods(device) & method) != method)
-		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
-
 	/* Check method is a single valid method */
 	switch (method) {
 	case LIBINPUT_CONFIG_SCROLL_NO_SCROLL:
@@ -1590,6 +1587,9 @@ libinput_device_config_scroll_set_method(struct libinput_device *device,
 		return LIBINPUT_CONFIG_STATUS_INVALID;
 	}
 
+	if ((libinput_device_config_scroll_get_methods(device) & method) != method)
+		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+
 	if (device->config.scroll_method)
 		return device->config.scroll_method->set_method(device, method);
 	else /* method must be _NO_SCROLL to get here */
@@ -1618,13 +1618,13 @@ LIBINPUT_EXPORT enum libinput_config_status
 libinput_device_config_scroll_set_button(struct libinput_device *device,
 					 uint32_t button)
 {
+	if (button && !libinput_device_has_button(device, button))
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
 	if ((libinput_device_config_scroll_get_methods(device) &
 	     LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) == 0)
 		return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
 
-	if (button && !libinput_device_has_button(device, button))
-		return LIBINPUT_CONFIG_STATUS_INVALID;
-
 	return device->config.scroll_method->set_button(device, button);
 }
 

From 93eca929aeb4376aea974566a24277708da84de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 4 Dec 2014 11:44:09 +0800
Subject: [PATCH 117/121] Introduce unaccelerated motion event vectors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For certain applications (such as FPS games) it is necessary to use
unaccelerated motion events (the motion vector that is passed to the
acceleration filter) to get a more natural feeling. Supply this
information by passing both accelerated and unaccelerated motion
vectors to the existing motion event.

Note that the unaccelerated motion event is not equivalent to 'raw'
events as read from devices.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev-mt-touchpad-edge-scroll.c |  2 +-
 src/evdev-mt-touchpad.c             | 20 +++++--
 src/evdev-mt-touchpad.h             |  4 +-
 src/evdev.c                         | 19 ++++--
 src/libinput-private.h              |  4 +-
 src/libinput.c                      | 22 ++++++-
 src/libinput.h                      | 42 +++++++++++++
 test/pointer.c                      | 91 ++++++++++++++++++++++++++---
 test/touchpad.c                     |  8 ++-
 9 files changed, 188 insertions(+), 24 deletions(-)

diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c
index 1dca0eab..d68fc686 100644
--- a/src/evdev-mt-touchpad-edge-scroll.c
+++ b/src/evdev-mt-touchpad-edge-scroll.c
@@ -338,7 +338,7 @@ tp_edge_scroll_post_events(struct tp_dispatch *tp, uint64_t time)
 		}
 
 		tp_get_delta(t, &dx, &dy);
-		tp_filter_motion(tp, &dx, &dy, time);
+		tp_filter_motion(tp, &dx, &dy, NULL, NULL, time);
 
 		if (fabs(*delta) < t->scroll.threshold)
 			continue;
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index aa9c8197..8149c001 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -58,13 +58,20 @@ tp_motion_history_offset(struct tp_touch *t, int offset)
 
 void
 tp_filter_motion(struct tp_dispatch *tp,
-	         double *dx, double *dy, uint64_t time)
+	         double *dx, double *dy,
+	         double *dx_unaccel, double *dy_unaccel,
+		 uint64_t time)
 {
 	struct motion_params motion;
 
 	motion.dx = *dx * tp->accel.x_scale_coeff;
 	motion.dy = *dy * tp->accel.y_scale_coeff;
 
+	if (dx_unaccel)
+		*dx_unaccel = motion.dx;
+	if (dy_unaccel)
+		*dy_unaccel = motion.dy;
+
 	if (motion.dx != 0.0 || motion.dy != 0.0)
 		filter_dispatch(tp->device->pointer.filter, &motion, tp, time);
 
@@ -426,7 +433,7 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
 	dx /= nchanged;
 	dy /= nchanged;
 
-	tp_filter_motion(tp, &dx, &dy, time);
+	tp_filter_motion(tp, &dx, &dy, NULL, NULL, time);
 
 	evdev_post_scroll(tp->device, time, dx, dy);
 }
@@ -586,6 +593,7 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 	struct tp_touch *t = tp_current_touch(tp);
 	double dx, dy;
 	int filter_motion = 0;
+	double dx_unaccel, dy_unaccel;
 
 	/* Only post (top) button events while suspended */
 	if (tp->device->suspended) {
@@ -617,10 +625,12 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 		return;
 
 	tp_get_delta(t, &dx, &dy);
-	tp_filter_motion(tp, &dx, &dy, time);
+	tp_filter_motion(tp, &dx, &dy, &dx_unaccel, &dy_unaccel, time);
 
-	if (dx != 0.0 || dy != 0.0)
-		pointer_notify_motion(&tp->device->base, time, dx, dy);
+	if (dx != 0.0 || dy != 0.0 || dx_unaccel != 0.0 || dy_unaccel != 0.0) {
+		pointer_notify_motion(&tp->device->base, time,
+				      dx, dy, dx_unaccel, dy_unaccel);
+	}
 }
 
 static void
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index b2603b44..da9c0914 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -276,7 +276,9 @@ tp_set_pointer(struct tp_dispatch *tp, struct tp_touch *t);
 
 void
 tp_filter_motion(struct tp_dispatch *tp,
-	         double *dx, double *dy, uint64_t time);
+	         double *dx, double *dy,
+	         double *dx_unaccel, double *dy_unaccel,
+		 uint64_t time);
 
 int
 tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time);
diff --git a/src/evdev.c b/src/evdev.c
index c2d10d7e..fbfbcd35 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -196,6 +196,7 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 {
 	struct libinput *libinput = device->base.seat->libinput;
 	struct motion_params motion;
+	double dx_unaccel, dy_unaccel;
 	int32_t cx, cy;
 	int32_t x, y;
 	int slot;
@@ -209,8 +210,10 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 	case EVDEV_NONE:
 		return;
 	case EVDEV_RELATIVE_MOTION:
-		motion.dx = device->rel.dx / ((double)device->dpi / DEFAULT_MOUSE_DPI);
-		motion.dy = device->rel.dy / ((double)device->dpi / DEFAULT_MOUSE_DPI);
+		dx_unaccel = device->rel.dx / ((double) device->dpi /
+					       DEFAULT_MOUSE_DPI);
+		dy_unaccel = device->rel.dy / ((double) device->dpi /
+					       DEFAULT_MOUSE_DPI);
 		device->rel.dx = 0;
 		device->rel.dy = 0;
 
@@ -219,17 +222,23 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 		    hw_is_key_down(device, device->scroll.button)) {
 			if (device->scroll.button_scroll_active)
 				evdev_post_scroll(device, time,
-						  motion.dx, motion.dy);
+						  dx_unaccel, dy_unaccel);
 			break;
 		}
 
 		/* Apply pointer acceleration. */
+		motion.dx = dx_unaccel;
+		motion.dy = dy_unaccel;
 		filter_dispatch(device->pointer.filter, &motion, device, time);
 
-		if (motion.dx == 0.0 && motion.dy == 0.0)
+		if (motion.dx == 0.0 && motion.dy == 0.0 &&
+		    dx_unaccel == 0.0 && dy_unaccel == 0.0) {
 			break;
+		}
 
-		pointer_notify_motion(base, time, motion.dx, motion.dy);
+		pointer_notify_motion(base, time,
+				      motion.dx, motion.dy,
+				      dx_unaccel, dy_unaccel);
 		break;
 	case EVDEV_ABSOLUTE_MT_DOWN:
 		if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
diff --git a/src/libinput-private.h b/src/libinput-private.h
index 4a9bd540..b36dc954 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -259,7 +259,9 @@ void
 pointer_notify_motion(struct libinput_device *device,
 		      uint64_t time,
 		      double dx,
-		      double dy);
+		      double dy,
+		      double dx_noaccel,
+		      double dy_noaccel);
 
 void
 pointer_notify_motion_absolute(struct libinput_device *device,
diff --git a/src/libinput.c b/src/libinput.c
index 60505f67..279cce0f 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -59,6 +59,8 @@ struct libinput_event_pointer {
 	uint32_t time;
 	double x;
 	double y;
+	double dx_unaccel;
+	double dy_unaccel;
 	uint32_t button;
 	uint32_t seat_button_count;
 	enum libinput_button_state state;
@@ -303,6 +305,20 @@ libinput_event_pointer_get_dy(struct libinput_event_pointer *event)
 	return event->y;
 }
 
+LIBINPUT_EXPORT double
+libinput_event_pointer_get_dx_unaccelerated(
+	struct libinput_event_pointer *event)
+{
+	return event->dx_unaccel;
+}
+
+LIBINPUT_EXPORT double
+libinput_event_pointer_get_dy_unaccelerated(
+	struct libinput_event_pointer *event)
+{
+	return event->dy_unaccel;
+}
+
 LIBINPUT_EXPORT double
 libinput_event_pointer_get_absolute_x(struct libinput_event_pointer *event)
 {
@@ -891,7 +907,9 @@ void
 pointer_notify_motion(struct libinput_device *device,
 		      uint64_t time,
 		      double dx,
-		      double dy)
+		      double dy,
+		      double dx_unaccel,
+		      double dy_unaccel)
 {
 	struct libinput_event_pointer *motion_event;
 
@@ -903,6 +921,8 @@ pointer_notify_motion(struct libinput_device *device,
 		.time = time,
 		.x = dx,
 		.y = dy,
+		.dx_unaccel = dx_unaccel,
+		.dy_unaccel = dy_unaccel,
 	};
 
 	post_device_event(device, time,
diff --git a/src/libinput.h b/src/libinput.h
index be4a2225..0e2ba6b2 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -555,6 +555,48 @@ libinput_event_pointer_get_dx(struct libinput_event_pointer *event);
 double
 libinput_event_pointer_get_dy(struct libinput_event_pointer *event);
 
+/**
+ * @ingroup event_pointer
+ *
+ * Return the relative delta of the unaccelerated motion vector of the
+ * current event. For pointer events that are not of type @ref
+ * LIBINPUT_EVENT_POINTER_MOTION, this function returns 0.
+ *
+ * Relative unaccelerated motion deltas are normalized to represent those of a
+ * device with 1000dpi resolution. See @ref motion_normalization for more
+ * details. Note that unaccelerated events are not equivalent to 'raw' events
+ * as read from the device.
+ *
+ * @note It is an application bug to call this function for events other than
+ * @ref LIBINPUT_EVENT_POINTER_MOTION.
+ *
+ * @return the unaccelerated relative x movement since the last event
+ */
+double
+libinput_event_pointer_get_dx_unaccelerated(
+	struct libinput_event_pointer *event);
+
+/**
+ * @ingroup event_pointer
+ *
+ * Return the relative delta of the unaccelerated motion vector of the
+ * current event. For pointer events that are not of type @ref
+ * LIBINPUT_EVENT_POINTER_MOTION, this function returns 0.
+ *
+ * Relative unaccelerated motion deltas are normalized to represent those of a
+ * device with 1000dpi resolution. See @ref motion_normalization for more
+ * details. Note that unaccelerated events are not equivalent to 'raw' events
+ * as read from the device.
+ *
+ * @note It is an application bug to call this function for events other than
+ * @ref LIBINPUT_EVENT_POINTER_MOTION.
+ *
+ * @return the unaccelerated relative y movement since the last event
+ */
+double
+libinput_event_pointer_get_dy_unaccelerated(
+	struct libinput_event_pointer *event);
+
 /**
  * @ingroup event_pointer
  *
diff --git a/test/pointer.c b/test/pointer.c
index 206accd5..dfed6b7d 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -29,15 +29,43 @@
 #include <libinput.h>
 #include <math.h>
 #include <unistd.h>
+#include <values.h>
 
 #include "libinput-util.h"
 #include "litest.h"
 
+static struct libinput_event_pointer *
+get_accelerated_motion_event(struct libinput *li)
+{
+	struct libinput_event *event;
+	struct libinput_event_pointer *ptrev;
+
+	while (1) {
+		event = libinput_get_event(li);
+		ck_assert_notnull(event);
+		ck_assert_int_eq(libinput_event_get_type(event),
+				 LIBINPUT_EVENT_POINTER_MOTION);
+
+		ptrev = libinput_event_get_pointer_event(event);
+		ck_assert_notnull(ptrev);
+
+		if (fabs(libinput_event_pointer_get_dx(ptrev)) < DBL_MIN &&
+		    fabs(libinput_event_pointer_get_dy(ptrev)) < DBL_MIN) {
+			libinput_event_destroy(event);
+			continue;
+		}
+
+		return ptrev;
+	}
+
+	ck_abort_msg("No accelerated pointer motion event found");
+	return NULL;
+}
+
 static void
 test_relative_event(struct litest_device *dev, int dx, int dy)
 {
 	struct libinput *li = dev->libinput;
-	struct libinput_event *event;
 	struct libinput_event_pointer *ptrev;
 	double ev_dx, ev_dy;
 	double expected_dir;
@@ -56,12 +84,7 @@ test_relative_event(struct litest_device *dev, int dx, int dy)
 
 	libinput_dispatch(li);
 
-	event = libinput_get_event(li);
-	ck_assert(event != NULL);
-	ck_assert_int_eq(libinput_event_get_type(event), LIBINPUT_EVENT_POINTER_MOTION);
-
-	ptrev = libinput_event_get_pointer_event(event);
-	ck_assert(ptrev != NULL);
+	ptrev = get_accelerated_motion_event(li);
 
 	expected_length = sqrt(4 * dx*dx + 4 * dy*dy);
 	expected_dir = atan2(dx, dy);
@@ -78,7 +101,7 @@ test_relative_event(struct litest_device *dev, int dx, int dy)
 	 * indifference). */
 	ck_assert(fabs(expected_dir - actual_dir) < M_PI_2);
 
-	libinput_event_destroy(event);
+	libinput_event_destroy(libinput_event_pointer_get_base_event(ptrev));
 
 	litest_drain_events(dev->libinput);
 }
@@ -139,6 +162,57 @@ START_TEST(pointer_motion_absolute)
 }
 END_TEST
 
+static void
+test_unaccel_event(struct litest_device *dev, int dx, int dy)
+{
+      struct libinput *li = dev->libinput;
+      struct libinput_event *event;
+      struct libinput_event_pointer *ptrev;
+      double ev_dx, ev_dy;
+
+      litest_event(dev, EV_REL, REL_X, dx);
+      litest_event(dev, EV_REL, REL_Y, dy);
+      litest_event(dev, EV_SYN, SYN_REPORT, 0);
+
+      libinput_dispatch(li);
+
+      event = libinput_get_event(li);
+      ck_assert_notnull(event);
+      ck_assert_int_eq(libinput_event_get_type(event),
+                       LIBINPUT_EVENT_POINTER_MOTION);
+
+      ptrev = libinput_event_get_pointer_event(event);
+      ck_assert(ptrev != NULL);
+
+      ev_dx = libinput_event_pointer_get_dx_unaccelerated(ptrev);
+      ev_dy = libinput_event_pointer_get_dy_unaccelerated(ptrev);
+
+      ck_assert_int_eq(dx, ev_dx);
+      ck_assert_int_eq(dy, ev_dy);
+
+      libinput_event_destroy(event);
+
+      litest_drain_events(dev->libinput);
+}
+
+START_TEST(pointer_motion_unaccel)
+{
+      struct litest_device *dev = litest_current_device();
+
+      litest_drain_events(dev->libinput);
+
+      test_unaccel_event(dev, 10, 0);
+      test_unaccel_event(dev, 10, 10);
+      test_unaccel_event(dev, 10, -10);
+      test_unaccel_event(dev, 0, 10);
+
+      test_unaccel_event(dev, -10, 0);
+      test_unaccel_event(dev, -10, 10);
+      test_unaccel_event(dev, -10, -10);
+      test_unaccel_event(dev, 0, -10);
+}
+END_TEST
+
 static void
 test_button_event(struct litest_device *dev, unsigned int button, int state)
 {
@@ -652,6 +726,7 @@ int main (int argc, char **argv) {
 
 	litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
 	litest_add("pointer:motion", pointer_motion_absolute, LITEST_ABSOLUTE, LITEST_ANY);
+	litest_add("pointer:motion", pointer_motion_unaccel, LITEST_RELATIVE, LITEST_ANY);
 	litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD);
 	litest_add_no_device("pointer:button_auto_release", pointer_button_auto_release);
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
diff --git a/test/touchpad.c b/test/touchpad.c
index 2b79aafe..934674c1 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -1173,8 +1173,12 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move)
 		x = libinput_event_pointer_get_dx(p);
 		y = libinput_event_pointer_get_dy(p);
 
-		ck_assert(x > 0);
-		ck_assert(y == 0);
+		/* Ignore events only containing an unaccelerated motion
+		 * vector. */
+		if (x != 0 || y != 0) {
+			ck_assert(x > 0);
+			ck_assert(y == 0);
+		}
 
 		libinput_event_destroy(event);
 		libinput_dispatch(li);

From 3b4d8509ccf6b17d01a496e5d0d66892ffd5bde3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 4 Dec 2014 11:44:10 +0800
Subject: [PATCH 118/121] test: Don't send two motion events when button
 scrolling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Button scrolling motion events don't pass through the acceleration
filter so no need to assume the initial event will be absorbed.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 test/litest.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/test/litest.c b/test/litest.c
index e2ec90d6..2ab802bc 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -810,12 +810,6 @@ litest_button_scroll(struct litest_device *dev,
 	litest_timeout_buttonscroll();
 	libinput_dispatch(li);
 
-	/* Send two deltas, as the first one may be eaten up by an
-	 * acceleration filter. */
-	litest_event(dev, EV_REL, REL_X, dx);
-	litest_event(dev, EV_REL, REL_Y, dy);
-	litest_event(dev, EV_SYN, SYN_REPORT, 0);
-
 	litest_event(dev, EV_REL, REL_X, dx);
 	litest_event(dev, EV_REL, REL_Y, dy);
 	litest_event(dev, EV_SYN, SYN_REPORT, 0);

From 1affca8d44541141dc981e5a51766b98f4a8e259 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 5 Dec 2014 12:52:22 +1000
Subject: [PATCH 119/121] Split libinput-util into a noinst helper library
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes distcheck (automake 1.14.1)

make[2]: Entering directory '....../libinput-0.7.0/_build/test'
Makefile:926: ../src/.deps/libinput-util.Plo: No such file or directory
make[2]: *** No rule to make target '../src/.deps/libinput-util.Plo'.  Stop.
make[2]: Leaving directory '....../libinput/libinput-0.7.0/_build/test'
Makefile:412: recipe for target 'distclean-recursive' failed

That was the only place we used subdir objects, so we can drop it from
configure now.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
---
 configure.ac     |  2 +-
 src/Makefile.am  | 16 +++++++++++++---
 test/Makefile.am |  5 ++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8aa2a552..eb75a4e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_SUBST([LIBINPUT_VERSION], [libinput_version])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 
 # Before making a release, the LIBINPUT_LT_VERSION string should be
 # modified.
diff --git a/src/Makefile.am b/src/Makefile.am
index 027e08ca..0968459c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 lib_LTLIBRARIES = libinput.la
+noinst_LTLIBRARIES = libinput-util.la
 
 include_HEADERS =			\
 	libinput.h
@@ -7,8 +8,6 @@ libinput_la_SOURCES =			\
 	libinput.c			\
 	libinput.h			\
 	libinput-private.h		\
-	libinput-util.c			\
-	libinput-util.h			\
 	evdev.c				\
 	evdev.h				\
 	evdev-mt-touchpad.c		\
@@ -29,13 +28,24 @@ libinput_la_SOURCES =			\
 
 libinput_la_LIBADD = $(MTDEV_LIBS) \
 		     $(LIBUDEV_LIBS) \
-		     $(LIBEVDEV_LIBS)
+		     $(LIBEVDEV_LIBS) \
+		     libinput-util.la
+
 libinput_la_CFLAGS = -I$(top_srcdir)/include \
 		     $(MTDEV_CFLAGS)	\
 		     $(LIBUDEV_CFLAGS)	\
 		     $(LIBEVDEV_CFLAGS)	\
 		     $(GCC_CFLAGS)
 
+libinput_util_la_SOURCES = \
+	libinput-util.c		\
+	libinput-util.h
+
+libinput_util_la_LIBADD =
+libinput_util_la_CFLAGS = -I$(top_srcdir)/include \
+			  $(LIBUDEV_CFLAGS) \
+			  $(GCC_CFLAGS)
+
 libinput_la_LDFLAGS = -version-info $(LIBINPUT_LT_VERSION) -shared
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/test/Makefile.am b/test/Makefile.am
index 0abd695d..2c36e3fc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,8 +11,6 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
 TEST_LIBS = liblitest.la $(CHECK_LIBS) $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libinput.la
 noinst_LTLIBRARIES = liblitest.la
 liblitest_la_SOURCES = \
-	../src/libinput-util.h \
-	../src/libinput-util.c \
 	litest.h \
 	litest-int.h \
 	litest-alps-semi-mt.c \
@@ -30,6 +28,7 @@ liblitest_la_SOURCES = \
 	litest-xen-virtual-pointer.c \
 	litest-vmware-virtual-usb-mouse.c \
 	litest.c
+liblitest_la_LIBADD = $(top_builddir)/src/libinput-util.la
 
 run_tests = \
 	test-udev \
@@ -103,7 +102,7 @@ test_build_std_gnuc90_CFLAGS = -std=gnu90 -Werror
 # test for linking with the minimal linker flags
 test_build_linker_SOURCES = build-pedantic.c
 test_build_linker_CFLAGS = -I$(top_srcdir)/src
-test_build_linker_LDADD = $(top_builddir)/src/libinput.la
+test_build_linker_LDADD = $(top_builddir)/src/libinput.la $(top_builddir)/src/libinput-util.la
 
 # test including from C++
 test_build_cxx_SOURCES = build-cxx.cc

From f9336361430f176e1d090decd19f5af3650f1814 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 5 Dec 2014 13:41:04 +1000
Subject: [PATCH 120/121] udev: only apply default calibration on absolute
 devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a crash if the LIBINPUT_CALIBRATION_MATRIX is set for a relative device.

https://bugs.freedesktop.org/show_bug.cgi?id=86993

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
---
 src/udev-seat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/udev-seat.c b/src/udev-seat.c
index f7a3df34..3d057336 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -93,7 +93,8 @@ device_added(struct udev_device *udev_device,
 		udev_device_get_property_value(udev_device,
 					       "LIBINPUT_CALIBRATION_MATRIX");
 
-	if (calibration_values && sscanf(calibration_values,
+	if (device->abs.absinfo_x && device->abs.absinfo_y &&
+	    calibration_values && sscanf(calibration_values,
 					 "%f %f %f %f %f %f",
 					 &calibration[0],
 					 &calibration[1],

From 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 5 Dec 2014 12:08:22 +1000
Subject: [PATCH 121/121] configure.ac: libinput 0.7

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index eb75a4e2..33e380ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.64])
 
 m4_define([libinput_major_version], [0])
-m4_define([libinput_minor_version], [6])
+m4_define([libinput_minor_version], [7])
 m4_define([libinput_micro_version], [0])
 m4_define([libinput_version],
           [libinput_major_version.libinput_minor_version.libinput_micro_version])
@@ -30,7 +30,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBINPUT_LT_VERSION=5:0:0
+LIBINPUT_LT_VERSION=6:0:1
 AC_SUBST(LIBINPUT_LT_VERSION)
 
 AM_SILENT_RULES([yes])