(!64) fix struct name clash with Xserver SDK

> /builds/metux/xf86-input-libinput/_builddir/../src/xf86libinput.c: In function 'xf86libinput_set_pressure_range':
> /builds/metux/xf86-input-libinput/_builddir/../src/xf86libinput.c:465:53: warning: declaration of 'range' shadows a global declaration [-Wshadow]
>   465 |                                 const struct range *range)
>       |                                 ~~~~~~~~~~~~~~~~~~~~^~~~~
> In file included from /usr/include/xorg/xf86.h:44,
>                  from /builds/metux/xf86-input-libinput/_builddir/../src/xf86libinput.c:36:
> /usr/include/xorg/xf86str.h:110:3: note: shadowed declaration is here
>   110 | } range;
>       |   ^~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

.editorconfig

@@ -0,0 +1,17 @@
+# https://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{c,h}]
+indent_size = 8
+indent_style = tab
+
+[{meson.build,meson_options.txt}]
+indent_size = 8
+indent_style = tab

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -0,0 +1,65 @@
+name: 🐞 Bug report
+description: Create a report to help us improve
+
+labels: [bug, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to help everyone identify and fix the bug. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: dropdown
+    id: affected-version
+    attributes:
+      label: Select the version
+      options:
+        - 1.5.0.1
+        - Git master branch
+        - other or don't know
+      default: 1
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe your issue
+      placeholder: When I did X then Y happened.
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      placeholder: |
+        1. Start ...
+        2. Do this
+        3. Do that
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: What did you expect?
+      placeholder: I expected this to happen.
+  - type: textarea
+    id: environment
+    attributes:
+      label: Additional Information
+      description: |
+        Additional information you want to provide such as logs, system info, environment, screenshots, etc.
+      placeholder: |
+        Add any other context about the bug here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-libinput/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting this issue! We will get back to you as soon as possible.

.github/ISSUE_TEMPLATE/02-feature-request.yml

@@ -0,0 +1,49 @@
+name: ✨ Feature request
+description: Suggest a feature for this software
+labels: [enhancement, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to properly describe the new software feature you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: "Describe the feature"
+      placeholder: A thing in X that allows to do Y.
+    validations:
+      required: true
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "It should be done because"
+      placeholder: Doing Y is needed for Z.
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: "What are the alternatives?"
+      placeholder: We could do A or B instead.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Additional information you want to provide such as references to related issues or protocols, the implications on existing use cases, etc.
+      placeholder: |
+        Add any other context about the feature request here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-libinput/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your suggestion! Let's see together if it can be done.

.github/ISSUE_TEMPLATE/03-code-cleanup.yml

@@ -0,0 +1,49 @@
+name: 🔧 Code cleanup
+description: Level up the source code
+labels: [code-cleanup, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to properly describe the code cleanup you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: "Describe the cleanup"
+      placeholder: C in X needs to be changed into D.
+    validations:
+      required: true
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "It should be done because"
+      placeholder: Having D is needed for E.
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: "What are the alternatives?"
+      placeholder: We could do A or B instead.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Additional information you want to provide such as implications on existing code, how to ensure API/ABI stability, which tests are needed or to be run, related issues, etc.
+      placeholder: |
+        Add any other context about the cleanup here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-libinput/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for looking at the source code! Let's see together how it can be improved.

.github/ISSUE_TEMPLATE/04-doc-update.yml

@@ -0,0 +1,38 @@
+name: 🔖 Documentation update
+description: Make your mark for better documentation
+
+labels: [documentation, needs-triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to help others understand our software. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the update
+      placeholder: These things need to be better documented.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Additional Information
+      description: Additional information you want to provide such as tickets related to changes in the software, affected files, screenshots, etc.
+      placeholder: |
+        Add any other context about the update here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-libinput/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for requesting this update! We will get back to you as soon as possible.

.github/ISSUE_TEMPLATE/05-org-task.yml

@@ -0,0 +1,43 @@
+name: ✅ Organizational task
+description: Create a task for project organization
+
+labels: [needs-triage, organization]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to get organizational things done. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the task
+      placeholder: These things need to be done.
+    validations:
+      required: true
+  - type: textarea
+    id: rationale
+    attributes:
+      label: "It should be done because"
+      placeholder: Doing Y is needed for Z.
+  - type: textarea
+    id: environment
+    attributes:
+      label: Additional Information
+      description: Additional information you want to provide such as the context for bigger tasks, the implicatons on existing workflows, related issues, etc.
+      placeholder: |
+        Add any other context about the task here.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Extra fields
+      options:
+        - label: I have checked the existing [issues](https://github.com/X11Libre/xf86-input-libinput/issues)
+          required: true
+        - label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
+          required: true
+        - label: I'd like to work on this issue
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for adding this task! We will get back to you as soon as possible.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: XLibre Community Support
+    url: https://github.com/orgs/X11Libre/discussions
+    about: Please ask and answer questions here.
+  - name: Mailing List
+    url: https://www.freelists.org/list/xlibre
+    about: You can join the discussions on our mailing list.

.github/actions/build-driver/action.yaml

@@ -0,0 +1,69 @@
+name: 'build driver'
+description: 'build driver against specific Xserver'
+inputs:
+  xserver-version:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: check out driver repo
+      uses: actions/checkout@v4
+
+    - name: prepare build environment
+      shell: bash
+      run: |
+        MACHINE=`gcc -dumpmachine`
+        echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
+        echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
+        sudo chown root /bin/tar && sudo chmod u+s /bin/tar
+
+    - name: apt cache
+      uses: actions/cache@v4
+      with:
+        path: /var/cache/apt
+        key: apt-cache-${{ hashFiles('.github/scripts/ubuntu/install-pkg.sh') }}
+        restore-keys: apt-cache-
+
+    - name: pkg install
+      shell: bash
+      run:  sudo .github/scripts/ubuntu/install-pkg.sh
+
+    - name: X11 prereq cache
+      uses: actions/cache@v4
+      with:
+        path: |
+            ${{ env.X11_PREFIX }}
+        key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
+        restore-keys: ${{ runner.name }}-x11-deps-
+
+    - name: generic prereq
+      shell: bash
+      run:  .github/scripts/install-prereq.sh
+
+    - name: check out xserver repo
+      uses: actions/checkout@v4
+      with:
+        repository: X11Libre/xserver
+        path: xserver-sdk
+        ref: ${{ inputs.xserver-version }}
+
+    - name: build xserver sdk
+      shell: bash
+      env:
+        MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dnamespace=false -Dxselinux=false -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Ddocs=false
+      run:  |
+        cd xserver-sdk
+        echo -n > .meson_environment
+        echo "export MESON_BUILDDIR=$MESON_BUILDDIR" >> .meson_environment
+        echo "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> .meson_environment
+        .gitlab-ci/meson-build.sh --skip-test
+        sudo meson install --no-rebuild -C "$MESON_BUILDDIR"
+        sudo mkdir -p /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
+        sudo chown -R runner /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
+
+    - name: compile driver
+      shell: bash
+      run: |
+        CFLAGS="-Wall" ./autogen.sh # --prefix=$X11_PREFIX
+        CFLAGS="-Wall" make -j # install

.github/scripts/conf.sh

@@ -0,0 +1,13 @@
+export X11_OS=`uname -s`
+
+export X11_PREFIX="${X11_PREFIX:-$HOME/x11}"
+export X11_BUILD_DIR="${X11_BUILD_DIR:-$HOME/build-deps}"
+export DRV_BUILD_DIR="${DRV_BUILD_DIR:-$HOME/build-drivers}"
+
+case "$X11_OS" in
+Darwin) export FDO_CI_CONCURRENT=`sysctl -n hw.logicalcpu` ;;
+Linux) export FDO_CI_CONCURRENT=`nproc` ;;
+esac
+
+export PATH="$X11_PREFIX/bin:$PATH"
+export PKG_CONFIG_PATH="$X11_PREFIX/lib/x86_64-linux-gnu/pkgconfig:$X11_PREFIX/lib/pkgconfig:$X11_PREFIX/share/pkgconfig:$PKG_CONFIG_PATH"

.github/scripts/github/make-release

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+err() {
+    echo "$0: $*"
+}
+
+[ "$GITHUB_REPOSITORY" ] || err "missing variable GITHUB_REPOSITORY"
+
+TITLE=$(git tag -l --format='%(contents)' $tag)
+
+echo "tag=$tag"
+echo "title=$TITLE"
+
+gh release create "$tag" \
+        --repo="$GITHUB_REPOSITORY" \
+        --title="$tag" \
+        --generate-notes

.github/scripts/install-prereq.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+. .github/scripts/util.sh
+
+mkdir -p $X11_BUILD_DIR
+cd $X11_BUILD_DIR
+
+if [ "$X11_OS" = "Linux" ]; then
+build_meson   drm               https://gitlab.freedesktop.org/mesa/drm                  libdrm-2.4.121   "" \
+    -Domap=enabled
+fi
+build_meson   libxcvt           https://gitlab.freedesktop.org/xorg/lib/libxcvt          libxcvt-0.1.0
+build_ac      xorgproto         https://gitlab.freedesktop.org/xorg/proto/xorgproto      xorgproto-2024.1

.github/scripts/ubuntu/install-pkg.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+set -e
+
+# Packages which are needed by this script, but not for the xserver build
+EPHEMERAL="
+	libexpat-dev
+	libgles2-mesa-dev
+	libxkbcommon-dev
+	x11-utils
+	x11-xserver-utils
+	xauth
+	xvfb
+"
+
+apt-get update
+
+apt-get install -y \
+	$EPHEMERAL \
+	autoconf \
+	automake \
+	build-essential \
+	ca-certificates \
+	libaudit-dev \
+	libbsd-dev \
+	libcairo2-dev \
+	libdbus-1-dev \
+	libdrm-dev \
+	libegl1-mesa-dev \
+	libepoxy-dev \
+	libevdev2 \
+	libexpat1 \
+	libffi-dev \
+	libgbm-dev \
+	libgcrypt-dev \
+	libgl1-mesa-dev \
+	libgles2 \
+	libglx-mesa0 \
+	libinput10 \
+	libinput-dev \
+	libnvidia-egl-wayland-dev \
+	libpciaccess-dev \
+	libpixman-1-dev \
+	libspice-protocol-dev \
+	libsystemd-dev \
+	libudev-dev \
+	libunwind-dev \
+	libx11-dev \
+	libx11-xcb-dev \
+	libxau-dev \
+	libxaw7-dev \
+	libxcb-glx0-dev \
+	libxcb-icccm4-dev \
+	libxcb-image0-dev \
+	libxcb-keysyms1-dev \
+	libxcb-randr0-dev \
+	libxcb-render-util0-dev \
+	libxcb-render0-dev \
+	libxcb-shape0-dev \
+	libxcb-shm0-dev \
+	libxcb-util0-dev \
+	libxcb-xf86dri0-dev \
+	libxcb-xkb-dev \
+	libxcb-xv0-dev \
+	libxcb1-dev \
+	libxdmcp-dev \
+	libxext-dev \
+	libxfixes-dev \
+	libxfont-dev \
+	libxi-dev \
+	libxinerama-dev \
+	libxkbcommon0 \
+	libxkbfile-dev \
+	libxmu-dev \
+	libxmuu-dev \
+	libxpm-dev \
+	libxrender-dev \
+	libxres-dev \
+	libxshmfence-dev \
+	libxt-dev \
+	libxtst-dev \
+	libxv-dev \
+	mesa-common-dev \
+	meson \
+	nettle-dev \
+	libpango1.0-dev \
+	pkg-config \
+	x11-xkb-utils \
+	xfonts-utils \
+	xkb-data \
+	xtrans-dev \
+	xutils-dev \
+	libxaw7-dev \
+	python3-mako

.github/scripts/util.sh

@@ -0,0 +1,85 @@
+
+. .github/scripts/conf.sh
+
+clone_source() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+
+    if [ ! -f $pkgname/.git/config ]; then
+        echo "need to clone $pkgname"
+        if [ "$commit" ]; then
+            git clone $url $pkgname --branch=$ref
+        else
+            git clone $url $pkgname --branch=$ref --depth 1
+        fi
+    else
+        echo "already cloned $pkgname"
+    fi
+
+    if [ "$commit" ]; then
+        ( cd $pkgname && git checkout -f "$commit" )
+    fi
+}
+
+build_meson() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+    shift
+    shift
+    shift
+    shift || true
+    if [ -f $X11_PREFIX/$pkgname.DONE ]; then
+        echo "package $pkgname already built"
+    else
+        clone_source "$pkgname" "$url" "$ref" "$commit"
+        (
+            cd $pkgname
+            meson "$@" build -Dprefix=$X11_PREFIX
+            ninja -j${FDO_CI_CONCURRENT:-4} -C build install
+        )
+        touch $X11_PREFIX/$pkgname.DONE
+    fi
+}
+
+build_ac() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+    shift
+    shift
+    shift
+    shift || true
+    if [ -f $X11_PREFIX/$pkgname.DONE ]; then
+        echo "package $pkgname already built"
+    else
+        clone_source "$pkgname" "$url" "$ref" "$commit"
+        (
+            cd $pkgname
+            ./autogen.sh --prefix=$X11_PREFIX
+            make -j${FDO_CI_CONCURRENT:-4} install
+        )
+        touch $X11_PREFIX/$pkgname.DONE
+    fi
+}
+
+build_drv_ac() {
+    local pkgname="$1"
+    local url="$2"
+    local ref="$3"
+    local commit="$4"
+    shift
+    shift
+    shift
+    shift || true
+    clone_source "$pkgname" "$url" "$ref" "$commit"
+    (
+        cd $pkgname
+        ./autogen.sh # --prefix=$X11_PREFIX
+        make -j${FDO_CI_CONCURRENT:-4} # install
+    )
+}

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+name: Build driver
+
+permissions:
+    contents: write
+
+env:
+    MESON_BUILDDIR:  "build"
+    X11_PREFIX:      /home/runner/x11
+    X11_BUILD_DIR:   /home/runner/build-deps
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    for-xserver-stable-25_0:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: ./.github/actions/build-driver
+              with:
+                  xserver-version: xlibre-xserver-25.0.0.5
+
+    for-xserver-master:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: ./.github/actions/build-driver
+              with:
+                  xserver-version: master
+
+    release:
+        name: Release pushed tag
+        runs-on: ubuntu-latest
+        if: ${{ startsWith(github.ref, 'refs/tags/xlibre-') }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Create release
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  tag: ${{ github.ref_name }}
+              run: .github/scripts/github/make-release

.gitignore

@@ -84,3 +84,4 @@ core
 test-driver
 tags
 .vimdir
+test/test-bezier

.gitlab-ci.yml

@@ -4,7 +4,7 @@
 # Please see the ci-templates documentation for details:
 # https://freedesktop.pages.freedesktop.org/ci-templates/
 
-.templates_sha: &template_sha c5626190ec14b475271288dda7a7dae8dbe0cd76 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 84052757dacc5fd65f5ace92b7fe63c60f6c8558 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -26,10 +26,10 @@ stages:
 
 .fedora:
   variables:
-    FDO_DISTRIBUTION_VERSION: 33
-    FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros'
+    FDO_DISTRIBUTION_VERSION: 39
+    FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros diffutils'
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/fedora-install.sh'
-    FDO_DISTRIBUTION_TAG: '2021-09-15.0'
+    FDO_DISTRIBUTION_TAG: '2025-04-01.0'
 
 
 fedora@container_build:
@@ -58,7 +58,7 @@ fedora@container_build:
       - _builddir/config.log
 
 
-fedora:33@default-build:
+fedora@default-build:
   extends:
     - .fedora
     - .fdo.distribution-image@fedora

Makefile.am

@@ -19,7 +19,10 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
+# During distcheck, system locations (as provided by pkg-config) may
+# not be writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = --with-xorg-module-dir='$${libdir}/xorg/modules' \
+                            --with-sdkdir='$${includedir}/xorg'
 
 SUBDIRS = src include man test
 MAINTAINERCLEANFILES = ChangeLog INSTALL

configure.ac

@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-libinput],
-        [1.3.0],
+        [1.5.0],
         [https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
         [xf86-input-libinput])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -43,6 +43,8 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
