[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libinput: Changes to 'debian-unstable'



 .gitignore                                   |    2 
 Makefile.am                                  |    2 
 README.md                                    |   92 ++
 README.txt                                   |   98 --
 configure.ac                                 |  145 +--
 debian/changelog                             |    9 
 debian/libinput-tools.install                |    1 
 debian/rules                                 |    3 
 doc/Makefile.am                              |    3 
 doc/building.dox                             |  103 ++
 doc/device-configuration-via-udev.dox        |    2 
 doc/faqs.dox                                 |   23 
 doc/libinput.doxygen.in                      |    4 
 doc/page-hierarchy.dox                       |    3 
 doc/switches.dox                             |   18 
 doc/timestamps.dox                           |   36 
 doc/tools.dox                                |   73 -
 doc/touchpad-pressure.dox                    |    2 
 meson.build                                  |  683 ++++++++++++++++++
 meson_options.txt                            |   20 
 src/Makefile.am                              |    2 
 src/evdev-lid.c                              |   98 +-
 src/evdev-mt-touchpad-buttons.c              |    4 
 src/evdev-mt-touchpad-edge-scroll.c          |    2 
 src/evdev-mt-touchpad-gestures.c             |    5 
 src/evdev-mt-touchpad-tap.c                  |   86 +-
 src/evdev-mt-touchpad.c                      |  251 ++++--
 src/evdev-mt-touchpad.h                      |   22 
 src/evdev-tablet-pad.h                       |    4 
 src/evdev-tablet.c                           |  536 +++++++++-----
 src/evdev-tablet.h                           |   15 
 src/evdev.c                                  |   95 ++
 src/evdev.h                                  |   12 
 src/libinput-private.h                       |   26 
 src/libinput-restore-selinux-context.sh      |   12 
 src/libinput-util.c                          |    9 
 src/libinput-util.h                          |   41 -
 src/libinput.c                               |  119 ++-
 src/libinput.h                               |   44 +
 test/Makefile.am                             |    3 
 test/litest-device-mouse-wheel-click-count.c |    6 
 test/litest.c                                |  292 ++++---
 test/litest.h                                |   10 
 test/symbols-leak-test.in                    |   15 
 test/test-device.c                           |    2 
 test/test-keyboard.c                         |    3 
 test/test-lid.c                              |   54 +
 test/test-log.c                              |    1 
 test/test-misc.c                             |   14 
 test/test-path.c                             |  151 ++--
 test/test-pointer.c                          |    4 
 test/test-tablet.c                           |   81 +-
 test/test-touch.c                            |   66 +
 test/test-touchpad-tap.c                     |  252 ++++++
 test/test-touchpad.c                         |  156 ++--
 test/valgrind.suppressions                   |    6 
 tools/.gitignore                             |    4 
 tools/Makefile.am                            |   84 +-
 tools/event-debug.c                          |  922 -------------------------
 tools/event-gui.c                            |  903 ------------------------
 tools/install-compat-scripts.sh              |    9 
 tools/libinput-debug-events.c                |  994 +++++++++++++++++++++++++++
 tools/libinput-debug-events.compat           |    4 
 tools/libinput-debug-events.man              |   76 +-
 tools/libinput-debug-gui.c                   |  960 ++++++++++++++++++++++++++
 tools/libinput-debug-gui.man                 |   48 +
 tools/libinput-list-devices.c                |   26 
 tools/libinput-list-devices.compat           |    4 
 tools/libinput-list-devices.man              |   20 
 tools/libinput-measure-touchpad-tap.c        |  507 +++++++++++++
 tools/libinput-measure-touchpad-tap.man      |   80 ++
 tools/libinput-measure.c                     |   79 ++
 tools/libinput-measure.man                   |   30 
 tools/libinput-tool.c                        |  108 ++
 tools/libinput.man                           |   59 +
 tools/publish-doc                            |   10 
 tools/shared.c                               |  433 +++++------
 tools/shared.h                               |   74 +-
 udev/90-libinput-model-quirks.hwdb           |   25 
 udev/90-libinput-model-quirks.rules.in       |    8 
 udev/parse_hwdb.py                           |   11 
 81 files changed, 6115 insertions(+), 3184 deletions(-)

New commits:
commit ac45481793f206d893b615e2692827aa65113e11
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Thu Jul 6 01:03:20 2017 +0300

    release to unstable

diff --git a/debian/changelog b/debian/changelog
index 4d4114e..1e8283a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libinput (1.8.0-1) UNRELEASED; urgency=medium
+libinput (1.8.0-1) unstable; urgency=medium
 
   * New upstream release.
   * rules: Explicitly disable building debug-gui, documentation and
     tests.
   * tools: Add debug tools.
 
- -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Jul 2017 23:58:05 +0300
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 06 Jul 2017 00:56:56 +0300
 
 libinput (1.7.3-1) unstable; urgency=medium
 

commit 3c045a322631c7d805a3c7ad763d6eca4865a687
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Thu Jul 6 00:56:45 2017 +0300

    tools: Add debug tools.

diff --git a/debian/changelog b/debian/changelog
index 857493f..4d4114e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libinput (1.8.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * rules: Explicitly disable building debug-gui, documentation and
     tests.
+  * tools: Add debug tools.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Jul 2017 23:58:05 +0300
 
diff --git a/debian/libinput-tools.install b/debian/libinput-tools.install
index 68671de..4a8c702 100644
--- a/debian/libinput-tools.install
+++ b/debian/libinput-tools.install
@@ -1,2 +1,3 @@
 usr/bin/*
+usr/lib/*/libinput/*
 usr/share/man/man1/*

commit d1694fa5183cc426ff4ef1dd391eb80331c9048c
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Thu Jul 6 00:55:06 2017 +0300

    rules: Explicitly disable building debug-gui, documentation and tests.

diff --git a/debian/changelog b/debian/changelog
index bdfa8d3..857493f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libinput (1.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * rules: Explicitly disable building debug-gui, documentation and
+    tests.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Jul 2017 23:58:05 +0300
 
diff --git a/debian/rules b/debian/rules
index 5ea78db..042c323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		--enable-debug-gui=no \
+		--enable-documentation=no \
+		--enable-tests=no \
 		--with-udev-dir=/lib/udev
 
 override_dh_install:

commit ea3004ac7b9a2eb872637bc43dc120a2e0a902cb
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Thu Jul 6 00:00:17 2017 +0300

    update the changelog

diff --git a/debian/changelog b/debian/changelog
index 411720c..bdfa8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libinput (1.8.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Jul 2017 23:58:05 +0300
+
 libinput (1.7.3-1) unstable; urgency=medium
 
   * New upstream release.

commit 401728a1574ef886ddb7fa19cd8ed196420d7931
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Jul 3 15:07:20 2017 +1000

    configure.ac: libinput 1.8.0
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index a66371c..eabc9e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.64])
 
 m4_define([libinput_major_version], [1])
-m4_define([libinput_minor_version], [7])
-m4_define([libinput_micro_version], [902])
+m4_define([libinput_minor_version], [8])
+m4_define([libinput_micro_version], [0])
 m4_define([libinput_version],
           [libinput_major_version.libinput_minor_version.libinput_micro_version])
 
diff --git a/meson.build b/meson.build
index bc63971..5ee1520 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('libinput', 'c', 'cpp',
-	version : '1.7.902',
+	version : '1.8.0',
 	license : 'MIT/Expat',
 	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
 	meson_version : '>= 0.40.0')

commit 945122c6919a00dbb6fcd5c0ad17736f1c23d410
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Jul 3 13:33:20 2017 +1000

    tools: tidy up the libinput man pages again
    
    Make the libinput page more generic but suitable for short attention spans and
    most importantly, point to the xf86-input-libinput man page in a more obvious
    manner since we're now shadowing that.
    
    The rest of the man pages have punctuation and formatting cleanups only.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/tools/libinput-debug-events.man b/tools/libinput-debug-events.man
index ac16d57..473e064 100644
--- a/tools/libinput-debug-events.man
+++ b/tools/libinput-debug-events.man
@@ -2,7 +2,7 @@
 .SH NAME
 libinput\-debug\-events \- debug helper for libinput
 .SH SYNOPSIS
-libinput debug\-events [\-\-help] [\-\-show\-keycodes] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
+.B libinput debug\-events [\-\-help] [\-\-show\-keycodes] [\-\-udev \fI<seat>\fB|\-\-device \fI/dev/input/event0\fB] \fI[configuration options]\fB
 .SH DESCRIPTION
 .PP
 The
@@ -16,8 +16,8 @@ This tool usually needs to be run as root to have access to the
 /dev/input/eventX nodes.
 .SH OPTIONS
 .TP 8
-.B \-\-device /dev/input/event0
-Use the given device with the path backend.
+.B \-\-device \fI/dev/input/event0\fR
+Use the given device with the path backend
 .TP 8
 .B \-\-grab
 Exclusively grab all opened devices. This will prevent events from being
@@ -36,7 +36,7 @@ and other sensitive information showing up in the output. Use the
 .B \-\-show\-keycodes
 argument to make all keycodes visible.
 .TP 8
-.B \-\-udev <seat>
+.B \-\-udev \fI<seat>\fR
 Use the udev backend to listen for device notifications on the given seat.
 The default behavior is equivalent to \-\-udev "seat0".
 .TP 8
@@ -45,40 +45,40 @@ Use verbose output
 .SS libinput configuration options
 .TP 8
 .B \-\-enable\-tap|\-\-disable\-tap
-Enable or disable tap-to-click.
+Enable or disable tap-to-click
 .TP 8
 .B \-\-enable-drag|\-\-disable\-drag
 Enable or disable tap-and-drag
 .TP 8
 .B \-\-enable\-drag-lock|\-\-disable\-drag\-lock
-Enable or disable tap-and-drag.
+Enable or disable tap-and-drag
 .TP 8
 .B \-\-enable\-natural\-scrolling|\-\-disable\-natural\-scrolling
-Enable or disable natural scrolling.
+Enable or disable natural scrolling
 .TP 8
 .B \-\-enable\-left\-handed|\-\-disable\-left\-handed
-Enable or disable left handed button configuration.
+Enable or disable left handed button configuration
 .TP 8
 .B \-\-enable\-dwt|\-\-disable\-dwt
-Enable or disable disable-while-typing.
+Enable or disable disable-while-typing
 .TP 8
 .B \-\-set\-click\-method=[none|clickfinger|buttons]
 Set the desired click method
 .TP 8
 .B \-\-set\-scroll\-method=[none|twofinger|edge|button]
-Set the desired scroll method.
+Set the desired scroll method
 .TP 8
 .B \-\-set\-scroll\-button=BTN_MIDDLE
-Set the button to the given button code.
+Set the button to the given button code
 .TP 8
 .B \-\-set\-profile=[adaptive|flat]
-Set pointer acceleration profile.
+Set pointer acceleration profile
 .TP 8
 .B \-\-set\-speed=<value>
 Set pointer acceleration speed. The allowed range is [-1, 1].
 .TP 8
 .B \-\-set\-tap\-map=[lrm|lmr]
-Set button mapping for tapping.
+Set button mapping for tapping
 .SH NOTES
 .PP
 Events shown by this tool may not correspond to the events seen by a
diff --git a/tools/libinput-debug-gui.man b/tools/libinput-debug-gui.man
index de6a67a..f205377 100644
--- a/tools/libinput-debug-gui.man
+++ b/tools/libinput-debug-gui.man
@@ -2,7 +2,7 @@
 .SH NAME
 libinput\-debug\-gui \- visual debug helper for libinput
 .SH SYNOPSIS
-.B libinput debug\-gui [\-\-help] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
+.B libinput debug\-gui [\-\-help] [\-\-udev \fI<seat>\fB|\-\-device \fI/dev/input/event0\fB] \fI[configuration options]\fB
 .SH DESCRIPTION
 .PP
 The
@@ -20,7 +20,7 @@ This tool usually needs to be run as root to have access to the
 /dev/input/eventX nodes.
 .SH OPTIONS
 .TP 8
-.B \-\-device /dev/input/event0
+.B \-\-device \fI/dev/input/event0\fR
 Use the given device with the path backend.
 .TP 8
 .B \-\-grab
@@ -30,7 +30,7 @@ delivered to the host system.
 .B \-\-help
 Print help
 .TP 8
-.B \-\-udev <seat>
+.B \-\-udev \fI<seat>\fR
 Use the udev backend to listen for device notifications on the given seat.
 The default behavior is equivalent to \-\-udev "seat0".
 .TP 8
diff --git a/tools/libinput-measure-touchpad-tap.man b/tools/libinput-measure-touchpad-tap.man
index f0e4325..28e6753 100644
--- a/tools/libinput-measure-touchpad-tap.man
+++ b/tools/libinput-measure-touchpad-tap.man
@@ -2,7 +2,7 @@
 .SH NAME
 libinput\-measure\-touchpad\-tap \- measure tap-to-click properities of devices
 .SH SYNOPSIS
-.B libinput measure touchpad\-tap [\-\-help] [\-\-format=<format>] [/dev/input/event0]
+.B libinput measure touchpad\-tap [\-\-help] [\-\-format=\fI<format>\fB] \fI[/dev/input/event0]\fR
 .SH DESCRIPTION
 .PP
 The
diff --git a/tools/libinput-measure.man b/tools/libinput-measure.man
index 470657f..843f001 100644
--- a/tools/libinput-measure.man
+++ b/tools/libinput-measure.man
@@ -2,7 +2,7 @@
 .SH NAME
 libinput\-measure \- measure properties of devices
 .SH SYNOPSIS
-.B libinput measure [\-\-help] <feature> [<args>]
+.B libinput measure [\-\-help] \fI<feature> [<args>]\fR
 .SH DESCRIPTION
 .PP
 The
@@ -23,7 +23,7 @@ Print help
 Features that can be measured include
 .TP 8
 .B libinput\-measure\-touchpad\-tap\-time(1)
-Measure tap-to-click time.
+Measure tap-to-click time
 .SH LIBINPUT
 Part of the
 .B libinput(1)
diff --git a/tools/libinput.man b/tools/libinput.man
index 39bb34c..3098f5e 100644
--- a/tools/libinput.man
+++ b/tools/libinput.man
@@ -2,25 +2,28 @@
 .SH NAME
 libinput \- tool to interface with libinput
 .SH SYNOPSIS
-.B libinput [\-\-help] [\-\-version] <command> [<args>]
+.B libinput [\-\-help|\-\-version] \fI<command>\fR \fI[<args>]\fR
 .SH DESCRIPTION
 .PP
+libinput is a library to handle input devices and provides device
+detection and input device event processing for most Wayland
+compositors and the X.Org xf86-input-libinput driver.
+.PP
 The
 .B "libinput"
-tool creates a libinput context on the default seat "seat0" and interacts
-with that libinput context.
-.PP
-This tool usually needs to be run as root to have access to the
-/dev/input/eventX nodes.
+tools are a set of tools to debug, interface with and analyze data for
+libinput. These tools create libinput contexts separate from that of
+the compositor/X server and cannot change settings in a running session.
+See section
+.B COMMANDS
+for a list of available commands.
 .PP
-The context created by this tool is a new libinput context and independent
-of that created by the X.Org libinput driver, the Wayland compositor or any
-other process that utilizes libinput (henceforth called "the caller").
-Configuration options set in this context do not affect any other libinput
-contexts.
+libinput's API documentation and details on features and various high-level
+concepts are available online at
+.I https://wayland.freedesktop.org/libinput/doc/latest/
 .PP
-Note that a device may be recognized by this tool but not handled by the
-X.Org libinput driver or the Wayland compositor.
+The man page for the X.Org xf86-input-libinput driver is
+.B libinput(4).
 .SH OPTIONS
 .TP 8
 .B \-\-help
@@ -28,28 +31,22 @@ Print help and exit
 .TP 8
 .B \-\-version
 Print the version and exit
-
 .SH COMMANDS
-All commands support a
-.B \-\-help
-argument that prints command\-specific usage
-information, e.g.
-.B "libinput debug\-events \-\-help".
 .TP 8
 .B libinput\-debug\-events(1)
-Print all events as seen by libinput.
+Print all events as seen by libinput
 .TP 8
 .B libinput\-debug\-gui(1)
-Show a GUI to visualize libinput's events.
+Show a GUI to visualize libinput's events
 .TP 8
 .B libinput\-list\-devices(1)
-List all devices recognized by libinput.
+List all devices recognized by libinput
 .TP 8
 .B libinput\-measure(1)
-Measure various properties of devices.
+Measure various properties of devices
 .TP 8
 .B libinput\-measure\-touchpad\-tap(1)
-Measure tap-to-click time.
+Measure tap-to-click time
 .SH LIBINPUT
 Part of the
 .B libinput(1)

commit 57e35f4afa4fa9c4f1af60b4fa115fdaffc16539
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Mon Jul 3 13:43:21 2017 +1000

    README: tidy up the documentation links
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/README.md b/README.md
index b8a0cb7..f95a560 100644
--- a/README.md
+++ b/README.md
@@ -62,11 +62,12 @@ See @ref reporting_bugs for more info.
 Documentation
 -------------
 
-Developer API documentation:
-http://wayland.freedesktop.org/libinput/doc/latest/modules.html
-
-High-level documentation about libinput's features:
+- Developer API documentation: http://wayland.freedesktop.org/libinput/doc/latest/modules.html
+- High-level documentation about libinput's features:
 http://wayland.freedesktop.org/libinput/doc/latest/pages.html
+- Build instructions:
+http://wayland.freedesktop.org/libinput/doc/latest/building_libinput.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
 repository. Developers are encouraged to look at those tools for a
@@ -75,9 +76,6 @@ real-world (yet simple) example on how to use libinput.
 - A commandline debugging tool: https://cgit.freedesktop.org/wayland/libinput/tree/tools/libinput-debug-events.c
 - A GTK application that draws cursor/touch/tablet positions: https://cgit.freedesktop.org/wayland/libinput/tree/tools/libinput-debug-gui.c
 
-Build instructions:
-http://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html
-
 License
 -------
 

commit 5bba2dbb3ffe24c0fd18b8de5b4b88b3160534ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Jun 29 08:40:28 2017 +1000

    tools: add the libinput version to the man pages
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/configure.ac b/configure.ac
index 067c3e1..a66371c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC_C99
 AC_PROG_CXX # Only used by build C++ test
 AC_PROG_GREP
+AC_PROG_SED
 
 # Only used for testing the hwdb
 AM_PATH_PYTHON([3.0],, [:])
diff --git a/meson.build b/meson.build
index bd9b619..bc63971 100644
--- a/meson.build
+++ b/meson.build
@@ -357,6 +357,9 @@ lib_tools_shared = static_library('tools_shared',
 dep_tools_shared = declare_dependency(link_with : lib_tools_shared,
 				      dependencies : deps_tools_shared)
 
+man_config = configuration_data()
+man_config.set('LIBINPUT_VERSION', meson.project_version())
+
 deps_tools = [ dep_tools_shared, dep_libinput ]
 libinput_debug_events_sources = [ 'tools/libinput-debug-events.c' ]
 executable('libinput-debug-events',
@@ -366,7 +369,12 @@ executable('libinput-debug-events',
 	   install_dir : libinput_tool_path,
 	   install : true
 	   )
-install_man('tools/libinput-debug-events.1')
+configure_file(input : 'tools/libinput-debug-events.man',
+	       output : 'libinput-debug-events.1',
+	       configuration : man_config,
+	       install : true,
+	       install_dir : join_paths(get_option('mandir'), 'man1')
+	       )
 
 libinput_list_devices_sources = [ 'tools/libinput-list-devices.c' ]
 executable('libinput-list-devices',
@@ -376,7 +384,12 @@ executable('libinput-list-devices',
 	   install_dir : libinput_tool_path,
 	   install : true,
 	   )
-install_man('tools/libinput-list-devices.1')
+configure_file(input : 'tools/libinput-list-devices.man',
+	       output : 'libinput-list-devices.1',
+	       configuration : man_config,
+	       install : true,
+	       install_dir : join_paths(get_option('mandir'), 'man1')
+	       )
 
 libinput_measure_sources = [ 'tools/libinput-measure.c' ]
 executable('libinput-measure',
@@ -386,7 +399,12 @@ executable('libinput-measure',
 	   install_dir : libinput_tool_path,
 	   install : true,
 	   )
-install_man('tools/libinput-measure.1')
+configure_file(input : 'tools/libinput-measure.man',
+	       output : 'libinput-measure.1',
+	       configuration : man_config,
+	       install : true,
+	       install_dir : join_paths(get_option('mandir'), 'man1')
+	       )
 
 libinput_measure_touchpad_tap_sources = [ 'tools/libinput-measure-touchpad-tap.c' ]
 executable('libinput-measure-touchpad-tap',
@@ -396,7 +414,12 @@ executable('libinput-measure-touchpad-tap',
 	   install_dir : libinput_tool_path,
 	   install : true,
 	   )
-install_man('tools/libinput-measure-touchpad-tap.1')
+configure_file(input : 'tools/libinput-measure-touchpad-tap.man',
+	       output : 'libinput-measure-touchpad-tap.1',
+	       configuration : man_config,
+	       install : true,
+	       install_dir : join_paths(get_option('mandir'), 'man1')
+	       )
 
 if get_option('debug-gui')
 	dep_gtk = dependency('gtk+-3.0')
@@ -416,7 +439,12 @@ if get_option('debug-gui')
 		   install_dir : libinput_tool_path,
 		   install : true
 		   )
-	install_man('tools/libinput-debug-gui.1')
+	configure_file(input : 'tools/libinput-debug-gui.man',
+		       output : 'libinput-debug-gui.1',
+		       configuration : man_config,
+		       install : true,
+		       install_dir : join_paths(get_option('mandir'), 'man1')
+		       )
 endif
 
 libinput_sources = [ 'tools/libinput-tool.c' ]
@@ -427,7 +455,12 @@ executable('libinput',
 	   include_directories : include_directories ('src'),
 	   install : true
 	   )
-install_man('tools/libinput.1')
+configure_file(input : 'tools/libinput.man',
+	       output : 'libinput.1',
+	       configuration : man_config,
+	       install : true,
+	       install_dir : join_paths(get_option('mandir'), 'man1')
+	       )
 
 meson.add_install_script('tools/install-compat-scripts.sh')
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a484e25..2c8660b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -70,3 +70,10 @@ install-data-hook:
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/libinput-list-devices
 	rm -f $(DESTDIR)$(bindir)/libinput-debug-events
+
+SUFFIXES = .man
+.man.1: 
+	$(AM_V_GEN)$(SED) -e 's|\@LIBINPUT_VERSION\@|$(PACKAGE_VERSION)|' < $< > $@
+CLEANFILES = *.1
+EXTRA_DIST += $(dist_man1_MANS:.1=.man)
+
diff --git a/tools/libinput-debug-events.1 b/tools/libinput-debug-events.1
deleted file mode 100644
index 6030388..0000000
--- a/tools/libinput-debug-events.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH libinput-debug-events "1"
-.SH NAME
-libinput\-debug\-events \- debug helper for libinput
-.SH SYNOPSIS
-libinput debug\-events [\-\-help] [\-\-show\-keycodes] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
-.SH DESCRIPTION
-.PP
-The
-.B "libinput debug\-events"
-tool creates a libinput context and prints all events from these devices.
-.PP
-This is a debugging tool only, its output may change at any time. Do not
-rely on the output.
-.PP
-This tool usually needs to be run as root to have access to the
-/dev/input/eventX nodes.
-.SH OPTIONS
-.TP 8
-.B \-\-device /dev/input/event0
-Use the given device with the path backend.
-.TP 8
-.B \-\-grab
-Exclusively grab all opened devices. This will prevent events from being
-delivered to the host system.
-.TP 8
-.B \-\-help
-Print help
-.TP 8
-.B \-\-quiet
-Only print libinput messages, don't print anything from this tool. This is
-useful in combination with --verbose for internal state debugging.
-.TP 8
-.B \-\-show\-keycodes
-Key events shown by this tool are partially obfuscated to avoid passwords
-and other sensitive information showing up in the output. Use the
-.B \-\-show\-keycodes
-argument to make all keycodes visible.
-.TP 8
-.B \-\-udev <seat>
-Use the udev backend to listen for device notifications on the given seat.
-The default behavior is equivalent to \-\-udev "seat0".
-.TP 8
-.B \-\-verbose
-Use verbose output
-.SS libinput configuration options
-.TP 8
-.B \-\-enable\-tap|\-\-disable\-tap
-Enable or disable tap-to-click.
-.TP 8
-.B \-\-enable-drag|\-\-disable\-drag
-Enable or disable tap-and-drag
-.TP 8
-.B \-\-enable\-drag-lock|\-\-disable\-drag\-lock
-Enable or disable tap-and-drag.
-.TP 8
-.B \-\-enable\-natural\-scrolling|\-\-disable\-natural\-scrolling
-Enable or disable natural scrolling.
-.TP 8
-.B \-\-enable\-left\-handed|\-\-disable\-left\-handed
-Enable or disable left handed button configuration.
-.TP 8
-.B \-\-enable\-dwt|\-\-disable\-dwt
-Enable or disable disable-while-typing.
-.TP 8
-.B \-\-set\-click\-method=[none|clickfinger|buttons]
-Set the desired click method
-.TP 8
-.B \-\-set\-scroll\-method=[none|twofinger|edge|button]
-Set the desired scroll method.
-.TP 8
-.B \-\-set\-scroll\-button=BTN_MIDDLE
-Set the button to the given button code.
-.TP 8
-.B \-\-set\-profile=[adaptive|flat]
-Set pointer acceleration profile.
-.TP 8
-.B \-\-set\-speed=<value>
-Set pointer acceleration speed. The allowed range is [-1, 1].
-.TP 8
-.B \-\-set\-tap\-map=[lrm|lmr]
-Set button mapping for tapping.
-.SH NOTES
-.PP
-Events shown by this tool may not correspond to the events seen by a
-different user of libinput. This tool initializes a separate context.
-.SH LIBINPUT
-Part of the
-.B libinput(1)
-suite
diff --git a/tools/libinput-debug-events.man b/tools/libinput-debug-events.man
new file mode 100644
index 0000000..ac16d57
--- /dev/null
+++ b/tools/libinput-debug-events.man
@@ -0,0 +1,89 @@
+.TH libinput-debug-events "1" "" "libinput @LIBINPUT_VERSION@" "libinput Manual"
+.SH NAME
+libinput\-debug\-events \- debug helper for libinput
+.SH SYNOPSIS
+libinput debug\-events [\-\-help] [\-\-show\-keycodes] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
+.SH DESCRIPTION
+.PP
+The
+.B "libinput debug\-events"
+tool creates a libinput context and prints all events from these devices.
+.PP
+This is a debugging tool only, its output may change at any time. Do not
+rely on the output.
+.PP
+This tool usually needs to be run as root to have access to the
+/dev/input/eventX nodes.
+.SH OPTIONS
+.TP 8
+.B \-\-device /dev/input/event0
+Use the given device with the path backend.
+.TP 8
+.B \-\-grab
+Exclusively grab all opened devices. This will prevent events from being
+delivered to the host system.
+.TP 8
+.B \-\-help
+Print help
+.TP 8
+.B \-\-quiet
+Only print libinput messages, don't print anything from this tool. This is
+useful in combination with --verbose for internal state debugging.
+.TP 8
+.B \-\-show\-keycodes
+Key events shown by this tool are partially obfuscated to avoid passwords
+and other sensitive information showing up in the output. Use the
+.B \-\-show\-keycodes
+argument to make all keycodes visible.
+.TP 8
+.B \-\-udev <seat>
+Use the udev backend to listen for device notifications on the given seat.
+The default behavior is equivalent to \-\-udev "seat0".
+.TP 8
+.B \-\-verbose
+Use verbose output
+.SS libinput configuration options
+.TP 8
+.B \-\-enable\-tap|\-\-disable\-tap
+Enable or disable tap-to-click.
+.TP 8
+.B \-\-enable-drag|\-\-disable\-drag
+Enable or disable tap-and-drag
+.TP 8
+.B \-\-enable\-drag-lock|\-\-disable\-drag\-lock
+Enable or disable tap-and-drag.
+.TP 8
+.B \-\-enable\-natural\-scrolling|\-\-disable\-natural\-scrolling
+Enable or disable natural scrolling.
+.TP 8
+.B \-\-enable\-left\-handed|\-\-disable\-left\-handed
+Enable or disable left handed button configuration.
+.TP 8
+.B \-\-enable\-dwt|\-\-disable\-dwt
+Enable or disable disable-while-typing.
+.TP 8
+.B \-\-set\-click\-method=[none|clickfinger|buttons]
+Set the desired click method
+.TP 8
+.B \-\-set\-scroll\-method=[none|twofinger|edge|button]
+Set the desired scroll method.
+.TP 8
+.B \-\-set\-scroll\-button=BTN_MIDDLE
+Set the button to the given button code.
+.TP 8
+.B \-\-set\-profile=[adaptive|flat]
+Set pointer acceleration profile.
+.TP 8
+.B \-\-set\-speed=<value>
+Set pointer acceleration speed. The allowed range is [-1, 1].
+.TP 8
+.B \-\-set\-tap\-map=[lrm|lmr]
+Set button mapping for tapping.
+.SH NOTES
+.PP
+Events shown by this tool may not correspond to the events seen by a
+different user of libinput. This tool initializes a separate context.
+.SH LIBINPUT
+Part of the
+.B libinput(1)
+suite
diff --git a/tools/libinput-debug-gui.1 b/tools/libinput-debug-gui.1
deleted file mode 100644
index 00263ac..0000000
--- a/tools/libinput-debug-gui.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.TH libinput-debug-gui "1"
-.SH NAME
-libinput\-debug\-gui \- visual debug helper for libinput
-.SH SYNOPSIS
-.B libinput debug\-gui [\-\-help] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
-.SH DESCRIPTION
-.PP
-The
-.B "libinput debug\-gui"
-tool creates a libinput context and a full-screen GTK window to visualize
-events processed by libinput. This tool exclusively grabs pointing devices
-and stops them from interacting with the rest of the GUI.
-.PP
-.B Hit Esc to exit this tool.
-.PP
-This is a debugging tool only, its output or behavior may change at any
-time. Do not rely on the output or the behavior.
-.PP
-This tool usually needs to be run as root to have access to the
-/dev/input/eventX nodes.
-.SH OPTIONS
-.TP 8
-.B \-\-device /dev/input/event0
-Use the given device with the path backend.
-.TP 8
-.B \-\-grab
-Exclusively grab all opened devices. This will prevent events from being
-delivered to the host system.
-.TP 8
-.B \-\-help
-Print help
-.TP 8
-.B \-\-udev <seat>
-Use the udev backend to listen for device notifications on the given seat.
-The default behavior is equivalent to \-\-udev "seat0".
-.TP 8
-.B \-\-verbose
-Use verbose output
-.PP
-For libinput configuration options, see libinput-debug-events(1)
-.SH NOTES
-.PP
-Events shown by this tool may not correspond to the events seen by a
-different user of libinput. This tool initializes a separate context.
-.SH LIBINPUT
-Part of the
-.B libinput(1)
-suite
diff --git a/tools/libinput-debug-gui.man b/tools/libinput-debug-gui.man
new file mode 100644
index 0000000..de6a67a
--- /dev/null
+++ b/tools/libinput-debug-gui.man
@@ -0,0 +1,48 @@
+.TH libinput-debug-gui "1" "" "libinput @LIBINPUT_VERSION@" "libinput Manual"
+.SH NAME
+libinput\-debug\-gui \- visual debug helper for libinput
+.SH SYNOPSIS
+.B libinput debug\-gui [\-\-help] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
+.SH DESCRIPTION
+.PP
+The
+.B "libinput debug\-gui"
+tool creates a libinput context and a full-screen GTK window to visualize
+events processed by libinput. This tool exclusively grabs pointing devices
+and stops them from interacting with the rest of the GUI.
+.PP
+.B Hit Esc to exit this tool.
+.PP
+This is a debugging tool only, its output or behavior may change at any
+time. Do not rely on the output or the behavior.
+.PP
+This tool usually needs to be run as root to have access to the
+/dev/input/eventX nodes.
+.SH OPTIONS
+.TP 8
+.B \-\-device /dev/input/event0
+Use the given device with the path backend.
+.TP 8
+.B \-\-grab
+Exclusively grab all opened devices. This will prevent events from being
+delivered to the host system.
+.TP 8
+.B \-\-help
+Print help
+.TP 8
+.B \-\-udev <seat>
+Use the udev backend to listen for device notifications on the given seat.
+The default behavior is equivalent to \-\-udev "seat0".
+.TP 8
+.B \-\-verbose
+Use verbose output
+.PP
+For libinput configuration options, see libinput-debug-events(1)
+.SH NOTES
+.PP
+Events shown by this tool may not correspond to the events seen by a
+different user of libinput. This tool initializes a separate context.
+.SH LIBINPUT
+Part of the
+.B libinput(1)
+suite
diff --git a/tools/libinput-list-devices.1 b/tools/libinput-list-devices.1
deleted file mode 100644
index 1d68a67..0000000
--- a/tools/libinput-list-devices.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH libinput-list-devices "1"
-.SH NAME
-libinput\-list\-devices \- list local devices as recognized by libinput
-.SH SYNOPSIS
-.B libinput list\-devices [\-\-help]
-.SH DESCRIPTION
-.PP
-The
-.B "libinput list\-devices"
-tool creates a libinput context on the default seat "seat0" and lists all
-devices recognized by libinput. Each device shows available configurations
-the respective default configuration setting.
-.PP
-For configuration options that allow multiple different settings
-(e.g. scrolling), all available settings are listed. The default setting is
-prefixed by an asterisk (*).
-.PP
-This tool usually needs to be run as root to have access to the
-/dev/input/eventX nodes.
-.SH OPTIONS
-.TP 8
-.B \-\-help
-Print help
-.SH NOTES
-.PP
-Some specific feature may still be available on a device even when
-no configuration is exposed, a lack of a configuration option does not
-necessarily mean that this feature does not work.
-.PP
-A device may be recognized by libinput but not handled by the X.Org libinput
-driver or the Wayland compositor.
-.PP
-An xorg.conf(5) configuration entry or Wayland compositor setting may have
-changed configurations on a device. The
-.B "libinput list\-devices"
-tool only shows the device's default configuration, not the current
-configuration.
-.SH LIBINPUT
-Part of the
-.B libinput(1)
-suite
diff --git a/tools/libinput-list-devices.man b/tools/libinput-list-devices.man
new file mode 100644
index 0000000..ccb30ff
--- /dev/null
+++ b/tools/libinput-list-devices.man
@@ -0,0 +1,41 @@
+.TH libinput-list-devices "1" "" "libinput @LIBINPUT_VERSION@" "libinput Manual"
+.SH NAME
+libinput\-list\-devices \- list local devices as recognized by libinput
+.SH SYNOPSIS
+.B libinput list\-devices [\-\-help]


Reply to: