开源软件构建与测试

_service:tar_scm:libinput.spec Changed

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/meson-prep.sh Deleted

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/meson-test.sh Deleted

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci.yml -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab-ci.yml Changed

@@ -34,7 +34,7 @@
 # <distribution>:<version>@activity:
 #  e.g. fedora:31@build-default
 
-.templates_sha: &template_sha 25459a8d343961918a7398e4b3c147e450926569
+.templates_sha: &template_sha dd90ac0d7a03b574eb4f18d7358083f0c97825f3
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -54,6 +54,11 @@
       # Ubuntu container builder template
       - '/templates/ubuntu.yml'
 
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+
 stages:
   - sanity check     # CI/commit checks
   - prep             # prep work like rebuilding the container images if there is a change
@@ -88,12 +93,12 @@
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular
   # libinput version
-  FEDORA_TAG:  '2022-11-16.2'
-  DEBIAN_TAG:  '2022-11-16.2'
-  UBUNTU_TAG:  '2022-11-16.2'
-  ARCH_TAG:    '2022-11-16.2'
-  ALPINE_TAG:  '2022-11-16.2'
-  FREEBSD_TAG: '2022-11-16.2'
+  FEDORA_TAG:  '2023-02-13.0'
+  DEBIAN_TAG:  '2023-02-13.0'
+  UBUNTU_TAG:  '2023-02-13.0'
+  ARCH_TAG:    '2023-02-13.0'
+  ALPINE_TAG:  '2023-02-13.0'
+  FREEBSD_TAG: '2023-02-13.0'
 
   FDO_UPSTREAM_REPO: libinput/libinput
 
@@ -164,7 +169,7 @@
     - exit 1
 
 #
-# Verify that commit messages are as expected, signed-off, etc.
+# Verify that commit messages are as expected, etc.
 #
 
 check-commit:
@@ -172,7 +177,7 @@
     - .fdo.ci-fairy
   stage: sanity check
   script:
-    - ci-fairy check-commits --signed-off-by --junit-xml=results.xml && exit 0 || true
+    - ci-fairy -vv check-commits --junit-xml=results.xml && exit 0 || true
     - >
       printf "%s\n" \
         "Error checking commit format. Please verify" \
@@ -186,35 +191,54 @@
     reports:
       junit: results.xml
 
+
+#
+# Check for trailing whitespaces
+#
+
+check-whitespace:
+  extends:
+    - .fdo.ci-fairy
+  stage: sanity check
+  script:
+    # remove trailing whitespaces
+    - sed -i 's/ *$//' $(git ls-files)
+    - git diff --exit-code || (echo "ERROR - Trailing whitespaces in patchset, please fix" && false)
+    - sed -i 's/\t*$//' $(git ls-files)
+    - git diff --exit-code || (echo "ERROR - Trailing tabs in patchset, please fix" && false)
+    # search for tab after space
+    - sed -i 's/ \t//' $(git ls-files)
+    - git diff --exit-code || (echo "ERROR - Tab after space in patchset, please fix" && false)
+    # search for duplicated empty lines
+    - sed -i '/^$/N;/^\n$/D' $(git ls-files src/*.{h,c} tools/*.{h,c} udev/*.c)
+    - git diff --exit-code || (echo "ERROR - Duplicated empty lines, please fix" && false)
+
+
 #################################################################
 #                                                               #
 #                          prep stage                           #
 #                                                               #
 #################################################################
 
-#
-# Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
-#
-#
-fedora:35@container-prep:
+fedora:37@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '35'
+    FDO_DISTRIBUTION_VERSION: '37'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:36@container-prep:
+fedora:38@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
@@ -307,24 +331,24 @@
   only:
     - schedules
 
-fedora:35@container-clean:
+fedora:37@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '35'
+    FDO_DISTRIBUTION_VERSION: '37'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:36@container-clean:
+fedora:38@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 debian:stable@container-clean:
@@ -402,8 +426,8 @@
     - kvm
   variables:
     MESON_BUILDDIR: build_dir
-    B2C_KERNEL: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v5.19/bzImage
-    B2C_VERSION: v0.9.8
+    B2C_KERNEL: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.1/bzImage
+    B2C_VERSION: v0.9.9
     B2C_IMAGE: $FDO_DISTRIBUTION_IMAGE
     B2C_COMMAND: .gitlab-ci/start-in-systemd.sh
   script:
@@ -411,7 +435,7 @@
     - .gitlab-ci/meson-build.sh --skip-test
 
     # pull b2c
-    - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/v0.9.8/vm2c.py
+    - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/v0.9.9/vm2c.py
     - chmod +x /app/boot2container
 
     # runs the test suite only
@@ -433,7 +457,6 @@
 .build-in-qemu@template:
   extends:
     - .policy
-    - .fdo.distribution-image@fedora
   tags:
     - kvm
   variables:
@@ -493,20 +516,20 @@
     - export LITEST_JOBS="2"
 
 
-.fedora:36@test-suite-vm:
+.fedora:38@test-suite-vm:
   extends:
     - .fdo.distribution-image@fedora
     - .test-suite-vm
   variables:
-    FDO_DISTRIBUTION_VERSION: 36
+    FDO_DISTRIBUTION_VERSION: 38
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:36@container-prep"
+    - "fedora:38@container-prep"
 
 
 vm-touchpad:
   extends:
-    - .fedora:36@test-suite-vm
+    - .fedora:38@test-suite-vm

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/ci.template -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab-ci/ci.template Changed

@@ -36,7 +36,7 @@
 # <distribution>:<version>@activity:
 #  e.g. fedora:31@build-default
 
-.templates_sha: &template_sha 25459a8d343961918a7398e4b3c147e450926569
+.templates_sha: &template_sha dd90ac0d7a03b574eb4f18d7358083f0c97825f3
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -48,6 +48,11 @@
       - '/templates/{{distro.name}}.yml'
   {% endfor %}
 
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+
 stages:
   - sanity check     # CI/commit checks
   - prep             # prep work like rebuilding the container images if there is a change
@@ -152,7 +157,7 @@
     - exit 1
 
 #
-# Verify that commit messages are as expected, signed-off, etc.
+# Verify that commit messages are as expected, etc.
 #
 
 check-commit:
@@ -160,7 +165,7 @@
     - .fdo.ci-fairy
   stage: sanity check
   script:
-    - ci-fairy check-commits --signed-off-by --junit-xml=results.xml && exit 0 || true
+    - ci-fairy -vv check-commits --junit-xml=results.xml && exit 0 || true
     - >
       printf "%s\n" \
         "Error checking commit format. Please verify" \
@@ -174,16 +179,35 @@
     reports:
       junit: results.xml
 
+
+#
+# Check for trailing whitespaces
+#
+
+check-whitespace:
+  extends:
+    - .fdo.ci-fairy
+  stage: sanity check
+  script:
+    # remove trailing whitespaces
+    - sed -i 's/ *$//' $(git ls-files)
+    - git diff --exit-code || (echo "ERROR - Trailing whitespaces in patchset, please fix" && false)
+    - sed -i 's/\t*$//' $(git ls-files)
+    - git diff --exit-code || (echo "ERROR - Trailing tabs in patchset, please fix" && false)
+    # search for tab after space
+    - sed -i 's/ \t//' $(git ls-files)
+    - git diff --exit-code || (echo "ERROR - Tab after space in patchset, please fix" && false)
+    # search for duplicated empty lines
+    - sed -i '/^$/N;/^\n$/D' $(git ls-files src/*.{h,c} tools/*.{h,c} udev/*.c)
+    - git diff --exit-code || (echo "ERROR - Duplicated empty lines, please fix" && false)
+
+
 #################################################################
 #                                                               #
 #                          prep stage                           #
 #                                                               #
 #################################################################
 
-#
-# Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
-#
-#
 {% for distro in distributions %}
 {% for version in distro.versions %}
 {{distro.name}}:{{version}}@container-prep:
@@ -309,7 +333,6 @@
 .build-in-qemu@template:
   extends:
     - .policy
-    - .fdo.distribution-image@fedora
   tags:
     - kvm
   variables:
@@ -682,10 +705,10 @@
     - .policy
   stage: deploy
   variables:
-    FDO_DISTRIBUTION_VERSION: '36'
+    FDO_DISTRIBUTION_VERSION: '{{version}}'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:36@container-prep"
+    - "fedora:{{version}}@container-prep"
   script:
     - meson "$MESON_BUILDDIR"
     - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version)
@@ -715,4 +738,3 @@
       - main
     variables:
       - $CI_PROJECT_PATH == "libinput/libinput"
-

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/config.yml -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab-ci/config.yml Changed

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/libinput.spec.in -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab-ci/libinput.spec.in Changed

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/meson-build.sh -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab-ci/meson-build.sh Changed

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+#
+# This script is sourced from here:
+# https://gitlab.freedesktop.org/whot/meson-helper
+#
+# SPDX-License-Identifier: MIT
 
 set -x
 if  -f .meson_environment ; then
@@ -42,15 +47,16 @@
 # run and debug locally.
 if  -z "$CI_JOB_ID"  ||  -z "$CI_JOB_NAME" ; then
 	echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME".
+	CI_PROJECT_NAME=$(basename "$PWD")
 	CI_JOB_ID=$(date +%s)
-	CI_JOB_NAME='libinput-job-local'
+	CI_JOB_NAME="$CI_PROJECT_NAME-job-local"
 	echo "Simulating gitlab environment: "
 	echo " CI_JOB_ID=$CI_JOB_ID"
 	echo " CI_JOB_NAME=$CI_JOB_NAME"
 fi
 
 if  -n "$FDO_CI_CONCURRENT" ; then
-	NINJA_ARGS="-j$FDO_CI_CONCURRENT $NINJA_ARGS"
+	jobcount="-j$FDO_CI_CONCURRENT"
 	export MESON_TESTTHREADS="$FDO_CI_CONCURRENT"
 fi
 
@@ -59,6 +65,7 @@
 echo "meson args: $MESON_ARGS"
 echo "ninja args: $NINJA_ARGS"
 echo "meson test args: $MESON_TEST_ARGS"
+echo "job count: ${jobcount-0}"
 echo "*************************************************"
 
 set -e
@@ -70,7 +77,10 @@
 meson configure "$MESON_BUILDDIR"
 
 if  -z "$MESON_SKIP_BUILD" ; then
-	ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
+	if  -n "$NINJA_ARGS" ; then
+		ninja_args="--ninja-args $NINJA_ARGS"
+	fi
+	meson compile -v -C "$MESON_BUILDDIR" $jobcount $ninja_args
 fi
 
 if  -n "$MESON_RUN_TEST" ; then

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab-ci/start-in-systemd.sh -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab-ci/start-in-systemd.sh Changed

_service:tar_scm:libinput-1.22.1.tar.gz/.gitlab/issue_templates/Bug.md -> _service:tar_scm:libinput-1.24.0.tar.gz/.gitlab/issue_templates/Bug.md Changed

_service:tar_scm:libinput-1.24.0.tar.gz/.triage-policies.yml Added

@@ -0,0 +1,40 @@
+# This is a set of bugbot commands for issues and merge requests - setting any of the
+# bugbot::foo labels will trigger gitlab-triage to run with this ruleset (well, the
+# one we have on the main branch at the time)
+#
+# Note that for adding labels, the label must first created in the project.
+resource_rules:
+  issues:
+    rules:
+      - name: "Close kernel bugs"
+        conditions:
+          labels:
+            - "bugbot::kernel"
+        actions:
+          labels:
+            - "kernel"
+          remove_labels:
+            - "bugbot::kernel"
+          comment: |
+            This bug looks like a kernel issue and it cannot be fixed
+            in libinput directly. I'm closing this bug but do feel free
+            to continue discussing the issue here.
+
+            Kernel bugs are usually best sent to the `linux-input` list(https://lore.kernel.org/linux-input/).
+          status: "close"
+  merge_requests:
+    rules:
+      - name: "Remind contributor of commit rules"
+        conditions:
+          labels:
+            - "bugbot::commit-rules"
+        actions:
+          remove_labels:
+            - "bugbot::commit-rules"
+          comment: |
+            Hi. Looks like the pipeline failed because one or more of the commits in this MR do not meet our requirements.
+            Most commonly this the format of the commit message itself. The "Test summary" above has the details.
+
+            Please see our docs for commit messages(https://wayland.freedesktop.org/libinput/doc/latest/contributing.html#commit-messages)
+            and our docs for submitting code(https://wayland.freedesktop.org/libinput/doc/latest/contributing.html#submitting-code)
+            that explain how to amend and force-push to this repo.

_service:tar_scm:libinput-1.22.1.tar.gz/CODING_STYLE.md -> _service:tar_scm:libinput-1.24.0.tar.gz/CODING_STYLE.md Changed

@@ -211,38 +211,6 @@
 maintainers to decide if a given patch is suitable for stable branches or
 inclusion in a distribution.
 
-## Developer Certificate of Origin
-
-Your commit **must** be signed off with a line:
-```
-Signed-off-by: <your name> <your email address>
-```
-By signing off, you indicate the developer certificate of origin(https://developercertificate.org/).
-
-> By making a contribution to this project, I certify that:
->
-> (a) The contribution was created in whole or in part by me and I
->     have the right to submit it under the open source license
->     indicated in the file; or
->
-> (b) The contribution is based upon previous work that, to the best
->     of my knowledge, is covered under an appropriate open source
->     license and I have the right under that license to submit that
->     work with modifications, whether created in whole or in part
->     by me, under the same open source license (unless I am
->     permitted to submit under a different license), as indicated
->     in the file; or
->
-> (c) The contribution was provided directly to me by some other
->     person who certified (a), (b) or (c) and I have not modified
->     it.
->
-> (d) I understand and agree that this project and the contribution
->     are public and that a record of the contribution (including all
->     personal information I submit with it, including my sign-off) is
->     maintained indefinitely and may be redistributed consistent with
->     this project or the open source license(s) involved.
-
 ## Commit message format
 
 The canonical git commit message format is:
@@ -257,8 +225,6 @@
 You can include extra data where required like:
 - benchmark one says 10s
 - benchmark two says 12s
-
-Signed-off-by: <your name> <your email>
 ```
 
 The subject line is the first thing everyone sees about this commit, so make
@@ -270,8 +236,8 @@
   "change foo to bar", not "changed foo to bar".
 - The text width of the commit should be 78 chars or less, especially the
   subject line.
-- The author and signed-off-by must be your real name and email address. We
-  do not accept the default `@users.noreply` gitlab addresses.
+- The author must be the name you usually identify as and email address. We do
+  not accept the default `@users.noreply` gitlab addresses.
   ```
   git config --global user.name Your Name
   git config --global user.email your@email

_service:tar_scm:libinput-1.22.1.tar.gz/doc/api/libinput.doxygen.in -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/api/libinput.doxygen.in Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/building.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/building.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/clickpad-with-right-button.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/clickpad-with-right-button.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/conf.py.in -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/conf.py.in Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/configuration.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/configuration.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/contributing.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/contributing.rst Changed

@@ -266,25 +266,6 @@
 Commit Messages
 ------------------------------------------------------------------------------
 
-Commit messages **must** contain a **Signed-off-by** line with your name
-and email address. An example is: ::
-
-    A description of this commit, and it's great work.
-
-    Signed-off-by: Claire Someone <name@domain>
-
-If you're not the patch's original author, you should
-also gather S-o-b's by them (and/or whomever gave the patch to you.) The
-significance of this is that it certifies that you created the patch, that
-it was created under an appropriate open source license, or provided to you
-under those terms. This lets us indicate a chain of responsibility for the
-copyright status of the code. An example is: ::
-
-    A description of this commit, and it's great work.
-
-    Signed-off-by: Claire Someone <name@domain>
-    Signed-off-by: Ferris Crab <name@domain>
-
 When you re-send patches, revised or not, it would be very good to document the
 changes compared to the previous revision in the commit message and/or the
 merge request. If you have already received Reviewed-by or Acked-by tags, you
@@ -354,26 +335,6 @@
 Follow the appropriate section to fix the errors.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Missing "Signed-off-by: author information"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-As explained in :ref:`contributing_commit_messages`, every commit must contain a
-Signed-off-by line with your name and email address.
-
-When this line is not present, it can be added to your commit afterwards: ::
-
-  git commit --amend -s
-
-If the merge request contains more than one commit, it must be added to all of
-them: ::
-
-  git rebase --interactive --exec 'git commit --amend -s' main
-
-Once the problem is fixed, force-push your branch. See
-:ref:`contributing_submitting_code` for more details about how to push your code
-and interactive rebases.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Committed gitlab-ci.yml differs from generated gitlab-ci.yml. Please verify
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/device-configuration-via-udev.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/device-configuration-via-udev.rst Changed

@@ -108,42 +108,6 @@
      ENV{ID_INPUT_TOUCHPAD}="", ENV{ID_INPUT_TABLET}="1"
 
 
-
-.. _ignoring_devices:
-
-------------------------------------------------------------------------------
-Ignoring specific devices
-------------------------------------------------------------------------------
-
-If a device has the **LIBINPUT_IGNORE_DEVICE** udev property set to any
-value but "0", that device is not initialized by libinput. For a context
-created with **libinput_udev_create_context()**, the device is silently ignored
-and never shows up. If the device is added with **libinput_path_add_device()**
-to a context created with **libinput_path_create_context()**, adding the device
-will fail and return NULL (see that function's documentation for more
-information).
-
-If the property value is exactly "0", then the property is considered unset
-and libinput initializes the device normally.
-
-This property should be used for devices that are correctly detected as
-input devices (see :ref:`udev_device_type`) but that should not be used by
-libinput. It is recommended that devices that should not be handled as input
-devices at all unset the **ID_INPUT** and related properties instead. The
-**LIBINPUT_IGNORE_DEVICE** property signals that only libinput should
-ignore this property but other parts of the stack (if any) should continue
-treating this device normally.
-
-Below is an example udev rule  to assign **LIBINPUT_IGNORE_DEVICE** to the
-device with the vendor/model ID of ``012a``/``034b``. ::
-
-  $ cat /etc/udev/rules.d/99-ignore-my-device.rules
-  ACTION=="add|change", KERNEL=="event0-9*", \
-     ENV{ID_VENDOR_ID}=="012a", \
-     ENV{ID_MODEL_ID}=="034b", \
-     ENV{LIBINPUT_IGNORE_DEVICE}="1"
-
-
 .. _model_specific_configuration:
 
 ------------------------------------------------------------------------------

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/device-quirks.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/device-quirks.rst Changed

@@ -112,11 +112,11 @@
 .. _device-quirks-list:
 
 ------------------------------------------------------------------------------
-List of supported device quirks
+List of currently available device quirks
 ------------------------------------------------------------------------------
 
 This list is a guide for developers to ease the process of submitting
-patches upstream. This section shows device quirks supported in
+patches upstream. This section shows device quirks currently available in
 |git_version|.
 
 .. warning:: Quirks are internal API and may change at any time for any reason.
@@ -147,6 +147,10 @@
     timestamps can not be relied upon.
 ModelSynapticsSerialTouchpad
     Reserved for touchpads made by Synaptics on the serial bus
+ModelPressurePad
+    Unlike in traditional touchpads, whose pressure value equals contact size,
+    on pressure pads pressure is a real physical axis.
+    Indicates that the device is a pressure pad.
 AttrSizeHint=NxM, AttrResolutionHint=N
     Hints at the width x height of the device in mm, or the resolution
     of the x/y axis in units/mm. These may only be used where they apply to
@@ -174,19 +178,14 @@
     Indicates the position of the touchpad on an external touchpad+keyboard
     combination device. This is a string enum. Don't specify it unless the
     touchpad is below.
-AttrEventCodeDisable=EV_ABS;BTN_STYLUS;EV_KEY:0x123;
-    Disables the evdev event type/code tuples on the device. Entries may be
+AttrEventCode=+EV_ABS;-BTN_STYLUS;+EV_KEY:0x123;
+    Enables or disables the evdev event type/code tuples on the device. The prefix
+    for each entry is either '+' (enable) or '-' (disable). Entries may be
     a named event type, or a named event code, or a named event type with a
     hexadecimal event code, separated by a single colon.
-AttrEventCodeEnable=EV_ABS;BTN_STYLUS;EV_KEY:0x123;
-    Enables the evdev event type/code tuples on the device. Entries may be
-    a named event type, or a named event code, or a named event type with a
-    hexadecimal event code, separated by a single colon.
-AttrInputPropDisable=INPUT_PROP_BUTTONPAD;INPUT_PROP_POINTER;
-    Disables the evdev input property on the device. Entries may be
-    a named input property or the hexadecimal value of that property.
-AttrInputPropEnable=INPUT_PROP_BUTTONPAD;INPUT_PROP_POINTER;
-    Enables the evdev input property on the device. Entries may be
+AttrInputProp=+INPUT_PROP_BUTTONPAD;-INPUT_PROP_POINTER;
+    Enables or disables the evdev input property on the device. The prefix
+    for each entry is either '+' (enable) or '-' (disable). Entries may be
     a named input property or the hexadecimal value of that property.
 AttrPointingStickIntegration=internal|external
     Indicates the integration of the pointing stick. This is a string enum.

_service:tar_scm:libinput-1.24.0.tar.gz/doc/user/ignoring-devices.rst Added

@@ -0,0 +1,36 @@
+.. _ignoring_devices:
+
+==============================================================================
+Ignoring specific devices
+==============================================================================
+
+If a device has the **LIBINPUT_IGNORE_DEVICE** udev property set to any
+value but "0", that device is not initialized by libinput.
+For a context created with **libinput_udev_create_context()**, the device is
+silently ignored and never shows up. If the device is added with
+**libinput_path_add_device()** to a context created with
+**libinput_path_create_context()**, adding the device will fail and return NULL
+(see that function's documentation for more
+information).
+
+If the property value is exactly "0", then the property is considered unset
+and libinput initializes the device normally.
+
+This property should be used for devices that are correctly detected as
+input devices (see :ref:`udev_device_type`) but that should not be used by
+libinput. It is recommended that devices that should not be handled as input
+devices at all unset the **ID_INPUT** and related properties instead. The
+**LIBINPUT_IGNORE_DEVICE** property signals that only libinput should
+ignore this property but other parts of the stack (if any) should continue
+treating this device normally.
+
+Below is an example udev rule  to assign **LIBINPUT_IGNORE_DEVICE** to the
+device with the vendor/model ID of ``012a``/``034b``. ::
+
+  $ cat /etc/udev/rules.d/99-ignore-my-device.rules
+  ACTION!="remove", KERNEL=="event0-9*", \
+     ENV{ID_VENDOR_ID}=="012a", \
+     ENV{ID_MODEL_ID}=="034b", \
+     ENV{LIBINPUT_IGNORE_DEVICE}="1"
+
+See :ref:`udev_config` for more details on libinput's udev properties.

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/incorrectly-enabled-hires.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/incorrectly-enabled-hires.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/meson.build -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/meson.build Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/palm-detection.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/palm-detection.rst Changed

@@ -92,9 +92,8 @@
 the edge zones, libinput detects vertical movements out of the edge zone and
 avoids palm detection on such touch sequences.
 
-Each side edge exclusion zone is divided into a top part and a bottom part.
-A touch starting in the top part of the exclusion zone does not trigger a
-tap (see :ref:`tapping`).
+A touch starting in the exclusion zone does not trigger a tap (see
+:ref:`tapping`).
 
 In the diagram below, the exclusion zones are painted red.
 Touch 'A' starts inside the exclusion zone and moves
@@ -104,10 +103,8 @@
 Touch 'B' starts inside the exclusion zone but moves horizontally out of the
 zone. It is considered a valid touch and controls the cursor.
 
-Touch 'C' occurs in the top part of the exclusion zone. Despite being a
-tapping motion, it does not generate an emulated button event. Touch 'D'
-likewise occurs within the exclusion zone but in the bottom half. libinput
-will generate a button event for this touch.
+Touch 'C' occurs in the exclusion zone. Despite being a tapping motion, it does
+not generate an emulated button event.
 
 .. figure:: palm-detection.svg
     :align: center

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/pointer-acceleration.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/pointer-acceleration.rst Changed

@@ -19,12 +19,16 @@
 ------------------------------------------------------------------------------
 
 The profile decides the general method of pointer acceleration.
-libinput currently supports two profiles: **"adaptive"** and **"flat"**.
+libinput currently supports three profiles: **"adaptive"**, **"flat"** and
+**"custom"**.
 
 - The **adaptive** profile is the default profile for all devices and takes the
   current speed of the device into account when deciding on acceleration.
 - The **flat** profile is simply a constant factor applied to all device deltas,
   regardless of the speed of motion (see :ref:`ptraccel-profile-flat`).
+- The **custom** profile allows the user to define a custom acceleration
+  function, giving full control over accelerations behavior at different speed
+  (see :ref:`ptraccel-profile-custom`).
 
 Most of this document describes the adaptive pointer acceleration.
 
@@ -198,3 +202,95 @@
 Pointer acceleration for relative motion on tablet devices is a flat
 acceleration, with the speed setting slowing down or speeding up the pointer
 motion by a constant factor. Tablets do not allow for switchable profiles.
+
+.. _ptraccel-profile-custom:
+
+------------------------------------------------------------------------------
+The custom acceleration profile
+------------------------------------------------------------------------------
+
+libinput supports a user-defined custom acceleration profile, which can be
+adjusted for different movement types supported by a device. Movement types
+include pointer movement, scrolling, etc. but the set of supported
+movement types depends on the device.
+
+The custom pointer acceleration profile gives users full control over the
+acceleration behavior at different speeds. libinput exposes
+an acceleration function ``f(x)`` where the x axis is the device speed in
+device units per millisecond and the y axis is the pointer speed. By
+supplying the y axis values for this function, users can control the
+behavior of the device.
+
+The user should take into account the native device dpi and screen dpi in
+order to achieve the desired behavior/feel.
+
+The custom acceleration function is defined using ``n`` points which are spaced
+uniformly along the x axis, starting from 0 and continuing in constant steps.
+At least two points must be defined and there is an implementation-defined
+limit on how many points may be added.
+
+Thus the points defining the custom function are:
+``(0 * step, f0), (1 * step, f1), ..., ((n-1) * step, fn-1)``
+where ``f`` is a list of ``n`` values defining the output velocity for each
+input velocity.
+The acceleration factor is defined by the ratio of the output velocity to the
+input velocity.
+When a velocity value does not lie exactly on those points, a linear
+interpolation of the two closest points will be calculated.
+When a velocity value is greater than the max point defined, a linear
+extrapolation of the two biggest points will be calculated.
+
+the calculation made by libinput: ::
+
+    input_delta = device delta units
+    delta_time = time in ms since last input_delta
+    input_speed = hypot(input_delta) / delta_time
+    output_speed = user_custom_function(input_speed)
+    acceleration_factor = output_speed / input_speed
+    output_delta = input_delta * acceleration_factor
+
+An example is the curve of ``0.0, 1.0`` with a step of ``1.0``. This curve
+is the equivalent of the flat acceleration profile with any input speed ``N``
+mapped to the same pointer speed ``N``. The curve ``1.0, 1.0`` neutralizes
+any input speed differences and results in a fixed pointer speed.
+
+Another example is the custom acceleration function ``x**2``,
+sampling the function at ``4`` points up to
+a maximum input speed of ``9`` will give us a custom function with
+a step of ``3`` and points ``0.0, 9.0, 36.0, 81.0``:
+
+.. figure:: ptraccel-custom.svg
+    :align: center
+
+More sampled points can be added to improve the accuracy of the user custom
+function.
+
+Supported Movement types:
+
++---------------+---------------------------------+----------------------+
+| Movement type | Uses                            | supported by         |
++===============+=================================+======================+
+| Fallback      | Catch-all default movement type | All devices          |
++---------------+---------------------------------+----------------------+
+| Motion        | Used for pointer motion         | All devices          |
++---------------+---------------------------------+----------------------+
+| Scroll        | Used for scroll movement        | Mouse, Touchpad      |
++---------------+---------------------------------+----------------------+
+
+If a user does not provide the fallback custom acceleration function, a
+flat acceleration function is used, i.e. no acceleration.
+
+The fallback acceleration may be used for different types of movements, it is
+strongly recommended that this acceleration function is a constant function.
+
+For example, a touchpad has multiple movement types: pointer
+movement, scroll movement, zoom movement (pinch), etc. As there is no separate
+movement type for zoom yet, zoom movement is accelerated using the Fallback
+acceleration function. Pointer movement is accelerated using the Motion
+acceleration function, and Scroll movement is accelerated using the Scroll
+acceleration function. If no Motion/Scroll acceleration function is set, the
+Fallback acceleration function is used.
+
+When using custom acceleration profile, any calls to set the speed have no
+effect on the behavior of the custom acceleration function, but any future calls to
+get the speed will reflect the requested speed setting.

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/scrolling.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/scrolling.rst Changed

@@ -150,3 +150,23 @@
 behavior of each scroll source.
 
 See also http://who-t.blogspot.com.au/2015/03/libinput-scroll-sources.html
+
+.. _natural_scrolling:
+
+------------------------------------------------------------------------------
+Natural scrolling vs. traditional scrolling
+------------------------------------------------------------------------------
+
+Natural scrolling is the term (probably) coined by Apple for matching
+the motion of the scroll device with the direction of the **content**.
+
+In traditional scrolling, moving the wheel down causes the scroll bar
+indicators to move down and the content to move up. In natural scrolling,
+moving the wheel down causes the content to move down and the scroll bar
+indicators to move up. This method of scrolling matches the interaction
+with content on touch screens where a movement down also moves the content
+down.
+
+libinput supports natural scrolling for all its scroll methods; it can
+be enabled with the
+**libinput_device_config_scroll_set_natural_scroll_enabled()** function.

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/svg/palm-detection.svg -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/svg/palm-detection.svg Changed

@@ -138,13 +138,6 @@
      style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6, 1;stroke-dashoffset:0;stroke-opacity:1;marker-mid:none;marker-end:url(#Arrow1Lend-2)"
      id="path13492"
      d="m 38.928571,67.914286 c 0,0 3.508205,24.810617 9.642857,57.857144 6.134651,33.04652 23.277202,79.68584 89.642852,90.35714" />
-  <rect
-     style="fill:#000000;fill-opacity:0.3559322;fill-rule:evenodd;stroke:none;stroke-width:3.30510259px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     id="rect3490"
-     width="65.310997"
-     height="136.12065"
-     x="7.0411549"
-     y="7.1355872" />
   <text
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:0%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
      xml:space="preserve"
@@ -155,13 +148,6 @@
        id="tspan13876"
        y="63.628628"
        x="33.214291">A</tspan></text>
-  <rect
-     style="fill:#000000;fill-opacity:0.3559322;fill-rule:evenodd;stroke:none;stroke-width:3.30527353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     id="rect3490-2"
-     width="65.272476"
-     height="136.21509"
-     x="321.22849"
-     y="6.8830237" />
   <text
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:0%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
      xml:space="preserve"
@@ -191,16 +177,6 @@
        id="tspan13876-7-9"
        y="46.009491"
        x="342.27759">C</tspan></text>
-  <text
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:0%;font-family:Utopia;-inkscape-font-specification:Utopia;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
-     xml:space="preserve"
-     id="text13874-8-1-4"
-     y="215.65927"
-     x="37.970726"><tspan
-       style="font-size:18px;font-family:Arial;-inkscape-font-specification:Arial"
-       id="tspan13876-7-9-5"
-       y="215.65927"
-       x="37.970726">D</tspan></text>
   <circle
      style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
      id="path4401"
@@ -208,13 +184,6 @@
      cy="24.53549"
      r="4.0658817"
      transform="scale(-1,1)" />
-  <circle
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="path4401-9"
-     cx="-36.452721"
-     cy="194.8819"
-     r="4.0658817"
-     transform="scale(-1,1)" />
   <rect
      width="248.87633"
      height="6.8111157"

_service:tar_scm:libinput-1.24.0.tar.gz/doc/user/svg/ptraccel-custom.svg Added

@@ -0,0 +1,1067 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="402.915625pt" height="321.95625pt" viewBox="0 0 402.915625 321.95625" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2023-08-16T19:10:50.848529</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.7.2, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
+ </defs>
+ <g id="figure_1">
+  <g id="patch_1">
+   <path d="M 0 321.95625
+L 402.915625 321.95625
+L 402.915625 0
+L 0 0
+z
+" style="fill: #ffffff"/>
+  </g>
+  <g id="axes_1">
+   <g id="patch_2">
+    <path d="M 46.965625 284.4
+L 395.715625 284.4
+L 395.715625 7.2
+L 46.965625 7.2
+z
+" style="fill: #ffffff"/>
+   </g>
+   <g id="matplotlib.axis_1">
+    <g id="xtick_1">
+     <g id="line2d_1">
+      <defs>
+       <path id="m909db5c39c" d="M 0 0
+L 0 3.5
+" style="stroke: #000000; stroke-width: 0.8"/>
+      </defs>
+      <g>
+       <use xlink:href="#m909db5c39c" x="62.817898" y="284.4" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_1">
+      
+      <g transform="translate(59.636648 298.998438) scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-30" d="M 2034 4250
+Q 1547 4250 1301 3770
+Q 1056 3291 1056 2328
+Q 1056 1369 1301 889
+Q 1547 409 2034 409
+Q 2525 409 2770 889
+Q 3016 1369 3016 2328
+Q 3016 3291 2770 3770
+Q 2525 4250 2034 4250
+z
+M 2034 4750
+Q 2819 4750 3233 4129
+Q 3647 3509 3647 2328
+Q 3647 1150 3233 529
+Q 2819 -91 2034 -91
+Q 1250 -91 836 529
+Q 422 1150 422 2328
+Q 422 3509 836 4129
+Q 1250 4750 2034 4750
+z
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-30"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_2">
+     <g id="line2d_2">
+      <g>
+       <use xlink:href="#m909db5c39c" x="126.226989" y="284.4" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_2">
+      
+      <g transform="translate(123.045739 298.998438) scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-33" d="M 2597 2516
+Q 3050 2419 3304 2112
+Q 3559 1806 3559 1356
+Q 3559 666 3084 287
+Q 2609 -91 1734 -91
+Q 1441 -91 1130 -33
+Q 819 25 488 141
+L 488 750
+Q 750 597 1062 519
+Q 1375 441 1716 441
+Q 2309 441 2620 675
+Q 2931 909 2931 1356
+Q 2931 1769 2642 2001
+Q 2353 2234 1838 2234
+L 1294 2234
+L 1294 2753
+L 1863 2753
+Q 2328 2753 2575 2939
+Q 2822 3125 2822 3475
+Q 2822 3834 2567 4026
+Q 2313 4219 1838 4219
+Q 1578 4219 1281 4162
+Q 984 4106 628 3988
+L 628 4550
+Q 988 4650 1302 4700
+Q 1616 4750 1894 4750
+Q 2613 4750 3031 4423
+Q 3450 4097 3450 3541
+Q 3450 3153 3228 2886
+Q 3006 2619 2597 2516
+z
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-33"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_3">
+     <g id="line2d_3">
+      <g>
+       <use xlink:href="#m909db5c39c" x="189.63608" y="284.4" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_3">
+      
+      <g transform="translate(186.45483 298.998438) scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-36" d="M 2113 2584
+Q 1688 2584 1439 2293
+Q 1191 2003 1191 1497
+Q 1191 994 1439 701
+Q 1688 409 2113 409
+Q 2538 409 2786 701
+Q 3034 994 3034 1497
+Q 3034 2003 2786 2293
+Q 2538 2584 2113 2584
+z
+M 3366 4563
+L 3366 3988
+Q 3128 4100 2886 4159
+Q 2644 4219 2406 4219
+Q 1781 4219 1451 3797
+Q 1122 3375 1075 2522
+Q 1259 2794 1537 2939
+Q 1816 3084 2150 3084
+Q 2853 3084 3261 2657
+Q 3669 2231 3669 1497
+Q 3669 778 3244 343
+Q 2819 -91 2113 -91
+Q 1303 -91 875 529
+Q 447 1150 447 2328
+Q 447 3434 972 4092
+Q 1497 4750 2381 4750
+Q 2619 4750 2861 4703
+Q 3103 4656 3366 4563
+z
+" transform="scale(0.015625)"/>
+       </defs>
+       <use xlink:href="#DejaVuSans-36"/>
+      </g>
+     </g>
+    </g>
+    <g id="xtick_4">
+     <g id="line2d_4">
+      <g>
+       <use xlink:href="#m909db5c39c" x="253.04517" y="284.4" style="stroke: #000000; stroke-width: 0.8"/>
+      </g>
+     </g>
+     <g id="text_4">
+      
+      <g transform="translate(249.86392 298.998438) scale(0.1 -0.1)">
+       <defs>
+        <path id="DejaVuSans-39" d="M 703 97
+L 703 672
+Q 941 559 1184 500
+Q 1428 441 1663 441
+Q 2288 441 2617 861
+Q 2947 1281 2994 2138
+Q 2813 1869 2534 1725
+Q 2256 1581 1919 1581
+Q 1219 1581 811 2004
+Q 403 2428 403 3163
+Q 403 3881 828 4315
+Q 1253 4750 1959 4750
+Q 2769 4750 3195 4129
+Q 3622 3509 3622 2328
+Q 3622 1225 3098 567
+Q 2575 -91 1691 -91

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/svg/ptraccel-trackpoint.svg -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/svg/ptraccel-trackpoint.svg Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/tablet-support.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/tablet-support.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/timestamps.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/timestamps.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/tools.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/tools.rst Changed

@@ -11,8 +11,10 @@
 
 The most common tools used are:
 
-- ``libinput list-devices``: to list locally available devices,
+- ``libinput list-devices``: to list locally available devices as seen by libinput,
   see :ref:`here <libinput-list-devices>`
+- ``libinput list-kernel-devices``: to list locally available devices as seen by the kernel,
+  see :ref:`here <libinput-list-kernel-devices>`
 - ``libinput debug-events``: to monitor and debug events,
   see :ref:`here <libinput-debug-events>`
 - ``libinput debug-gui``: to visualize events,
@@ -76,6 +78,55 @@
 .. note:: This tool is intended for human-consumption and may change its output
           at any time.
 
+.. _libinput-list-kernel-devices:
+
+------------------------------------------------------------------------------
+libinput list-kernel-devices
+------------------------------------------------------------------------------
+
+The ``libinput list-kernel-devices`` command shows the devices known by **the
+kernel**. This command can help identify issues when a device is not handled by
+libinput.
+
+::
+
+    $ libinput list-kernel-devices
+    /dev/input/event0:	Sleep Button
+    /dev/input/event1:	Power Button
+    /dev/input/event2:	Power Button
+    /dev/input/event3:	Microsoft Microsoft® 2.4GHz Transceiver v9.0
+    /dev/input/event4:	Microsoft Microsoft® 2.4GHz Transceiver v9.0 Mouse
+    ...
+
+
+In some cases, knowing about the HID devices behind the kernel's event nodes
+can be useful. To list HID devices, supply the ``--hid`` commandline flag:
+
+::
+
+    $ libinput list-kernel-devices --hid
+    hid:
+    - name:   'Logitech Gaming Mouse G303'
+      id:     '046d:c080'
+      driver: 'hid-generic'
+      hidraw: '/dev/hidraw6'
+      evdev:  '/dev/input/event13'
+
+    - name:   'Logitech Gaming Mouse G303'
+      id:     '046d:c080'
+      driver: 'hid-generic'
+      hidraw: '/dev/hidraw7'
+      evdev:  '/dev/input/event14'
+
+    - name:   'Microsoft Microsoft® 2.4GHz Transceiver v9.0'
+      id:     '045e:07a5'
+      driver: 'hid-generic'
+      hidraw: '/dev/hidraw0'
+      evdev:  '/dev/input/event3'
+
+.. note:: This tool is intended for human-consumption and may change its output
+          at any time.
+
 .. _libinput-debug-events:
 
 ------------------------------------------------------------------------------

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/trackpoint-configuration.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/trackpoint-configuration.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/doc/user/troubleshooting.rst -> _service:tar_scm:libinput-1.24.0.tar.gz/doc/user/troubleshooting.rst Changed

_service:tar_scm:libinput-1.22.1.tar.gz/include/valgrind/valgrind.h -> _service:tar_scm:libinput-1.24.0.tar.gz/include/valgrind/valgrind.h Changed

@@ -21,16 +21,16 @@
    1. Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
 
-   2. The origin of this software must not be misrepresented; you must 
-      not claim that you wrote the original software.  If you use this 
-      software in a product, an acknowledgment in the product 
+   2. The origin of this software must not be misrepresented; you must
+      not claim that you wrote the original software.  If you use this
+      software in a product, an acknowledgment in the product
       documentation would be appreciated but is not required.
 
    3. Altered source versions must be plainly marked as such, and must
       not be misrepresented as being the original software.
 
-   4. The name of the author may not be used to endorse or promote 
-      products derived from this software without specific prior written 
+   4. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior written
       permission.
 
    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -52,13 +52,13 @@
    the terms of the GNU General Public License, version 2.  See the
    COPYING file in the source distribution for details.
 
-   ---------------------------------------------------------------- 
+   ----------------------------------------------------------------
 */
 
 
 /* This file is for inclusion into client (your!) code.
 
-   You can use these macros to manipulate and query Valgrind's 
+   You can use these macros to manipulate and query Valgrind's
    execution inside your own programs.
 
    The resulting executables will still run without Valgrind, just a
@@ -238,8 +238,8 @@
    this is executed not under Valgrind.  Args are passed in a memory
    block, and so there's no intrinsic limit to the number that could
    be passed, but it's currently five.
-   
-   The macro args are: 
+
+   The macro args are:
       _zzq_rlval    result lvalue
       _zzq_default  default value (result returned when running on real CPU)
       _zzq_request  request code
@@ -267,7 +267,7 @@
     ||  defined(PLAT_x86_solaris) || defined(PLAT_x86_freebsd)
 
 typedef
-   struct { 
+   struct {
       unsigned int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -332,7 +332,7 @@
 #if defined(PLAT_x86_win32) && !defined(__GNUC__)
 
 typedef
-   struct { 
+   struct {
       unsigned int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -408,7 +408,7 @@
     ||  (defined(PLAT_amd64_win64) && defined(__GNUC__))
 
 typedef
-   struct { 
+   struct {
       unsigned long int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -480,7 +480,7 @@
 #if defined(PLAT_ppc32_linux)
 
 typedef
-   struct { 
+   struct {
       unsigned int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -549,7 +549,7 @@
 #if defined(PLAT_ppc64be_linux)
 
 typedef
-   struct { 
+   struct {
       unsigned long int nraddr; /* where's the code? */
       unsigned long int r2;  /* what tocptr do we need? */
    }
@@ -705,7 +705,7 @@
 #if defined(PLAT_arm_linux)
 
 typedef
-   struct { 
+   struct {
       unsigned int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -773,7 +773,7 @@
 #if defined(PLAT_arm64_linux)
 
 typedef
-   struct { 
+   struct {
       unsigned long int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -920,7 +920,7 @@
 #if defined(PLAT_mips32_linux)
 
 typedef
-   struct { 
+   struct {
       unsigned int nraddr; /* where's the code? */
    }
    OrigFn;
@@ -934,7 +934,7 @@
                      "srl $0, $0, 29\n\t"       \
                      "srl $0, $0, 3\n\t"        \
                      "srl $0, $0, 19\n\t"
-                    
+
 #define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
        _zzq_default, _zzq_request,                                \
        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)     \
@@ -2254,7 +2254,7 @@
 #define VALGRIND_RESTORE_STACK             \
       "mr 1,28\n\t"
 
-/* These CALL_FN_ macros assume that on ppc32-linux, 
+/* These CALL_FN_ macros assume that on ppc32-linux,
    sizeof(unsigned long) == 4. */
 
 #define CALL_FN_W_v(lval, orig)                                   \
@@ -4779,7 +4779,7 @@
       "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7"
 #endif
 
-/* Nb: Although r11 is modified in the asm snippets below (inside 
+/* Nb: Although r11 is modified in the asm snippets below (inside
    VALGRIND_CFI_PROLOGUE) it is not listed in the clobber section, for
    two reasons:
    (1) r11 is restored in VALGRIND_CFI_EPILOGUE, so effectively it is not
@@ -5229,7 +5229,7 @@
 #endif /* PLAT_s390x_linux */
 
 /* ------------------------- mips32-linux ----------------------- */
- 
+
 #if defined(PLAT_mips32_linux)
 
 /* These regs are trashed by the hidden call. */
@@ -6623,7 +6623,7 @@
 #define VG_IS_TOOL_USERREQ(a, b, v) \
    (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000))
 
-/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! 
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
    This enum comprises an ABI exported by Valgrind to programs
    which use client requests.  DO NOT CHANGE THE NUMERIC VALUES OF THESE
    ENTRIES, NOR DELETE ANY -- add new ones at the end of the most
@@ -6776,7 +6776,7 @@
    _qzz_res = VALGRIND_DO_CLIENT_REQUEST_EXPR(0,
                               VG_USERREQ__PRINTF_VALIST_BY_REF,
                               (unsigned long)format,
-                              (unsigned long)&vargs, 
+                              (unsigned long)&vargs,
                               0, 0, 0);
 #endif
    va_end(vargs);
@@ -6815,7 +6815,7 @@
    _qzz_res = VALGRIND_DO_CLIENT_REQUEST_EXPR(0,
                               VG_USERREQ__PRINTF_BACKTRACE_VALIST_BY_REF,
                               (unsigned long)format,
-                              (unsigned long)&vargs, 
+                              (unsigned long)&vargs,
                               0, 0, 0);
 #endif
    va_end(vargs);
@@ -6826,7 +6826,7 @@
 
 /* These requests allow control to move from the simulated CPU to the
    real CPU, calling an arbitrary function.
-   
+
    Note that the current ThreadId is inserted as the first argument.
    So this call:
 
@@ -6912,7 +6912,7 @@
    - It marks the block as being addressable and undefined (if 'is_zeroed' is
      not set), or addressable and defined (if 'is_zeroed' is set).  This
      controls how accesses to the block by the program are handled.
-   
+
    'addr' is the start of the usable block (ie. after any

_service:tar_scm:libinput-1.22.1.tar.gz/meson.build -> _service:tar_scm:libinput-1.24.0.tar.gz/meson.build Changed

@@ -1,5 +1,5 @@
 project('libinput', 'c',
-	version : '1.22.1',
+	version : '1.24.0',
 	license : 'MIT/Expat',
 	default_options :  'c_std=gnu99', 'warning_level=2' ,
 	meson_version : '>= 0.49.0')
@@ -292,6 +292,7 @@
 ############ libfilter.a ############
 src_libfilter = 
 		'src/filter.c',
+		'src/filter-custom.c',
 		'src/filter-flat.c',
 		'src/filter-low-dpi.c',
 		'src/filter-mouse.c',
@@ -477,6 +478,13 @@
      suite : 'all'
      )
 
+quirks_file_tester = find_program('test/test_quirks_files.py')
+test('validate-quirks-files',
+     quirks_file_tester,
+     suite : 'all',
+     env: 'MESON_SOURCE_ROOT=@0@'.format(meson.project_source_root()),
+     )
+
 libinput_list_devices_sources =  'tools/libinput-list-devices.c' 
 libinput_list_devices = executable('libinput-list-devices',
 				   libinput_list_devices_sources,
@@ -511,6 +519,7 @@
 	      'tools/libinput-analyze-per-slot-delta.py',
 	      'tools/libinput-analyze-recording.py',
 	      'tools/libinput-analyze-touch-down-state.py',
+	      'tools/libinput-list-kernel-devices.py',
 	      'tools/libinput-measure-fuzz.py',
 	      'tools/libinput-measure-touchpad-size.py',
 	      'tools/libinput-measure-touchpad-tap.py',
@@ -545,7 +554,12 @@
 		config_h.set10('HAVE_GTK3', dep_gtk.found())
 	endif
 
-	gtk_targets = dep_gtk.get_pkgconfig_variable('targets')
+	if meson.version().version_compare('>= 0.58')
+		gtk_targets = dep_gtk.get_variable('targets')
+	else
+		gtk_targets = dep_gtk.get_pkgconfig_variable('targets')
+	endif
+
 	have_gtk_wayland = gtk_targets.contains('wayland')
 	have_gtk_x11 = gtk_targets.contains('x11')
 
@@ -562,7 +576,11 @@
 
 	if have_gtk_wayland and dep_wayland_client.found() and dep_wayland_protocols.found()
 		wayland_scanner = find_program('wayland-scanner')
-		wlproto_dir = dep_wayland_protocols.get_pkgconfig_variable('pkgdatadir')
+		if meson.version().version_compare('>= 0.58')
+			wlproto_dir = dep_wayland_protocols.get_variable('pkgdatadir')
+		else
+			wlproto_dir = dep_wayland_protocols.get_pkgconfig_variable('pkgdatadir')
+		endif
 
 		proto_name = 'pointer-constraints-unstable-v1'
 		input = files(wlproto_dir / 'unstable' / 'pointer-constraints' / '@0@.xml'.format(proto_name))
@@ -631,7 +649,7 @@
 					  configuration : config_tool_option_test)
 	test('tool-option-parsing',
 	     tool_option_test,
-	     args : tool_option_test, '-n', 'auto',
+	     args : tool_option_test,
 	     suite : 'all', 'root',
 	     timeout : 240)
 endif
@@ -773,6 +791,7 @@
 		'test/litest-device-synaptics-st.c',
 		'test/litest-device-synaptics-t440.c',
 		'test/litest-device-synaptics-x1-carbon-3rd.c',
+		'test/litest-device-synaptics-phantomclicks.c',
 		'test/litest-device-tablet-mode-switch.c',
 		'test/litest-device-thinkpad-extrabuttons.c',
 		'test/litest-device-trackpoint.c',
@@ -785,6 +804,7 @@
 		'test/litest-device-wacom-bamboo-2fg-pad.c',
 		'test/litest-device-wacom-bamboo-2fg-pen.c',
 		'test/litest-device-wacom-bamboo-16fg-pen.c',
+		'test/litest-device-wacom-calibrated-tablet.c',
 		'test/litest-device-wacom-cintiq-12wx-pen.c',
 		'test/litest-device-wacom-cintiq-13hdt-finger.c',
 		'test/litest-device-wacom-cintiq-13hdt-pad.c',
@@ -956,6 +976,12 @@
 else
 	man_config.set('HAVE_INSTALLED_TESTS', '')
 endif
+if get_option('debug-gui')
+	man_config.set('HAVE_DEBUG_GUI', '')
+else
+	man_config.set('HAVE_DEBUG_GUI', '.\"')
+endif
+
 src_man += files(
 	'tools/libinput.man',
 	'tools/libinput-analyze.man',
@@ -965,6 +991,7 @@
 	'tools/libinput-debug-events.man',
 	'tools/libinput-debug-tablet.man',
 	'tools/libinput-list-devices.man',
+	'tools/libinput-list-kernel-devices.man',
 	'tools/libinput-measure.man',
 	'tools/libinput-measure-fuzz.man',
 	'tools/libinput-measure-touchpad-size.man',

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-aiptek.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-aiptek.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-kensington.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-kensington.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-logitech.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-logitech.quirks Changed

@@ -8,9 +8,9 @@
 Logitech Marble Mouse Trackball
 MatchUdevType=mouse
 MatchBus=usb
-MatchVendor=0x46D
+MatchVendor=0x046D
 MatchProduct=0xC408
-AttrEventCodeDisable=BTN_MIDDLE
+AttrEventCode=-BTN_MIDDLE
 
 Logitech K400
 MatchUdevType=mouse
@@ -46,51 +46,66 @@
 MatchProduct=0x4011
 AttrPalmPressureThreshold=400
 
-Logitech MX Master
-MatchVendor=0x46D
+Logitech MX Master (4041)
+MatchVendor=0x046D
 MatchProduct=0x4041
 ModelInvertHorizontalScrolling=1
-Logitech MX Master
-MatchVendor=0x46D
+Logitech MX Master (4060)
+MatchVendor=0x046D
 MatchProduct=0x4060
 ModelInvertHorizontalScrolling=1
-Logitech MX Master
-MatchVendor=0x46D
+Logitech MX Master (4071)
+MatchVendor=0x046D
 MatchProduct=0x4071
 ModelInvertHorizontalScrolling=1
 
 # MX Master has a different PID on bluetooth
-Logitech MX Master
-MatchVendor=0x46D
+Logitech MX Master (Bluetooth B012)
+MatchVendor=0x046D
 MatchProduct=0xB012
 ModelInvertHorizontalScrolling=1
-Logitech MX Master
-MatchVendor=0x46D
+Logitech MX Master (Bluetooth B017)
+MatchVendor=0x046D
 MatchProduct=0xB017
 ModelInvertHorizontalScrolling=1
-Logitech MX Master
-MatchVendor=0x46D
+Logitech MX Master (Bluetooth B01E)
+MatchVendor=0x046D
 MatchProduct=0xB01E
 ModelInvertHorizontalScrolling=1
 
-Logitech MX Master 2S
-MatchVendor=0x46D
+Logitech MX Master 2S USB
+MatchVendor=0x046D
 MatchProduct=0x4069
 ModelInvertHorizontalScrolling=1
 
 # MX Master 2S has a different PID on bluetooth
-Logitech MX Master 2S
-MatchVendor=0x46D
+Logitech MX Master 2S Bluetooth
+MatchVendor=0x046D
 MatchProduct=0xB019
 ModelInvertHorizontalScrolling=1
 
-Logitech MX Master 3
-MatchVendor=0x46D
+Logitech MX Master 3 USB
+MatchVendor=0x046D
 MatchProduct=0x4082
 ModelInvertHorizontalScrolling=1
 
 # MX Master 3 has a different PID on bluetooth
-Logitech MX Master 3
-MatchVendor=0x46D
+Logitech MX Master 3 Bluetooth
+MatchVendor=0x046D
 MatchProduct=0xB023
 ModelInvertHorizontalScrolling=1
+
+Logitech MX Master 3S
+MatchVendor=0x046D
+MatchProduct=0xB034
+ModelInvertHorizontalScrolling=1
+
+Logitech MX Master 3B
+MatchVendor=0x046D
+MatchProduct=0xB028
+ModelInvertHorizontalScrolling=1
+
+# Don't add quirks for the Logitech Bolt Receiver:
+# MatchVendor=0x046D
+# MatchProduct=0xC548
+# This receiver can be used with multiple mice.

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-madcatz.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-madcatz.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-razer.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-razer.quirks Changed

@@ -5,6 +5,10 @@
 MatchDMIModalias=dmi:*svnRazer:pnBlade*
 AttrLidSwitchReliability=write_open
 
+# Manually added entries must go above this line.
+# Entries below this line are autogenerated
+# AUTOGENERATED
+
 RazerBladeStealth Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
@@ -12,11 +16,11 @@
 MatchProduct=0x0205
 AttrKeyboardIntegration=internal
 
-RazerBladeStealthLate2016 Keyboard
+RazerBladeQHD Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0220
+MatchProduct=0x020F
 AttrKeyboardIntegration=internal
 
 RazerBladeProLate2016 Keyboard
@@ -26,32 +30,32 @@
 MatchProduct=0x0210
 AttrKeyboardIntegration=internal
 
-RazerBladeLate2016 Keyboard
+RazerBladeStealthLate2016 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0224
+MatchProduct=0x0220
 AttrKeyboardIntegration=internal
 
-RazerBladeQHD Keyboard
+RazerBladeLate2016 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x020F
+MatchProduct=0x0224
 AttrKeyboardIntegration=internal
 
-RazerBladeStealthMid2017 Keyboard
+RazerBladePro2017 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x022D
+MatchProduct=0x0225
 AttrKeyboardIntegration=internal
 
-RazerBladePro2017 Keyboard
+RazerBladeStealthMid2017 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0225
+MatchProduct=0x022D
 AttrKeyboardIntegration=internal
 
 RazerBladePro2017FullHD Keyboard
@@ -75,11 +79,25 @@
 MatchProduct=0x0233
 AttrKeyboardIntegration=internal
 
-RazerBlade2018Mercury Keyboard
+RazerBladePro2019 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0240
+MatchProduct=0x0234
+AttrKeyboardIntegration=internal
+
+RazerBladeStealth2019 Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x0239
+AttrKeyboardIntegration=internal
+
+RazerBlade2019Adv Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x023A
 AttrKeyboardIntegration=internal
 
 RazerBlade2018Base Keyboard
@@ -89,11 +107,25 @@
 MatchProduct=0x023B
 AttrKeyboardIntegration=internal
 
-RazerBladeStealth2019 Keyboard
+RazerBlade2018Mercury Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0239
+MatchProduct=0x0240
+AttrKeyboardIntegration=internal
+
+RazerBladeMid2019Mercury Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x0245
+AttrKeyboardIntegration=internal
+
+RazerBlade2019Base Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x0246
 AttrKeyboardIntegration=internal
 
 RazerBladeStealthLate2019 Keyboard
@@ -103,6 +135,20 @@
 MatchProduct=0x024A
 AttrKeyboardIntegration=internal
 
+RazerBladeProLate2019 Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x024C
+AttrKeyboardIntegration=internal
+
+RazerBlade2019StudioEdition Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x024D
+AttrKeyboardIntegration=internal
+
 RazerBladeStealthEarly2020 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
@@ -110,6 +156,27 @@
 MatchProduct=0x0252
 AttrKeyboardIntegration=internal
 
+RazerBlade15Advanced2020 Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x0253
+AttrKeyboardIntegration=internal
+
+RazerBladeEarly2020Base Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x0255
+AttrKeyboardIntegration=internal
+
+RazerBladeProEarly2020 Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchVendor=0x1532
+MatchProduct=0x0256
+AttrKeyboardIntegration=internal
+
 RazerBladeStealthLate2020 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
@@ -117,59 +184,80 @@
 MatchProduct=0x0259
 AttrKeyboardIntegration=internal
 
-RazerBlade2019Adv Keyboard
+RazerBlade15AdvancedEarly2021 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x023A
+MatchProduct=0x026D
 AttrKeyboardIntegration=internal
 
-RazerBladeMid2019Mercury Keyboard
+RazerBlade17ProEarly2021 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0245
+MatchProduct=0x026E
 AttrKeyboardIntegration=internal
 
-RazerBlade2019Base Keyboard
+RazerBladeEarly2021Base Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x1532
-MatchProduct=0x0246
+MatchProduct=0x026F

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-synaptics.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-synaptics.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/30-vendor-wacom.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/30-vendor-wacom.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-framework.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-framework.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-apple.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-apple.quirks Changed

@@ -30,7 +30,7 @@
 Apple Internal Keyboard (SPI)
 MatchUdevType=keyboard
 MatchBus=spi
-MatchVendor=0x5AC
+MatchVendor=0x05AC
 AttrKeyboardIntegration=internal
 
 # The Apple MagicMouse has a touchpad built-in but the kernel still
@@ -41,7 +41,7 @@
 MatchBus=bluetooth
 MatchVendor=0x05AC
 MatchProduct=0x030D
-AttrEventCodeDisable=EV_ABS
+AttrEventCode=-EV_ABS
 
 # The External Apple "Magic" trackpads, both the 1st and 2nd generations, have
 # pretty good built-in spurious touch filtering in the device firmware. Using
@@ -49,7 +49,7 @@
 Apple Magic Trackpad v1 (2010, clickpad)
 MatchUdevType=touchpad
 MatchBus=bluetooth
-MatchVendor=0x5AC
+MatchVendor=0x05AC
 MatchProduct=0x030E
 AttrSizeHint=130x110
 AttrTouchSizeRange=20:10
@@ -78,7 +78,7 @@
 Apple Touchpad OneButton
 MatchUdevType=touchpad
 MatchBus=usb
-MatchVendor=0x5AC
+MatchVendor=0x05AC
 MatchProduct=0x021A
 ModelAppleTouchpadOneButton=1
 
@@ -92,14 +92,14 @@
 Apple Laptop Touchpad (MacBookPro11,2 among others)
 MatchUdevType=touchpad
 MatchBus=usb
-MatchVendor=0x5AC
+MatchVendor=0x05AC
 MatchProduct=0x0262
 AttrPalmSizeThreshold=1600
 
 Apple Laptop Touchpad (SPI)
 MatchUdevType=touchpad
 MatchBus=spi
-MatchVendor=0x5AC
+MatchVendor=0x05AC
 ModelAppleTouchpad=1
 AttrSizeHint=104x75
 AttrTouchSizeRange=150:130
@@ -108,17 +108,23 @@
 Apple Laptop Touchpad (MTP)
 MatchUdevType=touchpad
 MatchName=Apple*MTP*
-MatchVendor=0x5AC
+MatchVendor=0x05AC
 ModelAppleTouchpad=1
 AttrSizeHint=104x75
 AttrTouchSizeRange=150:130
 AttrPalmSizeThreshold=1600
 
+Apple Laptop Keyboard (MTP)
+MatchUdevType=keyboard
+MatchName=Apple*MTP*
+MatchVendor=0x05AC
+AttrKeyboardIntegration=internal
+
 # The Linux applespi driver currently uses the Synaptics vendor for some reason
-Apple Laptop Touchpad (SPI)
+Apple Laptop Touchpad (SPI) applespi driver
 MatchUdevType=touchpad
 MatchBus=spi
-MatchVendor=0x6CB
+MatchVendor=0x06CB
 ModelAppleTouchpad=1
 AttrSizeHint=104x75
 AttrTouchSizeRange=150:130

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-asus.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-asus.quirks Changed

@@ -16,7 +16,7 @@
 Asus UX302LA
 MatchName=*ETPS/2 Elantech Touchpad*
 MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnUX302LA:*
-AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
+AttrEventCode=-ABS_MT_PRESSURE;-ABS_PRESSURE;
 
 # Asus VivoBook Flip 14 TP412UA tablet switch seems misbehaving, always
 # indicating tablet position
@@ -25,7 +25,7 @@
 MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
 ModelTabletModeSwitchUnreliable=1
 
-# keyboard has a different vid/pid to the touchpad 
+# keyboard has a different vid/pid to the touchpad
 # so libinput won't pair the two together and dwt isn't active.
 # see: https://gitlab.freedesktop.org/libinput/libinput/-/issues/615
 Asus ROG Zephyrus G15 2021 keyboard
@@ -34,7 +34,7 @@
 MatchUdevType=keyboard
 AttrKeyboardIntegration=internal
 
-# keyboard has a different vid/pid to the touchpad 
+# keyboard has a different vid/pid to the touchpad
 # so libinput won't pair the two together and dwt isn't active.
 Asus ROG Strix G15 2021 keyboard
 MatchVendor=0x0B05

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-chicony.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-chicony.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-chuwi.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-chuwi.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-cyborg.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-cyborg.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-dell.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-dell.quirks Changed

@@ -45,6 +45,7 @@
 MatchName=* Touchpad
 MatchDMIModalias=dmi:*svnDellInc.:pnXPS159500:*
 ModelTouchpadVisibleMarker=0
+ModelTouchpadPhantomClicks=1
 
 Dell Latitude D620 Trackpoint
 MatchName=*DualPoint Stick
@@ -98,7 +99,7 @@
 MatchBus=i2c
 MatchUdevType=touchpad
 MatchDMIModalias=dmi:*svnDellInc.:pnPrecision7?50*
-AttrInputPropDisable=INPUT_PROP_BUTTONPAD
+AttrInputProp=-INPUT_PROP_BUTTONPAD
 
 # The touch device has the same vid/pid as the totem, the MatchName
 # directive is required here
@@ -109,9 +110,9 @@
 MatchProduct=0x0204
 ModelDellCanvasTotem=1
 
-Dell Latitude 5290 2-in-1
+Dell 2-in-1 Models
 MatchName=AT Translated Set 2 keyboard
-MatchDMIModalias=dmi:*:svnDellInc.:pnLatitude52902-in-1:*
+MatchDMIModalias=dmi:*:svnDellInc.:pn*2-in-1:*
 ModelTabletModeNoSuspend=1
 
 # This is a true pressurepad so disable pressure for contact size
@@ -120,4 +121,10 @@
 MatchBus=i2c
 MatchVendor=0x27C6
 MatchProduct=0x0F60
-AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
+ModelPressurePad=1
+
+Dell Mayabay Touchpad
+MatchBus=i2c
+MatchVendor=0x06CB
+MatchProduct=0xCFA0
+ModelPressurePad=1

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-google.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-google.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-gpd.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-gpd.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-hp.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-hp.quirks Changed

@@ -5,14 +5,14 @@
 HP Compaq 6910p
 MatchName=*SynPS/2 Synaptics TouchPad
 MatchDMIModalias=dmi:*svnHewlett-Packard:*pnHPCompaq6910p*
-AttrEventCodeDisable=BTN_TOOL_DOUBLETAP;BTN_TOOL_TRIPLETAP;
+AttrEventCode=-BTN_TOOL_DOUBLETAP;-BTN_TOOL_TRIPLETAP;
 
 # Claims to have double/tripletap but doesn't actually send it
 # https://bugzilla.redhat.com/show_bug.cgi?id=1351285 and
 HP Compaq 8510w
 MatchName=*SynPS/2 Synaptics TouchPad
 MatchDMIModalias=dmi:*svnHewlett-Packard:*pnHPCompaq8510w*
-AttrEventCodeDisable=BTN_TOOL_DOUBLETAP;BTN_TOOL_TRIPLETAP;
+AttrEventCode=-BTN_TOOL_DOUBLETAP;-BTN_TOOL_TRIPLETAP;
 
 HP Pavilion dmi4
 MatchName=*SynPS/2 Synaptics TouchPad
@@ -24,7 +24,7 @@
 HP Stream 11
 MatchName=SYN1EDE:00 06CB:7442*
 MatchDMIModalias=dmi:*svnHewlett-Packard:pnHPStreamNotebookPC11*
-AttrInputPropEnable=INPUT_PROP_BUTTONPAD
+AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 # The HP stream x360's embedded-controller filters out events form its builtin
 # keyboard when in tablet-mode itself; and it has a capacitive home-button
@@ -66,6 +66,14 @@
 AttrThumbPressureThreshold=90
 AttrPalmPressureThreshold=100
 
+# The HP stream x360's embedded-controller filters out events form its builtin
+# keyboard when in tablet-mode itself; and it has a volume up/down on the side.
+# Do not suspend the keyboard when in tablet-mode so that the volume up/down
+# button keeps working when in tablet-mode.
+HP Spectre x360 Convertible 15-ch0xx Tablet Mode Switch
+MatchName=AT Translated Set 2 keyboard
+MatchDMIModalias=dmi:*svnHP:pnHPSpectrex360Convertible15-ch0xx:*
+ModelTabletModeNoSuspend=1
 
 HP Elite x2 1013 G3 Tablet Mode Switch
 MatchName=*Intel Virtual Button*

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-huawei.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-huawei.quirks Changed

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-lenovo.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-lenovo.quirks Changed

@@ -41,26 +41,32 @@
 Lenovo T480s Touchpad
 MatchName=Elan Touchpad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT480s*
-AttrInputPropEnable=INPUT_PROP_BUTTONPAD
+AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 # Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
 # https://gitlab.freedesktop.org/libinput/libinput/issues/177
 Lenovo T490s Touchpad
 MatchName=Elan Touchpad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT490s*
-AttrInputPropEnable=INPUT_PROP_BUTTONPAD
+AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 Lenovo T490s Trackpoint
 MatchName=*TPPS/2 IBM TrackPoint
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT490s:*
 AttrTrackpointMultiplier=0.4
 
+Lenovo P14s Gen 1 AMD Trackpoint
+MatchUdevType=pointingstick
+MatchName=*TPPS/2 Elan TrackPoint*
+MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadP14sGen1*
+AttrTrackpointMultiplier=0.4
+
 # Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
 # https://gitlab.freedesktop.org/libinput/libinput/issues/234
 Lenovo L380 Touchpad
 MatchName=Elan Touchpad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadL380*
-AttrInputPropEnable=INPUT_PROP_BUTTONPAD
+AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 Lenovo X200 Trackpoint
 MatchName=*TPPS/2 IBM TrackPoint
@@ -77,6 +83,16 @@
 MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX230:*
 AttrTrackpointMultiplier=0.25
 
+Lenovo X280 Trackpoint
+MatchName=*TPPS/2 Elan TrackPoint
+MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX280:*
+AttrTrackpointMultiplier=0.5
+
+Lenovo X280 Touchpad
+MatchName=Synaptics TM3381-002
+MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX280*
+AttrPalmSizeThreshold=6
+
 Lenovo P50 Touchpad
 MatchName=SynPS/2 Synaptics TouchPad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadP50*:
@@ -147,7 +163,7 @@
 MatchBus=i2c
 MatchVendor=0x06CB
 MatchProduct=0xCE37
-AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
+ModelPressurePad=1
 
 Lenovo Yoga C930 Tablet
 MatchBus=i2c
@@ -160,7 +176,7 @@
 Lenovo Carbon X1 6th gen
 MatchName=Synaptics TM3288-011
 MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX1Carbon6th:*
-AttrEventCodeDisable=ABS_MT_TOOL_TYPE
+AttrEventCode=-ABS_MT_TOOL_TYPE
 ModelLenovoX1Gen6Touchpad=1
 
 Lenovo X41 Tablet
@@ -224,14 +240,14 @@
 
 # Misidentified as an external keyboard by libinput
 # Tested on Legion 5 15AR05H
-Lenovo Legion 5 Keyboard
+Lenovo Legion 5 Keyboard (C100)
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x048D
 MatchProduct=0xC100
 AttrKeyboardIntegration=internal
 
-Lenovo Legion 5 Keyboard
+Lenovo Legion 5 Keyboard (C955)
 MatchUdevType=keyboard
 MatchBus=usb
 MatchVendor=0x048D
@@ -246,6 +262,11 @@
 MatchProduct=0xC101
 AttrKeyboardIntegration=internal
 
+Lenovo Legion 5i Keyboard
+MatchName=ITE Tech. Inc. ITE Device(8910) Keyboard
+MatchDMIModalias=dmi:*svnLENOVO:*pvrLegion515IAH7H:*
+AttrKeyboardIntegration=internal
+
 Lenovo Legion 7 Keyboard
 MatchUdevType=keyboard
 MatchBus=usb
@@ -272,7 +293,7 @@
 MatchBus=i2c
 MatchVendor=0x27C6
 MatchProduct=0x01E8
-AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
+ModelPressurePad=1
 
 # Duet 7i tablet switch activated by folding keyboard cover, or removing it.
 # We must not disable volume rocker 'keyboard'.
@@ -294,3 +315,9 @@
 MatchName=*SynPS/2 Synaptics TouchPad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrLenovoYoga2Pro*
 AttrPressureRange=50:45
+
+Lenovo Legion 7i 4090 Keyboard
+MatchUdevType=keyboard
+MatchBus=usb
+MatchDMIModalias=dmi:*svnLENOVO:*:pvrLegionY9000PIRX8H*
+AttrKeyboardIntegration=internal

_service:tar_scm:libinput-1.22.1.tar.gz/quirks/50-system-starlabs.quirks -> _service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-starlabs.quirks Changed

_service:tar_scm:libinput-1.24.0.tar.gz/quirks/50-system-vaio.quirks Added

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-fallback.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-fallback.c Changed

@@ -113,10 +113,10 @@
 	case BUTTONSCROLL_SCROLLING:
 		{
 		const struct normalized_coords normalized =
-				filter_dispatch_constant(device->pointer.filter,
-						         &raw,
-							 device,
-							 time);
+				filter_dispatch_scroll(device->pointer.filter,
+						       &raw,
+						       device,
+						       time);
 		evdev_post_scroll(device, time,
 				  LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,
 				  &normalized);
@@ -151,20 +151,18 @@
 	return false;
 }
 
-static inline void
+static inline struct device_float_coords
 fallback_rotate_relative(struct fallback_dispatch *dispatch,
 			 struct evdev_device *device)
 {
-	struct device_coords rel = dispatch->rel;
+	struct device_float_coords rel = { dispatch->rel.x, dispatch->rel.y };
 
 	if (!device->base.config.rotation)
-		return;
+		return rel;
 
-	/* loss of precision for non-90 degrees, but we only support 90 deg
-	 * right now anyway */
-	matrix_mult_vec(&dispatch->rotation.matrix, &rel.x, &rel.y);
+	matrix_mult_vec_double(&dispatch->rotation.matrix, &rel.x, &rel.y);
 
-	dispatch->rel = rel;
+	return rel;
 }
 
 static void
@@ -174,15 +172,12 @@
 {
 	struct libinput_device *base = &device->base;
 	struct normalized_coords accel;
-	struct device_float_coords raw;
 
 	if (!(device->seat_caps & EVDEV_DEVICE_POINTER))
 		return;
 
-	fallback_rotate_relative(dispatch, device);
+	struct device_float_coords raw = fallback_rotate_relative(dispatch, device);
 
-	raw.x = dispatch->rel.x;
-	raw.y = dispatch->rel.y;
 	dispatch->rel.x = 0;
 	dispatch->rel.y = 0;
 
@@ -813,9 +808,11 @@
 			 struct mt_slot *slot)
 {
 	bool discard = false;
+	struct device_coords point = slot->point;
+	evdev_transform_absolute(dispatch->device, &point);
 
 	if (dispatch->arbitration.state == ARBITRATION_IGNORE_RECT &&
-	    point_in_rect(&slot->point, &dispatch->arbitration.rect)) {
+	    point_in_rect(&point, &dispatch->arbitration.rect)) {
 		slot->palm_state = PALM_IS_PALM;
 		discard = true;
 	}
@@ -1002,19 +999,24 @@
 {
 	unsigned int idx;
 	bool need_frame = false;
+	struct device_coords point;
 
-	if (!rect || point_in_rect(&dispatch->abs.point, rect))
+	point = dispatch->abs.point;
+	evdev_transform_absolute(device, &point);
+	if (!rect || point_in_rect(&point, rect))
 		need_frame = fallback_flush_st_cancel(dispatch,
 						      device,
 						      time);
 
 	for (idx = 0; idx < dispatch->mt.slots_len; idx++) {
 		struct mt_slot *slot = &dispatch->mt.slotsidx;
+		point = slot->point;
+		evdev_transform_absolute(device, &point);
 
 		if (slot->seat_slot == -1)
 			continue;
 
-		if ((!rect || point_in_rect(&slot->point, rect)) &&
+		if ((!rect || point_in_rect(&point, rect)) &&
 		    fallback_flush_mt_cancel(dispatch, device, idx, time))
 			need_frame = true;
 	}
@@ -1055,10 +1057,15 @@
 				LIBINPUT_KEY_STATE_RELEASED);
 			break;
 		case KEY_TYPE_BUTTON:
+			/* Note: the left-handed configuration is nonzero for
+			 * the mapped button (not the physical button), in
+			 * get_key_down_count(). We must not map this to left-handed
+			 * again, see #881.
+			 */
 			evdev_pointer_notify_button(
 				device,
 				time,
-				evdev_to_left_handed(device, code),
+				code,
 				LIBINPUT_BUTTON_STATE_RELEASED);
 			break;
 		}
@@ -1488,14 +1495,13 @@
 fallback_init_rotation(struct fallback_dispatch *dispatch,
 		       struct evdev_device *device)
 {
-	if ((device->model_flags & EVDEV_MODEL_TRACKBALL) == 0)
+	if (device->tags & EVDEV_TAG_TRACKPOINT)
 		return;
 
 	dispatch->rotation.config.is_available = fallback_rotation_config_is_available;
 	dispatch->rotation.config.set_angle = fallback_rotation_config_set_angle;
 	dispatch->rotation.config.get_angle = fallback_rotation_config_get_angle;
 	dispatch->rotation.config.get_default_angle = fallback_rotation_config_get_default_angle;
-	dispatch->rotation.is_enabled = false;
 	matrix_init_identity(&dispatch->rotation.matrix);
 	device->base.config.rotation = &dispatch->rotation.config;
 }

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-fallback.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-fallback.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-mt-touchpad-buttons.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-mt-touchpad-buttons.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-mt-touchpad-gestures.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-mt-touchpad-gestures.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-mt-touchpad-tap.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-mt-touchpad-tap.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-mt-touchpad.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-mt-touchpad.c Changed

@@ -93,6 +93,24 @@
 					&raw, tp, time);
 }
 
+struct normalized_coords
+tp_filter_scroll(struct tp_dispatch *tp,
+		 const struct device_float_coords *unaccelerated,
+		 uint64_t time)
+{
+	struct device_float_coords raw;
+	const struct normalized_coords zero = { 0.0, 0.0 };
+
+	if (device_float_is_zero(*unaccelerated))
+		return zero;
+
+	/* Convert to device units with x/y in the same resolution */
+	raw = tp_scale_to_xaxis(tp, *unaccelerated);
+
+	return filter_dispatch_scroll(tp->device->pointer.filter,
+				      &raw, tp, time);
+}
+
 static inline void
 tp_calculate_motion_speed(struct tp_dispatch *tp,
 			  struct tp_touch *t,
@@ -679,7 +697,6 @@
 		tp->num_slots = tp->nactive_slots;
 	}
 
-
 	start = tp->has_mt ? tp->num_slots : 0;
 	for (i = start; i < tp->ntouches; i++) {
 		t = tp_get_touch(tp, i);
@@ -865,21 +882,6 @@
 	return tp_palm_in_side_edge(tp, t) || tp_palm_in_top_edge(tp, t);
 }
 
-bool
-tp_palm_tap_is_palm(const struct tp_dispatch *tp, const struct tp_touch *t)
-{
-	if (t->state != TOUCH_BEGIN)
-		return false;
-
-	if (!tp_palm_in_edge(tp, t))
-		return false;
-
-	evdev_log_debug(tp->device,
-			"palm: touch %d: palm-tap detected\n",
-			t->index);
-	return true;
-}
-
 static bool
 tp_palm_detect_dwt_triggered(struct tp_dispatch *tp,
 			     struct tp_touch *t,
@@ -1082,13 +1084,6 @@
 	if (t->state != TOUCH_BEGIN || !tp_palm_in_edge(tp, t))
 		return false;
 
-	/* don't detect palm in software button areas, it's
-	   likely that legitimate touches start in the area
-	   covered by the exclusion zone */
-	if (tp->buttons.is_clickpad &&
-	    tp_button_is_inside_softbutton_area(tp, t))
-		return false;
-
 	if (tp_touch_get_edge(tp, t) & EDGE_RIGHT)
 		return false;
 
@@ -2213,7 +2208,6 @@
 	tp->palm.trackpoint_last_event_time = time;
 	tp->palm.trackpoint_event_count++;
 
-
 	/* Require at least three events before enabling palm detection */
 	if (tp->palm.trackpoint_event_count < 3) {
 		libinput_timer_set(&tp->palm.trackpoint_timer,
@@ -2990,18 +2984,26 @@
 	tp->accel.y_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_y;
 	tp->accel.xy_scale_coeff = 1.0 * res_x/res_y;
 
-	if (which == LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT)
+	if (which == LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT) {
 		filter = create_pointer_accelerator_filter_touchpad_flat(dpi);
-	else if (evdev_device_has_model_quirk(device, QUIRK_MODEL_LENOVO_X230) ||
-		 tp->device->model_flags & EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81)
+	} else if (which == LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM) {
+		filter = create_custom_accelerator_filter();
+	} else if (evdev_device_has_model_quirk(device, QUIRK_MODEL_LENOVO_X230) ||
+		 tp->device->model_flags & EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81) {
 		filter = create_pointer_accelerator_filter_lenovo_x230(dpi, use_v_avg);
-	else if (libevdev_get_id_bustype(device->evdev) == BUS_BLUETOOTH)
+	} else {
+		uint64_t eds_threshold = 0;
+		uint64_t eds_value = 0;
+
+		if (libevdev_get_id_bustype(device->evdev) == BUS_BLUETOOTH) {
+			eds_threshold = ms2us(50);
+			eds_value = ms2us(10);
+		}
 		filter = create_pointer_accelerator_filter_touchpad(dpi,
-								    ms2us(50),
-								    ms2us(10),
+								    eds_threshold,
+								    eds_value,
 								    use_v_avg);
-	else
-		filter = create_pointer_accelerator_filter_touchpad(dpi, 0, 0, use_v_avg);
+	}
 
 	if (!filter)
 		return false;
@@ -3135,12 +3137,24 @@
 	return tp_scroll_get_default_method(tp);
 }
 
+static int
+tp_scroll_config_natural_get_default(struct libinput_device *device)
+{
+	struct evdev_device *dev = evdev_device(device);
+
+	return (evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD) ||
+		evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON));
+}
+
 static void
 tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device)
 {
 	tp_edge_scroll_init(tp, device);
 
 	evdev_init_natural_scroll(device);
+	/* Override natural scroll config for Apple touchpads */
+	device->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default;
+	device->scroll.natural_scrolling_enabled = tp_scroll_config_natural_get_default(&device->base);
 
 	tp->scroll.config_method.get_methods = tp_scroll_config_scroll_method_get_methods;
 	tp->scroll.config_method.set_method = tp_scroll_config_scroll_method_set_method;
@@ -3336,6 +3350,10 @@
 	    !tp_is_tpkb_combo_below(device))
 		return;
 