+CFLAGS="$CFLAGS -Wno-declaration-after-statement"
+
 # Obtain compiler/linker options from server and required extensions
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.19] xproto [inputproto >= 2.2])
 PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.11.0])
@@ -89,15 +91,38 @@ AC_LINK_IFELSE(
                [AC_MSG_RESULT([no])
                 [libinput_have_custom_accel=no]])
 
+AC_MSG_CHECKING([if libinput_tablet_tool_config_pressure_range_set is available])
+AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([[#include <libinput.h>]],
+                                [[libinput_tablet_tool_config_pressure_range_set(0)]])],
+               [AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_LIBINPUT_PRESURE_RANGE, [1],
+                          [libinput_tablet_tool_config_pressure_range_set() is available])
+                [libinput_have_pressure_range=yes]],
+               [AC_MSG_RESULT([no])
+                [libinput_have_pressure_range=no]])
+
+AC_MSG_CHECKING([if libinput_device_config_click_set_clickfinger_button_map is available])
+AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([[#include <libinput.h>]],
+                                [[libinput_device_config_click_set_clickfinger_button_map(NULL, 0)]])],
+               [AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP, [1],
+                          [libinput_device_config_click_set_clickfinger_button_map() is available])
+                [libinput_have_clickfinger_button_map=yes]],
+               [AC_MSG_RESULT([no])
+                [libinput_have_clickfinger_button_map=no]])
+
 LIBS=$OLD_LIBS
 CFLAGS=$OLD_CFLAGS
 
 # Define a configure option for an alternate input module directory
+PKG_PROG_PKG_CONFIG([0.25])
 AC_ARG_WITH(xorg-module-dir,
-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                           [Default xorg module directory]),
             [moduledir="$withval"],
-            [moduledir="$libdir/xorg/modules"])
+            [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 

include/libinput-properties.h

@@ -51,6 +51,13 @@
 /* Tap button default order: BOOL, 2 values in order LRM, LMR, read-only */
 #define LIBINPUT_PROP_TAP_BUTTONMAP_DEFAULT "libinput Tapping Button Mapping Default"
 
+/* Clickfinger button order: BOOL, 2 values in order LRM, LMR, only one may be set
+   at any time */
+#define LIBINPUT_PROP_CLICKFINGER_BUTTONMAP "libinput Clickfinger Button Mapping Enabled"
+
+/* Clickfinger button default order: BOOL, 2 values in order LRM, LMR, read-only */
+#define LIBINPUT_PROP_CLICKFINGER_BUTTONMAP_DEFAULT "libinput Clickfinger Button Mapping Default"
+
 /* Calibration matrix: FLOAT, 9 values of a 3x3 matrix, in rows */
 #define LIBINPUT_PROP_CALIBRATION "libinput Calibration Matrix"
 
@@ -147,6 +154,12 @@
 /* Scroll pixel distance: CARD32, 1 value, read-only */
 #define LIBINPUT_PROP_SCROLL_PIXEL_DISTANCE_DEFAULT "libinput Scrolling Pixel Distance Default"
 
+/* Scroll factor: FLOAT, 1 value, 32 bit */
+#define LIBINPUT_PROP_SCROLL_FACTOR "libinput Scrolling Factor"
+
+/* Scroll factor: FLOAT, 1 value, 32 bit, read-only */
+#define LIBINPUT_PROP_SCROLL_FACTOR_DEFAULT "libinput Scrolling Factor Default"
+
 /* Click method: BOOL read-only, 2 values in order buttonareas, clickfinger
    shows available click methods */
 #define LIBINPUT_PROP_CLICK_METHODS_AVAILABLE "libinput Click Methods Available"
@@ -222,6 +235,15 @@
  */
 #define LIBINPUT_PROP_TABLET_TOOL_PRESSURECURVE "libinput Tablet Tool Pressurecurve"
 
+/* Tablet tool pressure range: float, 2 values, 32 bit
+ * Value range is [0.0, 1.0] for min and max physical pressure to map to the logical range
+ * Default value: 0.0 1.0
+ */
+#define LIBINPUT_PROP_TABLET_TOOL_PRESSURE_RANGE "libinput Tablet Tool Pressure Range"
+
+/* Tablet tool pressure range: float, 2 values, 32 bit, read-only */
+#define LIBINPUT_PROP_TABLET_TOOL_PRESSURE_RANGE_DEFAULT "libinput Tablet Tool Pressure Range Default"
+
 /* Tablet tool area ratio: CARD32, 2 values, w and h */
 #define LIBINPUT_PROP_TABLET_TOOL_AREA_RATIO "libinput Tablet Tool Area Ratio"
 
@@ -229,4 +251,19 @@
  * If disabled, high-resolution wheel scroll events are discarded */
 #define LIBINPUT_PROP_HIRES_WHEEL_SCROLL_ENABLED "libinput High Resolution Wheel Scroll Enabled"
 
+/* The tablet tool unique serial number: CARD32, 1 value, constant for the
+ * lifetime of the device.
+ *
+ * If this property exists and is zero, the tool does not have a unique serial
+ * number.
+ */
+#define LIBINPUT_PROP_TABLET_TOOL_SERIAL "libinput Tablet Tool Serial"
+
+/* The tablet tool hardware ID: CARD32, 1 value, constant for the lifetime of the device.
+ *
+ * This property only exists if the device has a known tool ID.
+ * See libinput_tablet_tool_get_tool_id() in the libinput documentation for details.
+ */
+#define LIBINPUT_PROP_TABLET_TOOL_ID "libinput Tablet Tool ID"
+
 #endif /* _LIBINPUT_PROPERTIES_H_ */

man/libinput.man

@@ -1,6 +1,7 @@
+'\" t
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH LIBINPUT 4 @VERSION@
+.TH LIBINPUT 4 2025-06-01 "@VERSION@"
 .SH NAME
 libinput \- libinput-based X.Org input driver
 .SH SYNOPSIS
@@ -14,74 +15,93 @@ libinput \- libinput-based X.Org input driver
 .fi
 
 .SH NOTE
-This is the man page for the X input driver. If you are looking for the
-library documentation, go to
-.BI http://wayland.freedesktop.org/libinput/doc/
+This is the man page for the X input driver.
+If you are looking for the library documentation, go to
+.B http://wayland.freedesktop.org/libinput/doc/
 
 .SH DESCRIPTION
 .B libinput
-is an Xorg input driver based on libinput.  It
-therefore supports all input devices that libinput can handle, including
+is an Xorg input driver based on libinput.
+It therefore supports all input devices that libinput can handle, including
 most mice, keyboards, tablets and touchscreens.
 .PP
 It is recommended that
 .B libinput
 devices are configured through the
 .B InputClass
-directive (refer to xorg.conf(5)) instead of manual
-per-device configuration. Devices configured in the
-xorg.conf(5) are not hot-plug capable.
+directive (refer to
+.BR xorg.conf (5))
+instead of manual per-device configuration.
+Devices configured using the
+.B InputDevice
+directive in the
+.BR xorg.conf (5)
+file are not hot-plug capable.
 
 .SH CONFIGURATION DETAILS
-Please refer to xorg.conf(5) for general configuration
-details and for options that can be used with all input drivers.  This
-section only covers configuration details specific to this driver.
+Please refer to
+.BR xorg.conf (5)
+for general configuration details
+and for options that can be used with all input drivers.
+This section only covers configuration details specific to this driver.
 .PP
 The following driver
 .B Options
 are supported:
 .TP 7
 .BI "Option \*qAccelProfile\*q \*q" string \*q
-Sets the pointer acceleration profile to the given profile. Permitted values
-are
-.BI adaptive,
-.BI flat,
-.BI custom.
-Not all devices support this option or all profiles. If a profile is
-unsupported, the default profile for this device is used. For a description
-on the profiles and their behavior, see the libinput documentation.
+Sets the pointer acceleration profile to the given profile.
+Permitted values are
+.BR adaptive ,
+.BR flat ,
+.BR custom .
+Not all devices support this option or all profiles.
+If a profile is unsupported, the default profile for this device is used.
+For a description on the profiles and their behavior,
+see the libinput documentation.
 .TP 7
 .BI "Option \*qAccelSpeed\*q \*q" float \*q
 Sets the pointer acceleration speed within the range [-1, 1].
 This only applies to the flat or adaptive profile.
-.BI "Option \*AccelPointsFallback\*q \*q" string \*q
-Sets the points of the Fallback acceleration function, (see the libinput documentation).
-The string must be a space-separated list of floating point non-negative numbers, e.g.
+.TP 7
+.BI "Option \*qAccelPointsFallback\*q \*q" string \*q
+.TQ
+.BI "Option \*qAccelPointsMotion\*q \*q" string \*q
+.TQ
+.BI "Option \*qAccelPointsScroll\*q \*q" string \*q
+Sets the points of the Fallback/Motion/Scroll acceleration functions.
+The string must be a space-separated list of
+floating point non-negative numbers, e.g.,
 "0.0 1.0 2.4 2.5".
 This only applies to the custom profile.
-.BI "Option \*AccelStepFallback\*q \*q" float \*q
-Sets the step between the points of the Fallback acceleration function, (see the libinput documentation).
-When a step of 0.0 is provided, libinput's default Fallback acceleration function is used.
+See section
+.B CUSTOM ACCELERATION PROFILE
+.TP 7
+.BI "Option \*qAccelStepFallback\*q \*q" float \*q
+.TQ
+.BI "Option \*qAccelStepMotion\*q \*q" float \*q
+.TQ
+.BI "Option \*qAccelStepScroll\*q \*q" float \*q
+Sets the step between the points of the Fallback/Motion/Scroll
+acceleration functions.
+When a step of 0.0 is provided,
+libinput's Fallback acceleration function is used.
 This only applies to the custom profile.
-.BI "Option \*AccelPointsMotion\*q \*q" string \*q
-Equivalent to AccelPointsFallback but applies to the Motion acceleration function.
-.BI "Option \*AccelStepMotion\*q \*q" float \*q
-Equivalent to AccelStepFallback but applies to the Motion acceleration function.
-.BI "Option \*AccelPointsScroll\*q \*q" string \*q
-Equivalent to AccelPointsFallback but applies to the Scroll acceleration function.
-.BI "Option \*AccelStepScroll\*q \*q" float \*q
-Equivalent to AccelStepFallback but applies to the Scroll acceleration function.
+See section
+.B CUSTOM ACCELERATION PROFILE
 .TP 7
 .BI "Option \*qButtonMapping\*q \*q" string \*q
 Sets the logical button mapping for this device, see
-XSetPointerMapping(3). The string must be a
-space-separated list of button mappings in the order of the
+.BR XSetPointerMapping (3).
+The string must be a space-separated list of button mappings in the order of the
 logical buttons on the device, starting with button 1.
-The default mapping is "1 2 3 ... 32". A mapping of 0
-deactivates the button. Multiple buttons can have the same mapping.
+The default mapping is "1 2 3 ... 32".
+A mapping of 0 deactivates the button.
+Multiple buttons can have the same mapping.
 Invalid mapping strings are discarded and the default mapping
-is used for all buttons. Buttons not specified in the user's mapping use the
-default mapping. See section
+is used for all buttons.
+Buttons not specified in the user's mapping use the default mapping.
+See section
 .B BUTTON MAPPING
 for more details.
 .TP 7
@@ -92,44 +112,49 @@ Sets the calibration matrix to the 3x3 matrix where the first row is (abc),
 the second row is (def) and the third row is (ghi).
 .TP 7
 .BI "Option \*qClickMethod\*q \*q" string \*q
-Enables a click method. Permitted values are
-.BI none,
-.BI buttonareas,
-.BI clickfinger.
-Not all devices support all methods, if an option is unsupported, the
-default click method for this device is used.
+Enables a click method.
+Permitted values are
+.BR none ,
+.BR buttonareas ,
+.BR clickfinger .
+Not all devices support all methods.
+If an option is unsupported, the default click method for this device is used.
 .TP 7
 .BI "Option \*qDisableWhileTyping\*q \*q" bool \*q
 Indicates if the touchpad should be disabled while typing on the keyboard
 (this does not apply to modifier keys such as Ctrl or Alt).
 .TP 7
 .BI "Option \*qDevice\*q \*q" string \*q
-Specifies the device through which the device can be accessed.  This will
-generally be of the form \*q/dev/input/eventX\*q, where X is some integer.
+Specifies the device through which the device can be accessed.
+This will generally be of the form \*q/dev/input/eventX\*q,
+where X is some integer.
 When using
 .B InputClass
 directives, this option is set by the server.
-The mapping from device node to hardware is system-dependent. Property:
-"Device Node" (read-only).
+The mapping from device node to hardware is system-dependent.
+Property: "Device Node" (read-only).
 .TP 7
 .BI "Option \*qDragLockButtons\*q \*q" "L1 B1 L2 B2 ..." \*q
 Sets "drag lock buttons" that simulate a button logically down even when it has
-been physically released. To logically release a locked button, a second click
-of the same button is required.
+been physically released.
+To logically release a locked button,
+a second click of the same button is required.
 .IP
 If the option is a single button number, that button acts as the
-"meta" locking button for the next button number. See section
+"meta" locking button for the next button number.
+See section
 .B BUTTON DRAG LOCK
 for details.
 .IP
 If the option is a list of button number pairs, the first number of each
 number pair is the lock button, the second number the logical button number
-to be locked. See section
+to be locked.
+See section
 .B BUTTON DRAG LOCK
 for details.
 .IP
-For both meta and button pair configuration, the button numbers are
-device button numbers, i.e. the
+For both meta and button pair configuration,
+the button numbers are device button numbers, i.e. the
 .B ButtonMapping
 applies after drag lock.
 .TP 7
@@ -139,77 +164,101 @@ the driver forwards only high-resolution wheel scroll events from libinput.
 When disabled, the driver forwards legacy wheel scroll events instead.
 .TP 7
 .BI "Option \*qHorizontalScrolling\*q \*q" bool \*q
-Enables or disables horizontal scrolling. When disabled, this driver will
-discard any horizontal scroll events from libinput. This does not disable
-horizontal scroll events from libinput; it merely discards the horizontal axis
-from any scroll events. Default is enabled.
+Enables or disables horizontal scrolling.
+When disabled,
+this driver will discard any horizontal scroll events from libinput.
+This does not disable horizontal scroll events from libinput;
+it merely discards the horizontal axis from any scroll events.
+Default is enabled.
 .TP 7
 .BI "Option \*qLeftHanded\*q \*q" bool \*q
 Enables left-handed button orientation, i.e. swapping left and right buttons.
 .TP 7
 .BI "Option \*qMiddleEmulation\*q \*q" bool \*q
-Enables middle button emulation. When enabled, pressing the left and right
+Enables middle button emulation.
+When enabled, pressing the left and right
 buttons simultaneously produces a middle mouse button click.
 .TP 7
 .BI "Option \*qNaturalScrolling\*q \*q" bool \*q
 Enables or disables natural scrolling behavior.
 .TP 7
 .BI "Option \*qRotationAngle\*q \*q" float \*q
-Sets the rotation angle of the device to the given angle, in degrees
-clockwise. The angle must be between 0.0 (inclusive) and 360.0 (exclusive).
+Sets the rotation angle of the device to the given angle, in degrees clockwise.
+The angle must be between 0.0 (inclusive) and 360.0 (exclusive).
 .TP 7
 .BI "Option \*qScrollButton\*q \*q" int \*q
-Designates a button as scroll button. If the
-.BI ScrollMethod
+Designates a button as scroll button.
+If the
+.B ScrollMethod
 is
-.BI button
+.B button
 and the button is logically down, x/y axis movement is converted into
 scroll events.
 .TP 7
 .BI "Option \*qScrollButtonLock\*q \*q" bool \*q
-Enables or disables the scroll button lock. If enabled, the
-.BI ScrollButton
+Enables or disables the scroll button lock.
+If enabled, the
+.B ScrollButton
 is considered logically down after the first click and remains down until
-the second click of that button. If disabled (the default), the
-.BI ScrollButton
+the second click of that button.
+If disabled (the default), the
+.B ScrollButton
 button is considered logically down while held down and up once physically
 released.
 .TP 7
+.BI "Option \*qScrollFactor\*q \*q" float \*q
+Sets the scroll factor for scroll events. A value higher than 1.0 means faster scrolling.
+Applications that don't support xi2 input will instead receive scroll button events
+less or more frequently depending on the scroll factor value, instead of scrolling "smoother".
+.TP 7
 .BI "Option \*qScrollMethod\*q \*q" string \*q
 Enables a scroll method. Permitted values are
-.BI none,
-.BI twofinger,
-.BI edge,
-.BI button.
-Not all devices support all options, if an option is unsupported, the
-default scroll option for this device is used.
+.BR none ,
+.BR twofinger ,
+.BR edge ,
+.BR button .
+Not all devices support all options.
+If an option is unsupported, the default scroll option for this device is used.
 .TP 7
 .BI "Option \*qScrollPixelDistance\*q \*q" int \*q
 Sets the movement distance, in "pixels", required to trigger one logical
-wheel click. This option only applies to the scroll methods
-.BI twofinger,
-.BI edge,
-.BI button.
+wheel click.
+This option only applies to the scroll methods
+.BR twofinger ,
+.BR edge ,
+.BR button .
 See section
 .B SCROLL PIXEL DISTANCE
 for more details.
 .TP 7
 .BI "Option \*qSendEventsMode\*q \*q" (disabled|enabled|disabled-on-external-mouse) \*q
-Sets the send events mode to disabled, enabled, or "disable when an external
-mouse is connected".
+Sets the send events mode to disabled, enabled,
+or "disable when an external mouse is connected".
 .TP 7
 .BI "Option \*qTabletToolPressureCurve\*q \*q" "x0/y0 x1/y1 x2/y2 x3/y3" \*q
 Set the pressure curve for a tablet stylus to the bezier formed by the four
-points. The respective x/y coordinate must be in the [0.0, 1.0] range. For
-more information see section
-.B TABLET STYLUS PRESSURE CURVE.
+points.
+The respective x/y coordinate must be in the [0.0, 1.0] range.
+For more information see section
+.B TABLET TOOL PRESSURE CURVE.
+.TP 7
+.BI "Option \*qTabletToolPressureRange\*q \*q" "min max" \*q
+Set the pressure range for a tablet stylus to the given subset of the physical
+range.
+The min/max values must be in the [0.0, 1.0] range.
+For example, a min of 0.3 means the tablet will send 0 pressure for anything
+equal or below 30% of the physical pressure range and a max of 0.7 means
+the tablet sends its maximum pressure value for any pressure equal or higher to
+70% of the physical pressure range.
 .TP 7
 .BI "Option \*qTabletToolAreaRatio\*q \*q" "w:h" \*q
-Sets the area ratio for a tablet tool. The area always starts at the
-origin (0/0) and expands to the largest available area with the specified
-aspect ratio. Events outside this area are cropped to the area. The special
-value "default" is used for the default mapping (i.e. the device-native
-mapping). For more information see section
+Sets the area ratio for a tablet tool.
+The area always starts at the origin (0/0) and
+expands to the largest available area with the specified aspect ratio.
+Events outside this area are cropped to the area.
+The special value "default" is used for the default mapping
+(i.e. the device-native mapping).
+For more information see section
 .B TABLET TOOL AREA RATIO.
 .TP 7
 .BI "Option \*qTapping\*q \*q" bool \*q
@@ -220,150 +269,195 @@ Set the button mapping for 1/2/3-finger taps to left/right/middle or
 left/middle/right, respectively.
 .TP 7
 .BI "Option \*qTappingDrag\*q \*q" bool \*q
-Enables or disables drag during tapping behavior ("tap-and-drag"). When
-enabled, a tap followed by a finger held down causes a single button down
+Enables or disables drag during tapping behavior ("tap-and-drag").
+When enabled, a tap followed by a finger held down causes a single button down
 only, all motions of that finger thus translate into dragging motion.
 Tap-and-drag requires option
 .B Tapping
 to be enabled.
 .TP 7
 .BI "Option \*qTappingDragLock\*q \*q" bool \*q
-Enables or disables drag lock during tapping behavior. When enabled, a
-finger up during tap-and-drag will not immediately release the button. If
-the finger is set down again within the timeout, the dragging process
-continues.
+Enables or disables drag lock during tapping behavior.
+When enabled,
+a finger up during tap-and-drag will not immediately release the button.
+If the finger is set down again within the timeout,
+the dragging process continues.
 .PP
 For all options, the options are only parsed if the device supports that
-configuration option. For all options, the default value is the one used by
-libinput. On configuration failure, the default value is applied.
+configuration option.
+For all options, the default value is the one used by libinput.
+On configuration failure, the default value is applied.
 
 .SH SUPPORTED PROPERTIES
 .B libinput
-exports runtime-configurable options as properties. If a property listed
-below is not available, the matching configuration option is not available
-on the device. This however does not imply that the feature is not available
-on the device. The following properties are provided by the
+exports runtime-configurable options as properties.
+If a property listed below is not available,
+the matching configuration option is not available on the device.
+This however does not imply that the feature is not available on the device.
+The following properties are provided by the
 .B libinput
 driver.
 .TP 7
-.BI "libinput Accel Profiles Available"
-2 boolean values (8 bit, 0 or 1), in order "adaptive", "flat".
+.B "libinput Accel Profiles Available"
+3 boolean values (8 bit, 0 or 1), in order "adaptive", "flat", "custom".
 Indicates which acceleration profiles are available on this device.
 .TP 7
-.BI "libinput Accel Profile Enabled"
-2 boolean values (8 bit, 0 or 1), in order "adaptive", "flat".
+.B "libinput Accel Profile Enabled"
+3 boolean values (8 bit, 0 or 1), in order "adaptive", "flat", "custom".
 Indicates which acceleration profile is currently enabled on this device.
 .TP 7
-.BI "libinput Accel Speed"
-1 32-bit float value, defines the pointer speed. Value range -1, 1
+.B "libinput Accel Speed"
+1 32-bit float value, defines the pointer speed.
+Value range -1, 1.
+This only applies to the flat or adaptive profile.
 .TP 7
-.BI "libinput Button Scrolling Button"
-1 32-bit value. Sets the button number to use for button scrolling. This
-setting is independent of the scroll method, to enable button scrolling the
+.B "libinput Accel Custom Fallback Points"
+.TQ
+.B "libinput Accel Custom Motion Points"
+.TQ
+.B "libinput Accel Custom Scroll Points"
+A space-separated list of 32-bit floating point non-negative numbers, e.g.
+"0.0 1.0 2.4 2.5".
+Sets the points of the Fallback/Motion/Scroll acceleration functions.
+This only applies to the custom profile.
+See section
+.B CUSTOM ACCELERATION PROFILE
+.TP 7
+.B "libinput Accel Custom Fallback Step"
+.TQ
+.B "libinput Accel Custom Motion Step"
+.TQ
+.B "libinput Accel Custom Scroll Step"
+1 32-bit float value, sets the step between the points of the
+Fallback/Motion/Scroll acceleration functions.
+When a step of 0.0 is provided, libinput's Fallback acceleration
+function is used.
+This only applies to the custom profile.
+See section
+.B CUSTOM ACCELERATION PROFILE
+.TP 7
+.B "libinput Button Scrolling Button"
+1 32-bit value. Sets the button number to use for button scrolling.
+This setting is independent of the scroll method, to enable button scrolling the
 method must be set to button-scrolling and a valid button must be set.
 .TP 7
-.BI "libinput Button Scrolling Button Lock Enabled"
-1 boolean value. If true, the scroll button lock is enabled.  This
-setting is independent of the scroll method or the scroll button, to enable
+.B "libinput Button Scrolling Button Lock Enabled"
+1 boolean value. If true, the scroll button lock is enabled.
+This setting is independent of the scroll method or the scroll button, to enable
 button scrolling the method must be set to button-scrolling and a valid
 button must be set.
 .TP 7
-.BI "libinput Calibration Matrix"
+.B "libinput Calibration Matrix"
 9 32-bit float values, representing a 3x3 calibration matrix, order is row
 1, row 2, row 3
 .TP 7
-.BI "libinput Click Methods Available"
+.B "libinput Click Methods Available"
 2 boolean values (8 bit, 0 or 1), in order "buttonareas", "clickfinger".
 Indicates which click methods are available on this device.
 .TP 7
-.BI "libinput Click Methods Enabled"
+.B "libinput Click Methods Enabled"
 2 boolean values (8 bit, 0 or 1), in order "buttonareas", "clickfinger".
 Indicates which click methods are enabled on this device.
 .TP 7
-.BI "libinput Drag Lock Buttons"
+.B "libinput Drag Lock Buttons"
 Either one 8-bit value specifying the meta drag lock button, or a list of
-button pairs. See section
+button pairs.
+See section
 .B BUTTON DRAG LOCK
 for details.
 .TP 7
-.BI "libinput High Resolution Wheel Scroll Enabled"
-1 boolean value (8 bit, 0 or 1). Indicates whether high-resolution
-wheel scroll events are enabled or not.
+.B "libinput High Resolution Wheel Scroll Enabled"
+1 boolean value (8 bit, 0 or 1).
+Indicates whether high-resolution wheel scroll events are enabled or not.
 .TP 7
-.BI "libinput Horizontal Scroll Enabled"
-1 boolean value (8 bit, 0 or 1). Indicates whether horizontal scrolling
-events are enabled or not.
+.B "libinput Horizontal Scroll Enabled"
+1 boolean value (8 bit, 0 or 1).
+Indicates whether horizontal scrolling events are enabled or not.
 .TP 7
-.BI "libinput Left Handed Enabled"
-1 boolean value (8 bit, 0 or 1). Indicates if left-handed mode is enabled or
-disabled.
+.B "libinput Left Handed Enabled"
+1 boolean value (8 bit, 0 or 1).
+Indicates if left-handed mode is enabled or disabled.
 .TP 7
-.BI "libinput Middle Emulation Enabled"
-1 boolean value (8 bit, 0 or 1). Indicates if middle emulation is enabled or
-disabled.
+.B "libinput Middle Emulation Enabled"
+1 boolean value (8 bit, 0 or 1).
+Indicates if middle emulation is enabled or disabled.
 .TP 7
-.BI "libinput Natural Scrolling Enabled"
-1 boolean value (8 bit, 0 or 1). 1 enables natural scrolling
+.B "libinput Natural Scrolling Enabled"
+1 boolean value (8 bit, 0 or 1).
+1 enables natural scrolling.
 .TP 7
-.BI "libinput Rotation Angle"
-1 32-bit float value [0.0 to 360.0). Sets the rotation angle of the device,
+.B "libinput Rotation Angle"
+1 32-bit float value [0.0 to 360.0).
+Sets the rotation angle of the device,
 clockwise of its natural neutral position.
 .TP 7
-.BI "libinput Scroll Methods Available"
+.B "libinput Scrolling Factor"
+1 32-bit float value.
+Sets the scroll factor for scroll events. A value higher than 1.0 means faster scrolling.
+Applications that don't support xi2 input will instead receive scroll button events
+less or more frequently depending on the scroll factor value, instead of scrolling "smoother".
+.TP 7
+.B "libinput Scroll Methods Available"
 3 boolean values (8 bit, 0 or 1), in order "two-finger", "edge", "button".
 Indicates which scroll methods are available on this device.
 .TP 7
-.BI "libinput Scroll Method Enabled"
+.B "libinput Scroll Method Enabled"
 3 boolean values (8 bit, 0 or 1), in order "two-finger", "edge", "button".
 Indicates which scroll method is currently enabled on this device.
 .TP 7
-.BI "libinput Scroll Pixel Distance"
+.B "libinput Scrolling Pixel Distance"
 1 32-bit value (nonzero, with additional implementation-defined range checks).
 Changes the movement distance required to trigger one logical wheel click.
 .TP 7
-.BI "libinput Send Events Modes Available"
+.B "libinput Send Events Modes Available"
 2 boolean values (8 bit, 0 or 1), in order "disabled" and
-"disabled-on-external-mouse". Indicates which send-event modes are available
-on this device.
+"disabled-on-external-mouse".
+Indicates which send-event modes are available on this device.
 .TP 7
-.BI "libinput Send Events Mode Enabled"
+.B "libinput Send Events Mode Enabled"
 2 boolean values (8 bit, 0 or 1), in order "disabled" and
-"disabled-on-external-mouse". Indicates which send-event modes is currently
-enabled on this device.
+"disabled-on-external-mouse".
+Indicates which send-event mode is currently enabled on this device.
 .TP 7
-.BI "libinput Tablet Tool Pressurecurve"
-4 32-bit float values [0.0 to 1.0]. See section
+.B "libinput Tablet Tool Pressurecurve"
+4 32-bit float values [0.0 to 1.0].
+See section
 .B TABLET TOOL PRESSURE CURVE
 .TP 7
-.BI "libinput Tablet Tool Area Ratio"
-2 32-bit values, corresponding to width and height. Special value 0, 0
-resets to the default ratio. See section
+.B "libinput Tablet Tool Area Ratio"
+2 32-bit values, corresponding to width and height.
+Special value 0, 0 resets to the default ratio.
+See section
 .B TABLET TOOL AREA RATIO
 for more information.
 .TP 7
-.BI "libinput Tapping Enabled"
-1 boolean value (8 bit, 0 or 1). 1 enables tapping
+.B "libinput Tapping Enabled"
+1 boolean value (8 bit, 0 or 1).
+1 enables tapping.
+.TP 7.
+.B "libinput Tapping Button Mapping Enabled"
+2 boolean value (8 bit, 0 or 1), in order "lrm" and "lmr".
+Indicates which button mapping is currently enabled on this device.
 .TP 7
-.BI "libinput Tapping Button Mapping Enabled"
-2 boolean value (8 bit, 0 or 1), in order "lrm" and "lmr". Indicates which
-button mapping is currently enabled on this device.
+.B "libinput Tapping Drag Lock Enabled"
+1 boolean value (8 bit, 0 or 1).
+1 enables drag lock during tapping.
 .TP 7
-.BI "libinput Tapping Drag Lock Enabled"
-1 boolean value (8 bit, 0 or 1). 1 enables drag lock during tapping
-.TP 7
-.BI "libinput Disable While Typing Enabled"
-1 boolean value (8 bit, 0 or 1). Indicates if disable while typing is
-enabled or disabled.
+.B "libinput Disable While Typing Enabled"
+1 boolean value (8 bit, 0 or 1).
+Indicates if disable while typing is enabled or disabled.
 .PP
 Most properties have a
-.BI "libinput <property name> Default"
+.B "libinput <property name> Default"
 equivalent that indicates the default value for this setting on this device.
 
 .SH BUTTON MAPPING
-X clients receive events with logical button numbers, where 1, 2, 3
-are usually interpreted as left, middle, right and logical buttons 4, 5, 6,
-7 are usually interpreted as scroll up, down, left, right. The fourth and
-fifth physical buttons on a device will thus send logical buttons 8 and 9.
+X clients receive events with logical button numbers,
+where 1, 2, 3 are usually interpreted as left, middle, right;
+and logical buttons 4, 5, 6, 7 are usually interpreted
+as scroll up, down, left, right.
+The fourth and fifth physical buttons on a device
+will thus send logical buttons 8 and 9.
 The
 .B ButtonMapping
 option adjusts the logical button mapping, it does not affect how a physical
@@ -381,81 +475,129 @@ option instead.
 The
 .B libinput
 Xorg input driver does not use the button mapping after setup.
-Use XSetPointerMapping(3) to modify the button mapping at
-runtime.
+Use
+.BR XSetPointerMapping (3)
+to modify the button mapping at runtime.
 
 .SH BUTTON DRAG LOCK
 Button drag lock holds a button logically down even when the button itself
-has been physically released since. Button drag lock comes in two modes.
+has been physically released since.
+Button drag lock comes in two modes.
 .PP
 If in "meta" mode, a meta button click activates drag lock for the next
-button press of any other button. A button click in the future will keep
-that button held logically down until a subsequent click of that same
-button. The meta button events themselves are discarded. A separate meta
-button click is required each time a drag lock should be activated for a
-button in the future.
+button press of any other button.
+A button click in the future will keep that button held logically down
+until a subsequent click of that same button.
+The meta button events themselves are discarded.
+A separate meta button click is required each time a drag lock should be
+activated for a button in the future.
 .PP
 If in "pairs" mode, each button can be assigned a target locking button.
 On button click, the target lock button is held logically down until the
-next click of the same button. The button events themselves are discarded
+next click of the same button.
+The button events themselves are discarded
 and only the target button events are sent.
-.TP
+.PP
 This feature is provided by this driver, not by libinput.
 
-.SH TABLET TOOL PRESSURECURVE
-The pressure curve affects how stylus pressure is reported. By default, the
-hardware pressure is reported as-is. By setting a pressure curve, the feel
-of the stylus can be adjusted to be more like e.g. a pencil or a brush.
+.SH TABLET TOOL PRESSURE CURVE
+The pressure curve affects how stylus pressure is reported.
+By default, the hardware pressure is reported as-is.
+By setting a pressure curve, the feel of the stylus can be adjusted
+to be more like e.g. a pencil or a brush.
 .PP
 The pressure curve is a cubic Bezier curve, drawn within a normalized range
-of 0.0 to 1.0 between the four points provided. This normalized range is
-applied to the tablet's pressure input so that the highest pressure maps to
-1.0. The points must have increasing x coordinates, if x0 is larger than 0.0
-all pressure values lower than x0 are equivalent to y0. If x3 is less than
-1.0, all pressure values higher than x3  are equivalent to y3.
-
-The input for a linear  curve  (default) is  "0.0/0.0 0.0/0.0 1.0/1.0 1.0/1.0";
-a slightly
-depressed curve (firmer) might be "0.0/0.0 0.05/0.0 1.0/0.95 1.0/1.0"; a slightly raised
-curve (softer) might  be "0.0/0.0 0.0/0.05 0.95/1.0 1.0/1.0".
-.TP
+of 0.0 to 1.0 between the four points provided.
+This normalized range is applied to the tablet's pressure input
+so that the highest pressure maps to 1.0.
+The points must have increasing x coordinates, if x0 is larger than 0.0
+all pressure values lower than x0 are equivalent to y0.
+If x3 is less than 1.0,
+all pressure values higher than x3 are equivalent to y3.
+.PP
+The input for a linear curve (default) is  "0.0/0.0 0.0/0.0 1.0/1.0 1.0/1.0";
+a slightly depressed curve (firmer) might be
+"0.0/0.0 0.05/0.0 1.0/0.95 1.0/1.0";
+a slightly raised curve (softer) might be "0.0/0.0 0.0/0.05 0.95/1.0 1.0/1.0".
+.PP
 This feature is provided by this driver, not by libinput.
 
 .SH TABLET TOOL AREA RATIO
 By default, a tablet tool can access the whole sensor area and the tablet
-area is mapped to the available screen area. For external tablets like
-the Wacom Intuos series, the height:width ratio of the tablet may be
-different to that of the monitor, causing the skew of input data.
+area is mapped to the available screen area.
+For external tablets like the Wacom Intuos series,
+the height:width ratio of the tablet may be different to that of the monitor,
+causing the skew of input data.
 .PP
 To avoid this skew of input data, an area ratio may be set to match the
-ratio of the screen device. For example, a ratio of 4:3 will reduce the
-available area of the tablet to the largest available area with a ratio of
-4:3. Events within this area will scale to the tablet's announced axis
-range, the area ratio is thus transparent to the X server. Any events
-outside this area will send events equal to the maximum value of that axis.
-The area always starts at the device's origin in it's current rotation, i.e.
+ratio of the screen device.
+For example, a ratio of 4:3 will reduce the available area of the tablet
+to the largest available area with a ratio of 4:3.
+Events within this area will scale to the tablet's announced axis range,
+the area ratio is thus transparent to the X server.
+Any events outside this area will send events equal to the maximum value of
+that axis.
+The area always starts at the device's origin in it's current rotation, i.e.,
 it takes left-handed-ness into account.
-.TP
+.PP
 This feature is provided by this driver, not by libinput.
 
 .SH SCROLL PIXEL DISTANCE
 The X server does not support per-pixel scrolling but it does support
-smooth scrolling. All scroll events however are based around a logical
-unit of scrolling (traditionally corresponding to a wheel click).
+smooth scrolling.
+All scroll events however are based around a logical unit of scrolling
+(traditionally corresponding to a wheel click).
 It is thus not possible to scroll by 10 pixels, but it is possible for a
 driver to scroll by 1/10th of a logical wheel click.
 .PP
-libinput provides scroll data in pixels. The \fBScrollPixelDistance\fR
-option defines the amount of movement equivalent to one wheel click. For
-example, a value of 50 means the user has to move a finger by 50 pixels to
+libinput provides scroll data in pixels.
+The \fBScrollPixelDistance\fR option defines the amount of movement equivalent
+to one wheel click.
+For example, a value of 50 means the user has to move a finger by 50 pixels to
 generate one logical click event and each pixel is 1/50th of a wheel click.
+
+.SH CUSTOM ACCELERATION PROFILE
+The custom pointer acceleration profile gives users full control over the
+acceleration behavior at different speeds.
+libinput exposes an acceleration function \fIf(x)\fP
+where the x-axis is the device speed in device units per millisecond
+and the y-axis is the pointer speed.
+.PP
+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.
+Thus the points defining the custom function are:
+.EX
+(0 * step, f[0]), (1 * step, f[1]), ..., ((n-1) * step, f[n-1])
+.EE
+When a velocity value does not lie exactly on those points,
+a linear interpolation/extrapolation of the two closest points
+will be calculated.
+.PP
+There are 3 custom acceleration functions,
+which are used for different movement types:
+.TS
+tab(;) allbox;
+l l l.
+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
+.TE
+.PP
+See libinput library documentation for more details:
+https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html#the-custom-acceleration-profile
+
 .SH BUGS
 This driver does not work with \fBOption \*qDevice\*q\fR set to an event
-node in \fI/dev/input/by-id\fR and \fI/dev/input/by-path\fR. This can be
-usually be worked by using \fBSection \*qInputClass\*q\fR with an
-appropriate \fBMatch*\fR statement in the xorg.conf(5).
+node in \fI/dev/input/by-id\fR and \fI/dev/input/by-path\fR.
+This can be usually be worked by using \fBSection \*qInputClass\*q\fR with an
+appropriate \fBMatch*\fR statement in the
+.BR xorg.conf (5).
 
 .SH AUTHORS
 Peter Hutterer
 .SH "SEE ALSO"
-Xorg(1), xorg.conf(5), Xserver(1), X(7)
+.BR Xorg (1),
+.BR xorg.conf (5),
+.BR Xserver (1),
+.BR X (7)

meson.build

@@ -1,5 +1,5 @@
 project('xf86-input-libinput', 'c',
-        version: '1.3.0',  # bump version in configure.ac
+        version: '1.5.0',  # bump version in configure.ac
         default_options: ['warning_level=2'],
         meson_version: '>= 0.50.0')
 
@@ -57,6 +57,17 @@ if cc.has_function('libinput_config_accel_create',
 		   dependencies: dep_libinput)
 	config_h.set('HAVE_LIBINPUT_CUSTOM_ACCEL', 1)
 endif
+if cc.has_function('libinput_tablet_tool_config_pressure_range_set',
+		   dependencies: dep_libinput)
+	config_h.set('HAVE_LIBINPUT_PRESSURE_RANGE', 1)
+endif
+if cc.has_function('libinput_device_config_click_set_clickfinger_button_map',
+		   dependencies: dep_libinput)
+	config_h.set('HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP', 1)
+endif
+if cc.has_header_symbol('libinput.h', 'LIBINPUT_LED_COMPOSE')
+	config_h.set('HAVE_LIBINPUT_COMPOSE_AND_KANA', 1)
+endif
 
 dir_headers = get_option('sdkdir')
 if dir_headers == ''
@@ -135,6 +146,8 @@ configure_file(
 	install_dir: dir_man4
 )
 
+install_headers('include/libinput-properties.h', install_dir: dir_headers)
+
 install_data('conf/40-libinput.conf', install_dir: dir_xorg_conf)
 
 # Now generate config.h

src/util-strings.c

@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#define _GNU_SOURCE
 
 #include "util-strings.h"
 
@@ -58,36 +59,6 @@ next_word(const char **state, size_t *len, const char *separators)
 	return next;
 }
 
