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-25 18:08:39 +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
31 changed files with 282 additions and 778 deletions
--- a/.editorconfig
+++ b/.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
--- 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
@@ -0,0 +1,83 @@
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/
+
+.templates_sha: &template_sha fb9d50ccb3cbbb4c6dc5f9ef53a0ad3cb0d8a177
+
+include:
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/fedora.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
+variables:
+  FDO_UPSTREAM_REPO: xorg/driver/xf86-input-libinput
+
+
+stages:
+  - containers
+  - build
+  - test
+
+.fedora:
+  variables:
+    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-10-24.0'
+
+
+fedora@container_build:
+  extends:
+    - .fedora
+    - .fdo.container-build@fedora
+  stage: containers
+  variables:
+    GIT_STRATEGY: none
+
+
+.default_build:
+  stage: build
+  script:
+    - mkdir _builddir _inst
+    - pushd _builddir > /dev/null
+    - ../autogen.sh --prefix=$(realpath ../_inst) --disable-silent-rules
+    - make && make check
+    - make install
+    - popd > /dev/null
+  artifacts:
+    name: "automake-logs-$CI_JOB_NAME"
+    when: always
+    expire_in: 1 week
+    paths:
+      - _builddir/config.log
+
+
+fedora@default-build:
+  extends:
+    - .fedora
+    - .fdo.distribution-image@fedora
+    - .default_build
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: test
+  script:
+    - ci-fairy check-commits --junit-xml=results.xml
+  except:
+    - master@xorg/driver/xf86-input-libinput
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+  allow_failure: true
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,14 +19,14 @@
 #  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

+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xorg-libinput.pc
+
 dist_xorgconf_DATA = conf/40-libinput.conf

 .PHONY: ChangeLog INSTALL
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@ xf86-input-libinput - a libinput-based X driver
 ===============================================

 The official repository for this driver is
-
-  https://github.com/X11Libre/xf86-input-evdev
+https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput

 This is an X driver based on libinput. It is a thin wrapper around libinput,
 so while it does provide all features that libinput supports it does little
@@ -13,6 +12,19 @@ beyond.
 usable input devices in your X session. Use with caution.***


+Prerequisites
+-------------
+
+To build, you'll need the X.Org X server SDK (check your distribution for a
+xorg-x11-server-devel package or similar) and libinput (check your
+distribution for libinput-devel or similar).
+
+To get libinput from source, see:
+https://www.freedesktop.org/wiki/Software/libinput/
+
+To build the X server from source:
+https://www.x.org/wiki/Building_the_X_Window_System/
+
 Building
 --------

@@ -31,3 +43,13 @@ Install the default configuration file:
    cp conf/99-libinput.conf /etc/X11/xorg.conf.d/

 This will assign this driver to *all* devices. Use with caution.
+
+
+Bugs
+----
+
+Bugs in libinput go to the Issues section of the libinput gitlab project:
+https://gitlab.freedesktop.org/libinput/libinput/issues
+
+Bugs in this driver go to the Issues section of its gitlab project:
+https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,10 @@

 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xlibre-xf86-input-libinput],
-        [25.0.0],
-        [https://github.com/X11Libre/xf86-input-libinput/issues],
-        [xlibre-xf86-input-libinput])
+AC_INIT([xf86-input-libinput],
+        [1.5.0],
+        [https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
+        [xf86-input-libinput])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -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])
@@ -128,12 +126,11 @@ 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)

@@ -152,10 +149,13 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
 AC_SUBST([sdkdir])

+DRIVER_NAME=libinput
+AC_SUBST([DRIVER_NAME])
+
 AC_CONFIG_FILES([Makefile
 		 include/Makefile
 		 src/Makefile
 		 man/Makefile
 		 test/Makefile
-		])
+		 xorg-libinput.pc])
 AC_OUTPUT
--- 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/Makefile.am
+++ b/man/Makefile.am
@@ -22,11 +22,11 @@

 drivermandir = $(DRIVER_MAN_DIR)

-driverman_PRE = libinput.man
+driverman_PRE = $(DRIVER_NAME).man

 driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))

-EXTRA_DIST = libinput.man
+EXTRA_DIST = $(DRIVER_NAME).man

 CLEANFILES = $(driverman_DATA)

--- a/man/libinput.man
+++ b/man/libinput.man
@@ -21,7 +21,7 @@ If you are looking for the library documentation, go to

 .SH DESCRIPTION
 .B libinput
-is an XLibre input driver based on libinput.
+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
@@ -178,15 +178,6 @@ Enables left-handed button orientation, i.e. swapping left and right buttons.
 Enables middle button emulation.
 When enabled, pressing the left and right
 buttons simultaneously produces a middle mouse button click.
-A synonym
-.IP
-.BI "Option \*qEmulate3Buttons\*q \*q" bool \*q
-.IP
-is preserved for compatibility with
-.B evdev
-driver, with 
-.BI "\*qMiddleEmulation\*q
-having preference if both are set.
 .TP 7
 .BI "Option \*qNaturalScrolling\*q \*q" bool \*q
 Enables or disables natural scrolling behavior.
@@ -215,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 ,
@@ -400,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.
@@ -414,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
@@ -477,13 +457,13 @@ button mapping of
 .B "\*q3 2 1 ...\*q"
 On systems using the
 .B libinput
-XLibre input driver it is recommended to use the
+Xorg input driver it is recommended to use the
 .B LeftHanded
 option instead.
 .PP
 The
 .B libinput
-XLibre input driver does not use the button mapping after setup.
+Xorg input driver does not use the button mapping after setup.
 Use
 .BR XSetPointerMapping (3)
 to modify the button mapping at runtime.
@@ -606,7 +586,7 @@ appropriate \fBMatch*\fR statement in the
 .SH AUTHORS
 Peter Hutterer
 .SH "SEE ALSO"
-.BR XLibre (1),
+.BR Xorg (1),
 .BR xorg.conf (5),
 .BR Xserver (1),
 .BR X (7)
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,11 @@
 project('xf86-input-libinput', 'c',
-        version: '25.0.0',
+        version: '1.5.0',  # bump version in configure.ac
        default_options: ['warning_level=2'],
        meson_version: '>= 0.50.0')

 driver_version = meson.project_version().split('.')

+dir_pkgconf	= get_option('prefix') / get_option('libdir') / 'pkgconfig'
 dir_man4	= get_option('prefix') / get_option('mandir') / 'man4'

 cc = meson.get_compiler('c')
@@ -127,6 +128,18 @@ test_draglock = executable('test-draglock',
 			 install: false)
 test('test-draglock', test_draglock)

+
+conf_pkgconf = configuration_data()
+conf_pkgconf.set('PACKAGE_VERSION', meson.project_version())
+conf_pkgconf.set('sdkdir', dir_headers)
+
+configure_file(
+	input: 'xorg-libinput.pc.in',
+	output: 'xorg-libinput.pc',
+	configuration: conf_pkgconf,
+	install_dir: dir_pkgconf,
+)
+
 config_man = configuration_data()
 config_man.set('VERSION', '@0@ @1@'.format(meson.project_name(), meson.project_version()))

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,12 +28,12 @@
 AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
 AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBINPUT_CFLAGS)

-libinput_drv_la_LTLIBRARIES = libinput_drv.la
-libinput_drv_la_LDFLAGS = -module -avoid-version
-libinput_drv_la_LIBADD = $(LIBINPUT_LIBS) libdraglock.la libbezier.la -lm
-libinput_drv_ladir = @inputdir@
+@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+@DRIVER_NAME@_drv_la_LIBADD = $(LIBINPUT_LIBS) libdraglock.la libbezier.la -lm
+@DRIVER_NAME@_drv_ladir = @inputdir@

