release 25.0.1

Signed-off-by: callmetango <callmetango@users.noreply.github.com>

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

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

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

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

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

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

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

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

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

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/build.yml

@@ -0,0 +1,50 @@
+permissions:
+    contents: write
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    ubuntu:
+        strategy:
+            matrix:
+                xserver-version: [ master, xlibre-xserver-25.1.0, xlibre-xserver-25.0.0.18 ]
+        runs-on: ubuntu-latest
+        steps:
+            - uses: X11Libre/action-build-driver/target/ubuntu@v0.3.7
+              with:
+                xserver-version: ${{ matrix.xserver-version }}
+
+    freebsd:
+        strategy:
+            matrix:
+                xserver-version: [ master, xlibre-xserver-25.1.0, xlibre-xserver-25.0.0.18 ]
+        runs-on: ubuntu-latest
+        steps:
+            - uses: X11Libre/action-build-driver/target/freebsd@v0.3.7
+              with:
+                xserver-version: ${{ matrix.xserver-version }}
+
+    dragonfly:
+        strategy:
+            matrix:
+                # xlibre-xserver-25.0.x not compiling on dragonfly yet
+                xserver-version: [ master, xlibre-xserver-25.1.0 ]
+        runs-on: ubuntu-latest
+        steps:
+            - uses: X11Libre/action-build-driver/target/dragonfly@v0.3.7
+              with:
+                xserver-version: ${{ matrix.xserver-version }}
+
+    # not supported on NetBSD
+
+    release-notes:
+        name:    Release pushed tag
+        runs-on: ubuntu-latest
+        if:      ${{ startsWith(github.ref, 'refs/tags/xlibre-') }}
+        needs:   [ ubuntu, freebsd, dragonfly ]
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        steps:
+            - uses: X11Libre/action-build-driver/release@v0.3.7

.gitignore

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

.gitlab-ci.yml

@@ -1,98 +0,0 @@
-# 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 c5626190ec14b475271288dda7a7dae8dbe0cd76 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-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: 33
-    FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros'
-    FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/fedora-install.sh'
-    FDO_DISTRIBUTION_TAG: '2021-09-15.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:33@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
-
-#
-# 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

.gitlab-ci/fedora-install.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# we require at least inputproto >= 2.3.99.1 which has been released in xorgproto 2021.5
-git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2021.5
-pushd xorgproto
-./autogen.sh
-make -j${FDO_CI_CONCURRENT:-4} install
-popd
-rm -rf xorgproto

Makefile.am

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

README.md

@@ -2,7 +2,8 @@ xf86-input-libinput - a libinput-based X driver
 ===============================================
 
 The official repository for this driver is
-https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
+
+  https://github.com/X11Libre/xf86-input-evdev
 
 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
@@ -12,19 +13,6 @@ 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
 --------
 
@@ -43,13 +31,3 @@ 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

configure.ac

@@ -22,10 +22,10 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xf86-input-libinput],
-        [1.3.0],
-        [https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
-        [xf86-input-libinput])
+AC_INIT([xlibre-xf86-input-libinput],
+        [25.0.1],
+        [https://github.com/X11Libre/xf86-input-libinput/issues],
+        [xlibre-xf86-input-libinput])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -43,13 +43,11 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-# 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])
+CFLAGS="$CFLAGS -Wno-declaration-after-statement"
 
-PKG_CHECK_MODULES(INPUTPROTO24, [inputproto >= 2.3.99.1],
-		  [AC_DEFINE(HAVE_INPUTPROTO24, [1], [inputproto 2.4 is available])],
-		  [:])
+# Obtain compiler/linker options from server and required extensions
+PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0] xproto [inputproto >= 2.3.99.1])
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.11.0])
 
 OLD_LIBS=$LIBS
 OLD_CFLAGS=$CFLAGS
@@ -89,15 +87,49 @@ AC_LINK_IFELSE(
                [AC_MSG_RESULT([no])
                 [libinput_have_custom_accel=no]])
 
+AC_MSG_CHECKING([if libinput_tablet_tool_config_pressure_range_set is available])
+AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([[#include <libinput.h>]],
+                                [[libinput_tablet_tool_config_pressure_range_set(0)]])],
+               [AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_LIBINPUT_PRESURE_RANGE, [1],
+                          [libinput_tablet_tool_config_pressure_range_set() is available])
+                [libinput_have_pressure_range=yes]],
+               [AC_MSG_RESULT([no])
+                [libinput_have_pressure_range=no]])
+
+AC_MSG_CHECKING([if libinput_device_config_click_set_clickfinger_button_map is available])
+AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([[#include <libinput.h>]],
+                                [[libinput_device_config_click_set_clickfinger_button_map(NULL, 0)]])],
+               [AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP, [1],
+                          [libinput_device_config_click_set_clickfinger_button_map() is available])
+                [libinput_have_clickfinger_button_map=yes]],
+               [AC_MSG_RESULT([no])
+                [libinput_have_clickfinger_button_map=no]])
+
+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,
-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                           [Default xorg module directory]),
             [moduledir="$withval"],