+	/* Edge palm detection hurts more than it helps on Apple touchpads. */
+	if (evdev_device_has_model_quirk(device, QUIRK_MODEL_APPLE_TOUCHPAD))
+		return;
+
 	evdev_device_get_size(device, &width, &height);
 
 	/* Enable edge palm detection on touchpads >= 70 mm. Anything
@@ -3618,7 +3636,6 @@
 		lo = abs->minimum + 0.10 * range;
 	}
 
-
 	if (hi > abs->maximum || hi < abs->minimum ||
 	    lo > abs->maximum || lo < abs->minimum) {
 		evdev_log_bug_libinput(device,
@@ -3705,7 +3722,8 @@
 	 *
 	 * See also #562
 	 */
-	if (libevdev_get_abs_resolution(device->evdev, ABS_MT_PRESSURE) != 0) {
+	if (libevdev_get_abs_resolution(device->evdev, ABS_MT_PRESSURE) != 0 ||
+	    evdev_device_has_model_quirk(device, QUIRK_MODEL_PRESSURE_PAD)) {
 		libevdev_disable_event_code(device->evdev, EV_ABS, ABS_MT_PRESSURE);
 		libevdev_disable_event_code(device->evdev, EV_ABS, ABS_PRESSURE);
 	}
@@ -3731,7 +3749,6 @@
 	if (!tp_init_slots(tp, device))
 		return false;
 
-
 	evdev_device_init_abs_range_warnings(device);
 	use_touch_size = tp_init_touch_size(tp, device);

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-mt-touchpad.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-mt-touchpad.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-tablet-pad-leds.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-tablet-pad-leds.c Changed

@@ -50,6 +50,7 @@
 	int mode_idx;
 };
 
+#if HAVE_LIBWACOM
 static inline struct pad_mode_toggle_button *
 pad_mode_toggle_button_new(struct pad_dispatch *pad,
 			   struct libinput_tablet_pad_mode_group *group,
@@ -62,6 +63,7 @@
 
 	return button;
 }
+#endif /* HAVE_LIBWACOM */
 
 static inline void
 pad_mode_toggle_button_destroy(struct pad_mode_toggle_button* button)
@@ -109,6 +111,7 @@
 	free(led);
 }
 
+#if HAVE_LIBWACOM
 static inline struct pad_mode_led *
 pad_led_new(struct libinput *libinput, const char *prefix, int group, int mode)
 {
@@ -146,6 +149,7 @@
 	pad_led_destroy(libinput, led);
 	return NULL;
 }
+#endif /* HAVE_LIBWACOM */
 
 static void
 pad_led_group_destroy(struct libinput_tablet_pad_mode_group *g)
@@ -183,6 +187,7 @@
 	return group;
 }
 
+#if HAVE_LIBWACOM
 static inline bool
 is_litest_device(struct evdev_device *device)
 {
@@ -269,7 +274,6 @@
 	return rc != -1;
 }
 
-#if HAVE_LIBWACOM
 static int
 pad_init_led_groups(struct pad_dispatch *pad,
 		    struct evdev_device *device,

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-tablet.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-tablet.c Changed

@@ -934,13 +934,12 @@
 		set_bit(tool->buttons, button);
 }
 
+#if HAVE_LIBWACOM
 static inline int
 tool_set_bits_from_libwacom(const struct tablet_dispatch *tablet,
 			    struct libinput_tablet_tool *tool)
 {
 	int rc = 1;
-
-#if HAVE_LIBWACOM
 	WacomDeviceDatabase *db;
 	const WacomStylus *s = NULL;
 	int code;
@@ -997,9 +996,10 @@
 		copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE);
 
 	rc = 0;
-#endif
+
 	return rc;
 }
+#endif
 
 static void
 tool_set_bits(const struct tablet_dispatch *tablet,
@@ -1085,7 +1085,7 @@
 			     struct libinput_tablet_tool *tool)
 {
 	struct evdev_device *device = tablet->device;
-	const struct input_absinfo *pressure;
+	const struct input_absinfo *pressure, *distance;
 	struct quirks_context *quirks = NULL;
 	struct quirks *q = NULL;
 	struct quirk_range r;
@@ -1101,7 +1101,14 @@
 	quirks = evdev_libinput_context(device)->quirks;
 	q = quirks_fetch_for_device(quirks, device->udev_device);
 
-	tool->pressure.offset = pressure->minimum;
+	distance = libevdev_get_abs_info(device->evdev, ABS_DISTANCE);
+	if (distance) {
+		tool->pressure.offset = pressure->minimum;
+		tool->pressure.heuristic_state = PRESSURE_HEURISTIC_STATE_DONE;
+	} else {
+		tool->pressure.offset = pressure->maximum;
+		tool->pressure.heuristic_state = PRESSURE_HEURISTIC_STATE_PROXIN1;
+	}
 
 	/* 5 and 1% of the pressure range */
 	hi = axis_range_percentage(pressure, 5);
@@ -1314,51 +1321,106 @@
 }
 
 static void
-detect_pressure_offset(struct tablet_dispatch *tablet,
-		       struct evdev_device *device,
-		       struct libinput_tablet_tool *tool)
+set_pressure_offset(struct libinput_tablet_tool *tool, int offset)
 {
-	const struct input_absinfo *pressure, *distance;
-	int offset;
+	tool->pressure.offset = offset;
+	tool->pressure.has_offset = true;
 
-	if (!bit_is_set(tablet->changed_axes,
-			LIBINPUT_TABLET_TOOL_AXIS_PRESSURE))
-		return;
+	/* Adjust the tresholds accordingly - we use the same gap (4% in
+	 * device coordinates) between upper and lower as before which isn't
+	 * technically correct (our range shrunk) but it's easy to calculate.
+	 */
+	int gap = tool->pressure.threshold.upper - tool->pressure.threshold.lower;
+	tool->pressure.threshold.lower = offset;
+	tool->pressure.threshold.upper = offset + gap;
+}
 
-	pressure = libevdev_get_abs_info(device->evdev, ABS_PRESSURE);
-	distance = libevdev_get_abs_info(device->evdev, ABS_DISTANCE);
+static void
+update_pressure_offset(struct tablet_dispatch *tablet,
+		       struct evdev_device *device,
+		       struct libinput_tablet_tool *tool)
+{
+	const struct input_absinfo *pressure =
+		libevdev_get_abs_info(device->evdev, ABS_PRESSURE);
 
-	if (!pressure || !distance)
+	if (!pressure ||
+	    !bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE))
 		return;
 
-	offset = pressure->value;
-
 	/* If we have an event that falls below the current offset, adjust
 	 * the offset downwards. A fast contact can start with a
 	 * higher-than-needed pressure offset and then we'd be tied into a
 	 * high pressure offset for the rest of the session.
+	 *
+	 * If we are still pending the offset decision, only update the observed
+	 * offset value, don't actually set it to have an offset.
 	 */
+	int offset = pressure->value;
 	if (tool->pressure.has_offset) {
 		if (offset < tool->pressure.offset)
-			goto set_offset;
-		return;
+			set_pressure_offset(tool, offset);
+	} else if (tool->pressure.heuristic_state != PRESSURE_HEURISTIC_STATE_DONE) {
+		tool->pressure.offset = min(offset, tool->pressure.offset);
 	}
+}
 
-	if (offset <= pressure->minimum)
+static void
+detect_pressure_offset(struct tablet_dispatch *tablet,
+		       struct evdev_device *device,
+		       struct libinput_tablet_tool *tool)
+{
+	const struct input_absinfo *pressure, *distance;
+	int offset;
+
+	if (tool->pressure.has_offset ||
+	    !bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE))
 		return;
 