-libinput_drv_la_SOURCES = \
+@DRIVER_NAME@_drv_la_SOURCES = \
 	xf86libinput.c \
 	util-macros.h \
 	util-strings.h \
--- a/src/bezier.c
+++ b/src/bezier.c
@@ -22,7 +22,10 @@
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 */
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif

 #include <assert.h>
 #include <math.h>
--- a/src/bezier.h
+++ b/src/bezier.h
@@ -22,7 +22,10 @@
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 */
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif

 #ifndef BEZIER_H
 #define BEZIER_H
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -22,7 +22,10 @@
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 */
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif

 #include "draglock.h"

--- a/src/draglock.h
+++ b/src/draglock.h
@@ -22,7 +22,10 @@
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 * IN THE SOFTWARE.
 */
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif

 #ifndef DRAGLOCK_H
 #define DRAGLOCK_H 1
--- a/src/util-strings.c
+++ b/src/util-strings.c
@@ -23,7 +23,6 @@
 */

 #include "config.h"
-#define _GNU_SOURCE

 #include "util-strings.h"

@@ -122,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;
--- 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>
@@ -97,6 +100,47 @@ safe_strdup(const char *str)
 	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)
 {
@@ -253,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))
@@ -393,3 +434,31 @@ 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,20 +2734,6 @@ xf86libinput_handle_event(struct libinput_event *event)
 			break;
 		case LIBINPUT_EVENT_SWITCH_TOGGLE:
 			break;
-
-		/* new libinput events we don't handle yet */
-#ifdef LIBINPUT_EVENT_GESTURE_HOLD_BEGIN
-		case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN:
-			break;
-#endif
-#ifdef LIBINPUT_EVENT_GESTURE_HOLD_END
-		case LIBINPUT_EVENT_GESTURE_HOLD_END:
-			break;
-#endif
-#ifdef LIBINPUT_EVENT_TABLET_PAD_KEY
-		case LIBINPUT_EVENT_TABLET_PAD_KEY:
-			break;
-#endif
 	}

 out:
@@ -3456,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)
@@ -3506,17 +3471,13 @@ static inline BOOL
 xf86libinput_parse_middleemulation_option(InputInfoPtr pInfo,
 					  struct libinput_device *device)
 {
-	int enabled;
+	BOOL enabled;

 	if (!libinput_device_config_middle_emulation_is_available(device))
 		return FALSE;

 	enabled = xf86SetBoolOption(pInfo->options,
 				    "MiddleEmulation",
-				    -1); /* returns -1 if the option has not been set */
-	if (enabled == -1)
-		enabled = xf86SetBoolOption(pInfo->options,
-				    "Emulate3Buttons",
 				    libinput_device_config_middle_emulation_get_default_enabled(device));
 	if (libinput_device_config_middle_emulation_set_enabled(device, enabled) !=
 	    LIBINPUT_CONFIG_STATUS_SUCCESS) {
@@ -3705,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;
@@ -3713,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;
@@ -3735,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
@@ -3813,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);
@@ -4301,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;
@@ -5293,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,
@@ -5408,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;
@@ -5576,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;
@@ -5619,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 ||
@@ -5666,8 +5593,7 @@ LibinputInitTapProperty(DeviceIntPtr dev,
 			struct xf86libinput *driver_data,
 			struct libinput_device *device)
 {
-	// By default tapping property config is true
-	BOOL tap = driver_data->options.tapping ? driver_data->options.tapping : TRUE;
+	BOOL tap = driver_data->options.tapping;

 	if (!subdevice_has_capabilities(dev, CAP_POINTER))
 		return;
@@ -6233,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,
@@ -6688,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)
@@ -6804,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);
--- a/xorg-libinput.pc.in
+++ b/xorg-libinput.pc.in
@@ -0,0 +1,6 @@
+sdkdir=@sdkdir@
+
+Name: xorg-libinput
+Description: X.Org libinput input driver.
+Version: @PACKAGE_VERSION@
+Cflags: -I${sdkdir}
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