-/**
- * Return a null-terminated string array with the contents of argv
- * duplicated.
- *
- * Use strv_free() to free the array.
- *
- * @return A null-terminated string array or NULL on errors
- */
-char**
-strv_from_argv(int argc, char **argv)
-{
-	char **strv = NULL;
-
-	assert(argc >= 0);
-
-	if (argc == 0)
-		return NULL;
-
-	strv = zalloc((argc + 1) * sizeof *strv);
-	for (int i = 0; i < argc; i++) {
-		char *copy = safe_strdup(argv[i]);
-		if (!copy) {
-			strv_free(strv);
-			return NULL;
-		}
-		strv[i] = copy;
-	}
-	return strv;
-}
-
 /**
  * Return a null-terminated string array with the tokens in the input
  * string, e.g. "one two\tthree" with a separator list of " \t" will return
@@ -121,7 +92,9 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements)
 	}
 
 	size_t strv_len = nelems + 1; /* NULL-terminated */
-	char **strv = zalloc(strv_len * sizeof *strv);
+	char **strv = calloc(strv_len, sizeof(*strv));
+	if (!strv)
+		return NULL;
 
 	size_t idx = 0;
 	const char *word;
@@ -141,103 +114,3 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements)
 
 	return strv;
 }
-
-/**
- * Return a newly allocated string with all elements joined by the
- * joiner, same as Python's string.join() basically.
- * A strv of ["one", "two", "three", NULL] with a joiner of ", " results
- * in "one, two, three".
- *
- * An empty strv ([NULL]) returns NULL, same for passing NULL as either
- * argument.
- *
- * @param strv Input string array
- * @param joiner Joiner between the elements in the final string
- *
- * @return A null-terminated string joining all elements
- */
-char *
-strv_join(char **strv, const char *joiner)
-{
-	char **s;
-	char *str;
-	size_t slen = 0;
-	size_t count = 0;
-
-	if (!strv || !joiner)
-		return NULL;
-
-	if (strv[0] == NULL)
-		return NULL;
-
-	for (s = strv, count = 0; *s; s++, count++) {
-		slen += strlen(*s);
-	}
-
-	assert(slen < 1000);
-	assert(strlen(joiner) < 1000);
-	assert(count > 0);
-	assert(count < 100);
-
-	slen += (count - 1) * strlen(joiner);
-
-	str = zalloc(slen + 1); /* trailing \0 */
-	for (s = strv; *s; s++) {
-		strcat(str, *s);
-		--count;
-		if (count > 0)
-			strcat(str, joiner);
-	}
-
-	return str;
-}
-
-/**
- * Return a pointer to the basename within filename.
- * If the filename the empty string or a directory (i.e. the last char of
- * filename is '/') NULL is returned.
- */
-const char *
-safe_basename(const char *filename)
-{
-	const char *basename;
-
-	if (*filename == '\0')
-		return NULL;
-
-	basename = strrchr(filename, '/');
-	if (basename == NULL)
-		return filename;
-
-	if (*(basename + 1) == '\0')
-		return NULL;
-
-	return basename + 1;
-}
-
-/**
- * Similar to basename() but returns the trunk only without the (last)
- * trailing suffix, so that:
- *
- * - foo.c returns foo
- * - foo.a.b returns foo.a
- * - foo returns foo
- * - foo/ returns ""
- *
- * @return an allocated string representing the trunk name of the file
- */
-char *
-trunkname(const char *filename)
-{
-	const char *base = safe_basename(filename);
-	char *suffix;
-
-	if (base == NULL)
-		return safe_strdup("");
-
-	suffix = rindex(base, '.');
-	if (suffix == NULL)
-		return safe_strdup(base);
-	else
-		return strndup(base, suffix-base);
-}