-	/* we only set a pressure offset on proximity in */
-	if (!tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY))
+	pressure = libevdev_get_abs_info(device->evdev, ABS_PRESSURE);
+	distance = libevdev_get_abs_info(device->evdev, ABS_DISTANCE);
+
+	if (!pressure)
 		return;
 
-	/* If we're closer than 50% of the distance axis, skip pressure
-	 * offset detection, too likely to be wrong */
-	if (distance->value < axis_range_percentage(distance, 50))
+	offset = pressure->value;
+	if (offset <= pressure->minimum)
 		return;
 
-	if (offset > axis_range_percentage(pressure, 20)) {
+	if (distance) {
+		/* If we're closer than 50% of the distance axis, skip pressure
+		 * offset detection, too likely to be wrong */
+		if (distance->value < axis_range_percentage(distance, 50))
+			return;
+	} else {
+                /* A device without distance will always have some pressure on
+                 * contact. Offset detection is delayed for a few proximity ins
+                 * in the hope we'll find the minimum value until then. That
+                 * offset is updated during motion events so by the time the
+                 * deciding prox-in arrives we should know the minimum offset.
+                 */
+                if (offset > pressure->minimum)
+			tool->pressure.offset = min(offset, tool->pressure.offset);
+
+		switch (tool->pressure.heuristic_state) {
+		case PRESSURE_HEURISTIC_STATE_PROXIN1:
+		case PRESSURE_HEURISTIC_STATE_PROXIN2:
+			tool->pressure.heuristic_state++;
+			return;
+		case PRESSURE_HEURISTIC_STATE_DECIDE:
+			tool->pressure.heuristic_state++;
+			offset = tool->pressure.offset;
+			break;
+		case PRESSURE_HEURISTIC_STATE_DONE:
+			return;
+		}
+	}
+
+	if (offset <= pressure->minimum)
+		return;
+
+	if (offset > axis_range_percentage(pressure, 50)) {
 		evdev_log_error(device,
-			 "Ignoring pressure offset greater than 20%% detected on tool %s (serial %#x). "
+			 "Ignoring pressure offset greater than 50%% detected on tool %s (serial %#x). "
 			 "See %s/tablet-support.html\n",
 			 tablet_tool_type_to_string(tool->type),
 			 tool->serial,
@@ -1372,17 +1434,8 @@
 		 tablet_tool_type_to_string(tool->type),
 		 tool->serial,
 		 HTTP_DOC_LINK);
-set_offset:
-	tool->pressure.offset = offset;
-	tool->pressure.has_offset = true;
 
-	/* Adjust the tresholds accordingly - we use the same gap (4% in
-	 * device coordinates) between upper and lower as before which isn't
-	 * technically correct (our range shrunk) but it's easy to calculate.
-	 */
-	int gap = tool->pressure.threshold.upper - tool->pressure.threshold.lower;
-	tool->pressure.threshold.lower = offset;
-	tool->pressure.threshold.upper = offset + gap;
+	set_pressure_offset(tool, offset);
 }

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev-wheel.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev-wheel.c Changed

@@ -196,10 +196,10 @@
 			.y = dispatch->wheel.lo_res.y * -1,
 		};
 		const struct normalized_coords normalized =
-				filter_dispatch_constant(device->pointer.filter,
-						         &raw,
-							 device,
-							 time);
+				filter_dispatch_scroll(device->pointer.filter,
+						       &raw,
+						       device,
+						       time);
 		evdev_post_scroll(device,
 				  time,
 				  LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,
@@ -323,6 +323,21 @@
 	}
 }
 
+static void
+fallback_rotate_wheel(struct fallback_dispatch *dispatch,
+		      struct evdev_device *device,
+		      struct input_event *e)
+{
+	/* Special case: if we're upside down (-ish),
+	 * swap the direction of the wheels so that user-down
+	 * means scroll down. This isn't done for any other angle
+	 * since it's not clear what the heuristics should be.*/
+	if (dispatch->rotation.angle >= 160.0 &&
+	    dispatch->rotation.angle <= 220.0) {
+		e->value *= -1;
+	}
+}
+
 void
 fallback_wheel_process_relative(struct fallback_dispatch *dispatch,
 				struct evdev_device *device,
@@ -330,6 +345,7 @@
 {
 	switch (e->code) {
 	case REL_WHEEL:
+		fallback_rotate_wheel(dispatch, device, e);
 		dispatch->wheel.lo_res.y += e->value;
 		if (dispatch->wheel.emulate_hi_res_wheel)
 			dispatch->wheel.hi_res.y += e->value * 120;
@@ -337,6 +353,7 @@
 		wheel_handle_event(dispatch, WHEEL_EVENT_SCROLL, time);
 		break;
 	case REL_HWHEEL:
+		fallback_rotate_wheel(dispatch, device, e);
 		dispatch->wheel.lo_res.x += e->value;
 		if (dispatch->wheel.emulate_hi_res_wheel)
 			dispatch->wheel.hi_res.x += e->value * 120;
@@ -344,6 +361,7 @@
 		wheel_handle_event(dispatch, WHEEL_EVENT_SCROLL, time);
 		break;
 	case REL_WHEEL_HI_RES:
+		fallback_rotate_wheel(dispatch, device, e);
 		dispatch->wheel.hi_res.y += e->value;
 		dispatch->wheel.hi_res_event_received = true;
 		dispatch->pending_event |= EVDEV_WHEEL;
@@ -351,6 +369,7 @@
 		wheel_handle_event(dispatch, WHEEL_EVENT_SCROLL, time);
 		break;
 	case REL_HWHEEL_HI_RES:
+		fallback_rotate_wheel(dispatch, device, e);
 		dispatch->wheel.hi_res.x += e->value;
 		dispatch->wheel.hi_res_event_received = true;
 		dispatch->pending_event |= EVDEV_WHEEL;

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev.c Changed

@@ -862,7 +862,6 @@
 	return LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_DISABLED;
 }
 
-
 void
 evdev_set_button_scroll_lock_enabled(struct evdev_device *device,
 				     bool enabled)
@@ -958,8 +957,7 @@
 static int
 evdev_scroll_config_natural_get_default(struct libinput_device *device)
 {
-	/* could enable this on Apple touchpads. could do that, could
-	 * very well do that... */
+	/* Overridden in evdev-mt-touchpad.c for Apple touchpads. */
 	return 0;
 }
 
@@ -1188,7 +1186,9 @@
 {
 	struct motion_filter *filter = NULL;
 
-	if (device->tags & EVDEV_TAG_TRACKPOINT) {
+	if (which == LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM)
+		filter = create_custom_accelerator_filter();
+	else if (device->tags & EVDEV_TAG_TRACKPOINT) {
 		if (which == LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT)
 			filter = create_pointer_accelerator_filter_trackpoint_flat(device->trackpoint_multiplier);
 		else
@@ -1256,7 +1256,8 @@
 		return LIBINPUT_CONFIG_ACCEL_PROFILE_NONE;
 
 	return LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE |
-		LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
+	       LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT |
+	       LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM;
 }
 
 static enum libinput_config_status
@@ -1305,6 +1306,20 @@
 	return LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
 }
 
+static enum libinput_config_status
+evdev_set_accel_config(struct libinput_device *libinput_device,
+		       struct libinput_config_accel *accel_config)
+{
+	assert(evdev_accel_config_get_profile(libinput_device) == accel_config->profile);
+
+	struct evdev_device *dev = evdev_device(libinput_device);
+
+	if (!filter_set_accel_config(dev->pointer.filter, accel_config))
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
 void
 evdev_device_init_pointer_acceleration(struct evdev_device *device,
 				       struct motion_filter *filter)
@@ -1322,6 +1337,7 @@
 		device->pointer.config.set_profile = evdev_accel_config_set_profile;
 		device->pointer.config.get_profile = evdev_accel_config_get_profile;
 		device->pointer.config.get_default_profile = evdev_accel_config_get_default_profile;
+		device->pointer.config.set_accel_config = evdev_set_accel_config;
 		device->base.config.accel = &device->pointer.config;
 
 		default_speed = evdev_accel_config_get_default_speed(&device->base);
@@ -1899,7 +1915,6 @@
 	if (!has_joystick_tags)
 		return false;
 
-
 	unsigned int num_well_known_keys = 0;
 
 	for (size_t i = 0; i < ARRAY_LENGTH(well_known_keyboard_keys); i++) {
@@ -2058,8 +2073,10 @@
 	    udev_tags & EVDEV_UDEV_TAG_POINTINGSTICK) {
 		evdev_tag_external_mouse(device, device->udev_device);
 		evdev_tag_trackpoint(device, device->udev_device);
-		device->dpi = evdev_read_dpi_prop(device);
-		device->trackpoint_multiplier = evdev_get_trackpoint_multiplier(device);
+		if (device->tags & EVDEV_TAG_TRACKPOINT)
+			device->trackpoint_multiplier = evdev_get_trackpoint_multiplier(device);
+		else
+			device->dpi = evdev_read_dpi_prop(device);
 		/* whether velocity should be averaged, false by default */
 		device->use_velocity_averaging = evdev_need_velocity_averaging(device);
 
@@ -2233,8 +2250,6 @@
 	struct quirks_context *quirks;
 	struct quirks *q;
 	const struct quirk_tuples *t;
-	const uint32_t *props = NULL;
-	size_t nprops = 0;
 	char *prop;
 
 	/* Touchpad claims to have 4 slots but only ever sends 2
@@ -2253,7 +2268,7 @@
 		libevdev_disable_event_code(device->evdev, EV_MSC, MSC_TIMESTAMP);
 	}
 
-	if (quirks_get_tuples(q, QUIRK_ATTR_EVENT_CODE_ENABLE, &t)) {
+	if (quirks_get_tuples(q, QUIRK_ATTR_EVENT_CODE, &t)) {
 		for (size_t i = 0; i < t->ntuples; i++) {
 			const struct input_absinfo absinfo = {
 				.minimum = 0,
@@ -2262,37 +2277,27 @@
 
 			int type = t->tuplesi.first;
 			int code = t->tuplesi.second;
+			bool enable = t->tuplesi.third;
 
-			if (code == EVENT_CODE_UNDEFINED)
-				libevdev_enable_event_type(device->evdev, type);
-			else
-				libevdev_enable_event_code(device->evdev,
-							    type,
-							    code,
-							    type == EV_ABS ?  &absinfo : NULL);
-			evdev_log_debug(device,
-					"quirks: enabling %s %s (%#x %#x)\n",
-					libevdev_event_type_get_name(type),
-					libevdev_event_code_get_name(type, code),
-					type,
-					code);
-		}
-	}
-
-	if (quirks_get_tuples(q, QUIRK_ATTR_EVENT_CODE_DISABLE, &t)) {
-		for (size_t i = 0; i < t->ntuples; i++) {
-			int type = t->tuplesi.first;
-			int code = t->tuplesi.second;
-
-			if (code == EVENT_CODE_UNDEFINED)
-				libevdev_disable_event_type(device->evdev,
-							    type);
-			else
-				libevdev_disable_event_code(device->evdev,
-							    type,
-							    code);
+			if (code == EVENT_CODE_UNDEFINED) {
+				if (enable)
+					libevdev_enable_event_type(device->evdev, type);
+				else
+					libevdev_disable_event_type(device->evdev, type);
+			} else {
+				if (enable)
+					libevdev_enable_event_code(device->evdev,
+								   type,
+								   code,
+								   type == EV_ABS ?  &absinfo : NULL);
+				else
+					libevdev_disable_event_code(device->evdev,
+								    type,
+								    code);
+			}
 			evdev_log_debug(device,
-					"quirks: disabling %s %s (%#x %#x)\n",
+					"quirks: %s %s %s (%#x %#x)\n",
+					enable ? "enabling" : "disabling",
 					libevdev_event_type_get_name(type),
 					libevdev_event_code_get_name(type, code),
 					type,
@@ -2300,37 +2305,28 @@
 		}
 	}
 
-	if (quirks_get_uint32_array(q,
-				    QUIRK_ATTR_INPUT_PROP_ENABLE,
-				    &props,
-				    &nprops)) {
-		for (size_t idx = 0; idx < nprops; idx++) {
-			unsigned int p = propsidx;
-			libevdev_enable_property(device->evdev, p);
-			evdev_log_debug(device,
-					"quirks: enabling %s (%#x)\n",
-					libevdev_property_get_name(p),
-					p);
-		}
-	}
+	if (quirks_get_tuples(q, QUIRK_ATTR_INPUT_PROP, &t)) {
+		for (size_t idx = 0; idx < t->ntuples; idx++) {
+			unsigned int p = t->tuplesidx.first;
+			bool enable = t->tuplesidx.second;
 
-	if (quirks_get_uint32_array(q,
-					 QUIRK_ATTR_INPUT_PROP_DISABLE,
-					 &props,
-					 &nprops)) {
+			if (enable) {
+				libevdev_enable_property(device->evdev, p);
+			}
+			else {
 #if HAVE_LIBEVDEV_DISABLE_PROPERTY
-		for (size_t idx = 0; idx < nprops; idx++) {
-			unsigned int p = propsidx;
-			libevdev_disable_property(device->evdev, p);
+				libevdev_disable_property(device->evdev, p);
+#else

_service:tar_scm:libinput-1.22.1.tar.gz/src/evdev.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/evdev.h Changed

_service:tar_scm:libinput-1.24.0.tar.gz/src/filter-custom.c Added

@@ -0,0 +1,439 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "filter.h"
+#include "filter-private.h"
+
+#define MOTION_TIMEOUT ms2us(1000)
+#define FIRST_MOTION_TIME_INTERVAL ms2us(7) /* random but good enough interval for very first event */
+
+struct custom_accel_function {
+	uint64_t last_time;
+	double step;
+	size_t npoints;
+	double points;
+};
+
+static struct custom_accel_function *
+create_custom_accel_function(double step, const double *points, size_t npoints)
+{
+	if (npoints < LIBINPUT_ACCEL_NPOINTS_MIN ||
+	    npoints > LIBINPUT_ACCEL_NPOINTS_MAX)
+		return NULL;
+
+	if (step <= 0 || step > LIBINPUT_ACCEL_STEP_MAX)
+		return NULL;
+
+	for (size_t idx = 0; idx < npoints; idx++) {
+		if (pointsidx < LIBINPUT_ACCEL_POINT_MIN_VALUE ||
+		    pointsidx > LIBINPUT_ACCEL_POINT_MAX_VALUE)
+			return NULL;
+	}
+
+	struct custom_accel_function *cf = zalloc(sizeof(*cf) + npoints * sizeof(*points));
+	cf->last_time = 0;
+	cf->step = step;
+	cf->npoints = npoints;
+	memcpy(cf->points, points, sizeof(*points) * npoints);
+
+	return cf;
+}
+
+static void
+custom_accel_function_destroy(struct custom_accel_function *cf)
+{
+	if (cf == NULL)
+		return;
+
+	free(cf);
+}
+
+static double
+custom_accel_function_calculate_speed(struct custom_accel_function *cf,
+				      const struct device_float_coords *unaccelerated,
+				      uint64_t time)
+{
+	/* Although most devices have a constant polling rate, and for fast
+	 * movements these distances do represent the actual speed,
+	 * for slow movements it is not the case.
+	 *
+	 * Since all devices have a finite resolution, real world events
+	 * for a slow smooth movement could look like:
+	 *   Event 1 - (0,  1) - time 0
+	 *   Event 2 - (0,  0) - time 7  - filtered (zero event)
+	 *   Event 3 - (1,  0) - time 14
+	 *   Event 4 - (0,  0) - time 21 - filtered (zero event)
+	 *   Event 5 - (0,  0) - time 28 - filtered (zero event)
+	 *   Event 6 - (0,  1) - time 35
+	 *
+	 * Not taking the time into account would mean interpreting those events as:
+	 *   Move 1 unit over 7 ms
+	 *   Pause for 7 ms
+	 *   Move 1 unit over 7 ms
+	 *   Pause for 14 ms
+	 *   Move 1 unit over 7ms
+	 *
+	 * Where in reality this was one smooth movement without pauses,
+	 * so after normalizing for time we get:
+	 *   Move 1 unit over 7 ms
+	 *   Move 1 unit over 14 ms
+	 *   Move 1 unit over 21ms
+	 *
+	 * which should give us better speed estimation.
+	 */
+
+	/* calculate speed based on time passed since last event */
+	double distance = hypot(unaccelerated->x, unaccelerated->y);
+	/* handle first event in a motion */
+	if (time - cf->last_time > MOTION_TIMEOUT)
+		cf->last_time = time - FIRST_MOTION_TIME_INTERVAL;
+
+	double dt = us2ms_f(time - cf->last_time);
+	double speed = distance / dt; /* speed is in device-units per ms */
+	cf->last_time = time;
+
+	return speed;
+}
+
+static double
+custom_accel_function_profile(struct custom_accel_function *cf,
+			      double speed_in)
+{
+	size_t npoints = cf->npoints;
+	double step = cf->step;
+	double *points = cf->points;
+
+	/* calculate the index of the first point used for interpolation */
+	size_t i = speed_in / step;
+
+	/* if speed is greater than custom curve's max speed,
+	   use last 2 points for linear extrapolation
+	   (same calculation as linear interpolation) */
+	i = min(i, npoints - 2);
+
+	/* the 2 points used for linear interpolation */
+	double x0 = step * i;
+	double x1 = step * (i + 1);
+	double y0 = pointsi;
+	double y1 = pointsi + 1;
+
+	/* linear interpolation */
+	double speed_out = (y0 * (x1 - speed_in) + y1 * (speed_in - x0)) / step;
+
+	/* We moved (dx, dy) device units within the last N ms. This gives us a
+	 * given speed S in units/ms, that's our accel input. Our curve says map
+	 * that speed S to some other speed S'.
+	 *
+	 * Our device delta is represented by the vector, that vector needs to
+	 * be modified to represent our intended speed.
+	 *
+	 * Example: we moved a delta of 7 over the last 7ms. Our speed is
+	 * thus 1 u/ms, our out speed is 2 u/ms because we want to double our
+	 * speed (points: 0.0, 2.0). Our delta must thus be 14 - factor of 2,
+	 * or out-speed/in-speed.
+	 *
+	 * Example: we moved a delta of 1 over the last 7ms. Our input speed is
+	 * 1/7 u/ms, our out speed is 1/7ms because we set up a flat accel
+	 * curve (points: 0.0, 1.0). Our delta must thus be 1 - factor of 1,
+	 * or out-speed/in-speed.
+	 *
+	 * Example: we moved a delta of 1 over the last 21ms. Our input speed is
+	 * 1/21 u/ms, our out speed is 1u/ms because we set up a fixed-speed
+	 * curve (points: 1.0, 1.0). Our delta must thus be 21 - factor of 21,
+	 * or out-speed/in-speed.
+	 *
+	 * Example: we moved a delta of 21 over the last 7ms. Our input speed is
+	 * 3 u/ms, our out speed is 1u/ms because we set up a fixed-speed
+	 * curve (points: 1.0, 1.0). Our delta must thus be 7 - factor of 1/3,
+	 * or out-speed/in-speed.
+	 */
+
+	/* calculate the acceleration factor based on the user desired speed out */
+	double accel_factor = speed_out / speed_in;
+
+	return accel_factor;
+}
+
+static struct normalized_coords
+custom_accel_function_filter(struct custom_accel_function *cf,
+			     const struct device_float_coords *unaccelerated,
+			     uint64_t time)
+{
+	double speed = custom_accel_function_calculate_speed(cf, unaccelerated, time);
+
+	double accel_factor = custom_accel_function_profile(cf, speed);
+
+	struct normalized_coords accelerated = {
+		.x = unaccelerated->x * accel_factor,
+		.y = unaccelerated->y * accel_factor,
+	};
+
+	return accelerated;
+}
+
+struct custom_accelerator {

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-flat.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-flat.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-low-dpi.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-low-dpi.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-mouse.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-mouse.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-private.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-private.h Changed

@@ -38,12 +38,18 @@
 			   struct motion_filter *filter,
 			   const struct device_float_coords *unaccelerated,
 			   void *data, uint64_t time);
+	struct normalized_coords (*filter_scroll)(
+			   struct motion_filter *filter,
+			   const struct device_float_coords *unaccelerated,
+			   void *data, uint64_t time);
 	void (*restart)(struct motion_filter *filter,
 			void *data,
 			uint64_t time);
 	void (*destroy)(struct motion_filter *filter);
 	bool (*set_speed)(struct motion_filter *filter,
 			  double speed_adjustment);
+	bool (*set_accel_config)(struct motion_filter *filter,
+				 struct libinput_config_accel *accel_config);
 };
 
 struct motion_filter {
@@ -63,6 +69,22 @@
 	uint64_t value;
 };
 
+static inline struct pointer_delta_smoothener *
+pointer_delta_smoothener_create(uint64_t event_delta_smooth_threshold,
+				uint64_t event_delta_smooth_value)
+{
+	struct pointer_delta_smoothener *s = zalloc(sizeof(*s));
+	s->threshold = event_delta_smooth_threshold;
+	s->value = event_delta_smooth_value;
+	return s;
+}
+
+static inline void
+pointer_delta_smoothener_destroy(struct pointer_delta_smoothener *smoothener)
+{
+	free(smoothener);
+}
+
 struct pointer_trackers {
 	struct pointer_tracker *trackers;
 	size_t ntrackers;

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-tablet.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-tablet.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-touchpad-flat.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-touchpad-flat.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-touchpad-x230.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-touchpad-x230.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-touchpad.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-touchpad.c Changed

@@ -113,26 +113,16 @@
 
 /* Maps the -1, 1 speed setting into a constant acceleration
  * range. This isn't a linear scale, we keep 0 as the 'optimized'
- * mid-point and scale down to 0 for setting -1 and up to 5 for
+ * mid-point and scale down to 0.05 for setting -1 and up to 5 for
  * setting 1. On the premise that if you want a faster cursor, it
  * doesn't matter as much whether you have 0.56789 or 0.56790,
  * but for lower settings it does because you may lose movements.
  * *shrug*.
- *
- * Magic numbers calculated by MyCurveFit.com, data points were
- *  0.0 0.0
- *  0.1 0.1 (because we need 4 points)
- *  1   1
- *  2   5
- *
- *  This curve fits nicely into the range necessary.
  */
 static inline double
 speed_factor(double s)
 {
-	s += 1; /* map to 0, 2 */
-	return 435837.2 + (0.04762636 - 435837.2)/(1 + pow(s/240.4549,
-							   2.377168));
+	return pow(s + 1, 2.38) * 0.95 + 0.05;
 }
 
 static bool
@@ -288,6 +278,7 @@
 	.type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
 	.filter = accelerator_filter_touchpad,
 	.filter_constant = touchpad_constant_filter,
+	.filter_scroll = touchpad_constant_filter,
 	.restart = touchpad_accelerator_restart,
 	.destroy = touchpad_accelerator_destroy,
 	.set_speed = touchpad_accelerator_set_speed,
@@ -300,7 +291,6 @@
 	bool use_velocity_averaging)
 {
 	struct touchpad_accelerator *filter;
-	struct pointer_delta_smoothener *smoothener;
 
 	filter = zalloc(sizeof *filter);
 	filter->last_velocity = 0.0;
@@ -312,11 +302,7 @@
 
 	filter->base.interface = &accelerator_interface_touchpad;
 	filter->profile = touchpad_accel_profile_linear;
-
-	smoothener = zalloc(sizeof(*smoothener));
-	smoothener->threshold = event_delta_smooth_threshold,
-	smoothener->value = event_delta_smooth_value,
-	filter->trackers.smoothener = smoothener;
+	filter->trackers.smoothener = pointer_delta_smoothener_create(event_delta_smooth_threshold, event_delta_smooth_value);
 
 	return &filter->base;
 }

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-trackpoint-flat.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-trackpoint-flat.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter-trackpoint.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter-trackpoint.c Changed

@@ -146,7 +146,6 @@
 	filter->speed_adjustment = speed_adjustment;
 	accel_filter->speed_factor = speed_factor(speed_adjustment);
 
-
 	return true;
 }
 
@@ -175,6 +174,7 @@
 	.type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
 	.filter = trackpoint_accelerator_filter,
 	.filter_constant = trackpoint_accelerator_filter_noop,
+	.filter_scroll = trackpoint_accelerator_filter_noop,
 	.restart = trackpoint_accelerator_restart,
 	.destroy = trackpoint_accelerator_destroy,
 	.set_speed = trackpoint_accelerator_set_speed,
@@ -184,7 +184,6 @@
 create_pointer_accelerator_filter_trackpoint(double multiplier, bool use_velocity_averaging)
 {
 	struct trackpoint_accelerator *filter;
-	struct pointer_delta_smoothener *smoothener;
 
 	assert(multiplier > 0.0);
 
@@ -209,11 +208,7 @@
 	trackers_init(&filter->trackers, use_velocity_averaging ? 16 : 2);
 
 	filter->base.interface = &accelerator_interface_trackpoint;
-
-	smoothener = zalloc(sizeof(*smoothener));
-	smoothener->threshold = ms2us(10);
-	smoothener->value = ms2us(10);
-	filter->trackers.smoothener = smoothener;
+	filter->trackers.smoothener = pointer_delta_smoothener_create(ms2us(10), ms2us(10));
 
 	return &filter->base;
 }

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter.c Changed

@@ -53,6 +53,14 @@
 	return filter->interface->filter_constant(filter, unaccelerated, data, time);
 }
 
+struct normalized_coords
+filter_dispatch_scroll(struct motion_filter *filter,
+		       const struct device_float_coords *unaccelerated,
+		       void *data, uint64_t time)
+{
+	return filter->interface->filter_scroll(filter, unaccelerated, data, time);
+}
+
 void
 filter_restart(struct motion_filter *filter,
 	       void *data, uint64_t time)
@@ -89,6 +97,18 @@
 	return filter->interface->type;
 }
 
+bool
+filter_set_accel_config(struct motion_filter *filter,
+			struct libinput_config_accel *accel_config)
+{
+	assert(filter_get_type(filter) == accel_config->profile);
+
+	if (!filter->interface->set_accel_config)
+		return false;
+
+	return filter->interface->set_accel_config(filter, accel_config);
+}
+
 void
 trackers_init(struct pointer_trackers *trackers, int ntrackers)
 {
@@ -103,7 +123,7 @@
 trackers_free(struct pointer_trackers *trackers)
 {
 	free(trackers->trackers);
-	free(trackers->smoothener);
+	pointer_delta_smoothener_destroy(trackers->smoothener);
 }
 
 void

_service:tar_scm:libinput-1.22.1.tar.gz/src/filter.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/filter.h Changed

@@ -82,6 +82,28 @@
 			 const struct device_float_coords *unaccelerated,
 			 void *data, uint64_t time);
 
+/**
+ * Apply a scroll filter.
+ * Depending on the device, and the acceleration profile,
+ * this filter allows the user to accelerate the scroll movement.
+ *
+ * Takes a set of unaccelerated deltas and applies the scroll filter to it.
+ *
+ * @param filter The device's motion filter
+ * @param unaccelerated The unaccelerated delta in the device's dpi
+ * resolution as specified during filter creation. If a device has uneven
+ * resolution for x and y, one axis needs to be scaled to match the
+ * originally provided resolution.
+ * @param data Custom data
+ * @param time The time of the delta
+ *
+ * @see filter_dispatch
+ */
+struct normalized_coords
+filter_dispatch_scroll(struct motion_filter *filter,
+		       const struct device_float_coords *unaccelerated,
+		       void *data, uint64_t time);
+
 void
 filter_restart(struct motion_filter *filter,
 	       void *data, uint64_t time);
@@ -103,6 +125,10 @@
 				       double velocity,
 				       uint64_t time);
 
+bool
+filter_set_accel_config(struct motion_filter *filter,
+		        struct libinput_config_accel *accel_config);
+
 /* Pointer acceleration types */
 struct motion_filter *
 create_pointer_accelerator_filter_flat(int dpi);
@@ -134,6 +160,9 @@
 struct motion_filter *
 create_pointer_accelerator_filter_tablet(int xres, int yres);
 
+struct motion_filter *
+create_custom_accelerator_filter(void);
+
 /*
  * Pointer acceleration profiles.
  */
@@ -163,4 +192,19 @@
 			 void *data,
 			 double velocity,
 			 uint64_t time);
+double
+custom_accel_profile_fallback(struct motion_filter *filter,
+			      void *data,
+			      double speed_in,
+			      uint64_t time);
+double
+custom_accel_profile_motion(struct motion_filter *filter,
+			    void *data,
+			    double speed_in,
+			    uint64_t time);
+double
+custom_accel_profile_scroll(struct motion_filter *filter,
+			    void *data,
+			    double speed_in,
+			    uint64_t time);
 #endif /* FILTER_H */

_service:tar_scm:libinput-1.22.1.tar.gz/src/libinput-private.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/libinput-private.h Changed

@@ -231,6 +231,50 @@
 	enum libinput_config_send_events_mode (*get_default_mode)(struct libinput_device *device);
 };
 
+/**
+ * Custom acceleration function min number of points
+ * At least 2 points are required for linear interpolation
+ */
+#define LIBINPUT_ACCEL_NPOINTS_MIN 2
+
+/**
+ * Custom acceleration function max number of points
+ * an arbitrary limit of sample points
+ * it should be more than enough for everyone
+ */
+#define LIBINPUT_ACCEL_NPOINTS_MAX 64
+
+/**
+ * Custom acceleration function min point value
+ */
+#define LIBINPUT_ACCEL_POINT_MIN_VALUE 0
+
+/**
+ * Custom acceleration function max point value
+ */
+#define LIBINPUT_ACCEL_POINT_MAX_VALUE 10000
+
+/**
+ * Custom acceleration function max step size
+ */
+#define LIBINPUT_ACCEL_STEP_MAX 10000
+
+struct libinput_config_accel_custom_func {
+	double step;
+	size_t npoints;
+	double pointsLIBINPUT_ACCEL_NPOINTS_MAX;
+};
+
+struct libinput_config_accel {
+	enum libinput_config_accel_profile profile;
+
+	struct  {
+		struct libinput_config_accel_custom_func *fallback;
+		struct libinput_config_accel_custom_func *motion;
+		struct libinput_config_accel_custom_func *scroll;
+	} custom;
+};
+
 struct libinput_device_config_accel {
 	int (*available)(struct libinput_device *device);
 	enum libinput_config_status (*set_speed)(struct libinput_device *device,
@@ -243,6 +287,8 @@
 						   enum libinput_config_accel_profile);
 	enum libinput_config_accel_profile (*get_profile)(struct libinput_device *device);
 	enum libinput_config_accel_profile (*get_default_profile)(struct libinput_device *device);
+	enum libinput_config_status (*set_accel_config)(struct libinput_device *device,
+						        struct libinput_config_accel *accel_config);
 };
 
 struct libinput_device_config_natural_scroll {
@@ -396,6 +442,13 @@
 	struct phys_ellipsis size;
 };
 
+enum pressure_heuristic_state {
+	PRESSURE_HEURISTIC_STATE_PROXIN1, /** First proximity in event */
+	PRESSURE_HEURISTIC_STATE_PROXIN2, /** Second proximity in event */
+	PRESSURE_HEURISTIC_STATE_DECIDE,  /** Decide on offset now */
+	PRESSURE_HEURISTIC_STATE_DONE,    /** Decision's been made, live with it */
+};
+
 struct libinput_tablet_tool {
 	struct list link;
 	uint32_t serial;
@@ -410,6 +463,8 @@
 		struct threshold threshold; /* in device coordinates */
 		int offset; /* in device coordinates */
 		bool has_offset;
+
+		enum pressure_heuristic_state heuristic_state;
 	} pressure;
 };
 
@@ -467,7 +522,6 @@
                libinput->log_priority <= priority;
 }
 
-
 void
 log_msg_ratelimit(struct libinput *libinput,
 		  struct ratelimit *ratelimit,
@@ -923,5 +977,4 @@
 static inline void libinput_libwacom_unref(struct libinput *li) {}
 #endif
 
-
 #endif /* LIBINPUT_PRIVATE_H */

_service:tar_scm:libinput-1.22.1.tar.gz/src/libinput-util.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/libinput-util.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/libinput.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/libinput.c Changed

@@ -4159,6 +4159,7 @@
 	switch (profile) {
 	case LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT:
 	case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
 		break;
 	default:
 		return LIBINPUT_CONFIG_STATUS_INVALID;
@@ -4171,6 +4172,133 @@
 	return device->config.accel->set_profile(device, profile);
 }
 
+static inline struct libinput_config_accel_custom_func *
+libinput_config_accel_custom_func_create(void)
+{
+	struct libinput_config_accel_custom_func *func = zalloc(sizeof(*func));
+
+	func->step = 1.0;
+	func->npoints = 2;
+	func->points0 = 0.0; /* default to a flat unaccelerated function */
+	func->points1 = 1.0;
+
+	return func;
+}
+
+static inline void
+libinput_config_accel_custom_func_destroy(struct libinput_config_accel_custom_func * func)
+{
+	free(func);
+}
+
+LIBINPUT_EXPORT struct libinput_config_accel *
+libinput_config_accel_create(enum libinput_config_accel_profile profile)
+{
+	struct libinput_config_accel *config = zalloc(sizeof(*config));
+
+	config->profile = profile;
+
+	switch (profile) {
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_NONE:
+		break;
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT:
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
+		return config;
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
+		config->custom.fallback = libinput_config_accel_custom_func_create();
+		return config;
+	}
+
+	free(config);
+	return NULL;
+}
+
+LIBINPUT_EXPORT void
+libinput_config_accel_destroy(struct libinput_config_accel *accel_config)
+{
+	libinput_config_accel_custom_func_destroy(accel_config->custom.fallback);
+	libinput_config_accel_custom_func_destroy(accel_config->custom.motion);
+	libinput_config_accel_custom_func_destroy(accel_config->custom.scroll);
+	free(accel_config);
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_device_config_accel_apply(struct libinput_device *device,
+				   struct libinput_config_accel *accel_config)
+{
+	enum libinput_config_status status;
+	status = libinput_device_config_accel_set_profile(device, accel_config->profile);
+	if (status != LIBINPUT_CONFIG_STATUS_SUCCESS)
+		return status;
+
+	switch (accel_config->profile) {
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT:
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
+	{
+		double speed = libinput_device_config_accel_get_default_speed(device);
+		return libinput_device_config_accel_set_speed(device, speed);
+	}
+	case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
+		return device->config.accel->set_accel_config(device, accel_config);
+
+	default:
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+	}
+}
+
+LIBINPUT_EXPORT enum libinput_config_status
+libinput_config_accel_set_points(struct libinput_config_accel *config,
+				 enum libinput_config_accel_type accel_type,
+				 double step, size_t npoints, double *points)
+{
+	if (config->profile != LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM)
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	switch (accel_type) {
+	case LIBINPUT_ACCEL_TYPE_FALLBACK:
+	case LIBINPUT_ACCEL_TYPE_MOTION:
+	case LIBINPUT_ACCEL_TYPE_SCROLL:
+		break;
+	default:
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+	}
+
+	if (step <= 0 || step > LIBINPUT_ACCEL_STEP_MAX)
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	if (npoints < LIBINPUT_ACCEL_NPOINTS_MIN || npoints > LIBINPUT_ACCEL_NPOINTS_MAX)
+		return LIBINPUT_CONFIG_STATUS_INVALID;
+
+	for (size_t idx = 0; idx < npoints; idx++) {
+		if (pointsidx < LIBINPUT_ACCEL_POINT_MIN_VALUE ||
+		    pointsidx > LIBINPUT_ACCEL_POINT_MAX_VALUE)
+			return LIBINPUT_CONFIG_STATUS_INVALID;
+	}
+
+	struct libinput_config_accel_custom_func *func = libinput_config_accel_custom_func_create();
+
+	func->step = step;
+	func->npoints = npoints;
+	memcpy(func->points, points, sizeof(*points) * npoints);
+
+	switch (accel_type) {
+	case LIBINPUT_ACCEL_TYPE_FALLBACK:
+		libinput_config_accel_custom_func_destroy(config->custom.fallback);
+		config->custom.fallback = func;
+		break;
+	case LIBINPUT_ACCEL_TYPE_MOTION:
+		libinput_config_accel_custom_func_destroy(config->custom.motion);
+		config->custom.motion = func;
+		break;
+	case LIBINPUT_ACCEL_TYPE_SCROLL:
+		libinput_config_accel_custom_func_destroy(config->custom.scroll);
+		config->custom.scroll = func;
+		break;
+	}
+
+	return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
 LIBINPUT_EXPORT int
 libinput_device_config_scroll_has_natural_scroll(struct libinput_device *device)
 {
@@ -4576,7 +4704,7 @@
 		return degrees_cw ? LIBINPUT_CONFIG_STATUS_UNSUPPORTED :
 				    LIBINPUT_CONFIG_STATUS_SUCCESS;
 
-	if (degrees_cw >= 360 || degrees_cw % 90)
+	if (degrees_cw >= 360)
 		return LIBINPUT_CONFIG_STATUS_INVALID;
 
 	return device->config.rotation->set_angle(device, degrees_cw);

_service:tar_scm:libinput-1.22.1.tar.gz/src/libinput.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/libinput.h Changed

@@ -4370,7 +4370,7 @@
  *
  * @param device A current input device
  *
- * @return The number of buttons supported by the device.
+ * @return The number of buttons supported by the device. -1 on error.
  *
  * @since 1.3
  */
@@ -4385,7 +4385,7 @@
  *
  * @param device A current input device
  *
- * @return The number of rings or 0 if the device has no rings.
+ * @return The number of rings or 0 if the device has no rings. -1 on error.
  *
  * @see libinput_event_tablet_pad_get_ring_number
  *
@@ -4402,7 +4402,7 @@
  *
  * @param device A current input device
  *
- * @return The number of strips or 0 if the device has no strips.
+ * @return The number of strips or 0 if the device has no strips. -1 on error.
  *
  * @see libinput_event_tablet_pad_get_strip_number
  *
@@ -5172,6 +5172,12 @@
  * returned value is normalized to a range of -1, 1.
  * See libinput_device_config_accel_set_speed() for details.
  *
+ * If the current acceleration profile is @ref
+ * LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM, the behavior of the
+ * device will not change but future calls to
+ * libinput_device_config_accel_get_speed() will reflect the updated speed
+ * setting.
+ *
  * @param device The device to configure
  *
  * @return The current speed, range -1 to 1
@@ -5225,11 +5231,184 @@
 	 * on the input speed. This is the default profile for most devices.
 	 */
 	LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE = (1 << 1),
+
+	/**
+	 * A custom acceleration profile. Device movement acceleration depends
+	 * on user defined custom acceleration functions for each movement
+	 * type.
+	 *
+	 * @see libinput_config_accel_set_points
+	 */
+	LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM = (1 << 2),
+};
+
+/**
+ * @ingroup config
+ *
+ * A handle for configuration pointer acceleration.
+ *
+ * @warning Unlike other structs pointer acceleration configuration is
+ * considered transient and <b>not</b> refcounted. Calling
+ * libinput_config_accel_destroy() <b>will</b> destroy the configuration.
+ *
+ * To configure pointer acceleration, first create a config of a desired
+ * acceleration profile with libinput_config_accel_create(), then
+ * configure the profile-specific acceleration properties.
+ *
+ * In this version of libinput, this pointer acceleration configuration
+ * only provides configuration for @ref LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.
+ *
+ * For @ref LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM use
+ * @ref libinput_config_accel_set_points.
+ *
+ * Once set up, apply the configuration to a device using
+ * libinput_device_config_accel_apply(). Once applied,
+ * destroy it with libinput_config_accel_destroy().
+ *
+ * @since 1.23
+ */
+struct libinput_config_accel;
+
+/**
+ * @ingroup config
+ *
+ * Create an acceleration configuration of a given profile.
+ *
+ * Note that in this version of libinput, only the
+ * @ref LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM profile provides configuration
+ * options. All other acceleration profiles, when applied, will merely switch
+ * the profile and reset any profile-specific options to the default values.
+ *
+ * @param profile The profile of the newly created acceleration configuration.
+ *
+ * @return The newly created acceleration configuration or NULL on error.
+ *
+ * @warning Unlike other structs pointer acceleration configuration is
+ * considered transient and <b>not</b> refcounted. Calling
+ * libinput_config_accel_destroy() <b>will</b> destroy the configuration.
+ *
+ * @see libinput_config_accel
+ * @since 1.23
+ */
+struct libinput_config_accel *
+libinput_config_accel_create(enum libinput_config_accel_profile profile);
+
+/**
+ * @ingroup config
+ *
+ * Destroy an acceleration configuration.
+ *
+ * @warning Unlike other structs pointer acceleration configuration is
+ * considered transient and <b>not</b> refcounted. Calling
+ * libinput_config_accel_destroy() <b>will</b> destroy the configuration.
+ *
+ * @param accel_config The acceleration configuration to destroy.
+ *
+ * @see libinput_config_accel
+ * @since 1.23
+ */
+void
+libinput_config_accel_destroy(struct libinput_config_accel *accel_config);
+
+/**
+ * @ingroup config
+ *
+ * Apply this pointer acceleration configuration to the device. This changes the
+ * device's pointer acceleration method to the method given in
+ * libinput_config_accel_create() and applies all other configuration settings.
+ *
+ * Once applied, call libinput_config_accel_destroy() to destroy the
+ * configuration struct.
+ *
+ * @param device The device to configure.
+ * @param accel_config The acceleration configuration.
+ *
+ * @return A config status code.
+ *
+ * @see libinput_config_accel
+ * @since 1.23
+ */
+enum libinput_config_status
+libinput_device_config_accel_apply(struct libinput_device *device,
+				   struct libinput_config_accel *accel_config);
+
+/**
+ * @ingroup config
+ *
+ * Acceleration types are categories of movement by a device that may have
+ * specific acceleration functions applied. A device always supports the
+ * @ref LIBINPUT_ACCEL_TYPE_MOTION type (for regular pointer motion). Other
+ * types (e.g. scrolling) may be added in the future.
+ *
+ * The special type @ref LIBINPUT_ACCEL_TYPE_FALLBACK specifies the acceleration
+ * function to be moved for any movement produced by the device that does not
+ * have a specific acceleration type defined.
+ *
+ * Use to specify the acceleration function type in
+ * @ref libinput_config_accel_set_points
+ *
+ * Each device implements a subset of those types, see a list of supported
+ * devices for each movement type definition.
+ *
+ * @see LIBINPUT_ACCEL_ARG_TYPE
+ * @since 1.23
+ */
+enum libinput_config_accel_type {
+	/**
+	 * The default acceleration type used as a fallback when other
+	 * acceleration types are not provided.
+	 */
+	LIBINPUT_ACCEL_TYPE_FALLBACK = 0,
+	/**
+	 * Acceleration type for regular pointer movement. This
+	 * type is always supported.
+	 */
+	LIBINPUT_ACCEL_TYPE_MOTION,
+	/**
+	 * Acceleration type for scroll movement.
+	 * This type is supported by mouse and touchpad.
+	 */
+	LIBINPUT_ACCEL_TYPE_SCROLL,
 };
 
 /**
  * @ingroup config
  *
+ * Defines the acceleration function for a given movement type
+ * in an acceleration configuration with the profile
+ * @ref LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.
+ *
+ * Movement types are specific to each device, @see libinput_config_accel_type.
+ *
+ * Each custom acceleration function is defined by ``n`` points spaced uniformly
+ * along the x-axis starting from 0 and continuing in a constant step size.
+ * There by the function is defined by the following points:
+ * (0 * step, f0), (1 * step, f1), ..., ((n - 1) * step, fn - 1).
+ * The x-axis represents the device-speed in device units per millisecond.
+ * The y-axis represents the pointer-speed.
+ *

_service:tar_scm:libinput-1.22.1.tar.gz/src/libinput.sym -> _service:tar_scm:libinput-1.24.0.tar.gz/src/libinput.sym Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/path-seat.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/path-seat.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/quirks.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/quirks.c Changed

@@ -175,6 +175,10 @@
 	/* These are not ref'd, just a collection of pointers */
 	struct property **properties;
 	size_t nproperties;
+
+	/* Special properties for AttrEventCode and AttrInputCode, these are
+	 * owned by us, not the section */
+	struct list floating_properties;
 };
 
 /**
@@ -263,8 +267,10 @@
 	case QUIRK_MODEL_TABLET_MODE_NO_SUSPEND:	return "ModelTabletModeNoSuspend";
 	case QUIRK_MODEL_TABLET_MODE_SWITCH_UNRELIABLE:	return "ModelTabletModeSwitchUnreliable";
 	case QUIRK_MODEL_TOUCHPAD_VISIBLE_MARKER:	return "ModelTouchpadVisibleMarker";
+	case QUIRK_MODEL_TOUCHPAD_PHANTOM_CLICKS:	return "ModelTouchpadPhantomClicks";
 	case QUIRK_MODEL_TRACKBALL:			return "ModelTrackball";
 	case QUIRK_MODEL_WACOM_TOUCHPAD:		return "ModelWacomTouchpad";
+	case QUIRK_MODEL_PRESSURE_PAD:			return "ModelPressurePad";
 
 	case QUIRK_ATTR_SIZE_HINT:			return "AttrSizeHint";
 	case QUIRK_ATTR_TOUCH_SIZE_RANGE:		return "AttrTouchSizeRange";
@@ -282,10 +288,8 @@
 	case QUIRK_ATTR_TABLET_SMOOTHING:               return "AttrTabletSmoothing";
 	case QUIRK_ATTR_THUMB_SIZE_THRESHOLD:		return "AttrThumbSizeThreshold";
 	case QUIRK_ATTR_MSC_TIMESTAMP:			return "AttrMscTimestamp";
-	case QUIRK_ATTR_EVENT_CODE_DISABLE:		return "AttrEventCodeDisable";
-	case QUIRK_ATTR_EVENT_CODE_ENABLE:		return "AttrEventCodeEnable";
-	case QUIRK_ATTR_INPUT_PROP_DISABLE:		return "AttrInputPropDisable";
-	case QUIRK_ATTR_INPUT_PROP_ENABLE:		return "AttrInputPropEnable";
+	case QUIRK_ATTR_EVENT_CODE:			return "AttrEventCode";
+	case QUIRK_ATTR_INPUT_PROP:			return "AttrInputProp";
 	default:
 		abort();
 	}
@@ -817,14 +821,11 @@
 		p->type = PT_STRING;
 		p->value.s = safe_strdup(value);
 		rc = true;
-	} else if (streq(key, quirk_get_name(QUIRK_ATTR_EVENT_CODE_DISABLE)) ||
-		   streq(key, quirk_get_name(QUIRK_ATTR_EVENT_CODE_ENABLE))) {
+	} else if (streq(key, quirk_get_name(QUIRK_ATTR_EVENT_CODE))) {
 		struct input_event events32;
 		size_t nevents = ARRAY_LENGTH(events);
-		if (streq(key, quirk_get_name(QUIRK_ATTR_EVENT_CODE_DISABLE)))
-		    p->id = QUIRK_ATTR_EVENT_CODE_DISABLE;
-		else
-		    p->id = QUIRK_ATTR_EVENT_CODE_ENABLE;
+
+		p->id = QUIRK_ATTR_EVENT_CODE;
 
 		if (!parse_evcode_property(value, events, &nevents) ||
 		    nevents == 0)
@@ -833,27 +834,29 @@
 		for (size_t i = 0; i < nevents; i++) {
 			p->value.tuples.tuplesi.first = eventsi.type;
 			p->value.tuples.tuplesi.second = eventsi.code;
+			p->value.tuples.tuplesi.third = eventsi.value;
 		}
 		p->value.tuples.ntuples = nevents;
 		p->type = PT_TUPLES;
 
 		rc = true;
-	} else if (streq(key, quirk_get_name(QUIRK_ATTR_INPUT_PROP_DISABLE)) ||
-		   streq(key, quirk_get_name(QUIRK_ATTR_INPUT_PROP_ENABLE))) {
-		unsigned int propsINPUT_PROP_CNT;
+	} else if (streq(key, quirk_get_name(QUIRK_ATTR_INPUT_PROP))) {
+		struct input_prop propsINPUT_PROP_CNT;
 		size_t nprops = ARRAY_LENGTH(props);
-		if (streq(key, quirk_get_name(QUIRK_ATTR_INPUT_PROP_DISABLE)))
-			p->id = QUIRK_ATTR_INPUT_PROP_DISABLE;
-		else
-			p->id = QUIRK_ATTR_INPUT_PROP_ENABLE;
+
+		p->id = QUIRK_ATTR_INPUT_PROP;
 
 		if (!parse_input_prop_property(value, props, &nprops) ||
 		    nprops == 0)
 			goto out;
 
-		memcpy(p->value.array.data.u, props, nprops * sizeof(unsigned int));
-		p->value.array.nelements = nprops;
-		p->type = PT_UINT_ARRAY;
+		for (size_t i = 0; i < nprops; i++) {
+			p->value.tuples.tuplesi.first = propsi.prop;
+			p->value.tuples.tuplesi.second = propsi.enabled;
+		}
+
+		p->value.tuples.ntuples = nprops;
+		p->type = PT_TUPLES;
 
 		rc = true;
 	} else {
@@ -880,7 +883,7 @@
 parse_value_line(struct quirks_context *ctx, struct section *s, const char *line)
 {
 	bool rc = false;
-	
+
 	size_t nelem;
 	char **strv = strv_from_string(line, "=", &nelem);
 	if (!strv || nelem != 2)
@@ -1201,6 +1204,7 @@
 	q->refcount = 1;
 	q->nproperties = 0;
 	list_init(&q->link);
+	list_init(&q->floating_properties);
 
 	return q;
 }
@@ -1219,6 +1223,13 @@
 		property_unref(q->propertiesi);
 	}
 
+	/* Floating properties are owned by our quirks context, need to be
+	 * cleaned up here */
+	struct property *p;
+	list_for_each_safe(p, &q->floating_properties, link) {
+		property_cleanup(p);
+	}
+
 	list_remove(&q->link);
 	free(q->properties);
 	free(q);
@@ -1379,6 +1390,41 @@
 }
 
 static void
+quirk_merge_event_codes(struct quirks_context *ctx,
+			struct quirks *q,
+			const struct property *property)
+{
+	for (size_t i = 0; i < q->nproperties; i++) {
+		struct property *p = q->propertiesi;
+
+		if (p->id != property->id)
+			continue;
+
+		/* We have a duplicated property, merge in with ours */
+		size_t offset = p->value.tuples.ntuples;
+		size_t max = ARRAY_LENGTH(p->value.tuples.tuples);
+		for (size_t j = 0; j < property->value.tuples.ntuples; j++) {
+			if (offset + j >= max)
+				break;
+			p->value.tuples.tuplesoffset + j = property->value.tuples.tuplesj;
+			p->value.tuples.ntuples++;
+		}
+		return;
+	}
+
+	/* First time we add AttrEventCode: create a new property.
+	 * Unlike the other properties, this one isn't part of a section, it belongs
+	 * to the quirks */
+	struct property *newprop = property_new();
+	newprop->id = property->id;
+	newprop->type = property->type;
+	newprop->value.tuples = property->value.tuples;
+	/* Caller responsible for pre-allocating space */
+	q->propertiesq->nproperties++ = property_ref(newprop);
+	list_append(&q->floating_properties, &newprop->link);
+}
+
+static void
 quirk_apply_section(struct quirks_context *ctx,
 		    struct quirks *q,
 		    const struct section *s)
@@ -1401,7 +1447,26 @@
 		qlog_debug(ctx, "property added: %s from %s\n",
 			   quirk_get_name(p->id), s->name);
 
-		q->propertiesq->nproperties++ = property_ref(p);
+		/* All quirks but AttrEventCode and AttrInputProp
+		 * simply overwrite each other, so we can just append the
+		 * matching property and, later when checking the quirk, pick
+		 * the last one in the array.
+		 *
+		 * The event codes/input props are special because they're lists
+		 * that may *partially* override each other, e.g. a section may
+		 * enable BTN_LEFT and BTN_RIGHT but a later section may disable
+		 * only BTN_RIGHT. This should result in BTN_LEFT force-enabled
+		 * and BTN_RIGHT force-disabled.
+		 *
+		 * To hack around this, those are the only ones where only ever
+		 * have one struct property in the list (not owned by a section)
+		 * and we simply merge any extra sections onto that.
+		 */
+		if (p->id == QUIRK_ATTR_EVENT_CODE ||
+		    p->id == QUIRK_ATTR_INPUT_PROP)
+			quirk_merge_event_codes(ctx, q, p);
+		else
+			q->propertiesq->nproperties++ = property_ref(p);
 	}
 }
 
@@ -1517,7 +1582,6 @@
 	return q;
 }
 
-
 static inline struct property *

_service:tar_scm:libinput-1.22.1.tar.gz/src/quirks.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/quirks.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/udev-seat.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/udev-seat.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-bits.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-bits.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-input-event.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-input-event.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-list.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-list.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-macros.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-macros.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-matrix.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-matrix.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-prop-parsers.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-prop-parsers.c Changed

@@ -178,7 +178,7 @@
 {
 	if (!prop)
 		return false;
-	
+
 	bool rc = false;
 
 	size_t num_calibration;
@@ -347,10 +347,10 @@
 }
 
 /**
- * Parses a string of the format "EV_ABS;KEY_A;BTN_TOOL_DOUBLETAP;ABS_X;"
- * where each element must be a named event type OR a named event code OR a
- * tuple in the form of EV_KEY:0x123, i.e. a named event type followed by a
- * hex event code.
+ * Parses a string of the format "+EV_ABS;+KEY_A;-BTN_TOOL_DOUBLETAP;-ABS_X;"
+ * where each element must be + or - (enable/disable) followed by a named event
+ * type OR a named event code OR a tuple in the form of EV_KEY:0x123, i.e. a
+ * named event type followed by a hex event code.
  *
  * events must point to an existing array of size nevents.
  * nevents specifies the size of the array in events and returns the number
@@ -361,7 +361,8 @@
  * other fields undefined. Where only the event type is specified, the code
  * is set to EVENT_CODE_UNDEFINED.
  *
- * On success, events contains nevents events.
+ * On success, events contains nevents events with each event's value set to 1
+ * or 0 depending on the + or - prefix.
  */
 bool
 parse_evcode_property(const char *prop, struct input_event *events, size_t *nevents)
@@ -380,6 +381,16 @@
 	ncodes = min(*nevents, ncodes);
 	for (size_t idx = 0; strvidx; idx++) {
 		char *s = strvidx;
+		bool enable;
+
+		switch (*s) {
+		case '+': enable = true; break;
+		case '-': enable = false; break;
+		default:
+			goto out;
+		}
+
+		s++;
 
 		int type, code;
 
@@ -399,6 +410,7 @@
 
 		evsidx.type = type;
 		evsidx.code = code;
+		evsidx.value = enable;
 	}
 
 	memcpy(events, evs, ncodes * sizeof *events);
@@ -411,9 +423,9 @@
 }
 
 /**
- * Parses a string of the format "INPUT_PROP_BUTTONPAD;INPUT_PROP_POINTER;0x123;"
+ * Parses a string of the format "+INPUT_PROP_BUTTONPAD;-INPUT_PROP_POINTER;+0x123;"
  * where each element must be a named input prop OR a hexcode in the form
- * 0x1234
+ * 0x1234. The prefix for each element must be either '+' (enable) or '-' (disable).
  *
  * props must point to an existing array of size nprops.
  * nprops specifies the size of the array in props and returns the number
@@ -423,10 +435,10 @@
  * On success, props contains nprops elements.
  */
 bool
