Add support for the libinput plugin system

This is hardcoded to be enabled from the default paths (/usr/share and /etc) without any extra paths. If there is a need we can add xorg.conf options later but for now it will do. Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/73>
CI: drop the merge request check
2026-03-26 02:18:32 +00:00 · 2025-11-05 09:25:10 +10:00 · 2025-10-24 14:54:57 +10:00 · 2025-10-24 11:22:54 +10:00 · 2025-10-23 09:31:45 +10:00 · 2025-06-24 15:33:33 +10:00
22 changed files with 490 additions and 754 deletions
--- a/.github/ISSUE_TEMPLATE/01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@@ -1,65 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/02-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/02-feature-request.yml
@@ -1,49 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/03-code-cleanup.yml
+++ b/.github/ISSUE_TEMPLATE/03-code-cleanup.yml
@@ -1,49 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/04-doc-update.yml
+++ b/.github/ISSUE_TEMPLATE/04-doc-update.yml
@@ -1,38 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/05-org-task.yml
+++ b/.github/ISSUE_TEMPLATE/05-org-task.yml
@@ -1,43 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +0,0 @@
-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.
--- a/.github/actions/build-driver/action.yaml
+++ b/.github/actions/build-driver/action.yaml
@@ -1,69 +0,0 @@
-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
--- a/.github/scripts/conf.sh
+++ b/.github/scripts/conf.sh
@@ -1,13 +0,0 @@
-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"
--- a/.github/scripts/github/make-release
+++ b/.github/scripts/github/make-release
@@ -1,17 +0,0 @@
-#!/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
--- a/.github/scripts/install-prereq.sh
+++ b/.github/scripts/install-prereq.sh
@@ -1,15 +0,0 @@
-#!/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
--- a/.github/scripts/ubuntu/install-pkg.sh
+++ b/.github/scripts/ubuntu/install-pkg.sh
@@ -1,94 +0,0 @@
-#!/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
--- a/.github/scripts/util.sh
+++ b/.github/scripts/util.sh
@@ -1,85 +0,0 @@
-
-. .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
-    )
-}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,43 +0,0 @@
-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
--- a/.gitlab-ci.yml
+++ b/.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 84052757dacc5fd65f5ace92b7fe63c60f6c8558 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha fb9d50ccb3cbbb4c6dc5f9ef53a0ad3cb0d8a177

 include:
  - project: 'freedesktop/ci-templates'
@@ -26,10 +26,10 @@ stages:

 .fedora:
  variables:
-    FDO_DISTRIBUTION_VERSION: 39
+    FDO_DISTRIBUTION_VERSION: 43
    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: '2025-04-01.0'
+    FDO_DISTRIBUTION_TAG: '2025-10-24.0'


 fedora@container_build:
@@ -81,18 +81,3 @@ check-commits:
    reports:
      junit: results.xml
  allow_failure: true
-
-#
-# Verify that the merge request has the allow-collaboration checkbox ticked
-#
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: test
-  script:
-    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-  artifacts:
-    when: on_failure
-    reports:
-      junit: results.xml
-  allow_failure: true
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


-# 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'
+DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'

 SUBDIRS = src include man test
 MAINTAINERCLEANFILES = ChangeLog INSTALL
--- a/configure.ac
+++ b/configure.ac
@@ -43,8 +43,6 @@ 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])
@@ -113,16 +111,26 @@ AC_LINK_IFELSE(
               [AC_MSG_RESULT([no])
                [libinput_have_clickfinger_button_map=no]])

+AC_MSG_CHECKING([if libinput_plugin_system_load is available])
+AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([[#include <libinput.h>]],
+                                [[libinput_plugin_system_load_plugins(NULL, 0)]])],
+               [AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_LIBINPUT_PLUGINS, [1],
+                          [libinput_plugin_system_load_plugins() is available])
+                [libinput_have_plugin_system=yes]],
+               [AC_MSG_RESULT([no])
+                [libinput_have_plugin_system=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,
-            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory]),
+            AC_HELP_STRING([--with-xorg-module-dir=DIR],
+                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
            [moduledir="$withval"],
-            [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
+            [moduledir="$libdir/xorg/modules"])
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)