src/util-strings.h

@@ -24,9 +24,6 @@
 
 #pragma once
 
-#include "config.h"
-#define _GNU_SOURCE
-
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -46,161 +43,6 @@
 
 #include "util-macros.h"
 
-static inline bool
-streq(const char *str1, const char *str2)
-{
-	/* one NULL, one not NULL is always false */
-	if (str1 && str2)
-		return strcmp(str1, str2) == 0;
-	return str1 == str2;
-}
-
-static inline bool
-strneq(const char *str1, const char *str2, int n)
-{
-	/* one NULL, one not NULL is always false */
-	if (str1 && str2)
-		return strncmp(str1, str2, n) == 0;
-	return str1 == str2;
-}
-
-static inline void *
-zalloc(size_t size)
-{
-	void *p;
-
-	/* We never need to alloc anything more than 1,5 MB so we can assume
-	 * if we ever get above that something's going wrong */
-	if (size > 1536 * 1024)
-		assert(!"bug: internal malloc size limit exceeded");
-
-	p = calloc(1, size);
-	if (!p)
-		abort();
-
-	return p;
-}
-
-/**
- * strdup guaranteed to succeed. If the input string is NULL, the output
- * string is NULL. If the input string is a string pointer, we strdup or
- * abort on failure.
- */
-static inline char*
-safe_strdup(const char *str)
-{
-	char *s;
-
-	if (!str)
-		return NULL;
-
-	s = strdup(str);
-	if (!s)
-		abort();
-	return s;
-}
-
-/**
- * Simple wrapper for asprintf that ensures the passed in-pointer is set
- * to NULL upon error.
- * The standard asprintf() call does not guarantee the passed in pointer
- * will be NULL'ed upon failure, whereas this wrapper does.
- *
- * @param strp pointer to set to newly allocated string.
- * This pointer should be passed to free() to release when done.
- * @param fmt the format string to use for printing.
- * @return The number of bytes printed (excluding the null byte terminator)
- * upon success or -1 upon failure. In the case of failure the pointer is set
- * to NULL.
- */
-__attribute__ ((format (printf, 2, 3)))
-static inline int
-xasprintf(char **strp, const char *fmt, ...)
-{
-	int rc = 0;
-	va_list args;
-
-	va_start(args, fmt);
-	rc = vasprintf(strp, fmt, args);
-	va_end(args);
-	if ((rc == -1) && strp)
-		*strp = NULL;
-
-	return rc;
-}
-
-__attribute__ ((format (printf, 2, 0)))
-static inline int
-xvasprintf(char **strp, const char *fmt, va_list args)
-{
-	int rc = 0;
-	rc = vasprintf(strp, fmt, args);
-	if ((rc == -1) && strp)
-		*strp = NULL;
-
-	return rc;
-}
-
-static inline bool
-safe_atoi_base(const char *str, int *val, int base)
-{
-	char *endptr;
-	long v;
-
-	assert(base == 10 || base == 16 || base == 8);
-
-	errno = 0;
-	v = strtol(str, &endptr, base);
-	if (errno > 0)
-		return false;
-	if (str == endptr)
-		return false;
-	if (*str != '\0' && *endptr != '\0')
-		return false;
-
-	if (v > INT_MAX || v < INT_MIN)
-		return false;
-
-	*val = v;
-	return true;
-}
-
-static inline bool
-safe_atoi(const char *str, int *val)
-{
-	return safe_atoi_base(str, val, 10);
-}
-
-static inline bool
-safe_atou_base(const char *str, unsigned int *val, int base)
-{
-	char *endptr;
-	unsigned long v;
-
-	assert(base == 10 || base == 16 || base == 8);
-
-	errno = 0;
-	v = strtoul(str, &endptr, base);
-	if (errno > 0)
-		return false;
-	if (str == endptr)
-		return false;
-	if (*str != '\0' && *endptr != '\0')
-		return false;
-
-	if ((long)v < 0)
-		return false;
-
-	*val = v;
-	return true;
-}
-
-static inline bool
-safe_atou(const char *str, unsigned int *val)
-{
-	return safe_atou_base(str, val, 10);
-}
-
 static inline bool
 safe_atod(const char *str, double *val)
 {
@@ -255,9 +97,7 @@ safe_atod(const char *str, double *val)
 	return true;
 }
 
-char **strv_from_argv(int argc, char **argv);
 char **strv_from_string(const char *in, const char *separator, size_t *num_elements);