-parse_input_prop_property(const char *prop, unsigned int *props_out, size_t *nprops)
+parse_input_prop_property(const char *prop, struct input_prop *props_out, size_t *nprops)
 {
 	bool rc = false;
-	unsigned int propsINPUT_PROP_CNT; /* doubling up on quirks is a bug */
+	struct input_prop propsINPUT_PROP_CNT; /* doubling up on quirks is a bug */
 
 	size_t count;
 	char **strv = strv_from_string(prop, ";", &count);
@@ -437,6 +449,16 @@
 	for (size_t idx = 0; strvidx; idx++) {
 		char *s = strvidx;
 		unsigned int prop;
+		bool enable;
+
+		switch (*s) {
+		case '+': enable = true; break;
+		case '-': enable = false; break;
+		default:
+			goto out;
+		}
+
+		s++;
 
 		if (safe_atou_base(s, &prop, 16)) {
 			if (prop > INPUT_PROP_MAX)
@@ -447,7 +469,8 @@
 				goto out;
 			prop = (unsigned int)val;
 		}
-		propsidx = prop;
+		propsidx.prop = prop;
+		propsidx.enabled = enable;
 	}
 
 	memcpy(props_out, props, count * sizeof *props);
@@ -483,7 +506,7 @@
 
 	/* basic sanity check: 5 digits for min/max, 3 for resolution, fuzz,
 	 * flat and the colons. That's plenty, anything over is garbage */
-	if (strlen(prop) > 24)
+	if (!prop || strlen(prop) > 24)
 		goto out;
 
 	current = str;

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-prop-parsers.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-prop-parsers.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-strings.c -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-strings.c Changed

@@ -39,6 +39,8 @@
 static const char *
 next_word(const char **state, size_t *len, const char *separators)
 {
+	assert(state != NULL);
+
 	const char *next = *state;
 	size_t l;
 
@@ -72,6 +74,7 @@
 	char **strv = NULL;
 
 	assert(argc >= 0);
+	assert(argv != NULL);
 
 	if (argc == 0)
 		return NULL;
@@ -98,7 +101,7 @@
  * Another example:
  *   result = strv_from_string("+1-2++3--4++-+5-+-", "+-", &nelem)
  *   result ==  "1", "2", "3", "4", "5", NULL  and nelem == 5
- * 
+ *
  * @param in Input string
  * @param separators List of separator characters
  * @param num_elements Number of elements found in the input string
@@ -109,8 +112,9 @@
 strv_from_string(const char *in, const char *separators, size_t *num_elements)
 {
 	assert(in != NULL);
+	assert(separators != NULL);
+	assert(num_elements != NULL);
 
-	
 	const char *s = in;
 	size_t l, nelems = 0;
 	while (next_word(&s, &l, separators) != NULL)
@@ -137,7 +141,7 @@
 
 		strvidx++ = copy;
 	}
-	
+
 	*num_elements = nelems;
 
 	return strv;
@@ -160,6 +164,8 @@
 char *
 strv_join(char **strv, const char *joiner)
 {
+	assert(strv != NULL);
+
 	char **s;
 	char *str;
 	size_t slen = 0;
@@ -201,6 +207,8 @@
 const char *
 safe_basename(const char *filename)
 {
+	assert(filename != NULL);
+
 	const char *basename;
 
 	if (*filename == '\0')
@@ -216,7 +224,6 @@
 	return basename + 1;
 }
 
-
 /**
  * Similar to basename() but returns the trunk only without the (last)
  * trailing suffix, so that:
@@ -231,6 +238,8 @@
 char *
 trunkname(const char *filename)
 {
+	assert(filename != NULL);
+
 	const char *base = safe_basename(filename);
 	char *suffix;

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-strings.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-strings.h Changed

@@ -143,6 +143,8 @@
 static inline bool
 safe_atoi_base(const char *str, int *val, int base)
 {
+	assert(str != NULL);
+
 	char *endptr;
 	long v;
 
@@ -167,12 +169,15 @@
 static inline bool
 safe_atoi(const char *str, int *val)
 {
+	assert(str != NULL);
 	return safe_atoi_base(str, val, 10);
 }
 
 static inline bool
 safe_atou_base(const char *str, unsigned int *val, int base)
 {
+	assert(str != NULL);
+
 	char *endptr;
 	unsigned long v;
 
@@ -197,12 +202,15 @@
 static inline bool
 safe_atou(const char *str, unsigned int *val)
 {
+	assert(str != NULL);
 	return safe_atou_base(str, val, 10);
 }
 
 static inline bool
 safe_atod(const char *str, double *val)
 {
+	assert(str != NULL);
+
 	char *endptr;
 	double v;
 #ifdef HAVE_LOCALE_H
@@ -274,6 +282,51 @@
 	free (strv);
 }
 
+/**
+ * parse a string containing a list of doubles into a double array.
+ *
+ * @param in string to parse
+ * @param separator string used to separate double in list e.g. ","
+ * @param result double array
+ * @param length length of double array
+ * @return true when parsed successfully otherwise false
+ */
+static inline double *
+double_array_from_string(const char *in,
+			 const char *separator,
+			 size_t *length)
+{
+	assert(in != NULL);
+	assert(separator != NULL);
+	assert(length != NULL);
+
+	double *result = NULL;
+	*length = 0;
+
+	size_t nelem;
+	char **strv = strv_from_string(in, separator, &nelem);
+	if (!strv)
+		return result;
+
+	double *numv = zalloc(sizeof(double) * nelem);
+	for (size_t idx = 0; idx < nelem; idx++) {
+		double val;
+		if (!safe_atod(strvidx, &val))
+			goto out;
+
+		numvidx = val;
+	}
+
+	result = numv;
+	numv = NULL;
+	*length = nelem;
+
+out:
+	strv_free(strv);
+	free(numv);
+	return result;
+}
+
 struct key_value_str{
 	char *key;
 	char *value;
@@ -345,6 +398,8 @@
 static inline char *
 strstrip(const char *input, const char *what)
 {
+	assert(input != NULL);
+
 	char *str, *last;
 
 	str = safe_strdup(&inputstrspn(input, what));
@@ -368,6 +423,9 @@
 static inline bool
 strendswith(const char *str, const char *suffix)
 {
+	if (str == NULL)
+		return false;
+
 	size_t slen = strlen(str);
 	size_t suffixlen = strlen(suffix);
 	size_t offset;
@@ -382,6 +440,9 @@
 static inline bool
 strstartswith(const char *str, const char *prefix)
 {
+	if (str == NULL)
+		return false;
+
 	size_t prefixlen = strlen(prefix);
 
 	return prefixlen > 0 ? strneq(str, prefix, strlen(prefix)) : false;

_service:tar_scm:libinput-1.22.1.tar.gz/src/util-time.h -> _service:tar_scm:libinput-1.24.0.tar.gz/src/util-time.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest-device-calibrated-touchscreen.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-calibrated-touchscreen.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest-device-elan-tablet.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-elan-tablet.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest-device-keyboard-quirked.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-keyboard-quirked.c Changed

@@ -199,22 +199,46 @@
 };
 
 static const char quirk_file =
-"litest Quirked Keyboard enable rel\n"
+"litest Quirked Keyboard enable buttons\n"
 "MatchName=litest Quirked Keyboard\n"
-"AttrEventCodeEnable=BTN_RIGHT;EV_KEY:0x110\n" /* BTN_LEFT */
+"AttrEventCode=+BTN_RIGHT;+BTN_MIDDLE;+EV_KEY:0x110\n" /* BTN_LEFT */
+"\n"
+"litest Quirked Keyboard disable buttons\n"
+"MatchName=litest Quirked Keyboard\n"
+"AttrEventCode=-BTN_MIDDLE;-BTN_RIGHT\n"
+"\n"
+"litest Quirked Keyboard re-enable buttons\n"
+"MatchName=litest Quirked Keyboard\n"
+"AttrEventCode=+BTN_RIGHT\n"
 "\n"
 "litest Quirked keyboard disable F1-F3\n"
 "MatchName=litest Quirked Keyboard\n"
-"AttrEventCodeDisable=KEY_F1;EV_KEY:0x3c;KEY_F3\n"
+"AttrEventCode=-KEY_F1;-EV_KEY:0x3c;-KEY_F3\n"
 #if HAVE_LIBEVDEV_DISABLE_PROPERTY
 "\n"
 "litest Quirked keyboard enable buttonpad\n"
 "MatchName=litest Quirked Keyboard\n"
-"AttrInputPropEnable=INPUT_PROP_BUTTONPAD\n"
+"AttrInputProp=+INPUT_PROP_BUTTONPAD\n"
 "\n"
 "litest Quirked keyboard disable pointingstick\n"
 "MatchName=litest Quirked Keyboard\n"
-"AttrInputPropDisable=INPUT_PROP_POINTING_STICK\n"
+"AttrInputProp=-INPUT_PROP_POINTING_STICK\n"
+"\n"
+"litest Quirked keyboard enable direct\n"
+"MatchName=litest Quirked Keyboard\n"
+"AttrInputProp=+INPUT_PROP_DIRECT\n"
+"\n"
+"litest Quirked keyboard disable direct\n"
+"MatchName=litest Quirked Keyboard\n"
+"AttrInputProp=-INPUT_PROP_DIRECT\n"
+"\n"
+"litest Quirked keyboard disable semi-mt\n"
+"MatchName=litest Quirked Keyboard\n"
+"AttrInputProp=-INPUT_PROP_SEMI_MT\n"
+"\n"
+"litest Quirked keyboard enable semi-mt\n"
+"MatchName=litest Quirked Keyboard\n"
+"AttrInputProp=+INPUT_PROP_SEMI_MT\n"
 #endif
 ;

_service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-synaptics-phantomclicks.c Added

@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2023 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include "litest.h"
+#include "litest-int.h"
+
+static struct input_event down = {
+	{ .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN  },
+	{ .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+static struct input_event move = {
+	{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN  },
+	{ .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+static struct litest_device_interface interface = {
+	.touch_down_events = down,
+	.touch_move_events = move,
+};
+
+static struct input_id input_id = {
+	.bustype = 0x18,
+	.vendor = 0x4f3,
+	.product = 0x311c,
+};
+
+static int events = {
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_TOOL_FINGER,
+	EV_KEY, BTN_TOUCH,
+	EV_KEY, BTN_TOOL_DOUBLETAP,
+	EV_KEY, BTN_TOOL_TRIPLETAP,
+	EV_KEY, BTN_TOOL_QUADTAP,
+	EV_KEY, BTN_TOOL_QUINTTAP,
+	INPUT_PROP_MAX, INPUT_PROP_POINTER,
+	INPUT_PROP_MAX, INPUT_PROP_BUTTONPAD,
+	-1, -1,
+};
+
+static struct input_absinfo absinfo = {
+	{ ABS_X, 0, 4654, 0, 0, 31 },
+	{ ABS_Y, 0, 2730, 0, 0, 31 },
+	{ ABS_MT_SLOT, 0, 4, 0, 0, 0 },
+	{ ABS_MT_POSITION_X, 0, 4654, 0, 0, 31 },
+	{ ABS_MT_POSITION_Y, 0, 2730, 0, 0, 31 },
+	{ ABS_MT_TOOL_TYPE, 0, 2, 0, 0, 0 },
+	{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
+	{ .value = -1 }
+};
+
+static const char quirk_file =
+"litest Dell XPS 15 9500 Touchpad\n"
+"MatchName=litest DELL097D:00 04F3:311C Touchpad\n"
+"ModelTouchpadVisibleMarker=0\n"
+"ModelTouchpadPhantomClicks=1\n";
+
+TEST_DEVICE("synaptics-phantomclicks",
+	.type = LITEST_SYNAPTICS_PHANTOMCLICKS,
+	.features = LITEST_TOUCHPAD | LITEST_CLICKPAD | LITEST_BUTTON,
+	.interface = &interface,
+	.name = "DELL097D:00 04F3:311C Touchpad",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+	.quirk_file = quirk_file,
+)

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest-device-touch-screen.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-touch-screen.c Changed

_service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-wacom-calibrated-tablet.c Added

@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2023 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include "litest.h"
+#include "litest-int.h"
+
+static bool
+inverter(struct litest_device *dev,
+		 double *x, double *y,
+		 struct axis_replacement *axes)
+{
+	/* Input data is in percent (0-100), so let's swap x and y around.
+	 * With our matrix this should be undone by libinput later
+	 * and the tablet behaves as if normal */
+	*x = 100 - *x;
+	*y = 100 - *y;
+
+	/* let the generic code handle the event */
+	return false;
+}
+
+static bool
+proximity_in_handler(struct litest_device *dev,
+		     unsigned int tool_type,
+		     double *x, double *y,
+		     struct axis_replacement *axes)
+{
+	/* let the generic code handle the event */
+	return inverter(dev, x, y, axes);
+}
+
+static struct input_event proximity_in = {
+	{ .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_KEY, .code = LITEST_BTN_TOOL_AUTO, .value = 1 },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+static struct input_event proximity_out = {
+	{ .type = EV_ABS, .code = ABS_X, .value = 0 },
+	{ .type = EV_ABS, .code = ABS_Y, .value = 0 },
+	{ .type = EV_KEY, .code = LITEST_BTN_TOOL_AUTO, .value = 0 },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+static struct input_event motion = {
+	{ .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+};
+
+static int
+get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value)
+{
+	switch (evcode) {
+	case ABS_PRESSURE:
+		*value = 100;
+		return 0;
+	}
+	return 1;
+}
+
+static struct litest_device_interface interface = {
+	.tablet_proximity_in = proximity_in_handler,
+	.tablet_tip_down = inverter,
+	.tablet_tip_up = inverter,
+	.tablet_motion = inverter,
+
+	.tablet_proximity_in_events = proximity_in,
+	.tablet_proximity_out_events = proximity_out,
+	.tablet_motion_events = motion,
+
+	.get_axis_default = get_axis_default,
+};
+
+static struct input_absinfo absinfo = {
+	{ ABS_X, 0, 29476, 4, 0, 100 },
+	{ ABS_Y, 0, 16624, 4, 0, 100 },
+	{ ABS_PRESSURE, 0, 1023, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x3,
+	.vendor = 0x56a,
+	.product = 0x501e,
+	.version = 0x111,
+};
+
+static int events = {
+	EV_KEY, BTN_TOOL_PEN,
+	EV_KEY, BTN_TOOL_RUBBER,
+	EV_KEY, BTN_TOUCH,
+	EV_KEY, BTN_STYLUS,
+	EV_KEY, BTN_STYLUS2,
+	INPUT_PROP_MAX, INPUT_PROP_DIRECT,
+	-1, -1,
+};
+
+TEST_DEVICE("wacom-calibrated-tablet",
+	.type = LITEST_WACOM_CALIBRATED_TABLET,
+	.features = LITEST_TABLET|LITEST_PRECALIBRATED,
+	.interface = &interface,
+
+	.name = "Wacom MultiTouch Sensor Pen",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+	.udev_properties = {
+	{ "LIBINPUT_CALIBRATION_MATRIX", "-1 0 1 0 -1 1" },
+	{ NULL }
+	},
+)

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest-device-wacom-isdv4-524c-pen.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest-device-wacom-isdv4-524c-pen.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest-int.h -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest-int.h Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest.c Changed

@@ -80,10 +80,10 @@
 static bool verbose = false;
 static bool run_deviceless = false;
 static bool use_system_rules_quirks = false;
-const char *filter_test = NULL;
-const char *filter_device = NULL;
-const char *filter_group = NULL;
-const char *xml_prefix = NULL;
+static const char *filter_test = NULL;
+static const char *filter_device = NULL;
+static const char *filter_group = NULL;
+static const char *xml_prefix = NULL;
 static struct quirks_context *quirks_context;
 
 struct created_file {
@@ -91,8 +91,8 @@
 	char *path;
 };
 
-struct list created_files_list; /* list of all files to remove at the end of
-				   the test run */
+static struct list created_files_list; /* list of all files to remove at the end
+					  of the test run */
 
 static void litest_init_udev_rules(struct list *created_files_list);
 static void litest_remove_udev_rules(struct list *created_files_list);
@@ -319,7 +319,7 @@
 	current_device = NULL;
 }
 
-struct list devices;
+static struct list devices;
 
 static struct list all_tests;
 
@@ -854,7 +854,7 @@
 	close(fd);
 }
 
-struct libinput_interface interface = {
+static struct libinput_interface interface = {
 	.open_restricted = open_restricted,
 	.close_restricted = close_restricted,
 };
@@ -2471,14 +2471,16 @@
 }
 
 void
-litest_tablet_proximity_in(struct litest_device *d, int x, int y, struct axis_replacement *axes)
+litest_tablet_proximity_in(struct litest_device *d,
+			   double x, double y,
+			   struct axis_replacement *axes)
 {
 	struct input_event *ev;
 
 	/* If the test device overrides proximity_in and says it didn't
 	 * handle the event, let's continue normally */
 	if (d->interface->tablet_proximity_in &&
-	    d->interface->tablet_proximity_in(d, d->interface->tool_type, x, y, axes))
+	    d->interface->tablet_proximity_in(d, d->interface->tool_type, &x, &y, axes))
 		return;
 
 	ev = d->interface->tablet_proximity_in_events;
@@ -2528,10 +2530,18 @@
 }
 
 void
-litest_tablet_motion(struct litest_device *d, int x, int y, struct axis_replacement *axes)
+litest_tablet_motion(struct litest_device *d,
+		     double x, double y,
+		     struct axis_replacement *axes)
 {
 	struct input_event *ev;
 
+	/* If the test device overrides proximity_out and says it didn't
+	 * handle the event, let's continue normally */
+	if (d->interface->tablet_motion &&
+	    d->interface->tablet_motion(d, &x, &y, axes))
+		return;
+
 	ev = d->interface->tablet_motion_events;
 	while (ev && (int16_t)ev->type != -1 && (int16_t)ev->code != -1) {
 		int value = auto_assign_tablet_value(d, ev, x, y, axes);
@@ -2543,13 +2553,13 @@
 
 void
 litest_tablet_tip_down(struct litest_device *d,
-		       int x, int y,
+		       double x, double y,
 		       struct axis_replacement *axes)
 {
 	/* If the test device overrides tip_down and says it didn't
 	 * handle the event, let's continue normally */
 	if (d->interface->tablet_tip_down &&
-	    d->interface->tablet_tip_down(d, x, y, axes))
+	    d->interface->tablet_tip_down(d, &x, &y, axes))
 		return;
 
 	litest_event(d, EV_KEY, BTN_TOUCH, 1);
@@ -2558,13 +2568,13 @@
 
 void
 litest_tablet_tip_up(struct litest_device *d,
-		     int x, int y,
+		     double x, double y,
 		     struct axis_replacement *axes)
 {
 	/* If the test device overrides tip_down and says it didn't
 	 * handle the event, let's continue normally */
 	if (d->interface->tablet_tip_up &&
-	    d->interface->tablet_tip_up(d, x, y, axes))
+	    d->interface->tablet_tip_up(d, &x, &y, axes))
 		return;
 
 	litest_event(d, EV_KEY, BTN_TOUCH, 0);
@@ -3986,6 +3996,21 @@
 }
 
 void
+litest_assert_switch_event(struct libinput *li,
+			   enum libinput_switch sw,
+			   enum libinput_switch_state state)
+{
+	struct libinput_event *event;
+
+	litest_wait_for_event(li);
+	event = libinput_get_event(li);
+
+	litest_is_switch_event(event, sw, state);
+
+	libinput_event_destroy(event);
+}
+
+void
 litest_assert_pad_button_event(struct libinput *li,
 			       unsigned int button,
 			       enum libinput_button_state state)

_service:tar_scm:libinput-1.22.1.tar.gz/test/litest.h -> _service:tar_scm:libinput-1.24.0.tar.gz/test/litest.h Changed

@@ -35,6 +35,10 @@
 #include <libinput.h>
 #include <math.h>
 
+#ifndef ck_assert_notnull
+#define ck_assert_notnull(ptr) ck_assert_ptr_ne(ptr, NULL)
+#endif
+
 #include "check-double-macros.h"
 
 #include "libinput-private-config.h"
@@ -323,6 +327,8 @@
 	LITEST_WACOM_ISDV4_524C_PEN,
 	LITEST_MOUSE_FORMAT_STRING,
 	LITEST_LENOVO_SCROLLPOINT,
+	LITEST_SYNAPTICS_PHANTOMCLICKS,
+	LITEST_WACOM_CALIBRATED_TABLET,
 };
 
 #define LITEST_DEVICELESS	-2
@@ -361,6 +367,7 @@
 #define LITEST_DIRECT		bit(30)
 #define LITEST_TOTEM		bit(31)
 #define LITEST_FORCED_PROXOUT	bit(32)
+#define LITEST_PRECALIBRATED	bit(33)
 
 /* this is a semi-mt device, so we keep track of the touches that the tests
  * send and modify them so that the first touch is always slot 0 and sends
@@ -626,7 +633,7 @@
 
 void
 litest_tablet_proximity_in(struct litest_device *d,
-			   int x, int y,
+			   double x, double y,
 			   struct axis_replacement *axes);
 
 void
@@ -634,17 +641,17 @@
 
 void
 litest_tablet_tip_down(struct litest_device *d,
-		       int x, int y,
+		       double x, double y,
 		       struct axis_replacement *axes);
 
 void
 litest_tablet_tip_up(struct litest_device *d,
-		     int x, int y,
+		     double x, double y,
 		     struct axis_replacement *axes);
 
 void
 litest_tablet_motion(struct litest_device *d,
-		     int x, int y,
+		     double x, double y,
 		     struct axis_replacement *axes);
 
 void
@@ -831,6 +838,11 @@
 			   enum libinput_button_state state);
 
 void
+litest_assert_switch_event(struct libinput *li,
+			   enum libinput_switch sw,
+			   enum libinput_switch_state state);
+
+void
 litest_assert_scroll(struct libinput *li,
 		     enum libinput_event_type axis_type,
 		     enum libinput_pointer_axis axis,
@@ -981,10 +993,6 @@
 			struct litest_semi_mt *semi_mt,
 			unsigned int slot);
 
-#ifndef ck_assert_notnull
-#define ck_assert_notnull(ptr) ck_assert_ptr_ne(ptr, NULL)
-#endif
-
 static inline void
 litest_enable_tap(struct libinput_device *device)
 {
@@ -1064,6 +1072,8 @@
 
 	expected = LIBINPUT_CONFIG_STATUS_SUCCESS;
 	litest_assert_int_eq(status, expected);
+
+	libinput_device_config_scroll_set_natural_scroll_enabled(device, 0);
 }
 
 static inline void
@@ -1077,6 +1087,8 @@
 
 	expected = LIBINPUT_CONFIG_STATUS_SUCCESS;
 	litest_assert_int_eq(status, expected);
+
+	libinput_device_config_scroll_set_natural_scroll_enabled(device, 0);
 }
 
 static inline bool
@@ -1259,7 +1271,8 @@
 	return write(sock, buf, n);
 }
 
-static inline int litest_slot_count(struct litest_device *dev)
+static inline int
+litest_slot_count(struct litest_device *dev)
 {
 	if (dev->which == LITEST_ALPS_3FG)
 		return 2;
@@ -1282,7 +1295,7 @@
 	if (bustype == BUS_BLUETOOTH)
 		return 0;
 	if (vendor == VENDOR_ID_APPLE)
-		return 1;
+		return 0;
 
 	rc = libinput_device_get_size(dev->libinput_device, &width, &height);

_service:tar_scm:libinput-1.22.1.tar.gz/test/symbols-leak-test -> _service:tar_scm:libinput-1.24.0.tar.gz/test/symbols-leak-test Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-device.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-device.c Changed

@@ -1477,7 +1477,11 @@
 	     enable_btn_left = false;
 #if HAVE_LIBEVDEV_DISABLE_PROPERTY
 	bool disable_pointingstick = false,
-	     enable_buttonpad = false;
+	     enable_buttonpad = false,
+	     enable_direct = false,
+	     disable_direct = false,
+	     enable_semi_mt = false,
+	     disable_semi_mt = false;
 #endif
 
 	li = litest_create_context();
@@ -1490,6 +1494,8 @@
 						     BTN_LEFT));
 	ck_assert(libinput_device_pointer_has_button(dev->libinput_device,
 						     BTN_RIGHT));
+	ck_assert(!libinput_device_pointer_has_button(device,
+						      BTN_MIDDLE));
 	ck_assert(!libinput_device_keyboard_has_key(dev->libinput_device,
 						    KEY_F1));
 	ck_assert(!libinput_device_keyboard_has_key(dev->libinput_device,
@@ -1510,6 +1516,22 @@
 			enable_buttonpad = true;
 		if (strstr(*message, "disabling INPUT_PROP_POINTING_STICK"))
 			disable_pointingstick = true;
+		if (strstr(*message, "enabling INPUT_PROP_DIRECT")) {
+			ck_assert(!disable_direct);
+			enable_direct = true;
+		}
+		if (strstr(*message, "disabling INPUT_PROP_DIRECT")) {
+			ck_assert(enable_direct);
+			disable_direct = true;
+		}
+		if (strstr(*message, "enabling INPUT_PROP_SEMI_MT")) {
+			ck_assert(disable_semi_mt);
+			enable_semi_mt = true;
+		}
+		if (strstr(*message, "disabling INPUT_PROP_SEMI_MT")) {
+			ck_assert(!enable_semi_mt);
+			disable_semi_mt = true;
+		}
 #endif
 		free(*message);
 		message++;
@@ -1520,6 +1542,10 @@
 #if HAVE_LIBEVDEV_DISABLE_PROPERTY
 	ck_assert(enable_buttonpad);
 	ck_assert(disable_pointingstick);
+	ck_assert(enable_direct);
+	ck_assert(disable_direct);
+	ck_assert(enable_semi_mt);
+	ck_assert(disable_semi_mt);
 #endif
 
 	litest_disable_log_handler(li);
@@ -1598,7 +1624,7 @@
 	ck_assert_int_eq(rc, 0);
 	/* This matches the current set of test devices but may fail if
 	 * newer ones are added */
-	ck_assert_double_gt(w, 40);
+	ck_assert_double_gt(w, 30);
 	ck_assert_double_gt(h, 20);
 }
 END_TEST

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-pad.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-pad.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-pointer.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-pointer.c Changed

@@ -628,6 +628,13 @@
 		v120 *= -1;
 	}
 
+	double angle = libinput_device_config_rotation_get_angle(dev->libinput_device);
+	if (angle >= 160.0 && angle <= 220.0) {
+		expected *= -1;
+		discrete *= -1;
+		v120 *= -1;
+	}
+
 	axis = (which == REL_WHEEL || which == REL_WHEEL_HI_RES) ?
 				LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL :
 				LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
@@ -1060,6 +1067,38 @@
 }
 END_TEST
 
+START_TEST(pointer_scroll_with_rotation)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+	struct libinput_device *device = dev->libinput_device;
+	double angle = _i * 20; /* ranged test */
+
+	litest_drain_events(li);
+	libinput_device_config_rotation_set_angle(device, angle);
+
+	/* make sure we hit at least one of the below two conditions */
+	ck_assert(libevdev_has_event_code(dev->evdev, EV_REL, REL_WHEEL) ||
+		  libevdev_has_event_code(dev->evdev, EV_REL, REL_HWHEEL));
+
+	if (libevdev_has_event_code(dev->evdev, EV_REL, REL_WHEEL)) {
+		test_wheel_event(dev, REL_WHEEL, -1);
+		test_wheel_event(dev, REL_WHEEL, 1);
+
+		test_wheel_event(dev, REL_WHEEL, -5);
+		test_wheel_event(dev, REL_WHEEL, 6);
+	}
+
+	if (libevdev_has_event_code(dev->evdev, EV_REL, REL_HWHEEL)) {
+		test_wheel_event(dev, REL_HWHEEL, -1);
+		test_wheel_event(dev, REL_HWHEEL, 1);
+
+		test_wheel_event(dev, REL_HWHEEL, -5);
+		test_wheel_event(dev, REL_HWHEEL, 6);
+	}
+}
+END_TEST
+
 START_TEST(pointer_seat_button_count)
 {
 	struct litest_device *devices4;
@@ -1304,6 +1343,38 @@
 }
 END_TEST
 
+START_TEST(pointer_left_handed_disable_with_button_down)
+{
+	struct libinput *li = litest_create_context();
+	struct litest_device *dev = litest_add_device(li, LITEST_MOUSE);
+
+	enum libinput_config_status status;
+	status = libinput_device_config_left_handed_set(dev->libinput_device, 1);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+	litest_drain_events(li);
+	litest_button_click_debounced(dev, li, BTN_LEFT, 1);
+	libinput_dispatch(li);
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_PRESSED);
+
+	litest_delete_device(dev);
+	libinput_dispatch(li);
+
+	litest_assert_button_event(li,
+				   BTN_RIGHT,
+				   LIBINPUT_BUTTON_STATE_RELEASED);
+
+	struct libinput_event *event = libinput_get_event(li);
+	litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_REMOVED);
+	litest_assert_empty_queue(li);
+	libinput_event_destroy(event);
+
+	litest_destroy_context(li);
+}
+END_TEST
+
 START_TEST(pointer_scroll_button)
 {
 	struct litest_device *dev = litest_current_device();
@@ -2220,6 +2291,7 @@
 	profiles = libinput_device_config_accel_get_profiles(device);
 	ck_assert(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE);
 	ck_assert(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT);
+	ck_assert(profiles & LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
 
 	status = libinput_device_config_accel_set_profile(device,
 							  LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT);
@@ -2235,6 +2307,106 @@
 	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
 	profile = libinput_device_config_accel_get_profile(device);
 	ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE);
+
+	status = libinput_device_config_accel_set_profile(device,
+							  LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+	profile = libinput_device_config_accel_get_profile(device);
+	ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+}
+END_TEST
+
+START_TEST(pointer_accel_config_reset_to_defaults)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *device = dev->libinput_device;
+	double default_speed = libinput_device_config_accel_get_default_speed(device);
+
+	/* There are no settings for these profiles to toggle, so we expect it
+	 * to simply reset to defaults */
+	enum libinput_config_accel_profile profiles = {
+		LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
+		LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT,
+	};
+
+	ARRAY_FOR_EACH(profiles, profile) {
+		ck_assert_int_eq(libinput_device_config_accel_set_speed(device, 1.0),
+				 LIBINPUT_CONFIG_STATUS_SUCCESS);
+
+		ck_assert_double_eq(libinput_device_config_accel_get_speed(device), 1.0);
+
+		struct libinput_config_accel *config =
+			libinput_config_accel_create(LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE);
+		ck_assert_int_eq(libinput_device_config_accel_apply(device, config),
+				 LIBINPUT_CONFIG_STATUS_SUCCESS);
+		ck_assert_double_eq(libinput_device_config_accel_get_speed(device),
+				    default_speed);
+		libinput_config_accel_destroy(config);
+	}
+}
+END_TEST
+
+START_TEST(pointer_accel_config)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput_device *device = dev->libinput_device;
+	enum libinput_config_status status;
+	enum libinput_config_accel_profile profile;
+	enum libinput_config_status valid = LIBINPUT_CONFIG_STATUS_SUCCESS,
+				    invalid = LIBINPUT_CONFIG_STATUS_INVALID;
+	enum libinput_config_accel_type accel_types = {
+		LIBINPUT_ACCEL_TYPE_FALLBACK,
+		LIBINPUT_ACCEL_TYPE_MOTION,
+		LIBINPUT_ACCEL_TYPE_SCROLL,
+	};
+	struct custom_config_test {
+		double step;
+		double points4;
+		enum libinput_config_status expected_status;
+	} tests = {
+		{ 0.5,   { 1.0, 2.0, 2.5, 2.6 },  valid },
+		{ 0.003, { 0.1, 0.3, 0.4, 0.45 }, valid },
+		{ 2.7,   { 1.0, 3.0, 4.5, 4.5 },  valid },
+		{ 0,     { 1.0, 2.0, 2.5, 2.6 },  invalid },
+		{ -1,    { 1.0, 2.0, 2.5, 2.6 },  invalid },
+		{ 1e10,  { 1.0, 2.0, 2.5, 2.6 },  invalid },
+		{ 1,     { 1.0, 2.0, -2.5, 2.6 }, invalid },
+		{ 1,     { 1.0, 2.0, 1e10, 2.6 }, invalid },
+	};
+
+	ck_assert(libinput_device_config_accel_is_available(device));
+
+	struct libinput_config_accel *config_custom_default =
+		libinput_config_accel_create(LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+	struct libinput_config_accel *config_custom_changed =
+		libinput_config_accel_create(LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+
+	ck_assert_ptr_nonnull(config_custom_default);
+	ck_assert_ptr_nonnull(config_custom_changed);
+
+	ARRAY_FOR_EACH(tests, t) {
+		ARRAY_FOR_EACH(accel_types, accel_type) {
+			status = libinput_config_accel_set_points(config_custom_changed,
+								  *accel_type,
+								  t->step,
+								  ARRAY_LENGTH(t->points),
+								  t->points);
+			ck_assert_int_eq(status, t->expected_status);
+
+			status = libinput_device_config_accel_apply(device, config_custom_changed);
+			ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+			profile = libinput_device_config_accel_get_profile(device);
+			ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+
+			status = libinput_device_config_accel_apply(device, config_custom_default);
+			ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
+			profile = libinput_device_config_accel_get_profile(device);
+			ck_assert_int_eq(profile, LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+		}

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-switch.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-switch.c Changed

@@ -1097,13 +1097,23 @@
 
 	litest_keyboard_key(keyboard, KEY_A, true);
 	litest_keyboard_key(keyboard, KEY_A, false);
-	litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY);
+	litest_keyboard_key(keyboard, KEY_B, true); /* KEY_B down but not up */
+	libinput_dispatch(li);
+
+	litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED);
+	litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED);
+	litest_assert_key_event(li, KEY_B, LIBINPUT_KEY_STATE_PRESSED); /* KEY_B down but not up */
 
 	litest_switch_action(sw,
 			     LIBINPUT_SWITCH_TABLET_MODE,
 			     LIBINPUT_SWITCH_STATE_ON);
-	litest_drain_events(li);
 
+	/* The key currently down must be released */
+	litest_assert_key_event(li, KEY_B, LIBINPUT_KEY_STATE_RELEASED);
+	litest_assert_switch_event(li, LIBINPUT_SWITCH_TABLET_MODE, LIBINPUT_SWITCH_STATE_ON);
+	litest_assert_empty_queue(li);
+
+	litest_keyboard_key(keyboard, KEY_B, false); /* release the kernel device */
 	litest_keyboard_key(keyboard, KEY_A, true);
 	litest_keyboard_key(keyboard, KEY_A, false);
 	litest_assert_empty_queue(li);
@@ -1111,11 +1121,16 @@
 	litest_switch_action(sw,
 			     LIBINPUT_SWITCH_TABLET_MODE,
 			     LIBINPUT_SWITCH_STATE_OFF);
-	litest_assert_only_typed_events(li, LIBINPUT_EVENT_SWITCH_TOGGLE);
+	litest_assert_switch_event(li, LIBINPUT_SWITCH_TABLET_MODE, LIBINPUT_SWITCH_STATE_OFF);
 
 	litest_keyboard_key(keyboard, KEY_A, true);
 	litest_keyboard_key(keyboard, KEY_A, false);
-	litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY);
+	litest_keyboard_key(keyboard, KEY_B, true);
+	litest_keyboard_key(keyboard, KEY_B, false);
+	litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED);
+	litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED);
+	litest_assert_key_event(li, KEY_B, LIBINPUT_KEY_STATE_PRESSED);
+	litest_assert_key_event(li, KEY_B, LIBINPUT_KEY_STATE_RELEASED);
 
 	litest_delete_device(keyboard);
 }

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-tablet.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-tablet.c Changed

@@ -3808,18 +3808,42 @@
 }
 END_TEST
 
+static void
+assert_pressure(struct libinput *li, enum libinput_event_type type, double expected_pressure)
+{
+	struct libinput_event *event = libinput_get_event(li);
+	struct libinput_event_tablet_tool *tev = litest_is_tablet_event(event, type);
+	double pressure = libinput_event_tablet_tool_get_pressure(tev);
+	ck_assert_double_eq_tol(pressure, expected_pressure, 0.01);
+	libinput_event_destroy(event);
+}
+
 START_TEST(tablet_pressure_offset_set)
 {
 	struct litest_device *dev = litest_current_device();
 	struct libinput *li = dev->libinput;
 	struct libinput_event *event;
-	struct libinput_event_tablet_tool *tev;
 	struct axis_replacement axes = {
 		{ ABS_DISTANCE, 70 },
 		{ ABS_PRESSURE, 20 },
 		{ -1, -1 },
 	};
-	double pressure;
+
+	litest_drain_events(li);
+
+	if (!libevdev_has_event_code(dev->evdev, EV_ABS, ABS_DISTANCE)) {
+		/* First two prox ins won't do anything, coming with 10% should give
+		 * us ~10% pressure */
+		for (int i = 0; i < 2; i++) {
+			litest_tablet_proximity_in(dev, 5, 100, axes);
+			libinput_dispatch(li);
+
+			assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, 0.20);
+			assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.20);
+			litest_tablet_proximity_out(dev);
+			litest_drain_events(li);
+		}
+	}
 
 	/* This activates the pressure offset */
 	litest_tablet_proximity_in(dev, 5, 100, axes);
