README.md

@@ -15,11 +15,11 @@ User documentation
 ------------------
 
 Documentation explaining features available in libinput is available
-[here](https://wayland.freedesktop.org/libinput/doc/latest/pages.html).
+[here](https://wayland.freedesktop.org/libinput/doc/latest/features.html).
 
-This includes the [FAQ](https://wayland.freedesktop.org/libinput/doc/latest/faq.html)
+This includes the [FAQ](https://wayland.freedesktop.org/libinput/doc/latest/faqs.html)
 and the instructions on
-[reporting bugs](https://wayland.freedesktop.org/libinput/doc/latest/reporting_bugs.html).
+[reporting bugs](https://wayland.freedesktop.org/libinput/doc/latest/reporting-bugs.html).
 
 
 Source code
@@ -32,7 +32,7 @@ For a list of current and past releases visit:
 https://www.freedesktop.org/wiki/Software/libinput/
 
 Build instructions:
-https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html
+https://wayland.freedesktop.org/libinput/doc/latest/building.html
 
 Reporting Bugs
 --------------
@@ -49,11 +49,11 @@ for more info.
 Documentation
 -------------
 
-- Developer API documentation: https://wayland.freedesktop.org/libinput/doc/latest/modules.html
+- Developer API documentation: https://wayland.freedesktop.org/libinput/doc/latest/development.html
 - High-level documentation about libinput's features:
-  https://wayland.freedesktop.org/libinput/doc/latest/pages.html
+  https://wayland.freedesktop.org/libinput/doc/latest/features.html
 - Build instructions:
-  https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html
+  https://wayland.freedesktop.org/libinput/doc/latest/building.html
 - Documentation for previous versions of libinput: https://wayland.freedesktop.org/libinput/doc/
 
 Examples of how to use libinput are the debugging tools in the libinput

debian/changelog

-libinput (1.12.4-2) UNRELEASED; urgency=medium
+libinput (1.12.6-1) unstable; urgency=medium
 
+  * New upstream release.
   * control: Fix typos in descriptions. (Closes: #916458)
 
- -- Timo Aaltonen <tjaalton@debian.org>  Tue, 18 Dec 2018 13:03:42 +0200
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 23 Jan 2019 13:51:42 +0200
 
 libinput (1.12.4-1) unstable; urgency=medium
 

doc/user/reporting-bugs.rst

@@ -228,7 +228,7 @@ device capabilities together with the event stream from the kernel. On our
 side, this allows us to recreate a virtual device identical to your device
 and re-play the event sequence, hopefully triggering the same bug.
 
-evemu-record takes a <tt>/dev/input/eventX</tt> event node, but without arguments
+evemu-record takes a ``/dev/input/eventX`` event node, but without arguments
 it will simply show the list of devices and let you select: ::
 
      $ sudo evemu-record > scroll.evemu

meson.build

 project('libinput', 'c', 'cpp',
-	version : '1.12.4',
+	version : '1.12.6',
 	license : 'MIT/Expat',
 	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
 	meson_version : '>= 0.41.0')
@@ -251,6 +251,7 @@ quirks_data = [
 	'quirks/10-generic-trackball.quirks',
 	'quirks/30-vendor-aiptek.quirks',
 	'quirks/30-vendor-alps.quirks',
+	'quirks/30-vendor-contour.quirks',
 	'quirks/30-vendor-cyapa.quirks',
 	'quirks/30-vendor-elantech.quirks',
 	'quirks/30-vendor-huion.quirks',

quirks/30-vendor-contour.quirks

+[Contour Design RollerMouse Free 2]
+MatchVendor=0x0b33
+MatchProduct=0x0401
+MatchUdevType=mouse
+ModelBouncingKeys=1
+
+[Contour Design RollerMouse Re:d]
+MatchVendor=0x0b33
+MatchProduct=0x1000
+MatchUdevType=mouse
+ModelBouncingKeys=1

quirks/50-system-acer.quirks

@@ -3,3 +3,7 @@ MatchName=AT Translated Set 2 keyboard
 MatchDMIModalias=dmi:*svnAcer:pnSwitchSA5-271:*
 ModelTabletModeNoSuspend=1
 
+[Acer Spin 5]
+MatchName=AT Translated Set 2 keyboard
+MatchDMIModalias=dmi:*svnAcer:pnSpinSP513-52N:*
+ModelTabletModeNoSuspend=1
\ No newline at end of file

quirks/50-system-asus.quirks

@@ -17,3 +17,15 @@ AttrPressureRange=24:10
 MatchName=*ETPS/2 Elantech Touchpad*
 MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnUX302LA:*
 AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
+
+# Asus VivoBook Flip 14 TP412UA tablet switch seems misbehaving, always
+# indicating tablet position
+[Asus TP412UA Keyboard]
+MatchName=AT Translated Set 2 keyboard
+MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
+ModelTabletModeNoSuspend=1
+
+[Asus TP412UA Touchpad]
+MatchName=*ELAN*Touchpad*
+MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
+ModelTabletModeNoSuspend=1

src/evdev-mt-touchpad.c

@@ -2504,6 +2504,10 @@ tp_pair_tablet_mode_switch(struct evdev_device *touchpad,
 	if (touchpad->tags & EVDEV_TAG_EXTERNAL_TOUCHPAD)
 		return;
 
+	if (evdev_device_has_model_quirk(touchpad,
+					 QUIRK_MODEL_TABLET_MODE_NO_SUSPEND))
+		return;
+
 	evdev_log_debug(touchpad,
 			"tablet_mode_switch: activated for %s<->%s\n",
 			touchpad->devname,

src/libinput.h

@@ -3159,7 +3159,8 @@ libinput_set_user_data(struct libinput *libinput,
  *
  * @param libinput A previously initialized libinput context
  * @return The caller-specific data previously assigned in
- * libinput_create_udev().
+ * libinput_set_user_data(), libinput_path_create_context() or
+ * libinput_udev_create_context().
  */
 void *
 libinput_get_user_data(struct libinput *libinput);

tools/libinput-measure-fuzz.py

@@ -455,7 +455,7 @@ def main(args):
     except PermissionError as e:
         print('Permission denied, please re-run as root')
     except InvalidConfigurationError as e:
-        print('Error: {}'.format(e.message))
+        print('Error: {}'.format(e))
     except KeyboardInterrupt as e:
         print('Exited on user request')
 

tools/libinput-record.man

@@ -53,6 +53,10 @@ This option requires that a
 \fB\-\-output-file\fR is specified and that all devices to be recorded are
 given on the commandline.
 .TP 8
+.B \-\-show\-keycodes
+Show keycodes as-is in the recording. By default, common keys are obfuscated
+and printed as \fBKEY_A\fR to avoid information leaks.
+.TP 8
 .B \-\-with-libinput
 Record libinput events alongside device events.
 .B THIS FEATURE IS EXPERIMENTAL.