-char *strv_join(char **strv, const char *joiner);
 
 static inline void
 strv_free(char **strv) {
@@ -297,7 +137,10 @@ double_array_from_string(const char *in,
 	if(!strv)
 		return result;
 
-	double *numv = zalloc(sizeof(double) * nelem);
+	double *numv = calloc(nelem, sizeof(double));
+	if (!numv)
+		goto out;
+
 	for (size_t idx = 0; idx < nelem; idx++) {
 		double val;
 		if (!safe_atod(strv[idx], &val))
@@ -315,150 +158,3 @@ out:
 	free(numv);
 	return result;
 }
-
-struct key_value_str{
-	char *key;
-	char *value;
-};
-
-struct key_value_double {
-	double key;
-	double value;
-};
-
-static inline ssize_t
-kv_double_from_string(const char *string,
-		      const char *pair_separator,
-		      const char *kv_separator,
-		      struct key_value_double **result_out)
-
-{
-	struct key_value_double *result = NULL;
-
-	if (!pair_separator || pair_separator[0] == '\0' ||
-	    !kv_separator || kv_separator[0] == '\0')
-		return -1;
-
-	size_t npairs;
-	char **pairs = strv_from_string(string, pair_separator, &npairs);
-	if (!pairs || npairs == 0)
-		goto error;
-
-	result = zalloc(npairs * sizeof *result);
-
-	for (size_t idx = 0; idx < npairs; idx++) {
-		char *pair = pairs[idx];
-		size_t nelem;
-		char **kv = strv_from_string(pair, kv_separator, &nelem);
-		double k, v;
-
-		if (!kv || nelem != 2 ||
-		    !safe_atod(kv[0], &k) ||
-		    !safe_atod(kv[1], &v)) {
-			strv_free(kv);
-			goto error;
-		}
-
-		result[idx].key = k;
-		result[idx].value = v;
-
-		strv_free(kv);
-	}
-
-	strv_free(pairs);
-
-	*result_out = result;
-
-	return npairs;
-
-error:
-	strv_free(pairs);
-	free(result);
-	return -1;
-}
-
-/**
- * Strip any of the characters in what from the beginning and end of the
- * input string.
- *
- * @return a newly allocated string with none of "what" at the beginning or
- * end of string
- */
-static inline char *
-strstrip(const char *input, const char *what)
-{
-	char *str, *last;
-
-	str = safe_strdup(&input[strspn(input, what)]);
-
-	last = str;
-
-	for (char *c = str; *c != '\0'; c++) {
-		if (!strchr(what, *c))
-			last = c + 1;
-	}
-
-	*last = '\0';
-
-	return str;
-}
-
-/**
- * Return true if str ends in suffix, false otherwise. If the suffix is the
- * empty string, strendswith() always returns false.
- */
-static inline bool
-strendswith(const char *str, const char *suffix)
-{
-	size_t slen = strlen(str);
-	size_t suffixlen = strlen(suffix);
-	size_t offset;
-
-	if (slen == 0 || suffixlen == 0 || suffixlen > slen)
-		return false;
-
-	offset = slen - suffixlen;
-	return strneq(&str[offset], suffix, suffixlen);
-}
-
-static inline bool
-strstartswith(const char *str, const char *prefix)
-{
-	size_t prefixlen = strlen(prefix);
-
-	return prefixlen > 0 ? strneq(str, prefix, strlen(prefix)) : false;
-}
-
-const char *
-safe_basename(const char *filename);
-
-char *
-trunkname(const char *filename);
-
-/**
- * Return a copy of str with all % converted to %% to make the string
- * acceptable as printf format.
- */
-static inline char *
-str_sanitize(const char *str)
-{
-	if (!str)
-		return NULL;
-
-	if (!strchr(str, '%'))
-		return strdup(str);
-
-	size_t slen = min(strlen(str), 512);
-	char *sanitized = zalloc(2 * slen + 1);
-	const char *src = str;
-	char *dst = sanitized;
-
-	for (size_t i = 0; i < slen; i++) {
-		if (*src == '%')
-			*dst++ = '%';
-		*dst++ = *src++;
-	}
-	*dst = '\0';
-
-	return sanitized;
-}

src/xf86libinput.c

@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#define _GNU_SOURCE
 
 #include <errno.h>
 #include <fcntl.h>
@@ -52,6 +53,8 @@
 #define TOUCH_MAX_SLOTS 15
 #define XORG_KEYCODE_OFFSET 8
 #define SCROLL_INCREMENT 15
+#define SCROLL_FACTOR_MIN 0.0001
+#define SCROLL_FACTOR_MAX 1000.0
 #define TOUCHPAD_SCROLL_DIST_MIN 10 /* in libinput pixels */
 #define TOUCHPAD_SCROLL_DIST_MAX 50 /* in libinput pixels */
 
@@ -80,13 +83,15 @@
 #define TABLET_STRIP_AXIS_MAX 4096
 #define TABLET_RING_AXIS_MAX 71
 
-#define CAP_KEYBOARD	0x1
-#define CAP_POINTER	0x2
-#define CAP_TOUCH	0x4
-#define CAP_TABLET	0x8
-#define CAP_TABLET_TOOL	0x10
-#define CAP_TABLET_PAD	0x20
-#define CAP_GESTURE	0x40
+enum capabilities {
+	CAP_KEYBOARD = 0x1,
+	CAP_POINTER = 0x2,
+	CAP_TOUCH = 0x4,
+	CAP_TABLET = 0x8,
+	CAP_TABLET_TOOL = 0x10,
+	CAP_TABLET_PAD = 0x20,
+	CAP_GESTURE = 0x40,
+};
 
 #if HAVE_INPUTPROTO24
 #if ABI_XINPUT_VERSION >= SET_ABI_VERSION(24, 4)
@@ -136,6 +141,10 @@ struct accel_points {
 };
 #endif
 
+struct xf86libinput_pressure_range {
+	float min, max;
+};
+
 struct xf86libinput {
 	InputInfoPtr pInfo;
 	char *path;
@@ -173,10 +182,14 @@ struct xf86libinput {
 		CARD32 scroll_button; /* xorg button number */
 		BOOL scroll_buttonlock;
 		uint32_t scroll_pixel_distance;
+		float scroll_factor;
 		float speed;
 		float matrix[9];
 		enum libinput_config_scroll_method scroll_method;
 		enum libinput_config_click_method click_method;
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+		enum libinput_config_clickfinger_button_map clickfinger_button_map;
+#endif
 		enum libinput_config_accel_profile accel_profile;
 #if HAVE_LIBINPUT_CUSTOM_ACCEL
 		struct accel_points accel_points_fallback;
@@ -190,6 +203,7 @@ struct xf86libinput {
 
 		float rotation_angle;
 		struct bezier_control_point pressurecurve[4];
+		struct xf86libinput_pressure_range pressure_range;
 		struct ratio {
 			int x, y;
 		} area;
@@ -254,6 +268,7 @@ btn_linux2xorg(unsigned int b)
 	/* tablet button range */
 	case BTN_STYLUS: button = 2; break;
 	case BTN_STYLUS2: button = 3; break;
+	case BTN_STYLUS3: button = 8; break;
 	default:
 		button = 8 + b - BTN_SIDE;
 		break;
@@ -452,6 +467,25 @@ xf86libinput_set_pressurecurve(struct xf86libinput *driver_data,
 			    driver_data->pressurecurve.sz);
 }
 
+static inline bool
+xf86libinput_set_pressure_range(struct xf86libinput *driver_data,
+				const struct xf86libinput_pressure_range *rangeopt)
+{
+#if HAVE_LIBINPUT_PRESSURE_RANGE
+	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
+
+	if (!tool)
+		return FALSE;
+
+	return libinput_tablet_tool_config_pressure_range_is_available(tool) &&
+	       libinput_tablet_tool_config_pressure_range_set(tool,
+							      rangeopt->min,
+							      rangeopt->max) == LIBINPUT_CONFIG_STATUS_SUCCESS;
+#else
+	return FALSE;
+#endif
+}
+
 static inline void
 xf86libinput_set_area_ratio(struct xf86libinput *driver_data,
 			    const struct ratio *ratio)
@@ -498,8 +532,10 @@ subdevice_has_capabilities(DeviceIntPtr dev, uint32_t capabilities)
 }
 
 static int
-LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
-                 BOOL checkonly);
+LibinputSetProperty(DeviceIntPtr dev, Atom atom,
+		    XIPropertyValuePtr val,
+		    BOOL checkonly);
+
 static void
 LibinputInitProperty(DeviceIntPtr dev);
 
@@ -730,7 +766,7 @@ LibinputApplyConfigLeftHanded(DeviceIntPtr dev,
 {
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 
-	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET))
+	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET|CAP_TABLET_TOOL))
 		return;
 
 	if (libinput_device_config_left_handed_is_available(device) &&
@@ -801,6 +837,9 @@ LibinputApplyConfigClickMethod(DeviceIntPtr dev,
 			       struct libinput_device *device)
 {
 	InputInfoPtr pInfo = dev->public.devicePrivate;
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+	uint32_t click_methods = libinput_device_config_click_get_methods(device);
+#endif
 
 	if (!subdevice_has_capabilities(dev, CAP_POINTER))
 		return;
@@ -821,6 +860,24 @@ LibinputApplyConfigClickMethod(DeviceIntPtr dev,
 			    "Failed to set click method to %s\n",
 			    method);
 	}
+
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+	if (click_methods & LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER &&
+	    libinput_device_config_click_set_clickfinger_button_map(device,
+								    driver_data->options.clickfinger_button_map) != LIBINPUT_CONFIG_STATUS_SUCCESS) {
+		const char *map;
+
+		switch (driver_data->options.clickfinger_button_map) {
+		case LIBINPUT_CONFIG_CLICKFINGER_MAP_LRM: map = "LRM"; break;
+		case LIBINPUT_CONFIG_CLICKFINGER_MAP_LMR: map = "LMR"; break;
+		default:
+			map = "unknown"; break;
+		}
+		xf86IDrvMsg(pInfo, X_ERROR,
+			    "Failed to set clickfinger button map to %s\n",
+			    map);
+	}
+#endif
 }
 
 static void
@@ -876,6 +933,27 @@ LibinputApplyConfigRotation(DeviceIntPtr dev,
 			    driver_data->options.rotation_angle);
 }
 
+static void
+LibinputApplyConfigPressureRange(DeviceIntPtr dev,
+				 struct xf86libinput *driver_data,
+				 struct libinput_device *device)
+{
+#if HAVE_LIBINPUT_PRESSURE_RANGE
+	InputInfoPtr pInfo = dev->public.devicePrivate;
+	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
+	struct xf86libinput_pressure_range *rangeopt = &driver_data->options.pressure_range;
+
+	if (!subdevice_has_capabilities(dev, CAP_TABLET_TOOL))
+		return;
+
+	if (tool && libinput_tablet_tool_config_pressure_range_is_available(tool) &&
+	    libinput_tablet_tool_config_pressure_range_set(tool, rangeopt->min, rangeopt->max) != LIBINPUT_CONFIG_STATUS_SUCCESS)
+		xf86IDrvMsg(pInfo, X_ERROR,
+			    "Failed to set PressureRange to %.2f..%.2f\n",
+			    rangeopt->min, rangeopt->max);
+#endif
+}
+
 static inline void
 LibinputApplyConfig(DeviceIntPtr dev)
 {
@@ -894,6 +972,7 @@ LibinputApplyConfig(DeviceIntPtr dev)
 	LibinputApplyConfigMiddleEmulation(dev, driver_data, device);
 	LibinputApplyConfigDisableWhileTyping(dev, driver_data, device);
 	LibinputApplyConfigRotation(dev, driver_data, device);
+	LibinputApplyConfigPressureRange(dev, driver_data, device);
 }
 
 static int
@@ -1095,35 +1174,41 @@ xf86libinput_init_pointer_absolute(InputInfoPtr pInfo)
 
 	return Success;
 }
+
 static void
 xf86libinput_kbd_ctrl(DeviceIntPtr device, KeybdCtrl *ctrl)
 {
-#define CAPSFLAG	1
-#define NUMFLAG		2
-#define SCROLLFLAG	4
+#define CAPSFLAG    1
+#define NUMFLAG     2
+#define SCROLLFLAG  4
+#define COMPOSEFLAG 8
+#define KANAFLAG    16
+	static struct { int xbit, code; } bits[] = {
+		{ CAPSFLAG,	LIBINPUT_LED_CAPS_LOCK },
+		{ NUMFLAG,	LIBINPUT_LED_NUM_LOCK },
+		{ SCROLLFLAG,	LIBINPUT_LED_SCROLL_LOCK },
+#ifdef HAVE_LIBINPUT_COMPOSE_AND_KANA
+		{ COMPOSEFLAG,	LIBINPUT_LED_COMPOSE },
+		{ KANAFLAG,	LIBINPUT_LED_KANA },
+#endif
+		{ 0, 0 },
+	};
+	int i = 0;
+	enum libinput_led leds = 0;
+	InputInfoPtr pInfo = device->public.devicePrivate;
+	struct xf86libinput *driver_data = pInfo->private;
+	struct libinput_device *ldevice = driver_data->shared_device->device;
 
-    static struct { int xbit, code; } bits[] = {
-        { CAPSFLAG,	LIBINPUT_LED_CAPS_LOCK },
-        { NUMFLAG,	LIBINPUT_LED_NUM_LOCK },
-        { SCROLLFLAG,	LIBINPUT_LED_SCROLL_LOCK },
-	{ 0, 0 },
-    };
-    int i = 0;
-    enum libinput_led leds = 0;
-    InputInfoPtr pInfo = device->public.devicePrivate;
-    struct xf86libinput *driver_data = pInfo->private;
-    struct libinput_device *ldevice = driver_data->shared_device->device;
+	if (!device->enabled)
+		return;
 
-    if (!device->enabled)
-	    return;
+	while (bits[i].xbit) {
+		if (ctrl->leds & bits[i].xbit)
+			leds |= bits[i].code;
+		i++;
+	}
 
-    while (bits[i].xbit) {
-	    if (ctrl->leds & bits[i].xbit)
-		    leds |= bits[i].code;
-	    i++;
-    }
-
-    libinput_device_led_update(ldevice, leds);
+	libinput_device_led_update(ldevice, leds);
 }
 
 static void
@@ -1317,7 +1402,10 @@ xf86libinput_init_tablet(InputInfoPtr pInfo)
 	int nbuttons = TABLET_NUM_BUTTONS;
 	int naxes = 2;
 
-	BUG_RETURN(driver_data->tablet_tool == NULL);
+	if (driver_data->tablet_tool == NULL) {
+		xf86IDrvMsg(pInfo, X_WARNING, "BUG: tablet_tool is NULL\n");
+		return;
+	}
 
 	tool = driver_data->tablet_tool;
 
@@ -1435,7 +1523,10 @@ xf86libinput_init(DeviceIntPtr dev)
 	struct xf86libinput_device *shared_device = driver_data->shared_device;
 	struct libinput_device *device = shared_device->device;
 
-	BUG_RETURN_VAL(device == NULL, !Success);
+	if (device == NULL) {
+		xf86IDrvMsg(pInfo, X_WARNING, "BUG: xf86libinput_init() device is NULL\n");
+		return !Success;
+	}
 
 	dev->public.on = FALSE;
 
@@ -1497,12 +1588,13 @@ swap_registered_device(InputInfoPtr pInfo)
 		return;
 
 	next = xf86FirstLocalDevice();
-	while (next == pInfo || !is_libinput_device(next))
+	while (next && (next == pInfo || !is_libinput_device(next)))
 		next = next->next;
 
 	input_lock();
 	xf86RemoveEnabledDevice(pInfo);
-	xf86AddEnabledDevice(next);
+	if (next)
+		xf86AddEnabledDevice(next);
 	driver_context.registered_InputInfoPtr = next;
 	input_unlock();
 }
@@ -1645,6 +1737,14 @@ xf86libinput_handle_key(InputInfoPtr pInfo, struct libinput_event_keyboard *even
 	if ((driver_data->capabilities & CAP_KEYBOARD) == 0)
 		return;
 
+	/* keycodes > 256 that have a historical mapping in xkeyboard-config */
+	switch (key) {
+	case KEY_TOUCHPAD_TOGGLE: key = KEY_F21; break;
+	case KEY_TOUCHPAD_ON:     key = KEY_F22; break;
+	case KEY_TOUCHPAD_OFF:    key = KEY_F23; break;
+	case KEY_MICMUTE:         key = KEY_F20; break;
+	}
+
 	key += XORG_KEYCODE_OFFSET;
 
 	is_press = (libinput_event_keyboard_get_key_state(event) == LIBINPUT_KEY_STATE_PRESSED);
@@ -1819,6 +1919,7 @@ calculate_axis_value(struct xf86libinput *driver_data,
 		value = value/dist * SCROLL_INCREMENT * 8;
 	}
 
+	value *= driver_data->options.scroll_factor;
 	*value_out = value;
 
 	return true;
@@ -2406,7 +2507,10 @@ xf86libinput_handle_tablet_proximity(InputInfoPtr pInfo,
 	if (xf86libinput_tool_queue_event(event))
 		return EVENT_QUEUED;
 
-	BUG_RETURN_VAL(pDev == NULL, EVENT_HANDLED);
+	if (pDev == NULL) {
+		xf86IDrvMsg(pInfo, X_WARNING, "BUG: xf86libinput_handle_tablet_proximity() pDev is NULL\n");
+		return EVENT_HANDLED;
+	}
 
 	x = libinput_event_tablet_tool_get_x_transformed(event, TABLET_AXIS_MAX);
 	y = libinput_event_tablet_tool_get_y_transformed(event, TABLET_AXIS_MAX);
@@ -2637,6 +2741,12 @@ xf86libinput_handle_event(struct libinput_event *event)
 			break;
 		case LIBINPUT_EVENT_SWITCH_TOGGLE:
 			break;
+
+		// new libinput events we don't handle yet
+		case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN:
+		case LIBINPUT_EVENT_GESTURE_HOLD_END:
+		case LIBINPUT_EVENT_TABLET_PAD_KEY:
+			break;
 	}
 
 out:
@@ -2650,7 +2760,7 @@ xf86libinput_read_input(InputInfoPtr pInfo)
 	int rc;
 	struct libinput_event *event;
 
-        rc = libinput_dispatch(libinput);
+	rc = libinput_dispatch(libinput);
 	if (rc == -EAGAIN)
 		return;
 
@@ -2878,6 +2988,46 @@ xf86libinput_parse_tap_buttonmap_option(InputInfoPtr pInfo,
 	return map;
 }
 
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+static inline enum libinput_config_clickfinger_button_map
+xf86libinput_parse_clickfinger_map_option(InputInfoPtr pInfo,
+					  struct libinput_device *device)
+{
+	uint32_t click_methods = libinput_device_config_click_get_methods(device);
+	enum libinput_config_clickfinger_button_map map;
+	char *str;
+
+	map = libinput_device_config_click_get_clickfinger_button_map(device);
+	if ((click_methods & LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER) == 0)
+		return map;
+
+	str = xf86SetStrOption(pInfo->options,
+			       "ClickfingerButtonMap",
+			       NULL);
+	if (str) {
+		if (streq(str, "lmr"))
+			map = LIBINPUT_CONFIG_CLICKFINGER_MAP_LMR;
+		else if (streq(str, "lrm"))
+			map = LIBINPUT_CONFIG_CLICKFINGER_MAP_LRM;
+		else
+			xf86IDrvMsg(pInfo, X_ERROR,
+				    "Invalid ClickfingerButtonMap: %s\n",
+				    str);
+		free(str);
+	}
+
+	if (libinput_device_config_click_set_clickfinger_button_map(device, map) !=
+	    LIBINPUT_CONFIG_STATUS_SUCCESS) {
+		xf86IDrvMsg(pInfo, X_ERROR,
+			    "Failed to set Clickfinger Button Map to %d\n",
+			    map);
+		map = libinput_device_config_click_get_clickfinger_button_map(device);
+	}
+
+	return map;
+}
+#endif
+
 static inline double
 xf86libinput_parse_accel_option(InputInfoPtr pInfo,
 				struct libinput_device *device)
@@ -3298,6 +3448,20 @@ xf86libinput_parse_scroll_pixel_distance_option(InputInfoPtr pInfo,
 	return dist;
 }
 
+static inline double
+xf86libinput_parse_scroll_factor_option(InputInfoPtr pInfo,
+					struct libinput_device *device)
+{
+	const double scroll_factor_default = 1.0;
+	double scroll_factor = xf86SetRealOption(pInfo->options, "ScrollFactor", scroll_factor_default);
+	if (scroll_factor < SCROLL_FACTOR_MIN || scroll_factor > SCROLL_FACTOR_MAX) {
+		xf86IDrvMsg(pInfo, X_ERROR, "Invalid ScrollFactor %f, expected to be between %f and %f\n",
+			scroll_factor, SCROLL_FACTOR_MIN, SCROLL_FACTOR_MAX);
+		scroll_factor = scroll_factor_default;
+	}
+	return scroll_factor;
+}
+
 static inline unsigned int
 xf86libinput_parse_clickmethod_option(InputInfoPtr pInfo,
 				      struct libinput_device *device)
@@ -3526,6 +3690,46 @@ out:
 	xf86libinput_set_pressurecurve(driver_data, controls);
 }
 