--- a/include/libinput-properties.h
+++ b/include/libinput-properties.h
@@ -154,12 +154,6 @@
 /* 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"
--- a/man/libinput.man
+++ b/man/libinput.man
@@ -206,11 +206,6 @@ If disabled (the default), the
 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
 .BR none ,
@@ -391,12 +386,6 @@ Indicates if middle emulation is enabled or disabled.
 Sets the rotation angle of the device,
 clockwise of its natural neutral position.
 .TP 7
-.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.
@@ -405,7 +394,7 @@ Indicates which scroll methods are available on this device.
 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
-.B "libinput Scrolling Pixel Distance"
+.B "libinput Scroll 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
--- a/meson.build
+++ b/meson.build
@@ -65,9 +65,13 @@ 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')
+if cc.has_header_symbol('libinput.h', 'LIBINPUT_LED_COMPOSE',
+			dependencies: dep_libinput)
 	config_h.set('HAVE_LIBINPUT_COMPOSE_AND_KANA', 1)
 endif
+if cc.has_function('libinput_plugin_system_load_plugins', dependencies: dep_libinput)
+	config_h.set('HAVE_LIBINPUT_PLUGINS', 1)
+endif

 dir_headers = get_option('sdkdir')
 if dir_headers == ''
--- a/src/util-strings.c
+++ b/src/util-strings.c
@@ -23,7 +23,6 @@
 */

 #include "config.h"
-#define _GNU_SOURCE

 #include "util-strings.h"

@@ -59,6 +58,36 @@ 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
@@ -92,9 +121,7 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements)
 	}

 	size_t strv_len = nelems + 1; /* NULL-terminated */
-	char **strv = calloc(strv_len, sizeof(*strv));
-	if (!strv)
-		return NULL;
+	char **strv = zalloc(strv_len * sizeof *strv);

 	size_t idx = 0;
 	const char *word;
@@ -114,3 +141,103 @@ 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);
+}
--- a/src/util-strings.h
+++ b/src/util-strings.h
@@ -24,6 +24,9 @@

 #pragma once

+#include "config.h"
+#define _GNU_SOURCE
+
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -43,6 +46,161 @@

 #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)
 {
@@ -97,7 +255,9 @@ 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) {
@@ -137,10 +297,7 @@ double_array_from_string(const char *in,
 	if(!strv)
 		return result;

-	double *numv = calloc(nelem, sizeof(double));
-	if (!numv)
-		goto out;
-
+	double *numv = zalloc(sizeof(double) * nelem);
 	for (size_t idx = 0; idx < nelem; idx++) {
 		double val;
 		if (!safe_atod(strv[idx], &val))
@@ -158,3 +315,150 @@ 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;
+}
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -24,7 +24,6 @@
 */

 #include "config.h"
-#define _GNU_SOURCE

 #include <errno.h>
 #include <fcntl.h>
@@ -53,8 +52,6 @@
 #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 */

@@ -141,10 +138,6 @@ struct accel_points {
 };
 #endif

-struct xf86libinput_pressure_range {
-	float min, max;
-};
-
 struct xf86libinput {
 	InputInfoPtr pInfo;
 	char *path;
@@ -182,7 +175,6 @@ 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;
@@ -203,7 +195,9 @@ struct xf86libinput {

 		float rotation_angle;
 		struct bezier_control_point pressurecurve[4];
-		struct xf86libinput_pressure_range pressure_range;
+		struct range {
+			float min, max;
+		} pressure_range;
 		struct ratio {
 			int x, y;
 		} area;
@@ -469,7 +463,7 @@ xf86libinput_set_pressurecurve(struct xf86libinput *driver_data,

 static inline bool
 xf86libinput_set_pressure_range(struct xf86libinput *driver_data,
-				const struct xf86libinput_pressure_range *rangeopt)
+				const struct range *range)
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
@@ -479,8 +473,8 @@ xf86libinput_set_pressure_range(struct xf86libinput *driver_data,

 	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;
+							      range->min,
+							      range->max) == LIBINPUT_CONFIG_STATUS_SUCCESS;
 #else
 	return FALSE;
 #endif
@@ -941,16 +935,16 @@ LibinputApplyConfigPressureRange(DeviceIntPtr dev,
 #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;
+	struct range *range = &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)
+	    libinput_tablet_tool_config_pressure_range_set(tool, range->min, range->max) != LIBINPUT_CONFIG_STATUS_SUCCESS)
 		xf86IDrvMsg(pInfo, X_ERROR,
 			    "Failed to set PressureRange to %.2f..%.2f\n",
-			    rangeopt->min, rangeopt->max);
+			    range->min, range->max);
 #endif
 }

@@ -1919,7 +1913,6 @@ calculate_axis_value(struct xf86libinput *driver_data,
 		value = value/dist * SCROLL_INCREMENT * 8;
 	}

-	value *= driver_data->options.scroll_factor;
 	*value_out = value;

 	return true;
@@ -2741,12 +2734,6 @@ 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:
@@ -3448,20 +3435,6 @@ 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)
@@ -3693,7 +3666,7 @@ out:
 static void
 xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 					 struct xf86libinput *driver_data,
