Removing direct upstream changes.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 450 insertions, 73 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 0397f91..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0:
-
-include:
-  - project: 'freedesktop/ci-templates'
-    ref: 59de540b620c45739871d1a073d76d5521989d11 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-    file: '/templates/fedora.yml'
-
-
-variables:
-  FDO_UPSTREAM_REPO: xorg/drivers/xf86-input-libinput
-
-
-stages:
-  - containers
-  - build
-
-
-.fedora:
-  variables:
-    FDO_DISTRIBUTION_VERSION: 32
-    FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros'
-    FDO_DISTRIBUTION_TAG: '2020-05-19.0'
-
-
-fedora@container_build:
-  extends:
-    - .fedora
-    - .fdo.container-build@fedora
-  stage: containers
-  variables:
-    GIT_STRATEGY: none
-
-
-.default_build:
-  stage: build
-  script:
-    - mkdir _builddir _inst
-    - pushd _builddir > /dev/null
-    - ../autogen.sh --prefix=$(realpath ../_inst) --disable-silent-rules
-    - make && make check
-    - make install
-    - popd > /dev/null
-  artifacts:
-    name: "automake-logs-$CI_JOB_NAME"
-    when: always
-    expire_in: 1 week
-    paths:
-      - _builddir/config.log
-
-
-fedora:32@default-build:
-  extends:
-    - .fedora
-    - .fdo.distribution-image@fedora
-    - .default_build
diff --git a/ChangeLog b/ChangeLog
index 494ce99..12a16b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,449 @@
+commit 583ed5acdc17a4dc7848c891d7cdbd35ff07b781
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue May 19 15:37:30 2020 +1000
+
+    xf86-input-libinput 0.30.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e8e5d1a6b579c6bd5e6c9e76a53f13ca77fa0d5f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue May 19 15:57:52 2020 +1000
+
+    gitlab CI: update to latest CI templates
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 639b21d78a80566477163993366400e506f6e7b7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue May 19 15:47:00 2020 +1000
+
+    gitlab CI: bump to Fedora 32
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e52daf203bb690e33b27514cb8fc76b263e6622a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Oct 11 10:24:30 2019 +1000
+
+    Implement support for scroll button locks
+    
+    Add a boolean option/property to enable/disable the scroll button lock. Where
+    enabled, the button can be clicked and released as opposed to having to be
+    held down.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 400bf493d1840e72dc3bad624707b4934fe5de33
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 12 12:35:51 2019 +1000
+
+    xf86-input-libinput 0.29.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 27a88897bedb8dca41be311a162243ec7f4a952d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 12 10:57:11 2019 +1000
+
+    Add basic Gitlab CI for testing the build
+    
+    This merely tests against the devel package in Fedora, not against the xserver
+    from git. Should be enough, the driver here doesn't change enough to need the
+    git builds.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d5867e5db6300ba2fa08054f16af661bd0ae4200
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Aug 12 10:35:15 2019 +1000
+
+    Fix compiler warning about unhandled switch events
+    
+    This bumps the required libinput version to 1.7 - which has been out for over
+    two years now. That's conservative enough.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1ef2ed874e700a6be9091c01df5b432a3e4d8b2e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 30 11:23:46 2019 +1000
+
+    Check for the tool type too when creating subdevices
+    
+    Fixed #25
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3c9052d8865200818a3e98ea9077df54829e724c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 30 11:10:55 2019 +1000
+
+    Fix wrong enum type
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 39b0bb4585106a56a51236d8e9843b2da8d745a5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 30 11:46:50 2019 +1000
+
+    Revert "Upgrade the default scroll distance to 120"
+    
+    This was part of the high-resolution wheel work that was factored out ahead of
+    time. Problem is: this breaks scroll button emulation in the server as we
+    use the distance to determine when we click buttons 4-7.
+    
+    Before: movement of 15 normalized pixel units on a touchpad - one click. Now:
+    120 of those units. So that's a bit less than ideal.
+    
+    The change to 120 can be done, but needs the corresponding handling in the
+    axis distance calculations.
+    
+    Fixes #24
+    
+    This reverts commit 055481187d44b10ba220398a1ca46f4854fd76ee.
+
+commit 8923d18d25303354f250b4f165fa66b327b8ac7e
+Author: David Rosca <nowrep@gmail.com>
+Date:   Mon Feb 25 18:26:08 2019 +0100
+
+    Also use type to match tablet tool with device
+    
+    On devices with tools having both serial and id 0,
+    it would fail to create separate subdevices.
+    
+    Thinkpad X220T (Wacom ISDv4 E6) now correctly registers
+    Pen and Eraser xinput devices.
+
+commit 055481187d44b10ba220398a1ca46f4854fd76ee
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jan 23 09:01:24 2019 +1000
+
+    Upgrade the default scroll distance to 120
+    
+    This is just a number, to be used as divider and shouldn't have any effect in
+    correctly written clients. With the high-res scrolling coming up however, we
+    have a few devices where the dist cannot be expressed as an integer fraction
+    of 15, so let's up it to 120 because we know all hardware wheels have to be an
+    integer fraction of that that, thanks to Microsoft's API requirements.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5a925eaa84b31c5857969342802018cb5803475a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Feb 4 13:14:11 2019 +1000
+
+    xf86-input-libinput 0.28.2
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e7eafa199e9e60c15014a9d72d14efcbbf8e44ca
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 21 15:21:45 2019 +1000
+
+    Handle scroll wheel events with a discrete of 0
+    
+    The driver currently assumes that any wheel event has a non-zero discrete
+    value of 1. This is incorrect, it just hasn't triggered yet with any device.
+    
+    With the hi-res scroll patches in place in the kernel and libinput, we may get
+    wheel events with a discrete value of 0. We assume that if this ever happens,
+    the device has some sensible click angle set so all we need to do is ignore
+    the discrete 0 events and wait for the first discrete event to come.
+    
+    Also add an explanatory comment too to make it clear the calculation is only
+    done once.
+    
+    Fixes #19
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d13ab268bdf6eb589022c58ddc87c1211b49ac4c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 21 13:19:11 2019 +1000
+
+    Return the wheel scroll value instead of just the fraction
+    
+    This is prep work for the hi-res work but right now, no real functional
+    changes. It does however fix a bug where we used the vertial scroll dist for
+    the horizontal wheel as well.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 347c78387eb3fbadcd582f0ea51bb083962a728f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 21 13:05:23 2019 +1000
+
+    Split the scroll axis details up for easier extension
+    
+    If we need more per-axis fields, it's easier to add this way.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b63f7994dc4359900dbb2a29612e0112b6ae5b79
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jan 7 16:26:47 2019 +1000
+
+    conf: add an example snippet for how to assign options
+    
+    Users still like to copy the whole file, potentially messing things up.
+    Let's put a warning into the file directly that this is less than ideal.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 04f42d6e0f99d771cbbab25c896f287fd6697f37
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Nov 25 12:47:32 2018 -0800
+
+    Update configure.ac bug URL for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5d341d1d6c389b286279f87d7a3bdb0f5bd275f1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Nov 18 11:48:07 2018 -0800
+
+    Update README for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4985de5ef3e81d32d694c3d4a480a6311b6f1416
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Oct 15 15:29:37 2018 +1000
+
+    Remove two dead assignments
+    
+    Value stored but never read.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e26fc3c66c04eb3d3164e6a9e7c983154fb00856
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Oct 15 09:36:36 2018 +1000
+
+    xf86-input-libinput 0.28.1
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a759610292a53067fc811e70703bffff8dc0cb16
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 4 11:45:46 2018 +1000
+
+    Use the seat slot, not the device slot for touch events
+    
+    The device slot is per-device, so if we have more than one device we may get a
+    touch down event for a slot already in use.
+    
+    Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/153
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 21ff2ca7d1a771f6dcecb5b73dc1031f77c9dd69
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jul 19 15:58:06 2018 +1000
+
+    Remove unused assignment
+    
+    dev is our list iterator below, this is a dead assignment
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c67f191d5bc1a4a130f89743a3ce35ee06c90f85
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 11 11:06:59 2018 +1000
+
+    xf86-input-libinput 0.28.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1978a2555b338e5177523046e6338f58a4253951
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 11 10:59:20 2018 +1000
+
+    Minor whitespace fix
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0909a1a76546284f27fb1b17a6f545a04537cc36
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 10 11:17:50 2018 +1000
+
+    draglock: fix memory overwrite during draglock parsing
+    
+    Passing in the size of the array but using it as "number of elements" inside
+    the function. Rename a bunch of arguments to avoid this.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=107166
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 20bb8d6b9f4375557472dad67b5f8dcf31be27d3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed May 23 08:14:23 2018 +1000
+
+    Revert "Implement the custom acceleration curve options"
+    
+    Custom pointer acceleration curves were reverted in libinput, so no point
+    having this code here.
+    
+    This reverts commit d84e0035d12a9655c09a6e8c619b1144be42c90c.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1e88664d958a000ac610ae9000459c461ba45bd8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed May 2 13:59:00 2018 +1000
+
+    Use the libinput touch count to init the right number of touches
+    
+    Initial version by Johannes Pointner <h4nn35.work@gmail.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d84e0035d12a9655c09a6e8c619b1144be42c90c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Apr 17 13:51:53 2018 +1000
+
+    Implement the custom acceleration curve options
+    
+    One new property, and the existing accel profile gets extended to keep one
+    extra value. The new property libinput Accel Curve Points is a list of pairs
+    of points to be added to the acceleration curve.
+    
+    libinput only supports adding points to the curve so we simply declare the
+    behavior as undefined when the curve is set multiple times. Also helps to
+    identify those that bother to read the man page before playing with random
+    driver values.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6c75acfcdf6539713c3b62bc2227a4b215d05fdb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Apr 20 13:33:45 2018 +1000
+
+    Use xf86SetStrOption to check for string options
+    
+    This one shows up in the log and marks it as used.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit eaf847be16de1399aa271b94e4421a3794447462
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Apr 17 15:10:42 2018 +1000
+
+    man: whitespace fixes in man page
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d319092d557ec0280602879b19ef1b0a825e1e75
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Apr 17 13:52:11 2018 +1000
+
+    man: fix formatting issue caused by invalid tag
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 18cc042e6822f5f24d06291ead07ea70723f9434
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Apr 10 09:19:52 2018 +1000
+
+    xf86-input-libinput 0.27.1
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0db82219bb2ad10dcdf3ea8fe8e226858190c83b
+Author: Evangelos Foutras <evangelos@foutrelis.com>
+Date:   Thu Mar 22 01:47:07 2018 +0200
+
+    Fix "left handed" property not set on all pointers
+    
+    Remove conditional that prevents the LIBINPUT_PROP_LEFT_HANDED{,DEFAULT}
+    properties from being set on all pointer devices (only the first got it).
+    This appears to be a debugging left-over accidentally merged in
+    6d3bd4544a6a2f194fa.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=105667
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f93bc148d4e6702d50ce320f6d519753c0af7c42
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Mar 20 11:23:57 2018 +1000
+
+    xf86-input-libinput 0.27.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0d4b50fd6e200cb8b720ee0b917b882d2d03542b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Mar 19 10:00:59 2018 +1000
+
+    man: note that we don't do /dev/input/by-id or /dev/input/by-path
+    
+    For logind-setups we need to match the path libinput wants to open with the
+    Option Device path that the device has so we know when to return the
+    server-fd. This doesn't work for by-id or by-path because libinput resolves
+    those (through udev) to the actual eventX node so our paths look different
+    when they are the same device.
+    
+    This could be fixed but since this is easy enough to work around with a
+    InputClass section and rather a niche case, it's not really worth the effort.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=105562
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 9d9f59fd4c5a57e4663b19c3cace6f78202c4689
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Feb 2 13:54:32 2018 +1000
+
+    Apply the capabilities checks on subdevices when applying the config
+    
+    Properties are initialized on the correct devices only but on resume we'd just
+    blindly apply the config from our device. Depending on the resume order, this
+    would mean we'd apply a previously set config with a default config.
+    
+    Example:
+    * pointer device with keyboard subdevice
+    * pointer device exports natural scrolling, keyboard device does not and
+      remains at default (off)
+    * client enables natural scrolling on the pointer device
+    * VT switch away, VT switch back
+    * pointer device gets enabled first, enables natural scrolling on the
+      libinput device
+    * keyboard device gets enabled second, resets to the default value
+    
+    Reported-by: Yuxuan Shui <yshuiv7@gmail.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Tested-by: Yuxuan Shui <yshuiv7@gmail.com>
+
+commit 73534814909b8b6f4fce8f44b412b2903397bdb0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Feb 2 13:24:43 2018 +1000
+
+    Split LibinputDeviceApplyConfig into helper functions
+    
+    No functional changes
+
+commit 6d3bd4544a6a2f194fa2ca7e08dca9cc44211e99
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Feb 2 13:27:11 2018 +1000
+
+    Move the subdevice capabilities check into the properties
+    
+    87f9fe3a6fafe60134c6's intention was to not create properties that a subdevice
+    doesn't have configuration options for (i.e. if you have a pointer+keyboard
+    device, don't expose tapping configuration on the keyboard subdevice).
+    
+    The result was messy, the checker function had a confusing triple-negation and
+    some properties weren't checked - e.g. left-handed was allowed for touch/tablet
+    but not for pointer, dwt was allowed for any device.
+    
+    Fix this by moving the check into the property init function directly and
+    inverting the helper function to be easier to read.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
 commit 2be6487de417473aac85ebd800392cdd8604c4a6
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Sep 15 11:26:54 2017 +1000
@@ -60,6 +506,9 @@ Date:   Mon May 15 03:13:43 2017 +0200
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
+Notes (test-jelly):
+    SUCCESS: jelly: make check Mon May 15 11:42:39 AEST 2017
+
 commit 8772a593b45740f4429218648c9e3a305b3fe896
 Author: Martin Kepplinger <martin.kepplinger@ginzinger.com>
 Date:   Thu May 4 08:49:34 2017 +0200
@@ -124,7 +573,7 @@ Date:   Tue Feb 28 14:45:29 2017 +1000
     
     Compiled with -O0:
     Breakpoint 1, test_nonzero_x_linear () at test-bezier.c:157
-    157			assert(bezier[x] > bezier[x-1]);
+    157                     assert(bezier[x] > bezier[x-1]);
     (gdb) p bezier
     $6 = {0 <repeats 409 times>, 1, 2, 4, 5, 7, 9, 10, 12, 14, 15, 17, 19, 21, 22,
     
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100644
index 421528e..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd "$srcdir"
-
-autoreconf -v --install || exit 1
-cd "$ORIGDIR" || exit $?
-
-git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
-    git config --local format.subjectPrefix "PATCH xf86-input-libinput"
-
-if test -z "$NOCONFIGURE"; then
-    exec "$srcdir"/configure "$@"
-fi