@@ -3845,30 +3869,16 @@
 	litest_tablet_motion(dev, 70, 70, axes);
 	libinput_dispatch(li);
 
-	event = libinput_get_event(li);
-	tev = litest_is_tablet_event(event,
-				     LIBINPUT_EVENT_TABLET_TOOL_AXIS);
-	pressure = libinput_event_tablet_tool_get_pressure(tev);
-
 	/* we can't actually get a real 0.0 because that would trigger a tip
 	   up. but it's close enough to zero. */
-	ck_assert_double_lt(pressure, 0.01);
-
-	libinput_event_destroy(event);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 0.01);
 	litest_drain_events(li);
 
 	litest_axis_set_value(axes, ABS_PRESSURE, 21);
 	litest_tablet_motion(dev, 70, 70, axes);
 
 	libinput_dispatch(li);
-	event = libinput_get_event(li);
-	tev = litest_is_tablet_event(event,
-				     LIBINPUT_EVENT_TABLET_TOOL_AXIS);
-
-	pressure = libinput_event_tablet_tool_get_pressure(tev);
-
-	ck_assert_double_lt(pressure, 0.015);
-	libinput_event_destroy(event);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 0.015);
 
 
 	/* Make sure we can reach the upper range too */
@@ -3876,14 +3886,7 @@
 	litest_tablet_motion(dev, 70, 70, axes);
 
 	libinput_dispatch(li);
-	event = libinput_get_event(li);
-	tev = litest_is_tablet_event(event,
-				     LIBINPUT_EVENT_TABLET_TOOL_AXIS);
-
-	pressure = libinput_event_tablet_tool_get_pressure(tev);
-
-	ck_assert_double_ge(pressure, 1.0);
-	libinput_event_destroy(event);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 1.0);
 
 	/* Tablet motion at offset should trigger tip up. Use
 	 * the litest motion helper here to avoid false positives caused by
@@ -3902,36 +3905,33 @@
 {
 	struct litest_device *dev = litest_current_device();
 	struct libinput *li = dev->libinput;
-	struct libinput_event *event;
-	struct libinput_event_tablet_tool *tev;
 	struct axis_replacement axes = {
 		{ ABS_DISTANCE, 70 },
 		{ ABS_PRESSURE, 20 },
 		{ -1, -1 },
 	};
-	double pressure;
 
 	/* offset 20 on prox in */
 	litest_tablet_proximity_in(dev, 5, 100, axes);
 	litest_tablet_proximity_out(dev);
 	litest_drain_events(li);
 
+	/* offset 15 on prox in - this one is so we trigger on the next prox
+	 * in for the no-distance tablets */
+	litest_axis_set_value(axes, ABS_PRESSURE, 15);
+	litest_tablet_proximity_in(dev, 5, 100, axes);
+	litest_tablet_proximity_out(dev);
+	litest_drain_events(li);
+
 	/* a reduced pressure value must reduce the offset */
 	litest_axis_set_value(axes, ABS_PRESSURE, 10);
 	litest_tablet_proximity_in(dev, 5, 100, axes);
 	litest_tablet_proximity_out(dev);
 	litest_drain_events(li);
 
-	/* a higher pressure value leaves it as-is */
 	litest_tablet_proximity_in(dev, 5, 100, axes);
 	libinput_dispatch(li);
-	event = libinput_get_event(li);
-	tev = litest_is_tablet_event(event,
-				     LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
-	pressure = libinput_event_tablet_tool_get_pressure(tev);
-	ck_assert_double_eq(pressure, 0.0);
-
-	libinput_event_destroy(event);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, 0.0);
 	litest_drain_events(li);
 
 	/* trigger the pressure threshold */
@@ -3939,18 +3939,31 @@
 	litest_tablet_tip_down(dev, 70, 70, axes);
 	libinput_dispatch(li);
 
-	event = libinput_get_event(li);
-	tev = litest_is_tablet_event(event,
-				     LIBINPUT_EVENT_TABLET_TOOL_TIP);
-
-	pressure = libinput_event_tablet_tool_get_pressure(tev);
-
 	/* offset 10 + lower threshold of ~1% of original range,
 	 * value 15 is 5% over original range but with the above taken into
 	 * account it's closer to 5% into the remaining effective 89% range
 	 */
-	ck_assert_double_eq_tol(pressure, 0.05, 0.01);
-	libinput_event_destroy(event);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.05);
+
+	/* a reduced pressure value during motion events must reduce the offset
+	 * - here back down to 5%.
+	 * FIXME: this causes a tip up event which is a bug but working around
+	 * this is more effort than it's worth for what should be quite a niche
+	 * case.
+	 */
+	litest_axis_set_value(axes, ABS_PRESSURE, 5);
+	litest_tablet_motion(dev, 75, 75, axes);
+	libinput_dispatch(li);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.0);
+	litest_drain_events(li);
+
+	/* back to 10% should now give us 5% pressure because we reduced the
+	 * offset */
+        litest_axis_set_value(axes, ABS_PRESSURE, 10);
+	litest_tablet_motion(dev, 75, 75, axes);
+	libinput_dispatch(li);
+	assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.05);
+	litest_drain_events(li);
 }
 END_TEST
 
@@ -3958,21 +3971,24 @@
 {
 	struct litest_device *dev = litest_current_device();
 	struct libinput *li = dev->libinput;
-	struct libinput_event *event;
-	struct libinput_event_tablet_tool *tev;
 	struct axis_replacement axes = {
 		{ ABS_DISTANCE, 70 },
 		{ ABS_PRESSURE, 20 },
 		{ -1, -1 },
 	};
-	double pressure;
 
 	/* offset 20 on first prox in */
 	litest_tablet_proximity_in(dev, 5, 100, axes);
 	litest_tablet_proximity_out(dev);
 	litest_drain_events(li);
 
-	/* offset 30 on second prox in - must not change the offset */
+	/* offset 25 on second prox in - must not change the offset */
+	litest_axis_set_value(axes, ABS_PRESSURE, 25);

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-touchpad-buttons.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-touchpad-buttons.c Changed

@@ -169,6 +169,12 @@
 	struct litest_device *dev = litest_current_device();
 	struct libinput *li = dev->libinput;
 
+	if (dev->which == LITEST_SYNAPTICS_PHANTOMCLICKS) {
+		/* The XPS 15 9500 touchpad has the ModelTouchpadPhantomClicks
+		 * quirk enabled and doesn't generate events without touches. */
+		return;
+	}
+
 	litest_enable_clickfinger(dev);
 
 	litest_drain_events(li);
@@ -187,6 +193,26 @@
 }
 END_TEST
 
+START_TEST(touchpad_1fg_clickfinger_no_touch_phantomclicks)
+{
+	struct litest_device *dev = litest_current_device();
+	struct libinput *li = dev->libinput;
+
+	litest_enable_clickfinger(dev);
+
+	litest_drain_events(li);
+
+	litest_event(dev, EV_KEY, BTN_LEFT, 1);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+	litest_event(dev, EV_KEY, BTN_LEFT, 0);
+	litest_event(dev, EV_SYN, SYN_REPORT, 0);
+
+	libinput_dispatch(li);
+
+	litest_assert_empty_queue(li);
+}
+END_TEST
+
 START_TEST(touchpad_2fg_clickfinger)
 {
 	struct litest_device *dev = litest_current_device();
@@ -1410,7 +1436,7 @@
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 1, 20, 20);
-	litest_touch_move_to(dev, 1, 20, 20, 80, 20, 10);
+	litest_touch_move_to(dev, 1, 20, 20, 80, 20, 15);
 
 	libinput_dispatch(li);
 	event = libinput_get_event(li);
@@ -1441,7 +1467,7 @@
 
 	/* second finger down */
 	litest_touch_down(dev, 1, 20, 20);
-	litest_touch_move_to(dev, 1, 20, 20, 20, 80, 10);
+	litest_touch_move_to(dev, 1, 20, 20, 20, 80, 15);
 
 	libinput_dispatch(li);
 	event = libinput_get_event(li);
@@ -1492,7 +1518,7 @@
 	*/
 
 	litest_touch_down(dev, 0, 30, 90);
-	litest_touch_move_to(dev, 0, 30, 90, 90, 90, 10);
+	litest_touch_move_to(dev, 0, 30, 90, 90, 90, 15);
 	litest_drain_events(li);
 
 	litest_event(dev, EV_KEY, BTN_LEFT, 1);
@@ -1528,7 +1554,7 @@
 	*/
 
 	litest_touch_down(dev, 0, 80, 90);
-	litest_touch_move_to(dev, 0, 80, 90, 30, 90, 10);
+	litest_touch_move_to(dev, 0, 80, 90, 30, 90, 15);
 	litest_drain_events(li);
 
 	litest_event(dev, EV_KEY, BTN_LEFT, 1);
@@ -2130,6 +2156,8 @@
 	litest_add_for_device(touchpad_clickfinger_appletouch_2fg, LITEST_APPLETOUCH);
 	litest_add_for_device(touchpad_clickfinger_appletouch_3fg, LITEST_APPLETOUCH);
 
+	litest_add_for_device(touchpad_1fg_clickfinger_no_touch_phantomclicks, LITEST_SYNAPTICS_PHANTOMCLICKS);
+
 	litest_add_ranged(touchpad_clickfinger_click_drag, LITEST_CLICKPAD, LITEST_ANY, &finger_count);
 
 	litest_add(touchpad_click_defaults_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY);

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-touchpad.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-touchpad.c Changed

@@ -611,9 +611,11 @@
 {
 	struct litest_device *dev = litest_current_device();
 
+	int enabled = libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_APPLE;
+
 	ck_assert_int_ge(libinput_device_config_scroll_has_natural_scroll(dev->libinput_device), 1);
-	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0);
-	ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), 0);
+	ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), enabled);
+	ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), enabled);
 }
 END_TEST
 
@@ -799,7 +801,7 @@
 	litest_enable_edge_scroll(dev);
 
 	litest_touch_down(dev, 0, 20, 99);
-	litest_touch_move_to(dev, 0, 20, 99, 70, 99, 10);
+	litest_touch_move_to(dev, 0, 20, 99, 70, 99, 15);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -810,7 +812,7 @@
 	litest_assert_empty_queue(li);
 
 	litest_touch_down(dev, 0, 70, 99);
-	litest_touch_move_to(dev, 0, 70, 99, 20, 99, 10);
+	litest_touch_move_to(dev, 0, 70, 99, 20, 99, 15);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -1123,7 +1125,7 @@
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 20, 95);
-	litest_touch_move_to(dev, 0, 20, 95, 70, 95, 10);
+	litest_touch_move_to(dev, 0, 20, 95, 70, 95, 15);
 	litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER);
 
 	litest_button_click(dev, BTN_LEFT, true);
@@ -1148,7 +1150,7 @@
 	 * edge scrolling, click, then scrolling without lifting the finger
 	 * is so small we'll let it pass.
 	 */
-	litest_touch_move_to(dev, 0, 70, 95, 90, 95, 10);
+	litest_touch_move_to(dev, 0, 70, 95, 90, 95, 15);
 	litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION);
 
 	litest_button_click(dev, BTN_LEFT, false);
@@ -1173,7 +1175,7 @@
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 20, 95);
-	litest_touch_move_to(dev, 0, 20, 95, 70, 95, 10);
+	litest_touch_move_to(dev, 0, 20, 95, 70, 95, 15);
 	litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER);
 
 	litest_button_click(dev, BTN_LEFT, true);
@@ -1192,7 +1194,7 @@
 	libinput_event_destroy(event);
 
 	/* clickfinger releases pointer -> expect movement */
-	litest_touch_move_to(dev, 0, 70, 95, 90, 95, 10);
+	litest_touch_move_to(dev, 0, 70, 95, 90, 95, 15);
 	litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION);
 	litest_assert_empty_queue(li);
 
@@ -1284,7 +1286,7 @@
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 20, 1);
-	litest_touch_move_to(dev, 0, 20, 1, 70, 1, 10);
+	litest_touch_move_to(dev, 0, 20, 1, 70, 1, 15);
 	litest_touch_up(dev, 0);
 
 	litest_assert_empty_queue(li);
@@ -1431,7 +1433,7 @@
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 99, 50);
-	litest_touch_move_to(dev, 0, 99, 50, 0, 70, 20);
+	litest_touch_move_to(dev, 0, 99, 50, 0, 70, 25);
 	litest_touch_up(dev, 0);
 
 	libinput_dispatch(li);
@@ -1481,11 +1483,11 @@
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 99, 50, 10);
+	litest_touch_move_to(dev, 0, 50, 50, 99, 50, 15);
 
 	litest_drain_events(li);
 
-	litest_touch_move_to(dev, 0, 99, 50, 99, 90, 10);
+	litest_touch_move_to(dev, 0, 99, 50, 99, 90, 15);
 	libinput_dispatch(li);
 
 	litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION);
@@ -1511,11 +1513,11 @@
 	litest_drain_events(li);
 
 	litest_touch_down(dev, 0, 50, 50);
-	litest_touch_move_to(dev, 0, 50, 50, 0, 2, 10);
+	litest_touch_move_to(dev, 0, 50, 50, 0, 2, 15);
 
 	litest_drain_events(li);
 
-	litest_touch_move_to(dev, 0, 0, 2, 50, 50, 10);
+	litest_touch_move_to(dev, 0, 0, 2, 50, 50, 15);
 	libinput_dispatch(li);
 
 	litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION);
@@ -1602,6 +1604,8 @@
 	litest_disable_hold_gestures(dev->libinput_device);
 	litest_drain_events(li);
 
+	/* Two touches in the software button area, but inside
+	 * the palm detection edge zone -> expect palm detection */
 	litest_touch_down(dev, 0, 99, 99);
 	litest_touch_up(dev, 0);
 	libinput_dispatch(li);
@@ -1616,6 +1620,8 @@
 	litest_timeout_tap();
 	litest_assert_empty_queue(li);
 
+	/* Two touches in the software button area, but
+	 * not in the palm detection edge zone -> expect taps */
 	litest_touch_down(dev, 0, 10, 99);
 	litest_touch_up(dev, 0);
 	libinput_dispatch(li);
@@ -1657,6 +1663,8 @@
 	litest_disable_hold_gestures(dev->libinput_device);
 	litest_drain_events(li);
 
+	/* Taps in each of the 4 corners of the touchpad, all
+	 * inside the palm detection edge zone*/
 	litest_touch_down(dev, 0, 95, 5);
 	litest_touch_up(dev, 0);
 	libinput_dispatch(li);
@@ -2675,11 +2683,13 @@
 }
 END_TEST
 
+#if HAVE_LIBWACOM
 static inline bool
 touchpad_has_rotation(struct libevdev *evdev)
 {
 	return libevdev_get_id_vendor(evdev) == VENDOR_ID_WACOM;
 }
+#endif /* HAVE_LIBWACOM */
 
 START_TEST(touchpad_left_handed_rotation)
 {

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-trackball.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-trackball.c Changed

@@ -81,8 +81,6 @@
 	ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
 
 	for (angle = 1; angle < 360; angle++) {
-		if (angle % 90 == 0)
-			continue;
 		status = libinput_device_config_rotation_set_angle(device,
 								   angle);
 		ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_UNSUPPORTED);
@@ -117,11 +115,9 @@
 	ck_assert(libinput_device_config_rotation_is_available(device));
 
 	for (angle = 0; angle < 360; angle++) {
-		if (angle % 90 == 0)
-			continue;
 		status = libinput_device_config_rotation_set_angle(device,
 								   angle);
-		ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_INVALID);
+		ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
 	}
 }
 END_TEST
@@ -263,7 +259,7 @@
 {
 	litest_add(trackball_rotation_config_defaults, LITEST_TRACKBALL, LITEST_ANY);
 	litest_add(trackball_rotation_config_invalid_range, LITEST_TRACKBALL, LITEST_ANY);
-	litest_add(trackball_rotation_config_no_rotation, LITEST_ANY, LITEST_TRACKBALL);
+	litest_add(trackball_rotation_config_no_rotation, LITEST_POINTINGSTICK, LITEST_ANY);
 	litest_add(trackball_rotation_config_right_angle, LITEST_TRACKBALL, LITEST_ANY);
 	litest_add(trackball_rotation_config_odd_angle, LITEST_TRACKBALL, LITEST_ANY);
 	litest_add(trackball_rotation_x, LITEST_TRACKBALL, LITEST_ANY);

_service:tar_scm:libinput-1.22.1.tar.gz/test/test-utils.c -> _service:tar_scm:libinput-1.24.0.tar.gz/test/test-utils.c Changed

@@ -560,47 +560,50 @@
 	struct parser_test_tuple {
 		const char *prop;
 		bool success;
-		size_t ntuples;
-		int tuples20;
+		size_t nevents;
+		struct input_event events20;
 	} tests = {
-		{ "EV_KEY", true, 1, {EV_KEY, 0xffff} },
-		{ "EV_ABS;", true, 1, {EV_ABS, 0xffff} },
-		{ "ABS_X;", true, 1, {EV_ABS, ABS_X} },
-		{ "SW_TABLET_MODE;", true, 1, {EV_SW, SW_TABLET_MODE} },
-		{ "EV_SW", true, 1, {EV_SW, 0xffff} },
-		{ "ABS_Y", true, 1, {EV_ABS, ABS_Y} },
-		{ "EV_ABS:0x00", true, 1, {EV_ABS, ABS_X} },
-		{ "EV_ABS:01", true, 1, {EV_ABS, ABS_Y} },
-		{ "ABS_TILT_X;ABS_TILT_Y;", true, 2,
-			{ EV_ABS, ABS_TILT_X,
-			  EV_ABS, ABS_TILT_Y} },
-		{ "BTN_TOOL_DOUBLETAP;EV_KEY;KEY_A", true, 3,
-			{ EV_KEY, BTN_TOOL_DOUBLETAP,
-			  EV_KEY, 0xffff,
-			  EV_KEY, KEY_A } },
-		{ "REL_Y;ABS_Z;BTN_STYLUS", true, 3,
-			{ EV_REL, REL_Y,
-			  EV_ABS, ABS_Z,
-			  EV_KEY, BTN_STYLUS } },
-		{ "REL_Y;EV_KEY:0x123;BTN_STYLUS", true, 3,
-			{ EV_REL, REL_Y,
-			  EV_KEY, 0x123,
-			  EV_KEY, BTN_STYLUS } },
+		{ "+EV_KEY", true, 1, {{ .type = EV_KEY, .code = 0xffff, .value = 1 }} },
+		{ "-EV_ABS;", true, 1, {{ .type = EV_ABS, .code = 0xffff, .value = 0 }} },
+		{ "+ABS_X;", true, 1, {{ .type = EV_ABS, .code = ABS_X, .value = 1 }} },
+		{ "-SW_TABLET_MODE;", true, 1, {{ .type = EV_SW, .code = SW_TABLET_MODE, .value = 0 }} },
+		{ "+EV_SW", true, 1, {{ .type = EV_SW, .code = 0xffff, .value = 1 }} },
+		{ "-ABS_Y", true, 1, {{ .type = EV_ABS, .code = ABS_Y, .value = 0 }} },
+		{ "+EV_ABS:0x00", true, 1, {{ .type = EV_ABS, .code = ABS_X, .value = 1 }} },
+		{ "-EV_ABS:01", true, 1, {{ .type = EV_ABS, .code = ABS_Y, .value = 0 }} },
+		{ "+ABS_TILT_X;-ABS_TILT_Y;", true, 2,
+			{{ .type = EV_ABS, .code = ABS_TILT_X, .value = 1 },
+			 { .type = EV_ABS, .code = ABS_TILT_Y, .value = 0}} },
+		{ "+BTN_TOOL_DOUBLETAP;+EV_KEY;-KEY_A", true, 3,
+			{{ .type = EV_KEY, .code = BTN_TOOL_DOUBLETAP, .value = 1 } ,
+			 { .type = EV_KEY, .code = 0xffff, .value = 1 },
+			 { .type = EV_KEY, .code = KEY_A, .value = 0 }} },
+		{ "+REL_Y;-ABS_Z;+BTN_STYLUS", true, 3,
+			{{ .type = EV_REL, .code = REL_Y, .value = 1},
+			 { .type = EV_ABS, .code = ABS_Z, .value = 0},
+			 { .type = EV_KEY, .code = BTN_STYLUS, .value = 1 }} },
+		{ "-REL_Y;+EV_KEY:0x123;-BTN_STYLUS", true, 3,
+			{{ .type = EV_REL, .code = REL_Y, .value = 0 },
+			 { .type = EV_KEY, .code = 0x123, .value = 1 },
+			 { .type = EV_KEY, .code = BTN_STYLUS, .value = 0 }} },
 		{ .prop = "", .success = false },
-		{ .prop = "EV_FOO", .success = false },
-		{ .prop = "EV_KEY;EV_FOO", .success = false },
-		{ .prop = "BTN_STYLUS;EV_FOO", .success = false },
-		{ .prop = "BTN_UNKNOWN", .success = false },
-		{ .prop = "BTN_UNKNOWN;EV_KEY", .success = false },
-		{ .prop = "PR_UNKNOWN", .success = false },
-		{ .prop = "BTN_STYLUS;PR_UNKNOWN;ABS_X", .success = false },
-		{ .prop = "EV_REL:0xffff", .success = false },
-		{ .prop = "EV_REL:0x123.", .success = false },
-		{ .prop = "EV_REL:ffff", .success = false },
-		{ .prop = "EV_REL:blah", .success = false },
-		{ .prop = "KEY_A:0x11", .success = false },
-		{ .prop = "EV_KEY:0x11 ", .success = false },
-		{ .prop = "EV_KEY:0x11not", .success = false },
+		{ .prop = "+", .success = false },
+		{ .prop = "-", .success = false },
+		{ .prop = "!", .success = false },
+		{ .prop = "+EV_FOO", .success = false },
+		{ .prop = "+EV_KEY;-EV_FOO", .success = false },
+		{ .prop = "+BTN_STYLUS;-EV_FOO", .success = false },
+		{ .prop = "-BTN_UNKNOWN", .success = false },
+		{ .prop = "+BTN_UNKNOWN;+EV_KEY", .success = false },
+		{ .prop = "-PR_UNKNOWN", .success = false },
+		{ .prop = "-BTN_STYLUS;+PR_UNKNOWN;-ABS_X", .success = false },
+		{ .prop = "-EV_REL:0xffff", .success = false },
+		{ .prop = "-EV_REL:0x123.", .success = false },
+		{ .prop = "-EV_REL:ffff", .success = false },
+		{ .prop = "-EV_REL:blah", .success = false },
+		{ .prop = "+KEY_A:0x11", .success = false },
+		{ .prop = "+EV_KEY:0x11 ", .success = false },
+		{ .prop = "+EV_KEY:0x11not", .success = false },
 		{ .prop = "none", .success = false },
 		{ .prop = NULL },
 	};
@@ -617,14 +620,14 @@
 		if (!success)
 			continue;
 
-		ck_assert_int_eq(nevents, t->ntuples);
+		ck_assert_int_eq(nevents, t->nevents);
 		for (size_t j = 0; j < nevents; j++) {
-			int type, code;
-
-			type = eventsj.type;
-			code = eventsj.code;
-			ck_assert_int_eq(t->tuplesj * 2, type);
-			ck_assert_int_eq(t->tuplesj * 2 + 1, code);
+			unsigned int type = eventsj.type;
+			unsigned int code = eventsj.code;
+			int value = eventsj.value;
+			ck_assert_int_eq(t->eventsj.type, type);
+			ck_assert_int_eq(t->eventsj.code, code);
+			ck_assert_int_eq(t->eventsj.value, value);
 		}
 	}
 }
@@ -636,16 +639,16 @@
 		const char *prop;
 		bool success;
 		size_t nvals;
-		uint32_t values20;
+		struct input_prop values20;
 	} tests = {
-		{ "INPUT_PROP_BUTTONPAD", true, 1, {INPUT_PROP_BUTTONPAD}},
-		{ "INPUT_PROP_BUTTONPAD;INPUT_PROP_POINTER", true, 2,
-			{ INPUT_PROP_BUTTONPAD,
-			  INPUT_PROP_POINTER }},
-		{ "INPUT_PROP_BUTTONPAD;0x00;0x03", true, 3,
-			{ INPUT_PROP_BUTTONPAD,
-			  INPUT_PROP_POINTER,
-			  INPUT_PROP_SEMI_MT }},
+		{ "+INPUT_PROP_BUTTONPAD", true, 1, {{ INPUT_PROP_BUTTONPAD, true }}},
+		{ "+INPUT_PROP_BUTTONPAD;-INPUT_PROP_POINTER", true, 2,
+			{ { INPUT_PROP_BUTTONPAD, true },
+			  { INPUT_PROP_POINTER, false }}},
+		{ "+INPUT_PROP_BUTTONPAD;-0x00;+0x03", true, 3,
+			{ { INPUT_PROP_BUTTONPAD, true },
+			  { INPUT_PROP_POINTER, false },
+			  { INPUT_PROP_SEMI_MT, true }}},
 		{ .prop = "", .success = false },
 		{ .prop = "0xff", .success = false },
 		{ .prop = "INPUT_PROP", .success = false },
@@ -659,7 +662,7 @@
 
 	for (int i = 0; testsi.prop; i++) {
 		bool success;
-		uint32_t props32;
+		struct input_prop props32;
 		size_t nprops = ARRAY_LENGTH(props);
 
 		t = &testsi;
@@ -670,7 +673,8 @@
 
 		ck_assert_int_eq(nprops, t->nvals);
 		for (size_t j = 0; j < t->nvals; j++) {
-			ck_assert_int_eq(t->valuesj, propsj);
+			ck_assert_int_eq(t->valuesj.prop, propsj.prop);
+			ck_assert_int_eq(t->valuesj.enabled, propsj.enabled);
 		}
 	}
 }