-					 struct xf86libinput_pressure_range *rangeopt)
+					 struct range *range)
 {
 #if HAVE_LIBINPUT_PRESSURE_RANGE
 	struct libinput_tablet_tool *tool = driver_data->tablet_tool;
@@ -3701,8 +3674,8 @@ xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 	char *str;
 	int rc;

-	rangeopt->min = 0.0;
-	rangeopt->max = 1.0;
+	range->min = 0.0;
+	range->max = 1.0;

 	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)
 		return;
@@ -3723,8 +3696,8 @@ xf86libinput_parse_pressure_range_option(InputInfoPtr pInfo,
 	if (min < 0.0 || max > 1.0 || min >= max)
 		goto out;

-	rangeopt->min = min;
-	rangeopt->max = max;
+	range->min = min;
+	range->max = max;
 out:
 	free(str);
 #endif
@@ -3801,7 +3774,6 @@ 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);
@@ -3882,6 +3854,10 @@ xf86libinput_init_driver_context(void)
 		/* we want all msgs, let the server filter */
 		libinput_log_set_priority(driver_context.libinput,
 					  LIBINPUT_LOG_PRIORITY_DEBUG);
+#if HAVE_LIBINPUT_PLUGINS
+		libinput_plugin_system_append_default_paths(driver_context.libinput);
+		libinput_plugin_system_load_plugins(driver_context.libinput, LIBINPUT_PLUGIN_SYSTEM_FLAG_NONE);
+#endif
 	} else {
 		libinput_ref(driver_context.libinput);
 	}
@@ -4285,8 +4261,6 @@ 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;
@@ -5277,34 +5251,6 @@ 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,
@@ -5392,28 +5338,28 @@ LibinputSetPropertyPressureRange(DeviceIntPtr dev,
 	InputInfoPtr pInfo = dev->public.devicePrivate;
 	struct xf86libinput *driver_data = pInfo->private;
 	float *vals;
-	struct xf86libinput_pressure_range rangeopt = { 0.0, 1.0 };
+	struct range range = { 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];
+	range.min = vals[0];
+	range.max = vals[1];

 	if (checkonly) {
-		if (rangeopt.min < 0.0 || rangeopt.max > 1.0 || rangeopt.min >= rangeopt.max)
+		if (range.min < 0.0 || range.max > 1.0 || range.min >= range.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)
+		if (range.max - range.min < 0.2)
 			return BadValue;

 		if (!xf86libinput_check_device(dev, atom))
 			return BadMatch;
 	} else {
-		driver_data->options.pressure_range = rangeopt;
+		driver_data->options.pressure_range = range;
 	}

 	return Success;
@@ -5560,8 +5506,6 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom,
 		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;
@@ -5603,7 +5547,6 @@ LibinputSetProperty(DeviceIntPtr dev, Atom atom,
 		 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 ||
@@ -6216,32 +6159,6 @@ 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,
@@ -6671,10 +6588,10 @@ LibinputInitPressureRangeProperty(DeviceIntPtr dev,
 {
 #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;
+	const struct range *range = &driver_data->options.pressure_range;
 	float data[2] = {
-		rangeopt->min,
-		rangeopt->max,
+		range->min,
+		range->max,
 	};

 	if ((driver_data->capabilities & CAP_TABLET_TOOL) == 0)
@@ -6787,7 +6704,6 @@ 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);
Author	SHA1	Message	Date
Peter Hutterer	ac862672e4	Add support for the libinput plugin system This is hardcoded to be enabled from the default paths (/usr/share and /etc) without any extra paths. If there is a need we can add xorg.conf options later but for now it will do. Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/73>	2025-11-05 09:25:10 +10:00
Peter Hutterer	c169537717	CI: drop the merge request check Effectively obsolete and now broken, see https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/81 Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/75>	2025-10-24 14:54:57 +10:00
Peter Hutterer	79b62f322a	CI: bump to latest ci-templates and latest Fedora Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/74>	2025-10-24 11:22:54 +10:00
Peter Hutterer	6612ab7e97	meson.build: add dep_libinput as dependency for the KANA check So meson can find the libinput.h header if libinput is in a nonstandard path. Fixes: `0bcb60e744` ("Add support for LIBINPUT_LED_COMPOSE/LIBINPUT_LED_KANA") Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/72>	2025-10-23 09:31:45 +10:00
Peter Hutterer	709d0b0a9a	meson.build: install the libinput-properties.h file Patch provided by Brice De Bruyne Closes #67 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/71>	2025-06-24 15:33:33 +10:00