+static void
+xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
+					 struct xf86libinput *driver_data,
+					 struct xf86libinput_pressure_range *rangeopt)
+{
+#if HAVE_LIBINPUT_PRESSURE_RANGE
+	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
+	float min, max;
+	char *str;
+	int rc;
+
+	rangeopt->min = 0.0;
+	rangeopt->max = 1.0;
+
+	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)
+		return;
+
+	if (!tool || !libinput_tablet_tool_config_pressure_range_is_available(tool))
+		return;
+
+	str = xf86SetStrOption(pInfo->options,
+			       "TabletToolPressureRange",
+			       NULL);
+	if (!str)
+		return;
+
+	rc = sscanf(str, "%f %f", &min, &max);
+	if (rc != 2)
+		goto out;
+
+	if (min < 0.0 || max > 1.0 || min >= max)
+		goto out;
+
+	rangeopt->min = min;
+	rangeopt->max = max;
+out:
+	free(str);
+#endif
+}
+
 static inline bool
 want_area_handling(struct xf86libinput *driver_data)
 {
@@ -3597,7 +3801,11 @@ xf86libinput_parse_options(InputInfoPtr pInfo,
 	options->scroll_button = xf86libinput_parse_scrollbutton_option(pInfo, device);
 	options->scroll_buttonlock = xf86libinput_parse_scrollbuttonlock_option(pInfo, device);
 	options->scroll_pixel_distance = xf86libinput_parse_scroll_pixel_distance_option(pInfo, device);
+	options->scroll_factor = xf86libinput_parse_scroll_factor_option(pInfo, device);
 	options->click_method = xf86libinput_parse_clickmethod_option(pInfo, device);
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+	options->clickfinger_button_map = xf86libinput_parse_clickfinger_map_option(pInfo, device);
+#endif
 	options->middle_emulation = xf86libinput_parse_middleemulation_option(pInfo, device);
 	options->disable_while_typing = xf86libinput_parse_disablewhiletyping_option(pInfo, device);
 	options->rotation_angle = xf86libinput_parse_rotation_angle_option(pInfo, device);
@@ -3616,6 +3824,7 @@ xf86libinput_parse_options(InputInfoPtr pInfo,
 	xf86libinput_parse_pressurecurve_option(pInfo,
 						driver_data,
 						options->pressurecurve);
+	xf86libinput_parse_pressure_range_option(pInfo, driver_data, &options->pressure_range);
 	xf86libinput_parse_tablet_area_option(pInfo,
 					      driver_data,
 					      &options->area);
@@ -4076,9 +4285,13 @@ static Atom prop_scroll_buttonlock;
 static Atom prop_scroll_buttonlock_default;
 static Atom prop_scroll_pixel_distance;
 static Atom prop_scroll_pixel_distance_default;
+static Atom prop_scroll_factor;
+static Atom prop_scroll_factor_default;
 static Atom prop_click_methods_available;
 static Atom prop_click_method_enabled;
 static Atom prop_click_method_default;
+static Atom prop_clickfinger_buttonmap;
+static Atom prop_clickfinger_buttonmap_default;
 static Atom prop_middle_emulation;
 static Atom prop_middle_emulation_default;
 static Atom prop_disable_while_typing;
@@ -4090,12 +4303,16 @@ static Atom prop_mode_groups_rings;
 static Atom prop_mode_groups_strips;
 static Atom prop_rotation_angle;
 static Atom prop_rotation_angle_default;
+static Atom prop_pressure_range;
+static Atom prop_pressure_range_default;
 
 /* driver properties */
 static Atom prop_draglock;
 static Atom prop_horiz_scroll;
 static Atom prop_pressurecurve;
 static Atom prop_area_ratio;
+static Atom prop_serial;
+static Atom prop_tool_id;
 static Atom prop_hires_scroll;
 
 /* general properties */
@@ -4206,7 +4423,8 @@ xf86libinput_check_device(DeviceIntPtr dev,
 	struct libinput_device *device = driver_data->shared_device->device;
 
 	if (device == NULL) {
-		BUG_WARN(dev->public.on);
+		if (dev->public.on)
+			xf86IDrvMsg(pInfo, X_WARNING, "BUG: xf86libinput_check_device() device is on\n");
 		xf86IDrvMsg(pInfo, X_INFO,
 			    "SetProperty on %u called but device is disabled.\n"
 			    "This driver cannot change properties on a disabled device\n",
@@ -4219,9 +4437,9 @@ xf86libinput_check_device(DeviceIntPtr dev,
 
 static inline int
 LibinputSetPropertyTap(DeviceIntPtr dev,
-                       Atom atom,
-                       XIPropertyValuePtr val,
-                       BOOL checkonly)
+		       Atom atom,
+		       XIPropertyValuePtr val,
+		       BOOL checkonly)
 {
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct xf86libinput *driver_data = pInfo->private;
@@ -4349,8 +4567,8 @@ LibinputSetPropertyTapButtonmap(DeviceIntPtr dev,
 
 static inline int
 LibinputSetPropertyCalibration(DeviceIntPtr dev,
-                               Atom atom,
-                               XIPropertyValuePtr val,
+			       Atom atom,
+			       XIPropertyValuePtr val,
 			       BOOL checkonly)
 {
 	InputInfoPtr pInfo = dev->public.devicePrivate;
@@ -4500,6 +4718,8 @@ LibinputSetPropertyAccelPoints(DeviceIntPtr dev,
 			accel_points = &driver_data->options.accel_points_motion;
 		else if (atom == prop_accel_points_scroll)
 			accel_points = &driver_data->options.accel_points_scroll;
+		else
+			return BadValue;
 
 		for (size_t idx = 0; idx < val->size; idx++)
 			accel_points->points[idx] = data[idx];
@@ -4552,9 +4772,9 @@ LibinputSetPropertyAccelStep(DeviceIntPtr dev,
 
 static inline int
 LibinputSetPropertyNaturalScroll(DeviceIntPtr dev,
-                                 Atom atom,
-                                 XIPropertyValuePtr val,
-                                 BOOL checkonly)
+				 Atom atom,
+				 XIPropertyValuePtr val,
+				 BOOL checkonly)
 {
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct xf86libinput *driver_data = pInfo->private;
@@ -4820,6 +5040,46 @@ LibinputSetPropertyClickMethod(DeviceIntPtr dev,
 	return Success;
 }
 
+static inline int
+LibinputSetPropertyClickfingerButtonmap(DeviceIntPtr dev,
+					Atom atom,
+					XIPropertyValuePtr val,
+					BOOL checkonly)
+{
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+	InputInfoPtr pInfo = dev->public.devicePrivate;
+	struct xf86libinput *driver_data = pInfo->private;
+	BOOL* data;
+	enum libinput_config_clickfinger_button_map map;
+
+	if (val->format != 8 || val->size != 2 || val->type != XA_INTEGER)
+		return BadMatch;
+
+	data = (BOOL*)val->data;
+
+	if (checkonly) {
+	    if ((data[0] && data[1]) || (!data[0] && !data[1]))
+		return BadValue;
+
+	    if (!xf86libinput_check_device(dev, atom))
+		return BadMatch;
+	}
+
+	if (data[0])
+		map = LIBINPUT_CONFIG_CLICKFINGER_MAP_LRM;
+	else if (data[1])
+		map = LIBINPUT_CONFIG_CLICKFINGER_MAP_LMR;
+	else
+		return BadValue;
+
+	if (!checkonly)
+		driver_data->options.clickfinger_button_map = map;
+
+#endif
+	return Success;
+}
+
+
 static inline int
 LibinputSetPropertyMiddleEmulation(DeviceIntPtr dev,
 				   Atom atom,
@@ -4912,6 +5172,7 @@ prop_draglock_set_pairs(struct xf86libinput *driver_data,
 	int data[MAX_BUTTONS + 1] = {0};
 	int i;
 	int highest = 0;
+	const unsigned int max = MAX_BUTTONS;
 
 	if (len >= ARRAY_SIZE(data))
 		return BadMatch;
@@ -4922,7 +5183,7 @@ prop_draglock_set_pairs(struct xf86libinput *driver_data,
 	dl = (checkonly) ? &dummy : &driver_data->draglock;
 
 	for (i = 0; i < len; i += 2) {
-		if (pairs[i] > MAX_BUTTONS)
+		if (pairs[i] > max)
 			return BadValue;
 
 		data[pairs[i]] = pairs[i+1];
@@ -5016,6 +5277,34 @@ LibinputSetPropertyScrollPixelDistance(DeviceIntPtr dev,
 	return Success;
 }
 
+static inline int
+LibinputSetPropertyScrollFactor(DeviceIntPtr dev,
+				Atom atom,
+				XIPropertyValuePtr val,
+				BOOL checkonly)
+{
+	InputInfoPtr pInfo = dev->public.devicePrivate;
+	struct xf86libinput *driver_data = pInfo->private;
+	float *scroll_factor;
+
+	if (val->format != 32 || val->size != 1 || val->type != prop_float)
+		return BadMatch;
+
+	scroll_factor = (float*)val->data;
+
+	if (checkonly) {
+		if (*scroll_factor < SCROLL_FACTOR_MIN || *scroll_factor > SCROLL_FACTOR_MAX)
+			return BadValue;
+
+		if (!xf86libinput_check_device(dev, atom))
+			return BadMatch;
+	} else {
+		driver_data->options.scroll_factor = *scroll_factor;
+	}
+
+	return Success;
+}
+
 static inline int
 LibinputSetPropertyRotationAngle(DeviceIntPtr dev,
 				 Atom atom,
@@ -5094,6 +5383,42 @@ LibinputSetPropertyPressureCurve(DeviceIntPtr dev,
 	return Success;
 }
 
+static inline int
+LibinputSetPropertyPressureRange(DeviceIntPtr dev,
+				 Atom atom,
+				 XIPropertyValuePtr val,
+				 BOOL checkonly)
+{
+	InputInfoPtr pInfo = dev->public.devicePrivate;
+	struct xf86libinput *driver_data = pInfo->private;
+	float *vals;
+	struct xf86libinput_pressure_range rangeopt = { 0.0, 1.0 };
+
+	if (val->format != 32 || val->size != 2 || val->type != prop_float)
+		return BadMatch;
+
+	vals = val->data;
+	rangeopt.min = vals[0];
+	rangeopt.max = vals[1];
+
+	if (checkonly) {
+		if (rangeopt.min < 0.0 || rangeopt.max > 1.0 || rangeopt.min >= rangeopt.max)
+			return BadValue;
+
+		/* Disallow reducing the range to less than 20% of the range, mostly
+		 * to avoid footguns */
+		if (rangeopt.max - rangeopt.min < 0.2)
+			return BadValue;
+
+		if (!xf86libinput_check_device(dev, atom))
+			return BadMatch;
+	} else {
+		driver_data->options.pressure_range = rangeopt;
+	}
+
+	return Success;
+}
+
 static inline int
 LibinputSetPropertyAreaRatio(DeviceIntPtr dev,
 			     Atom atom,
@@ -5178,8 +5503,9 @@ LibinputSetPropertyHighResolutionScroll(DeviceIntPtr dev,
 }
 
 static int
-LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
-                 BOOL checkonly)
+LibinputSetProperty(DeviceIntPtr dev, Atom atom,
+		    XIPropertyValuePtr val,
+		    BOOL checkonly)
 {
 	int rc;
 
@@ -5222,6 +5548,8 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
 		rc = LibinputSetPropertyScrollButtonLock(dev, atom, val, checkonly);
 	else if (atom == prop_click_method_enabled)
 		rc = LibinputSetPropertyClickMethod(dev, atom, val, checkonly);
+	else if (atom == prop_clickfinger_buttonmap)
+		rc = LibinputSetPropertyClickfingerButtonmap(dev, atom, val, checkonly);
 	else if (atom == prop_middle_emulation)
 		rc = LibinputSetPropertyMiddleEmulation(dev, atom, val, checkonly);
 	else if (atom == prop_disable_while_typing)
@@ -5232,6 +5560,8 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
 		rc = LibinputSetPropertyHorizScroll(dev, atom, val, checkonly);
 	else if (atom == prop_scroll_pixel_distance)
 		rc = LibinputSetPropertyScrollPixelDistance(dev, atom, val, checkonly);
+	else if (atom == prop_scroll_factor)
+		rc = LibinputSetPropertyScrollFactor(dev, atom, val, checkonly);
 	else if (atom == prop_mode_groups) {
 		InputInfoPtr pInfo = dev->public.devicePrivate;
 		struct xf86libinput *driver_data = pInfo->private;
@@ -5245,36 +5575,44 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
 		rc = LibinputSetPropertyRotationAngle(dev, atom, val, checkonly);
 	else if (atom == prop_pressurecurve)
 		rc = LibinputSetPropertyPressureCurve(dev, atom, val, checkonly);
+	else if (atom == prop_pressure_range)
+		rc = LibinputSetPropertyPressureRange(dev, atom, val, checkonly);
 	else if (atom == prop_area_ratio)
 		rc = LibinputSetPropertyAreaRatio(dev, atom, val, checkonly);
 	else if (atom == prop_hires_scroll)
 		rc = LibinputSetPropertyHighResolutionScroll(dev, atom, val, checkonly);
-	else if (atom == prop_device || atom == prop_product_id ||
-		 atom == prop_tap_default ||
-		 atom == prop_tap_drag_default ||
-		 atom == prop_tap_drag_lock_default ||
-		 atom == prop_tap_buttonmap_default ||
-		 atom == prop_calibration_default ||
-		 atom == prop_accel_default ||
+	else if (atom == prop_accel_default ||
 		 atom == prop_accel_profile_default ||
-		 atom == prop_natural_scroll_default ||
-		 atom == prop_sendevents_default ||
-		 atom == prop_sendevents_available ||
-		 atom == prop_left_handed_default ||
-		 atom == prop_scroll_method_default ||
-		 atom == prop_scroll_methods_available ||
-		 atom == prop_scroll_button_default ||
-		 atom == prop_scroll_buttonlock_default ||
-		 atom == prop_scroll_pixel_distance_default ||
+		 atom == prop_calibration_default ||
 		 atom == prop_click_method_default ||
 		 atom == prop_click_methods_available ||
-		 atom == prop_middle_emulation_default ||
+		 atom == prop_clickfinger_buttonmap_default ||
 		 atom == prop_disable_while_typing_default ||
+		 atom == prop_left_handed_default ||
+		 atom == prop_middle_emulation_default ||
 		 atom == prop_mode_groups_available ||
 		 atom == prop_mode_groups_buttons ||
 		 atom == prop_mode_groups_rings ||
 		 atom == prop_mode_groups_strips ||
-		 atom == prop_rotation_angle_default)
+		 atom == prop_natural_scroll_default ||
+		 atom == prop_product_id ||
+		 atom == prop_pressure_range_default ||
+		 atom == prop_rotation_angle_default ||
+		 atom == prop_scroll_button_default ||
+		 atom == prop_scroll_buttonlock_default ||
+		 atom == prop_scroll_method_default ||
+		 atom == prop_scroll_methods_available ||
+		 atom == prop_scroll_pixel_distance_default ||
+		 atom == prop_scroll_factor_default ||
+		 atom == prop_sendevents_available ||
+		 atom == prop_sendevents_default ||
+		 atom == prop_serial ||
+		 atom == prop_tap_buttonmap_default ||
+		 atom == prop_tap_default ||
+		 atom == prop_tap_drag_default ||
+		 atom == prop_tap_drag_lock_default ||
+		 atom == prop_tool_id ||
+		 atom == prop_device)
 		return BadAccess; /* read-only */
 	else
 		return Success;
@@ -5726,7 +6064,7 @@ LibinputInitLeftHandedProperty(DeviceIntPtr dev,
 {
 	BOOL left_handed = driver_data->options.left_handed;
 
-	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET))
+	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET|CAP_TABLET_TOOL))
 		return;
 
 	if (!libinput_device_config_left_handed_is_available(device) ||
@@ -5878,6 +6216,32 @@ LibinputInitScrollPixelDistanceProperty(DeviceIntPtr dev,
 								  1, &dist);
 }
 
+static void
+LibinputInitScrollFactorProperty(DeviceIntPtr dev,
+				 struct xf86libinput *driver_data,
+				 struct libinput_device *device)
+{
+	float scroll_factor = driver_data->options.scroll_factor;
+
+	if (!subdevice_has_capabilities(dev, CAP_POINTER))
+		return;
+
+	prop_scroll_factor = LibinputMakeProperty(dev,
+						  LIBINPUT_PROP_SCROLL_FACTOR,
+						  prop_float, 32,
+						  1, &scroll_factor);
+	if (!prop_scroll_factor)
+		return;
+
+	prop_scroll_factor_default = LibinputMakeProperty(dev,
+							  LIBINPUT_PROP_SCROLL_FACTOR_DEFAULT,
+							  prop_float, 32,
+							  1, &scroll_factor);
+
+	if (!prop_scroll_factor_default)
+		return;
+}
+
 static void
 LibinputInitClickMethodsProperty(DeviceIntPtr dev,
 				 struct xf86libinput *driver_data,
@@ -5951,6 +6315,63 @@ LibinputInitClickMethodsProperty(DeviceIntPtr dev,
 							 methods);
 }
 
+static void
+LibinputInitClickfingerButtonmapProperty(DeviceIntPtr dev,
+				 	 struct xf86libinput *driver_data,
+				 	 struct libinput_device *device)
+{
+#if HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP
+	enum libinput_config_clickfinger_button_map map;
+	BOOL data[2] = {0};
+
+	if (!subdevice_has_capabilities(dev, CAP_POINTER))
+		return;
+
+	uint32_t click_methods = libinput_device_config_click_get_methods(device);
+	if ((click_methods & LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER) == 0)
+		return;
+
+	map = driver_data->options.clickfinger_button_map;
+
+	switch (map) {
+	case LIBINPUT_CONFIG_CLICKFINGER_MAP_LRM:
+		data[0] = 1;
+		break;
+	case LIBINPUT_CONFIG_CLICKFINGER_MAP_LMR:
+		data[1] = 1;
+		break;
+	default:
+		break;
+	}
+
+	prop_clickfinger_buttonmap = LibinputMakeProperty(dev,
+							  LIBINPUT_PROP_CLICKFINGER_BUTTONMAP,
+							  XA_INTEGER, 8,
+							  2, data);
+	if (!prop_clickfinger_buttonmap)
+		return;
+
+	map = libinput_device_config_click_get_default_clickfinger_button_map(device);
+	memset(data, 0, sizeof(data));
+
+	switch (map) {
+	case LIBINPUT_CONFIG_CLICKFINGER_MAP_LRM:
+		data[0] = 1;
+		break;
+	case LIBINPUT_CONFIG_CLICKFINGER_MAP_LMR:
+		data[1] = 1;
+		break;
+	default:
+		break;
+	}
+
+	prop_clickfinger_buttonmap_default = LibinputMakeProperty(dev,
+								  LIBINPUT_PROP_CLICKFINGER_BUTTONMAP_DEFAULT,
+								  XA_INTEGER, 8,
+								  2, data);
+#endif
+}
+
 static void
 LibinputInitMiddleEmulationProperty(DeviceIntPtr dev,
 				    struct xf86libinput *driver_data,
@@ -6244,6 +6665,44 @@ LibinputInitPressureCurveProperty(DeviceIntPtr dev,
 						  8, data);
 }
 
+static void
+LibinputInitPressureRangeProperty(DeviceIntPtr dev,
+				  struct xf86libinput *driver_data)
+{
+#if HAVE_LIBINPUT_PRESSURE_RANGE
+	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
+	const struct xf86libinput_pressure_range *rangeopt = &driver_data->options.pressure_range;
+	float data[2] = {
+		rangeopt->min,
+		rangeopt->max,
+	};
+
+	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)
+		return;
+
+
+	if (!tool || !libinput_tablet_tool_config_pressure_range_is_available(tool))
+		return;
+
+	prop_pressure_range = LibinputMakeProperty(dev,
+						   LIBINPUT_PROP_TABLET_TOOL_PRESSURE_RANGE,
+						   prop_float, 32,
+						   2, &data);
+	if (!prop_pressure_range)
+		return;
+
+	data[0] = libinput_tablet_tool_config_pressure_range_get_default_minimum(tool);
+	data[1] = libinput_tablet_tool_config_pressure_range_get_default_maximum(tool);
+	prop_pressure_range_default = LibinputMakeProperty(dev,
+							   LIBINPUT_PROP_TABLET_TOOL_PRESSURE_RANGE_DEFAULT,
+							   prop_float, 32,
+							   2, &data);
+
+	if (!prop_pressure_range_default)
+		return;
+#endif
+}
+
 static void
 LibinputInitTabletAreaRatioProperty(DeviceIntPtr dev,
 				    struct xf86libinput *driver_data)
@@ -6263,6 +6722,36 @@ LibinputInitTabletAreaRatioProperty(DeviceIntPtr dev,
 					       2, data);
 }
 
+static void
+LibinputInitTabletSerialProperty(DeviceIntPtr dev,
+				 struct xf86libinput *driver_data)
+{
+	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
+	uint32_t serial, tool_id;
+
+	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)
+		return;
+
+	if (!tool)
+		return;
+
+	/* Serial prop is always created to indicate when we don't have a serial */
+	serial = libinput_tablet_tool_get_serial(tool);
+	prop_serial = LibinputMakeProperty(dev,
+					  LIBINPUT_PROP_TABLET_TOOL_SERIAL,
+					  XA_CARDINAL, 32,
+					  1, &serial);
+
+	/* The tool ID prop is only created if we have a known tool id */
+	tool_id = libinput_tablet_tool_get_tool_id(tool);
+	if (tool_id) {
+		prop_tool_id = LibinputMakeProperty(dev,
+						    LIBINPUT_PROP_TABLET_TOOL_ID,
+						    XA_CARDINAL, 32,
+						    1, &tool_id);
+	}
+}
+
 static void
 LibinputInitHighResolutionScrollProperty(DeviceIntPtr dev,
 					 struct xf86libinput *driver_data,
@@ -6298,7 +6787,9 @@ LibinputInitProperty(DeviceIntPtr dev)
 	LibinputInitNaturalScrollProperty(dev, driver_data, device);
 	LibinputInitDisableWhileTypingProperty(dev, driver_data, device);
 	LibinputInitScrollMethodsProperty(dev, driver_data, device);
+	LibinputInitScrollFactorProperty(dev, driver_data, device);
 	LibinputInitClickMethodsProperty(dev, driver_data, device);
+	LibinputInitClickfingerButtonmapProperty(dev, driver_data, device);
 	LibinputInitMiddleEmulationProperty(dev, driver_data, device);
 	LibinputInitRotationAngleProperty(dev, driver_data, device);
 	LibinputInitAccelProperty(dev, driver_data, device);
@@ -6337,6 +6828,8 @@ LibinputInitProperty(DeviceIntPtr dev)
 	LibinputInitHorizScrollProperty(dev, driver_data);
 	LibinputInitScrollPixelDistanceProperty(dev, driver_data, device);
 	LibinputInitPressureCurveProperty(dev, driver_data);
+	LibinputInitPressureRangeProperty(dev, driver_data);
 	LibinputInitTabletAreaRatioProperty(dev, driver_data);
+	LibinputInitTabletSerialProperty(dev, driver_data);
 	LibinputInitHighResolutionScrollProperty(dev, driver_data, device);
 }

test/test-draglock.c

@@ -233,6 +233,7 @@ test_filter_meta_passthrough(void)
 	int i;
 
 	rc = draglock_init_from_string(&dl, "10");
+	assert(rc == 0);
 
 	for (i = 0; i < 10; i++) {
 		button = i;
@@ -259,6 +260,7 @@ test_filter_meta_click_meta_only(void)
 	int button, press;
 
 	rc = draglock_init_from_string(&dl, "10");
+	assert(rc == 0);
 
 	button = 10;
 	press = 1;
@@ -283,6 +285,7 @@ test_filter_meta(void)
 	int i;
 
 	rc = draglock_init_from_string(&dl, "10");
+	assert(rc == 0);
 
 	for (i = 1; i < 10; i++) {
 		/* meta down */
@@ -339,6 +342,7 @@ test_filter_meta_extra_click(void)
 	int i;
 
 	rc = draglock_init_from_string(&dl, "10");
+	assert(rc == 0);
 
 	for (i = 1; i < 10; i++) {
 		/* meta down */
@@ -409,6 +413,7 @@ test_filter_meta_interleaved(void)
 	int i;
 
 	rc = draglock_init_from_string(&dl, "10");
+	assert(rc == 0);
 
 	for (i = 1; i < 10; i++) {
 		/* meta down */
@@ -467,6 +472,7 @@ test_filter_pairs(void)
 	int i;
 
 	rc = draglock_init_from_string(&dl, "1 11 2 0 3 13 4 0 5 15 6 0 7 17 8 0 9 19");
+	assert(rc == 0);
 
 	for (i = 1; i < 10; i++) {
 		button = i;