@@ -1115,6 +1119,50 @@
 }
 END_TEST
 
+START_TEST(double_array_from_string_test)
+{
+	struct double_array_from_string_test {
+		const char *string;
+		const char *delim;
+		const double array10;
+		const size_t len;
+		const bool result;
+	} tests = {
+		{ "1 2 3", " ", { 1, 2, 3 }, 3 },
+		{ "1", " ", { 1 }, 1 },
+		{ "1,2.5,", ",", { 1, 2.5 }, 2 },
+		{ "1.0  2", " ", { 1, 2.0 }, 2 },
+		{ " 1 2", " ", { 1, 2 }, 2 },
+		{ " ; 1;2  3.5  ;;4.1", "; ", { 1, 2, 3.5, 4.1 }, 4 },
+		/* special cases */
+		{ "1 two", " ", { 0 }, 0 },
+		{ "one two", " ", { 0 }, 0 },
+		{ "one 2", " ", { 0 }, 0 },
+		{ "", " ", { 0 }, 0 },
+		{ " ", " ", { 0 }, 0 },
+		{ "    ", " ", { 0 }, 0 },
+		{ "", " ", { 0 }, 0 },
+		{ "oneoneone", "one", { 0 }, 0 },
+		{ NULL, NULL, { 0 }, 0 }
+	};
+	struct double_array_from_string_test *t = tests;
+
+	while (t->string) {
+		size_t len;
+		double *array = double_array_from_string(t->string,
+							 t->delim,
+							 &len);
+		ck_assert_int_eq(len, t->len);
+
+		for (size_t idx = 0; idx < len; idx++)
+			ck_assert_double_eq(arrayidx, t->arrayidx);
+
+		free(array);

_service:tar_scm:libinput-1.24.0.tar.gz/test/test_quirks_files.py Added

@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+#
+# This file is formatted with Python Black
+#
+# Run with pytest
+
+from pathlib import Path
+
+import configparser
+import os
+import pytest
+import re
+
+# see the IDs from
+# https://github.com/torvalds/linux/blob/master/drivers/hid/hid-ids.h#L772
+# https://github.com/torvalds/linux/blob/master/drivers/hid/hid-logitech-dj.c#L1826
+logitech_receivers = 
+    0xC50C,  # USB_DEVICE_ID_S510_RECEIVER
+    0xC517,  # USB_DEVICE_ID_S510_RECEIVER_2
+    0xC512,  # USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500
+    0xC513,  # USB_DEVICE_ID_MX3000_RECEIVER
+    0xC51B,  # USB_DEVICE_ID_LOGITECH_27MHZ_MOUSE_RECEIVER
+    0xC52B,  # USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER
+    0xC52F,  # USB_DEVICE_ID_LOGITECH_NANO_RECEIVER
+    0xC532,  # USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2
+    0xC534,  # USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2
+    0xC539,  # USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1
+    0xC53F,  # USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1
+    0xC53A,  # USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY
+    0xC545,  # Bolt receiver, not listed in the kernel (yet)
+    0xC547,  # Bolt receiver, not listed in the kernel (yet)
+    0xC548,  # Bolt receiver, not listed in the kernel (yet)
+
+
+
+def quirksdir():
+    return Path(os.getenv("MESON_SOURCE_ROOT") or ".") / "quirks"
+
+
+def pytest_generate_tests(metafunc):
+    # for any function that takes a "quirksfile" argument return the path to
+    # a quirks file
+    if "quirksfile" in metafunc.fixturenames:
+        metafunc.parametrize("quirksfile", f for f in quirksdir().glob("*.quirks"))
+
+
+def test_matches_are_valid(quirksfile):
+    quirks = configparser.ConfigParser(strict=True)
+    # Don't convert to lowercase
+    quirks.optionxform = lambda option: option  # type: ignore
+    quirks.read(quirksfile)
+
+    for name, section in filter(lambda n: n != "DEFAULT", quirks.items()):
+        bus = section.get("MatchBus")
+        if bus is not None:
+            assert bus in ("ps2", "usb", "bluetooth", "i2c", "spi")
+
+        vid = section.get("MatchVendor")
+        if vid is not None:
+            assert re.match(
+                "0x0-9A-F{4}", vid
+            ), f"{quirksfile}: {name}: {vid} must be uppercase hex (0xAB12)"
+
+        pid = section.get("MatchProduct")
+        if pid is not None:
+            assert re.match(
+                "0x0-9A-F{4}", pid
+            ), f"{quirksfile}: {name}: {pid} must be uppercase hex (0xAB12)"
+
+
+def test_match_product_is_not_a_logitech_receiver(quirksfile):
+    quirks = configparser.ConfigParser(strict=True)
+    # Don't convert to lowercase
+    quirks.optionxform = lambda option: option  # type: ignore
+    quirks.read(quirksfile)
+
+    for name, section in filter(lambda n: n != "DEFAULT", quirks.items()):
+        vid = int(section.get("MatchVendor", "0x0"), 16)
+        if vid == 0x046D:
+            pid = int(section.get("MatchProduct", "0x0"), 16)
+            assert (
+                pid not in logitech_receivers
+            ), f"{quirksfile}: {name}: applies to a Logitech Receiver"
+
+
+def main():
+    args = __file__
+    try:
+        import xdist  # noqa
+
+        ncores = os.environ.get("FDO_CI_CONCURRENT", "auto")
+        args += "-n", ncores
+    except ImportError:
+        pass
+
+    return pytest.main(args)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-debug-events.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-debug-events.c Changed

@@ -494,7 +494,7 @@
 	double v = 0, h = 0, v120 = 0, h120 = 0;
 	const char *have_vert = "",
 		   *have_horiz = "";
-	const char *source = "invalid";
+	const char *source = NULL;
 	enum libinput_pointer_axis axis;
 	enum libinput_event_type type;
 
@@ -746,7 +746,7 @@
 print_tablet_pad_ring_event(struct libinput_event *ev)
 {
 	struct libinput_event_tablet_pad *p = libinput_event_get_tablet_pad_event(ev);
-	const char *source = "<invalid>";
+	const char *source = NULL;
 	unsigned int mode;
 
 	print_event_time(libinput_event_tablet_pad_get_time(p));
@@ -772,7 +772,7 @@
 print_tablet_pad_strip_event(struct libinput_event *ev)
 {
 	struct libinput_event_tablet_pad *p = libinput_event_get_tablet_pad_event(ev);
-	const char *source = "<invalid>";
+	const char *source = NULL;
 	unsigned int mode;
 
 	print_event_time(libinput_event_tablet_pad_get_time(p));
@@ -819,7 +819,6 @@
 	       state == LIBINPUT_KEY_STATE_PRESSED ? "pressed" : "released");
 }
 
-
 static void
 print_switch_event(struct libinput_event *ev)
 {

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-debug-events.man -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-debug-events.man Changed

@@ -94,14 +94,34 @@
 .B \-\-set\-scroll\-button=BTN_MIDDLE
 Set the button to the given button code
 .TP 8
-.B \-\-set\-profile=adaptive|flat
+.B \-\-set\-profile=adaptive|flat|custom
 Set pointer acceleration profile
 .TP 8
 .B \-\-set\-speed=<value>
 Set pointer acceleration speed. The allowed range is -1, 1.
+This only applies to the flat or adaptive profile.
+.TP 8
+.B \-\-set\-custom\-points="<value>;...;<value>"
+Sets the n points defining a custom acceleration function
+The points are defined in a semicolon-separated list of floating point
+non-negative numbers. Defaults to "0.0;1.0".
+This only applies to the custom profile.
+.TP 8
+.B \-\-set\-custom\-step=<value>
+Sets the distance along the x-axis between each point, starting from 0.
+Defaults to 1.0.
+This only applies to the custom profile.
+.TP 8
+.B \-\-set\-custom\-type=fallback|motion|scroll
+Sets the type of the custom acceleration function.
+Defaults to fallback.
+This only applies to the custom profile.
 .TP 8
 .B \-\-set\-tap\-map=lrm|lmr
 Set button mapping for tapping
+.TP 8
+.B \-\-set\-rotation\-angle=<degrees>
+Set the rotation angle in degrees (0 to 360).
 .SH NOTES
 .PP
 Events shown by this tool may not correspond to the events seen by a

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-debug-gui.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-debug-gui.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-list-devices.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-list-devices.c Changed

_service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-list-kernel-devices.man Added

_service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-list-kernel-devices.py Added

@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# vim: set expandtab shiftwidth=4:
+# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
+#
+# Copyright © 2018 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the 'Software'),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+import argparse
+import sys
+
+try:
+    import pyudev
+except ModuleNotFoundError as e:
+    print("Error: {}".format(str(e)), file=sys.stderr)
+    print(
+        "One or more python modules are missing. Please install those "
+        "modules and re-run this tool."
+    )
+    sys.exit(1)
+
+
+def list_devices():
+    devices = {}
+    context = pyudev.Context()
+    for device in context.list_devices(subsystem="input"):
+        if (device.device_node or "").startswith("/dev/input/event"):
+            parent = device.parent
+            if parent is not None:
+                name = parent.properties"NAME" or ""
+                # The udev name includes enclosing quotes
+                devicesdevice.device_node = name1:-1
+
+    def versionsort(key):
+        return int(keylen("/dev/input/event") :)
+
+    for k in sorted(devices, key=versionsort):
+        print(f"{k}:\t{devicesk}")
+
+
+class HidDevice:
+    def __init__(self, name, driver, vendor, product, devpath):
+        self.name = name
+        self.driver = driver
+        self.vendor = vendor
+        self.product = product
+        self.devpath = devpath
+        self.hidraws = 
+        self.evdevs = 
+
+
+def list_hid_devices():
+    devices = 
+    context = pyudev.Context()
+    for device in context.list_devices(subsystem="hid"):
+        name = device.properties.get("HID_NAME")
+        driver = device.properties.get("DRIVER")
+        devpath = device.properties.get("DEVPATH")
+        id = device.properties.get("HID_ID") or "0:0:0"
+        _, vendor, product = (int(x, 16) for x in id.split(":"))
+        devices.append(HidDevice(name, driver, vendor, product, devpath))
+
+    for device in context.list_devices(subsystem="hidraw"):
+        devpath = device.properties"DEVPATH"
+
+        for hid in devices:
+            if devpath.startswith(hid.devpath):
+                hid.hidraws.append(f"'{device.device_node}'")
+
+    for device in context.list_devices(subsystem="input"):
+        if (device.device_node or "").startswith("/dev/input/event"):
+            devpath = device.properties"DEVPATH"
+
+            for hid in devices:
+                if devpath.startswith(hid.devpath):
+                    hid.evdevs.append(f"'{device.device_node}'")
+
+    print("hid:")
+    for d in devices:
+        print(f"- name:   '{d.name}'")
+        print(f"  id:     '{d.vendor:04x}:{d.product:04x}'")
+        print(f"  driver: '{d.driver}'")
+        print(f"  hidraw: {', '.join(h for h in d.hidraws)}")
+        print(f"  evdev:  {', '.join(h for h in d.evdevs)}")
+        print("")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="List kernel devices")
+    parser.add_argument("--hid", action="store_true", default=False)
+    args = parser.parse_args()
+
+    if args.hid:
+        list_hid_devices()
+    else:
+        list_devices()
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        print("Exited on user request")

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-measure-touchpad-size.man -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-measure-touchpad-size.man Changed

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-quirks.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-quirks.c Changed

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-record.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-record.c Changed

@@ -965,7 +965,6 @@
 		abort();
 	}
 
-
 	button = libinput_event_tablet_tool_get_button(t);
 	state = libinput_event_tablet_tool_get_button_state(t);
 	time = time_offset(dev->ctx, libinput_event_tablet_tool_get_time_usec(t));
@@ -1071,7 +1070,6 @@
 		libinput_tablet_pad_mode_group_button_is_toggle(group, button) ? "true" : "false"
 	       );
 
-
 }
 
 static void
@@ -1784,9 +1782,13 @@
 				       QLOG_CUSTOM_LOG_PRIORITIES);
 	if (!quirks) {
 		fprintf(stderr,
-			"Failed to initialize the device quirks. "
-			"Please see the above errors "
-			"and/or re-run with --verbose for more details\n");
+			"Failed to load the device quirks from %s%s%s. "
+			"This will negatively affect device behavior. "
+			"See %s/device-quirks.html for details.\n",
+			data_path,
+			override_file ? " and " : "",
+			override_file ? override_file : "",
+			HTTP_DOC_LINK);
 		return;
 	}
 
@@ -2440,7 +2442,7 @@
 	close(fd);
 }
 
-const struct libinput_interface interface = {
+static const struct libinput_interface interface = {
 	.open_restricted = open_restricted,
 	.close_restricted = close_restricted,
 };

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-replay.man -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-replay.man Changed

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput-replay.py -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput-replay.py Changed

_service:tar_scm:libinput-1.22.1.tar.gz/tools/libinput.man -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/libinput.man Changed

_service:tar_scm:libinput-1.22.1.tar.gz/tools/ptraccel-debug.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/ptraccel-debug.c Changed

@@ -189,8 +189,12 @@
 	       "	linear	  ... the default motion filter\n"
 	       "	low-dpi	  ... low-dpi filter, use --dpi with this argument\n"
 	       "	touchpad  ... the touchpad motion filter\n"
-	       "	x230  	  ... custom filter for the Lenovo x230 touchpad\n"
+	       "	x230	  ... custom filter for the Lenovo x230 touchpad\n"
 	       "	trackpoint... trackpoint motion filter\n"
+	       "	custom    ... custom motion filter, use --custom-points and --custom-step with this argument\n"
+	       "--custom-points=\"<double>;...;<double>\"  ... n points defining a custom acceleration function\n"
+	       "--custom-step=<double>  ... distance along the x-axis between each point, \n"
+	       "                            starting from 0. defaults to 1.0\n"
 	       "\n"
 	       "If extra arguments are present and mode is not given, mode defaults to 'sequence'\n"
 	       "and the arguments are interpreted as sequence of delta x coordinates\n"
@@ -226,6 +230,13 @@
 	const char *filter_type = "linear";
 	accel_profile_func_t profile = NULL;
 	double tp_multiplier = 1.0;
+	struct libinput_config_accel_custom_func custom_func = {
+		.step = 1.0,
+		.npoints = 2,
+		.points = {0.0, 1.0},
+	};
+	struct libinput_config_accel *accel_config =
+		libinput_config_accel_create(LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
 
 	enum {
 		OPT_HELP = 1,
@@ -236,6 +247,8 @@
 		OPT_SPEED,
 		OPT_DPI,
 		OPT_FILTER,
+		OPT_CUSTOM_POINTS,
+		OPT_CUSTOM_STEP,
 	};
 
 	while (1) {
@@ -250,6 +263,8 @@
 			{"speed", 1, 0, OPT_SPEED },
 			{"dpi", 1, 0, OPT_DPI },
 			{"filter", 1, 0, OPT_FILTER },
+			{"custom-points", 1, 0, OPT_CUSTOM_POINTS },
+			{"custom-step", 1, 0, OPT_CUSTOM_STEP },
 			{0, 0, 0, 0}
 		};
 
@@ -307,6 +322,31 @@
 		case OPT_FILTER:
 			filter_type = optarg;
 			break;
+		case OPT_CUSTOM_POINTS: {
+			size_t npoints;
+			double *points = double_array_from_string(optarg,
+								  ";",
+								  &npoints);
+			if (!points ||
+			    npoints < LIBINPUT_ACCEL_NPOINTS_MIN ||
+			    npoints > LIBINPUT_ACCEL_NPOINTS_MAX) {
+				fprintf(stderr,
+					"Invalid --custom-points\n"
+					"Please provide at least 2 points separated by a semicolon\n"
+					" e.g. --custom-points=\"1.0;1.5\"\n");
+				free(points);
+				return 1;
+			}
+			custom_func.npoints = npoints;
+			memcpy(custom_func.points,
+			       points,
+			       sizeof(*points) * npoints);
+			free(points);
+			break;
+		}
+		case OPT_CUSTOM_STEP:
+			custom_func.step = strtod(optarg, NULL);
+			break;
 		default:
 			usage();
 			exit(1);
@@ -335,6 +375,15 @@
 		filter = create_pointer_accelerator_filter_trackpoint(tp_multiplier,
 								      use_averaging);
 		profile = trackpoint_accel_profile;
+	} else if (streq(filter_type, "custom")) {
+		libinput_config_accel_set_points(accel_config,
+						 LIBINPUT_ACCEL_TYPE_MOTION,
+						 custom_func.step,
+						 custom_func.npoints,
+						 custom_func.points);
+		filter = create_custom_accelerator_filter();
+		profile = custom_accel_profile_motion;
+		filter_set_accel_config(filter, accel_config);
 	} else {
 		fprintf(stderr, "Invalid filter type %s\n", filter_type);
 		return 1;
@@ -378,6 +427,7 @@
 		break;
 	}
 
+	libinput_config_accel_destroy(accel_config);
 	filter_destroy(filter);
 
 	return 0;

_service:tar_scm:libinput-1.24.0.tar.gz/tools/razer-quirks-lister.py Added

@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+#
+# SPDX-License-Identifier: MIT
+#
+# This utility clones the openrazer repository, extracts the known VID/PID combos
+# for "RazerBlade" keyboards and spits out a libinput-compatible quirks file
+# with those keyboards listed as "Internal".
+#
+# Usage:
+# $ cd path/to/libinput.git/
+# $ ./tools/razer-quirks-list.py
+
+from pathlib import Path
+from collections import namedtuple
+import tempfile
+import shutil
+import subprocess
+import sys
+
+
+KeyboardDescriptor = namedtuple("KeyboardDescriptor", "vid", "pid", "name")
+
+with tempfile.TemporaryDirectory() as tmpdir:
+    # Clone the openrazer directory and add its Python modyle basedir
+    # to our sys.path so we can import it
+    subprocess.run(
+        
+            "git",
+            "clone",
+            "--quiet",
+            "--depth=1",
+            "https://github.com/openrazer/openrazer",
+        ,
+        cwd=tmpdir,
+        check=True,
+    )
+    sys.path.append(str(Path(tmpdir) / "openrazer" / "daemon"))
+
+    import openrazer_daemon.hardware.keyboards as razer_keyboards  # type: ignore
+
+    keyboards: listKeyboardDescriptor = 
+
+    # All classnames for the keyboards we care about start with RazerBlade
+    for clsname in filter(lambda c: c.startswith("RazerBlade"), dir(razer_keyboards)):
+        kbd = getattr(razer_keyboards, clsname)
+        try:
+            k = KeyboardDescriptor(name=clsname, vid=kbd.USB_VID, pid=kbd.USB_PID)
+            keyboards.append(k)
+        except AttributeError:
+            continue
+
+    tmpfile = Path(tmpdir) / "30-vendor-razer.quirks"
+    try:
+        quirksfile = next(Path("quirks").glob("30-vendor-razer.quirks"))
+    except StopIteration:
+        print("Unable to find the razer quirks file.")
+        raise SystemExit(1)
+
+    with open(tmpfile, "w") as output:
+        with open(quirksfile) as input:
+            for line in input:
+                output.write(line)
+                if line.startswith("# AUTOGENERATED"):
+                    output.write("\n")
+                    break
+
+        for kbd in sorted(keyboards, key=lambda k: k.vid << 16 | k.pid):
+            print(
+                "\n".join(
+                    (
+                        f"{kbd.name} Keyboard",
+                        "MatchUdevType=keyboard",
+                        "MatchBus=usb",
+                        f"MatchVendor=0x{kbd.vid:04X}",
+                        f"MatchProduct=0x{kbd.pid:04X}",
+                        "AttrKeyboardIntegration=internal",
+                    )
+                ),
+                file=output,
+            )
+            print(file=output)
+
+    shutil.copy(tmpfile, quirksfile)

_service:tar_scm:libinput-1.22.1.tar.gz/tools/shared.c -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/shared.c Changed

@@ -114,6 +114,12 @@
 	options->scroll_button_lock = -1;
 	options->speed = 0.0;
 	options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_NONE;
+	/* initialize accel args */
+	static double points = {0.0, 1.0};
+	options->custom_points = points;
+	options->custom_npoints = ARRAY_LENGTH(points);
+	options->custom_type = LIBINPUT_ACCEL_TYPE_FALLBACK;
+	options->custom_step = 1.0;
 }
 
 int
@@ -252,6 +258,8 @@
 			options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
 		else if (streq(optarg, "flat"))
 		      options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
+		else if (streq(optarg, "custom"))
+		      options->profile = LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM;
 		else
 		      return 1;
 		break;
@@ -273,8 +281,49 @@
 			 "%s",
 			 optarg);
 		break;
-	}
+	case OPT_CUSTOM_POINTS:
+		if (!optarg)
+			return 1;
+		options->custom_points = double_array_from_string(optarg,
+								  ";",
+								  &options->custom_npoints);
+		if (!options->custom_points || options->custom_npoints < 2) {
+			fprintf(stderr,
+				"Invalid --set-custom-points\n"
+				"Please provide at least 2 points separated by a semicolon\n"
+				" e.g. --set-custom-points=\"1.0;1.5\"\n");
+			return 1;
+		}
+		break;
+	case OPT_CUSTOM_STEP:
+		if (!optarg)
+			return 1;
+		options->custom_step = strtod(optarg, NULL);
+		break;
+	case OPT_CUSTOM_TYPE:
+		if (!optarg)
+			return 1;
+		if (streq(optarg, "fallback"))
+			options->custom_type = LIBINPUT_ACCEL_TYPE_FALLBACK;
+		else if (streq(optarg, "motion"))
+			options->custom_type = LIBINPUT_ACCEL_TYPE_MOTION;
+		else if (streq(optarg, "scroll"))
+			options->custom_type = LIBINPUT_ACCEL_TYPE_SCROLL;
+		else {
+			fprintf(stderr, "Invalid --set-custom-type\n"
+			                "Valid custom types: fallback|motion|scroll\n");
+			return 1;
+		}
+		break;
+	case OPT_ROTATION_ANGLE:
+		if (!optarg)
+			return 1;
 
+		if (!safe_atou(optarg, &options->angle)) {
+			fprintf(stderr, "Invalid --set-rotation-angle value\n");
+			return 1;
+		}
+	}
 	return 0;
 }
 
@@ -460,7 +509,6 @@
 		libinput_device_config_scroll_set_button_lock(device,
 							      options->scroll_button_lock);
 
-
 	if (libinput_device_config_accel_is_available(device)) {
 		libinput_device_config_accel_set_speed(device,
 						       options->speed);
@@ -468,6 +516,21 @@
 			libinput_device_config_accel_set_profile(device,
 								 options->profile);
 	}
+
+	if (options->profile == LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM) {
+		struct libinput_config_accel *config =
+			libinput_config_accel_create(LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM);
+		libinput_config_accel_set_points(config,
+						 options->custom_type,
+						 options->custom_step,
+						 options->custom_npoints,
+						 options->custom_points);
+		libinput_device_config_accel_apply(device, config);
+		libinput_config_accel_destroy(config);
+	}
+
+	if (options->angle != 0)
+		libinput_device_config_rotation_set_angle(device, options->angle % 360);
 }
 
 static char*
@@ -633,11 +696,13 @@
 	off += printed;
 
 	for (size_t i = 0; off < sz && i < t->ntuples; i++) {
-		const char *name = libevdev_event_code_get_name(
-						t->tuplesi.first,
-						t->tuplesi.second);
+		unsigned int type = t->tuplesi.first;
+		unsigned int code = t->tuplesi.second;
+		bool enable = t->tuplesi.third;
+
+		const char *name = libevdev_event_code_get_name(type, code);
 
-		printed = snprintf(buf + off, sz - off, "%s;", name);
+		printed = snprintf(buf + off, sz - off, "%c%s;", enable ? '+' : '-', name);
 		assert(printed != -1);
 		off += printed;
 	}
@@ -646,21 +711,24 @@
 static void
 sprintf_input_props(char *buf, size_t sz, struct quirks *quirks, enum quirk q)
 {
-	const uint32_t *properties;
-	size_t nprops = 0;
+	const struct quirk_tuples *t;
 	size_t off = 0;
 	int printed;
 	const char *name;
 
-	quirks_get_uint32_array(quirks, q, &properties, &nprops);
+	quirks_get_tuples(quirks, q, &t);
 	name = quirk_get_name(q);
 	printed = snprintf(buf, sz, "%s=", name);
 	assert(printed != -1);
 	off += printed;
 
-	for (size_t i = 0; off < sz && i < nprops; i++) {
-		const char *name = libevdev_property_get_name(propertiesi);
-		printed = snprintf(buf + off, sz - off, "%s;", name);
+	for (size_t i = 0; off < sz && i < t->ntuples; i++) {
+		unsigned int prop = t->tuplesi.first;
+		bool enable = t->tuplesi.second;
+
+		const char *name = libevdev_property_get_name(prop);
+
+		printed = snprintf(buf + off, sz - off, "%c%s;", enable ? '+' : '-', name);
 		assert(printed != -1);
 		off += printed;
 	}
@@ -748,13 +816,11 @@
 				snprintf(buf, sizeof(buf), "%s=%d", name, b);
 				callback(userdata, buf);
 				break;
-			case QUIRK_ATTR_EVENT_CODE_DISABLE:
-			case QUIRK_ATTR_EVENT_CODE_ENABLE:
+			case QUIRK_ATTR_EVENT_CODE:
 				sprintf_event_codes(buf, sizeof(buf), quirks, q);
 				callback(userdata, buf);
 				break;
-			case QUIRK_ATTR_INPUT_PROP_DISABLE:
-			case QUIRK_ATTR_INPUT_PROP_ENABLE:
+			case QUIRK_ATTR_INPUT_PROP:
 				sprintf_input_props(buf, sizeof(buf), quirks, q);
 				callback(userdata, buf);
 				break;

_service:tar_scm:libinput-1.22.1.tar.gz/tools/shared.h -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/shared.h Changed

@@ -59,6 +59,10 @@
 	OPT_PROFILE,
 	OPT_DISABLE_SENDEVENTS,
 	OPT_APPLY_TO,
+	OPT_CUSTOM_POINTS,
+	OPT_CUSTOM_STEP,
+	OPT_CUSTOM_TYPE,
+	OPT_ROTATION_ANGLE,
 };
 
 #define CONFIGURATION_OPTIONS \
@@ -87,7 +91,11 @@
 	{ "set-profile",               required_argument, 0, OPT_PROFILE }, \
 	{ "set-tap-map",               required_argument, 0, OPT_TAP_MAP }, \
 	{ "set-speed",                 required_argument, 0, OPT_SPEED },\
-	{ "apply-to",                  required_argument, 0, OPT_APPLY_TO }
+	{ "apply-to",                  required_argument, 0, OPT_APPLY_TO },\
+	{ "set-custom-points",         required_argument, 0, OPT_CUSTOM_POINTS },\
+	{ "set-custom-step",           required_argument, 0, OPT_CUSTOM_STEP },\
+	{ "set-custom-type",           required_argument, 0, OPT_CUSTOM_TYPE },\
+	{ "set-rotation-angle",        required_argument, 0, OPT_ROTATION_ANGLE }
 
 enum tools_backend {
 	BACKEND_NONE,
@@ -114,6 +122,11 @@
 	int dwtp;
 	enum libinput_config_accel_profile profile;
 	char disable_pattern64;
+	enum libinput_config_accel_type custom_type;
+	double custom_step;
+	size_t custom_npoints;
+	double *custom_points;
+	unsigned int angle;
 };
 
 void tools_init_options(struct tools_options *options);

_service:tar_scm:libinput-1.22.1.tar.gz/tools/test_tool_option_parsing.py -> _service:tar_scm:libinput-1.24.0.tar.gz/tools/test_tool_option_parsing.py Changed

@@ -219,9 +219,10 @@
         "set-profile": "adaptive", "flat",
         "set-tap-map": "lrm", "lmr",
     },
-    # options with a range
+    # options with a range (and increment)
     "ranges": {
-        "set-speed": (float, -1.0, +1.0),
+        "set-speed": (-1.0, +1.0, 0.1),
+        "set-rotation": (0, 360, 10),
     },
 }
 
@@ -250,9 +251,7 @@
 @pytest.mark.parametrize("option", options"ranges".items())
 def test_options_ranges(libinput_debug_tool, option):
     name, values = option
-    range_type, minimum, maximum = values
-    assert range_type == float
-    step = (maximum - minimum) / 10.0
+    minimum, maximum, step = values
     value = minimum
     while value < maximum:
         libinput_debug_tool.run_command_success("--{}".format(name), str(value))
@@ -368,7 +367,8 @@
     try:
         import xdist  # noqa
 
-        args += "-n", "auto"
+        ncores = os.environ.get("FDO_CI_CONCURRENT", "auto")
+        args += "-n", ncores
     except ImportError:
         logger.info("python-xdist missing, this test will be slow")
         pass

_service:tar_scm:libinput-1675996727.286edd7.tar Deleted

Changes of Revision 2