-            [moduledir="$libdir/xorg/modules"])
+            [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 
@@ -116,9 +148,6 @@ 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

include/libinput-properties.h

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

man/Makefile.am

@@ -22,11 +22,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = $(DRIVER_NAME).man
+driverman_PRE = libinput.man
 
 driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
 
-EXTRA_DIST = $(DRIVER_NAME).man
+EXTRA_DIST = libinput.man
 
 CLEANFILES = $(driverman_DATA)
 

man/libinput.man

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

meson.build

@@ -1,5 +1,5 @@
 project('xf86-input-libinput', 'c',
-        version: '1.3.0',  # bump version in configure.ac
+        version: '25.0.1',
         default_options: ['warning_level=2'],
         meson_version: '>= 0.50.0')
 
@@ -33,7 +33,7 @@ add_project_arguments(cc.get_supported_arguments(cflags), language: 'c')
 pkgconfig = import('pkgconfig')
 dep_xserver = dependency('xorg-server', version: '>= 1.19')
 dep_xproto = dependency('xproto')
-dep_inputproto = dependency('inputproto', version: '>= 2.2')
+dep_inputproto = dependency('inputproto', version: '>= 2.3.99.1')
 dep_libinput = dependency('libinput', version: '>= 1.11.0')
 
 config_h = configuration_data()
@@ -41,10 +41,6 @@ config_h.set('PACKAGE_VERSION_MAJOR', driver_version[0])
 config_h.set('PACKAGE_VERSION_MINOR', driver_version[1])
 config_h.set('PACKAGE_VERSION_PATCHLEVEL', driver_version[2])
 
-if dep_inputproto.version().version_compare('>= 2.3.99.1')
-	config_h.set('HAVE_INPUTPROTO24', 1)
-endif
-
 if cc.has_function('libinput_device_config_scroll_get_button_lock',
 		   dependencies: dep_libinput)
 	config_h.set('HAVE_LIBINPUT_SCROLL_BUTTON_LOCK', 1)
@@ -57,6 +53,21 @@ if cc.has_function('libinput_config_accel_create',
 		   dependencies: dep_libinput)
 	config_h.set('HAVE_LIBINPUT_CUSTOM_ACCEL', 1)
 endif
+if cc.has_function('libinput_tablet_tool_config_pressure_range_set',
+		   dependencies: dep_libinput)
+	config_h.set('HAVE_LIBINPUT_PRESSURE_RANGE', 1)
+endif
+if cc.has_function('libinput_device_config_click_set_clickfinger_button_map',
+		   dependencies: dep_libinput)
+	config_h.set('HAVE_LIBINPUT_CLICKFINGER_BUTTON_MAP', 1)
+endif
+if cc.has_header_symbol('libinput.h', 'LIBINPUT_LED_COMPOSE',
+			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 == ''
@@ -135,6 +146,8 @@ configure_file(
 	install_dir: dir_man4
 )
 
+install_headers('include/libinput-properties.h', install_dir: dir_headers)
+
 install_data('conf/40-libinput.conf', install_dir: dir_xorg_conf)
 
 # Now generate config.h

src/Makefile.am

@@ -28,12 +28,12 @@
 AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
 AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBINPUT_CFLAGS)
 
-@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_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_SOURCES = \
+libinput_drv_la_SOURCES = \
 	xf86libinput.c \
 	util-macros.h \
 	util-strings.h \

src/bezier.c

@@ -22,10 +22,7 @@
  * 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>

src/bezier.h

@@ -22,10 +22,7 @@
  * 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

src/draglock.c

@@ -22,10 +22,7 @@
  * 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"
 

src/draglock.h

@@ -22,10 +22,7 @@
  * 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

src/util-strings.c

@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#define _GNU_SOURCE
 
 #include "util-strings.h"
 
@@ -121,7 +122,9 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements)
 	}
 
 	size_t strv_len = nelems + 1; /* NULL-terminated */
-	char **strv = zalloc(strv_len * sizeof *strv);
+	char **strv = calloc(strv_len, sizeof(*strv));
+	if (!strv)
+		return NULL;
 
 	size_t idx = 0;
 	const char *word;

src/util-strings.h

@@ -24,9 +24,6 @@
 
 #pragma once
 
-#include "config.h"
-#define _GNU_SOURCE
-
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -100,47 +97,6 @@ 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)
 {
@@ -297,7 +253,10 @@ double_array_from_string(const char *in,
 	if(!strv)
 		return result;
 
-	double *numv = zalloc(sizeof(double) * nelem);
+	double *numv = calloc(nelem, sizeof(double));
+	if (!numv)
+		goto out;
+
 	for (size_t idx = 0; idx < nelem; idx++) {
 		double val;
 		if (!safe_atod(strv[idx], &val))
@@ -434,31 +393,3 @@ 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;
-}

test/test-draglock.c

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