Merge branch 'master' into tablet-support

diff --cc configure.ac
Simple merge

diff --cc doc/Makefile.am
index 4c487a3,c9dccfd..ff65e5c
--- 1/doc/Makefile.am
--- 2/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -21,10 -22,10 +22,11 @@@ header_files = 
        $(srcdir)/scrolling.dox \
        $(srcdir)/seats.dox \
        $(srcdir)/t440-support.dox \
 +      $(srcdir)/tablet-support.dox \
        $(srcdir)/tapping.dox \
        $(srcdir)/test-suite.dox \
-       $(srcdir)/tools.dox
+       $(srcdir)/tools.dox \
+       $(srcdir)/touchpads.dox
  
  diagram_files = \
        $(srcdir)/dot/seats-sketch.gv \

diff --cc src/evdev-mt-touchpad.c
Simple merge

diff --cc src/evdev.c
index 8476832,17c2604..e58b007
--- 1/src/evdev.c
--- 2/src/evdev.c
+++ b/src/evdev.c
@@@ -1949,24 -1949,8 +1951,23 @@@ evdev_configure_device(struct evdev_dev
                }
        }
  
 +      /* libwacom assigns touchpad (or touchscreen) _and_ tablet to the
 +         tablet touch bits, so make sure we don't initialize the tablet
 +         interface for the touch device */
 +      tablet_tags = EVDEV_UDEV_TAG_TABLET |
 +                    EVDEV_UDEV_TAG_TOUCHPAD |
 +                    EVDEV_UDEV_TAG_TOUCHSCREEN;
 +      if ((udev_tags & tablet_tags) == EVDEV_UDEV_TAG_TABLET) {
 +              device->dispatch = evdev_tablet_create(device);
 +              device->seat_caps |= EVDEV_DEVICE_TABLET;
 +              log_info(libinput,
 +                       "input device '%s', %s is a tablet\n",
 +                       device->devname, devnode);
 +              return device->dispatch == NULL ? -1 : 0;
 +      }
 +
        if (udev_tags & EVDEV_UDEV_TAG_TOUCHPAD) {
                device->dispatch = evdev_mt_touchpad_create(device);
-               device->seat_caps |= EVDEV_DEVICE_GESTURE;
                log_info(libinput,
                         "input device '%s', %s is a touchpad\n",
                         device->devname, devnode);

diff --cc src/evdev.h
Simple merge

diff --cc src/libinput-private.h
Simple merge

diff --cc src/libinput-util.h
Simple merge

diff --cc src/libinput.c
Simple merge

diff --cc src/libinput.h
Simple merge

diff --cc src/libinput.sym
index fb1c59b,7e0ef1c..1529547
--- 1/src/libinput.sym
--- 2/src/libinput.sym
+++ b/src/libinput.sym
@@@ -168,32 -167,8 +168,36 @@@ LIBINPUT_0.21.0 
        libinput_device_config_dwt_set_enabled;
        libinput_device_config_dwt_get_enabled;
        libinput_device_config_dwt_get_default_enabled;
+       libinput_event_gesture_get_time_usec;
+       libinput_event_keyboard_get_time_usec;
+       libinput_event_pointer_get_time_usec;
+       libinput_event_touch_get_time_usec;
  } LIBINPUT_0.20.0;
 +
 +/* tablet APIs, they are not part of any stable API promise yet.
 + * keep them separate */
 +LIBINPUT_TABLET_SUPPORT {
 +      libinput_event_get_tablet_event;
 +      libinput_event_tablet_axis_has_changed;
 +      libinput_event_tablet_get_axis_delta;
 +      libinput_event_tablet_get_axis_delta_discrete;
 +      libinput_event_tablet_get_axis_value;
 +      libinput_event_tablet_get_base_event;
 +      libinput_event_tablet_get_button;
 +      libinput_event_tablet_get_button_state;
 +      libinput_event_tablet_get_proximity_state;
 +      libinput_event_tablet_get_seat_button_count;
 +      libinput_event_tablet_get_time;
 +      libinput_event_tablet_get_tool;
 +      libinput_event_tablet_get_x_transformed;
 +      libinput_event_tablet_get_y_transformed;
 +      libinput_tool_get_serial;
 +      libinput_tool_get_tool_id;
 +      libinput_tool_get_type;
 +      libinput_tool_get_user_data;
 +      libinput_tool_has_button;
 +      libinput_tool_has_axis;
 +      libinput_tool_ref;
 +      libinput_tool_set_user_data;
 +      libinput_tool_unref;
 +} LIBINPUT_0.21.0;

diff --cc test/Makefile.am
Simple merge

diff --cc test/litest.c
Simple merge

diff --cc test/litest.h
Simple merge

diff --cc test/misc.c
Simple merge

diff --cc test/pointer.c
Simple merge