Hello community,
here is the log from the commit of package xf86-input-libinput for openSUSE:Factory checked in at 2015-08-10 09:15:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-libinput (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-libinput.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-libinput"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-libinput/xf86-input-libinput.changes 2015-08-01 11:37:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-input-libinput.new/xf86-input-libinput.changes 2015-08-10 09:15:54.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Aug 4 16:51:08 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 0.13.0:
+ + Fix compiler warnings about touchpad gestures.
+ + man: minor man page improvements.
+ + Add a property for Disable While Typing.
+
+-------------------------------------------------------------------
Old:
----
xf86-input-libinput-0.12.0.tar.bz2
New:
----
xf86-input-libinput-0.13.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-libinput.spec ++++++
--- /var/tmp/diff_new_pack.9eTZH3/_old 2015-08-10 09:15:55.000000000 +0200
+++ /var/tmp/diff_new_pack.9eTZH3/_new 2015-08-10 09:15:55.000000000 +0200
@@ -17,7 +17,7 @@
Name: xf86-input-libinput
-Version: 0.12.0
+Version: 0.13.0
Release: 0
Summary: Libinput driver for the Xorg X server
License: MIT
@@ -27,7 +27,7 @@
Source1: 90-libinput.conf
BuildRequires: pkg-config
BuildRequires: pkgconfig(inputproto)
-BuildRequires: pkgconfig(libinput) >= 0.19.0
+BuildRequires: pkgconfig(libinput) >= 0.21.0
BuildRequires: pkgconfig(xorg-macros) >= 1.13
BuildRequires: pkgconfig(xorg-server) >= 1.7
BuildRequires: pkgconfig(xproto)
++++++ xf86-input-libinput-0.12.0.tar.bz2 -> xf86-input-libinput-0.13.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-libinput-0.12.0/ChangeLog new/xf86-input-libinput-0.13.0/ChangeLog
--- old/xf86-input-libinput-0.12.0/ChangeLog 2015-07-14 08:20:59.000000000 +0200
+++ new/xf86-input-libinput-0.13.0/ChangeLog 2015-08-04 09:09:25.000000000 +0200
@@ -1,3 +1,39 @@
+commit 4b2bed6912d79f0104770d7956f14b4448c8b0ed
+Author: Peter Hutterer
+Date: Tue Aug 4 17:08:22 2015 +1000
+
+ xf86-input-libinput 0.13.0
+
+ Signed-off-by: Peter Hutterer
+
+commit 223be9f62bc614c4bfa2836c5b0aaded70cadf9c
+Author: Stephen Chandler Paul
+Date: Sun Aug 2 14:18:10 2015 -0400
+
+ Add a property for Disable While Typing
+
+ Signed-off-by: Stephen Chandler Paul
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+
+commit d3ee745a2461c09c86916f2ecf97426b6145ee09
+Author: Peter Hutterer
+Date: Tue Jul 21 11:21:47 2015 +1000
+
+ man: minor man page improvements
+
+ Signed-off-by: Peter Hutterer
+
+commit b550b70a002e0f1645a3ac6bc80d367bd72b4b7a
+Author: Peter Hutterer
+Date: Tue Jul 21 11:16:06 2015 +1000
+
+ Fix compiler warnings about touchpad gestures
+
+ We don't do anything with them though.
+
+ Signed-off-by: Peter Hutterer
+
commit 254b1f27a07f2372aa0c70674e8be5a02d068feb
Author: Peter Hutterer
Date: Tue Jul 14 16:18:38 2015 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-libinput-0.12.0/configure new/xf86-input-libinput-0.13.0/configure
--- old/xf86-input-libinput-0.12.0/configure 2015-07-14 08:18:52.000000000 +0200
+++ new/xf86-input-libinput-0.13.0/configure 2015-08-04 09:08:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-input-libinput 0.12.0.
+# Generated by GNU Autoconf 2.69 for xf86-input-libinput 0.13.0.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-libinput'
PACKAGE_TARNAME='xf86-input-libinput'
-PACKAGE_VERSION='0.12.0'
-PACKAGE_STRING='xf86-input-libinput 0.12.0'
+PACKAGE_VERSION='0.13.0'
+PACKAGE_STRING='xf86-input-libinput 0.13.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1351,7 +1351,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-libinput 0.12.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-libinput 0.13.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1422,7 +1422,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-libinput 0.12.0:";;
+ short | recursive ) echo "Configuration of xf86-input-libinput 0.13.0:";;
esac
cat <<\_ACEOF
@@ -1548,7 +1548,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-libinput configure 0.12.0
+xf86-input-libinput configure 0.13.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1872,7 +1872,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-libinput $as_me 0.12.0, which was
+It was created by xf86-input-libinput $as_me 0.13.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2740,7 +2740,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-libinput'
- VERSION='0.12.0'
+ VERSION='0.13.0'
cat >>confdefs.h <<_ACEOF
@@ -17884,12 +17884,12 @@
pkg_cv_LIBINPUT_CFLAGS="$LIBINPUT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 0.19.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libinput >= 0.19.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 0.21.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 0.21.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 0.19.0" 2>/dev/null`
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 0.21.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17901,12 +17901,12 @@
pkg_cv_LIBINPUT_LIBS="$LIBINPUT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 0.19.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libinput >= 0.19.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinput >= 0.21.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 0.21.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 0.19.0" 2>/dev/null`
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 0.21.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17927,14 +17927,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinput >= 0.19.0" 2>&1`
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinput >= 0.21.0" 2>&1`
else
- LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinput >= 0.19.0" 2>&1`
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinput >= 0.21.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBINPUT_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libinput >= 0.19.0) were not met:
+ as_fn_error $? "Package requirements (libinput >= 0.21.0) were not met:
$LIBINPUT_PKG_ERRORS
@@ -18527,7 +18527,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-libinput $as_me 0.12.0, which was
+This file was extended by xf86-input-libinput $as_me 0.13.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18593,7 +18593,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-input-libinput config.status 0.12.0
+xf86-input-libinput config.status 0.13.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-libinput-0.12.0/configure.ac new/xf86-input-libinput-0.13.0/configure.ac
--- old/xf86-input-libinput-0.12.0/configure.ac 2015-07-14 08:18:35.000000000 +0200
+++ new/xf86-input-libinput-0.13.0/configure.ac 2015-08-04 09:08:12.000000000 +0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-libinput],
- [0.12.0],
+ [0.13.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-libinput])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -45,7 +45,7 @@
# Obtain compiler/linker options from server and required extensions
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto [inputproto >= 2.2])
-PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.19.0])
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.21.0])
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-libinput-0.12.0/include/libinput-properties.h new/xf86-input-libinput-0.13.0/include/libinput-properties.h
--- old/xf86-input-libinput-0.12.0/include/libinput-properties.h 2015-07-14 08:18:14.000000000 +0200
+++ new/xf86-input-libinput-0.13.0/include/libinput-properties.h 2015-08-03 04:00:58.000000000 +0200
@@ -108,4 +108,10 @@
/* Middle button emulation: BOOL, 1 value, read-only */
#define LIBINPUT_PROP_MIDDLE_EMULATION_ENABLED_DEFAULT "libinput Middle Emulation Enabled Default"
+/* Disable while typing: BOOL, 1 value */
+#define LIBINPUT_PROP_DISABLE_WHILE_TYPING "libinput Disable While Typing Enabled"
+
+/* Disable while typing: BOOL, 1 value, read-only */
+#define LIBINPUT_PROP_DISABLE_WHILE_TYPING_DEFAULT "libinput Disable While Typing Enabled Default"
+
#endif /* _LIBINPUT_PROPERTIES_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-libinput-0.12.0/man/libinput.man new/xf86-input-libinput-0.13.0/man/libinput.man
--- old/xf86-input-libinput-0.12.0/man/libinput.man 2015-07-14 08:18:14.000000000 +0200
+++ new/xf86-input-libinput-0.13.0/man/libinput.man 2015-08-03 04:00:58.000000000 +0200
@@ -44,6 +44,9 @@
.BI "Option \*qDevice\*q \*q" string \*q
Specifies the device through which the device can be accessed. This will
generally be of the form \*q/dev/input/eventX\*q, where X is some integer.
+When using
+.B InputClass
+directives, this option is set by the server.
The mapping from device node to hardware is system-dependent. Property:
"Device Node" (read-only).
.TP 7
@@ -64,7 +67,8 @@
for more details.
.TP 7
.BI "Option \*qCalibrationMatrix\*q \*q" string \*q
-A string of 9 space-separated floating point numbers.
+A string of 9 space-separated floating point numbers, in the order
+\*qa b c d e f g h i\*q.
Sets the calibration matrix to the 3x3 matrix where the first row is (abc),
the second row is (def) and the third row is (ghi).
.TP 7
@@ -115,6 +119,10 @@
finger up during tap-and-drag will not immediately release the button. If
the finger is set down again within the timeout, the draging process
continues.
+.TP 7
+.BI "Option \*qDisableWhileTyping\*q \*q" bool \*q
+Indicates if the touchpad should be disabled while typing on the keyboard
+(this does not apply to modifier keys such as Ctrl or Alt).
.PP
For all options, the options are only parsed if the device supports that
configuration option. For all options, the default value is the one used by
@@ -183,6 +191,10 @@
.BI "libinput Middle Emulation Enabled"
1 boolean value (8 bit, 0 or 1). Indicates if middle emulation is enabled or
disabled.
+.TP 7
+.BI "libinput Disable While Typing Enabled"
+1 boolean value (8 bit, 0 or 1). Indicates if disable while typing is
+enabled or disabled.
.TP7
.PP
The above properties have a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-libinput-0.12.0/src/libinput.c new/xf86-input-libinput-0.13.0/src/libinput.c
--- old/xf86-input-libinput-0.12.0/src/libinput.c 2015-07-14 08:18:14.000000000 +0200
+++ new/xf86-input-libinput-0.13.0/src/libinput.c 2015-08-03 04:00:58.000000000 +0200
@@ -102,6 +102,7 @@
BOOL natural_scrolling;
BOOL left_handed;
BOOL middle_emulation;
+ BOOL disable_while_typing;
CARD32 sendevents;
CARD32 scroll_button; /* xorg button number */
float speed;
@@ -338,6 +339,13 @@
xf86IDrvMsg(pInfo, X_ERROR,
"Failed to set MiddleEmulation to %d\n",
driver_data->options.middle_emulation);
+
+ if (libinput_device_config_dwt_is_available(device) &&
+ libinput_device_config_dwt_set_enabled(device,
+ driver_data->options.disable_while_typing) != LIBINPUT_CONFIG_STATUS_SUCCESS)
+ xf86IDrvMsg(pInfo, X_ERROR,
+ "Failed to set DisableWhileTyping to %d\n",
+ driver_data->options.disable_while_typing);
}
static int
@@ -924,6 +932,13 @@
libinput_event_get_touch_event(event),
libinput_event_get_type(event));
break;
+ case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
+ case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
+ case LIBINPUT_EVENT_GESTURE_SWIPE_END:
+ case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN:
+ case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
+ case LIBINPUT_EVENT_GESTURE_PINCH_END:
+ break;
}
}
@@ -1330,6 +1345,29 @@
return enabled;
}
+static inline BOOL
+xf86libinput_parse_disablewhiletyping_option(InputInfoPtr pInfo,
+ struct libinput_device *device)
+{
+ BOOL enabled;
+
+ if (!libinput_device_config_dwt_is_available(device))
+ return FALSE;
+
+ enabled = xf86SetBoolOption(pInfo->options,
+ "DisableWhileTyping",
+ libinput_device_config_dwt_get_default_enabled(device));
+ if (libinput_device_config_dwt_set_enabled(device, enabled) !=
+ LIBINPUT_CONFIG_STATUS_SUCCESS) {
+ xf86IDrvMsg(pInfo, X_ERROR,
+ "Failed to set DisableWhileTyping to %d\n",
+ enabled);
+ enabled = libinput_device_config_dwt_get_enabled(device);
+ }
+
+ return enabled;
+}
+
static void
xf86libinput_parse_buttonmap_option(InputInfoPtr pInfo,
unsigned char *btnmap,
@@ -1383,6 +1421,7 @@
options->scroll_button = xf86libinput_parse_scrollbutton_option(pInfo, device);
options->click_method = xf86libinput_parse_clickmethod_option(pInfo, device);
options->middle_emulation = xf86libinput_parse_middleemulation_option(pInfo, device);
+ options->disable_while_typing = xf86libinput_parse_disablewhiletyping_option(pInfo, device);
xf86libinput_parse_calibration_option(pInfo, device, driver_data->options.matrix);
/* non-libinput options */
@@ -1579,6 +1618,8 @@
static Atom prop_click_method_default;
static Atom prop_middle_emulation;
static Atom prop_middle_emulation_default;
+static Atom prop_disable_while_typing;
+static Atom prop_disable_while_typing_default;
/* general properties */
static Atom prop_float;
@@ -1988,6 +2029,37 @@
return Success;
}
+static inline int
+LibinputSetPropertyDisableWhileTyping(DeviceIntPtr dev,
+ Atom atom,
+ XIPropertyValuePtr val,
+ BOOL checkonly)
+{
+ InputInfoPtr pInfo = dev->public.devicePrivate;
+ struct xf86libinput *driver_data = pInfo->private;
+ struct libinput_device *device = driver_data->device;
+ BOOL* data;
+
+ if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER)
+ return BadMatch;
+
+ data = (BOOL*)val->data;
+ if (checkonly) {
+ if (*data != 0 && *data != 1)
+ return BadValue;
+
+ if (!xf86libinput_check_device(dev, atom))
+ return BadMatch;
+
+ if (!libinput_device_config_dwt_is_available(device))
+ return BadMatch;
+ } else {
+ driver_data->options.disable_while_typing = *data;
+ }
+
+ return Success;
+}
+
static int
LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
BOOL checkonly)
@@ -2023,6 +2095,8 @@
rc = LibinputSetPropertyClickMethod(dev, atom, val, checkonly);
else if (atom == prop_middle_emulation)
rc = LibinputSetPropertyMiddleEmulation(dev, atom, val, checkonly);
+ else if (atom == prop_disable_while_typing)
+ rc = LibinputSetPropertyDisableWhileTyping(dev, atom, val, checkonly);
else if (atom == prop_device || atom == prop_product_id ||
atom == prop_tap_default ||
atom == prop_tap_drag_lock_default ||
@@ -2034,7 +2108,8 @@
atom == prop_scroll_method_default ||
atom == prop_scroll_button_default ||
atom == prop_click_method_default ||
- atom == prop_middle_emulation_default)
+ atom == prop_middle_emulation_default ||
+ atom == prop_disable_while_typing_default)
return BadAccess; /* read-only */
else
return Success;
@@ -2464,6 +2539,32 @@
}
static void
+LibinputInitDisableWhileTypingProperty(DeviceIntPtr dev,
+ struct xf86libinput *driver_data,
+ struct libinput_device *device)
+{
+ BOOL dwt = driver_data->options.disable_while_typing;
+
+ if (!libinput_device_config_dwt_is_available(device))
+ return;
+
+ prop_disable_while_typing = LibinputMakeProperty(dev,
+ LIBINPUT_PROP_DISABLE_WHILE_TYPING,
+ XA_INTEGER,
+ 8,
+ 1,
+ &dwt);
+ if (!prop_disable_while_typing)
+ return;
+
+ dwt = libinput_device_config_dwt_get_default_enabled(device);
+ prop_disable_while_typing_default = LibinputMakeProperty(dev,
+ LIBINPUT_PROP_DISABLE_WHILE_TYPING_DEFAULT,
+ XA_INTEGER, 8,
+ 1, &dwt);
+}
+
+static void
LibinputInitProperty(DeviceIntPtr dev)
{
InputInfoPtr pInfo = dev->public.devicePrivate;
@@ -2485,6 +2586,7 @@
LibinputInitScrollMethodsProperty(dev, driver_data, device);
LibinputInitClickMethodsProperty(dev, driver_data, device);
LibinputInitMiddleEmulationProperty(dev, driver_data, device);
+ LibinputInitDisableWhileTypingProperty(dev, driver_data, device);
/* Device node property, read-only */
device_node = driver_data->path;