libinput: Changes to 'debian-unstable'
README.txt | 17 +++++++++++
configure.ac | 4 +-
debian/changelog | 6 ++++
doc/faqs.dox | 46 ++++++++++++++++++++++++++++++++
src/evdev-mt-touchpad.c | 18 ++++++++++++
src/evdev.c | 4 ++
udev/80-libinput-device-groups.rules.in | 1
7 files changed, 93 insertions(+), 3 deletions(-)
New commits:
commit 2509bba97e7a55aff590e3f275aefd15d6da1656
Author: Héctor Orón Martínez <zumbi@debian.org>
Date: Fri Aug 19 09:00:27 2016 +0200
Release Debian version libinput-1.4.1-1
Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 4fe252c..a28d825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libinput (1.4.1-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Héctor Orón Martínez <zumbi@debian.org> Fri, 19 Aug 2016 08:56:04 +0200
+
libinput (1.4.0-1) unstable; urgency=medium
* New upstream release.
commit 23388c99c3f2a3e3e3383558d4a859192bfe2076
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 5 11:30:41 2016 +1000
libinput 1.4.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 9e238b4..c81bb51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([libinput_major_version], [1])
m4_define([libinput_minor_version], [4])
-m4_define([libinput_micro_version], [0])
+m4_define([libinput_micro_version], [1])
m4_define([libinput_version],
[libinput_major_version.libinput_minor_version.libinput_micro_version])
@@ -35,7 +35,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
# b) If interfaces have been changed or added, but binary compatibility has
# been preserved, change to C+1:0:A+1
# c) If the interface is the same as the previous version, change to C:R+1:A
-LIBINPUT_LT_VERSION=19:1:9
+LIBINPUT_LT_VERSION=19:2:9
AC_SUBST(LIBINPUT_LT_VERSION)
AM_SILENT_RULES([yes])
commit 657c0872861c5f6a0c33c63eea74dd442403de0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 5 11:14:17 2016 +1000
doc: add some info about configuring devices in wayland/xorg
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit ae30353a739cf059a987cdc5b41173212bd66500)
diff --git a/doc/faqs.dox b/doc/faqs.dox
index c88f452..973e566 100644
--- a/doc/faqs.dox
+++ b/doc/faqs.dox
@@ -54,6 +54,52 @@ option is not exposed by the intermediary, it cannot be configured by the
client. Also some configuration options that are provided by the
intermediary may not be libinput-specific configuration options.
+@section faq_configure_wayland How do I configure my device on Wayland?
+
+See @ref faq_config_options Use the configuration tool provided by your
+desktop environment (e.g. gnome-control-center) or direct access to your
+desktop environment's configuration storage (e.g. gsettings).
+
+@section faq_configure_xorg How do I configure my device on X?
+
+See @ref faq_config_options If your desktop environment does not provide a
+graphical configuration tool you can use an
+<a href="https://www.x.org/archive/current/doc/man/man5/xorg.conf.5.xhtml";>xorg.conf.d snippet</a>.
+Usually, such a snippet looks like this:
+<pre>
+$> cat /etc/X11/xorg.conf.d/99-libinput-custom-config.conf
+Section "InputClass"
+ Identifier "something to identify this snippet"
+ MatchDriver "libinput"
+ MatchProduct "substring of the device name"
+ Option "some option name" "the option value"
+EndSection
+</pre>
+
+The identifier is merely a human-readable string that shows up in the log
+file. The MatchProduct line should contain the device name or a substring of
+the device name that the snippet should apply to. For a full list of option
+names and permitted values, see the
+<a href="https://www.mankier.com/4/libinput";>libinput man page</a>.
+xorg.conf.d snippets like the above apply to hotplugged devices but can be
+overwritten at runtime by desktop tools. Multiple snippets may be placed
+into the same file.
+
+For run-time configuration and testing, the
+<a href="https://www.x.org/archive/X11R7.5/doc/man/man1/xinput.1.html";>xinput</a>
+debugging tool can modify a devices' properties. See the
+<a href="https://www.mankier.com/4/libinput";>libinput man page</a>
+for supported property names and values. Usually, an invocation looks like
+this:
+<pre>
+$> xinput set-prop "the device name" "the property name" value [value2] [value3]
+</pre>
+
+@note
+Changes performed by xinput do not persist across device hotplugs. xinput is
+considered a debugging and testing tool only and should not be used for
+permanent configurations.
+
@section faq_hwdb_changes How to apply hwdb changes
Sometimes users are asked to test updates to the <a
commit 6614604e9abd1cf602669b35efb2aed107c7972c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 6 07:59:31 2016 +1000
touchpad: use the udev ID_INPUT_TOUCHPAD_INTEGRATION property if available
udev now labels touchpads as "internal" or "external" for us, use that value
where available and only fall back onto our own labelling if it's missing or
unknown.
systemd commit: https://github.com/systemd/systemd/pull/3638
https://bugs.freedesktop.org/show_bug.cgi?id=96735
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 64e39411892fa4897f6e018daaa2de2ffaf8b671)
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index a7b5a87..756d283 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1589,6 +1589,24 @@ evdev_tag_touchpad(struct evdev_device *device,
struct udev_device *udev_device)
{
int bustype, vendor;
+ const char *prop;
+
+ prop = udev_device_get_property_value(udev_device,
+ "ID_INPUT_TOUCHPAD_INTEGRATION");
+ if (prop) {
+ if (streq(prop, "internal")) {
+ evdev_tag_touchpad_internal(device);
+ return;
+ } else if (streq(prop, "external")) {
+ evdev_tag_touchpad_external(device);
+ return;
+ } else {
+ log_info(evdev_libinput_context(device),
+ "%s: tagged as unknown value %s\n",
+ device->devname,
+ prop);
+ }
+ }
/* simple approach: touchpads on USB or Bluetooth are considered
* external, anything else is internal. Exception is Apple -
commit d7d64d98716431a62deb2d1440df49f9d5d7de1f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 13:39:34 2016 +1000
doc: add links to the two debugging tools as examples
These are the simplest examples on how to use libinput and should be enough to
get any potential user started.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 14d0cd9d38520295fb9244869edfa4648dd9424b)
diff --git a/README.txt b/README.txt
index f557f69..b20ab3a 100644
--- a/README.txt
+++ b/README.txt
@@ -67,6 +67,23 @@ 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
+Examples of how to use libinput are the debugging tools in the libinput
+repository. Developers are encouraged to look at those tools for a
+real-world (yet simple) example on how to use libinput.
+
+- A commandline debugging tool: https://cgit.freedesktop.org/wayland/libinput/tree/tools/event-debug.c
+- A GTK application that draws cursor/touch/tablet positions: https://cgit.freedesktop.org/wayland/libinput/tree/tools/event-gui.c
+
+libinput provides a
+[pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/) file.
+Usually a program will use the `PKG_CHECK_MODULES` autoconf macro.
+Otherwise, the most rudimentary way to compile and link a program against
+libinput is:
+
+ gcc -o myprogram myprogram.c `pkg-config --cflags --libs libinput`
+
+For further information on using pkgconfig see the pkg-config documentation.
+
License
-------
commit 33a6613671178db1cc0415c3c68085f1da42dc0e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 20 19:55:48 2016 +1000
udev: don't overwrite a previously set device group
In some cases a device may need a device group assigned by a custom udev rule
or hwdb entry. Don't overwrite that with our generated one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit 188bad48668661378827818a8706aa621a1182dd)
diff --git a/udev/80-libinput-device-groups.rules.in b/udev/80-libinput-device-groups.rules.in
index c2af0ce..1a26f78 100644
--- a/udev/80-libinput-device-groups.rules.in
+++ b/udev/80-libinput-device-groups.rules.in
@@ -2,6 +2,7 @@ ACTION!="add|change", GOTO="libinput_device_group_end"
KERNEL!="event[0-9]*", GOTO="libinput_device_group_end"
ATTRS{phys}=="?*", \
+ ENV{LIBINPUT_DEVICE_GROUP}=="", \
PROGRAM="@UDEV_TEST_PATH@libinput-device-group %S%p", \
ENV{LIBINPUT_DEVICE_GROUP}="%c"
commit 92be97b04537db7c286a88790063ad5a2869de02
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 21 16:11:39 2016 +1000
evdev: prefix "tablet unknown to libwacom" error with the device name
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 45a574a7859cb83e589c6f2d33d81a3f666ba60d)
diff --git a/src/evdev.c b/src/evdev.c
index 1a0759b..c3ca64c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -3038,7 +3038,9 @@ evdev_tablet_has_left_handed(struct evdev_device *device)
if (libwacom_is_reversible(d))
has_left_handed = true;
} else if (libwacom_error_get_code(error) == WERROR_UNKNOWN_MODEL) {
- log_info(libinput, "Tablet unknown to libwacom\n");
+ log_info(libinput,
+ "%s: tablet unknown to libwacom\n",
+ device->devname);
} else {
log_error(libinput,
"libwacom error: %s\n",
Reply to: