qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-input-synaptics 1.8.3.

Browse Source 
ok matthieu@
This commit is contained in:
shadchin 2015-12-17 06:04:21 +00:00
parent 5fe94e14aa
commit 4a90ef48da
5 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
driver/xf86-input-synaptics/ChangeLog
View File

@ -1,3 +1,22 @@
commit af7d8a15278a968d919bf539628281bf713f747b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 29 12:10:09 2015 +1000
synaptics 1.8.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e7508ac087028f8f8e116f5279dad1ebcdc58e6
Author: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Date: Thu Aug 14 20:03:42 2014 +0200
Use cumulative relative touch movements while scrolling
Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit ec0901e5f81d9cad6cc8bbdcb5ea075009c13de5)
commit 6f8d4bac14ac8f3fd2714f0a8a9e37c5136a4013
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 27 11:26:55 2015 +1000

20
driver/xf86-input-synaptics/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xf86-input-synaptics 1.8.2.
# Generated by GNU Autoconf 2.69 for xf86-input-synaptics 1.8.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xf86-input-synaptics'
PACKAGE_TARNAME='xf86-input-synaptics'
PACKAGE_VERSION='1.8.2'
PACKAGE_STRING='xf86-input-synaptics 1.8.2'
PACKAGE_VERSION='1.8.3'
PACKAGE_STRING='xf86-input-synaptics 1.8.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
# 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-synaptics 1.8.2 to adapt to many kinds of systems.
\`configure' configures xf86-input-synaptics 1.8.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1449,7 +1449,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xf86-input-synaptics 1.8.2:";;
short | recursive ) echo "Configuration of xf86-input-synaptics 1.8.3:";;
esac
cat <<\_ACEOF
@ -1586,7 +1586,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xf86-input-synaptics configure 1.8.2
xf86-input-synaptics configure 1.8.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1910,7 +1910,7 @@ cat >config.log <<_ACEOF
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-synaptics $as_me 1.8.2, which was
It was created by xf86-input-synaptics $as_me 1.8.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2739,7 +2739,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-synaptics'
VERSION='1.8.2'
VERSION='1.8.3'
cat >>confdefs.h <<_ACEOF
@ -18820,7 +18820,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xf86-input-synaptics $as_me 1.8.2, which was
This file was extended by xf86-input-synaptics $as_me 1.8.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -18886,7 +18886,7 @@ _ACEOF
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-synaptics config.status 1.8.2
xf86-input-synaptics config.status 1.8.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
driver/xf86-input-synaptics/configure.ac
View File

@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
[1.8.2],
[1.8.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])

8
driver/xf86-input-synaptics/src/eventcomm.c
View File

@ -697,9 +697,11 @@ EventReadHwState(InputInfoPtr pInfo,
SynapticsResetTouchHwState(hw, FALSE);
/* Reset cumulative values if buttons were not previously pressed,
* or no finger was previously present. */
if ((!hw->left && !hw->right && !hw->middle) || hw->z < para->finger_low) {
/* Reset cumulative values if buttons were not previously pressed and no
* two-finger scrolling is ongoing, or no finger was previously present. */
if (((!hw->left && !hw->right && !hw->middle) &&
!(priv->vert_scroll_twofinger_on || priv->vert_scroll_twofinger_on)) ||
hw->z < para->finger_low) {
hw->cumulative_dx = hw->x;
hw->cumulative_dy = hw->y;
sync_cumulative = TRUE;

8
driver/xf86-input-synaptics/src/synaptics.c
View File

@ -3114,9 +3114,11 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
}
}
/* If a physical button is pressed on a clickpad, use cumulative relative
* touch movements for motion */
if (para->clickpad && (priv->lastButtons & 7) &&
/* If a physical button is pressed on a clickpad or a two-finger scrolling
* is ongoing, use cumulative relative touch movements for motion */
if (para->clickpad &&
((priv->lastButtons & 7) ||
(priv->vert_scroll_twofinger_on || priv->horiz_scroll_twofinger_on)) &&
priv->last_button_area != TOP_BUTTON_AREA) {
hw->x = hw->cumulative_dx;
hw->y = hw->cumulative_dy;