Merge branch 'wip/tablet-pad-support'

diff --cc src/evdev.c
Simple merge

diff --cc src/evdev.h
Simple merge

diff --cc src/libinput.sym
index a211388303fdd873dbd18e95126ae018218ecd5c,6be2940a5959fea23e25857435581e794677d010..ca1baba7824457016b11e140dff85117e9d78eba
--- 1/src/libinput.sym
--- 2/src/libinput.sym
+++ b/src/libinput.sym
@@@ -234,3 -234,21 +234,21 @@@ LIBINPUT_1.2 
        libinput_tablet_tool_set_user_data;
        libinput_tablet_tool_unref;
  } LIBINPUT_1.1;
 -TABLET_PAD {
+ 
++LIBINPUT_1.3 {
+       libinput_device_tablet_pad_get_num_buttons;
+       libinput_device_tablet_pad_get_num_rings;
+       libinput_device_tablet_pad_get_num_strips;
+       libinput_event_get_tablet_pad_event;
+       libinput_event_tablet_pad_get_base_event;
+       libinput_event_tablet_pad_get_button_number;
+       libinput_event_tablet_pad_get_button_state;
+       libinput_event_tablet_pad_get_ring_position;
+       libinput_event_tablet_pad_get_ring_number;
+       libinput_event_tablet_pad_get_ring_source;
+       libinput_event_tablet_pad_get_strip_position;
+       libinput_event_tablet_pad_get_strip_number;
+       libinput_event_tablet_pad_get_strip_source;
+       libinput_event_tablet_pad_get_time;
+       libinput_event_tablet_pad_get_time_usec;
+ } LIBINPUT_1.2;

diff --cc test/Makefile.am
Simple merge

diff --cc test/litest.c
index 937e86772e8a9c3c3daf66135331b8eb0a059673,b10c42e3a1789cd622a7e35de70ccbde6769b931..48569d6dd8f3b42a79983e236d160baa4a1d8c5d
--- 1/test/litest.c
--- 2/test/litest.c
+++ b/test/litest.c
@@@ -379,7 -379,8 +379,9 @@@ extern struct litest_test_device litest
  extern struct litest_test_device litest_yubikey_device;
  extern struct litest_test_device litest_synaptics_i2c_device;
  extern struct litest_test_device litest_wacom_cintiq_24hd_device;
 +extern struct litest_test_device litest_multitouch_fuzz_screen_device;
+ extern struct litest_test_device litest_wacom_intuos3_pad_device;
+ extern struct litest_test_device litest_wacom_intuos5_pad_device;
  
  struct litest_test_device* devices[] = {
        &litest_synaptics_clickpad_device,
@@@ -425,7 -426,8 +427,9 @@@
        &litest_yubikey_device,
        &litest_synaptics_i2c_device,
        &litest_wacom_cintiq_24hd_device,
 +      &litest_multitouch_fuzz_screen_device,
+       &litest_wacom_intuos3_pad_device,
+       &litest_wacom_intuos5_pad_device,
        NULL,
  };
  

diff --cc test/litest.h
index cc06ca51777ba730bbeb1c4c70e4d54427871e34,81ce44d8a148cdef973d57b40d368c6123ff3b02..f77fc7337ec445ef0dd4f56ae7be31be2f32d0a4
--- 1/test/litest.h
--- 2/test/litest.h
+++ b/test/litest.h
@@@ -196,7 -196,8 +196,9 @@@ enum litest_device_type 
        LITEST_YUBIKEY = -42,
        LITEST_SYNAPTICS_I2C = -43,
        LITEST_WACOM_CINTIQ_24HD = -44,
 -      LITEST_WACOM_INTUOS3_PAD = -45,
 -      LITEST_WACOM_INTUOS5_PAD = -46,
 +      LITEST_MULTITOUCH_FUZZ_SCREEN = -45,
++      LITEST_WACOM_INTUOS3_PAD = -46,
++      LITEST_WACOM_INTUOS5_PAD = -47,
  };
  
  enum litest_device_feature {