configure.ac: use AC_CONFIG_FILES() macro

passing output file names directly to AC_OUTPUT() is deprecated.

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

.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:
+        - 2.11.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-evdev/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-evdev/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-evdev/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-evdev/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-evdev/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

@@ -76,3 +76,5 @@ core
 #		Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
+man/evdev.4
+man/evdev.man

.gitlab-ci.yml

@@ -1,106 +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 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-
-include:
-  # Arch container builder template
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/arch.yml'
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/ci-fairy.yml'
-  - template: Security/SAST.gitlab-ci.yml
-
-
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    - if: $CI_COMMIT_BRANCH
-
-
-stages:
-  - prep             # prep work like rebuilding the container images if there is a change
-  - build            # for actually building and testing things in a container
-  - test
-  - deploy
-
-
-variables:
-  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-input-evdev'
-  # The tag should be updated each time the list of packages is updated.
-  # Changing a tag forces the associated image to be rebuilt.
-  # Note: the tag has no meaning, we use a date format purely for readability
-  FDO_DISTRIBUTION_TAG:  '2023-10-01.0'
-  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto xorg-server-devel pixman systemd-libs libevdev mtdev'
-
-
-#
-# Verify that commit messages are as expected
-#
-check-commits:
-  extends:
-    - .fdo.ci-fairy
-  stage: prep
-  script:
-    - ci-fairy check-commits --junit-xml=results.xml
-  except:
-    - master@xorg/driver/xf86-input-evdev
-  variables:
-    GIT_DEPTH: 100
-  artifacts:
-    reports:
-      junit: results.xml
-
-#
-# Verify that the merge request has the allow-collaboration checkbox ticked
-#
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: deploy
-  script:
-    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-  artifacts:
-    when: on_failure
-    reports:
-      junit: results.xml
-  allow_failure: true
-
-
-#
-# Build a container with the given tag and the packages pre-installed.
-# This only happens if the tag changes, otherwise the existing image is
-# re-used.
-#
-container-prep:
-  extends:
-    - .fdo.container-build@arch
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-
-
-#
-# The default build, runs on the image built above.
-#
-build:
-  stage: build
-  extends:
-    - .fdo.distribution-image@arch
-  script:
-    - autoreconf -ivf
-    - mkdir _builddir
-    - pushd _builddir > /dev/null
-    - ../configure --disable-silent-rules
-    - make
-    - make check
-    - make distcheck
-    - popd > /dev/null

Makefile.am

@@ -19,15 +19,13 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-# Provide an sdk location that is writable by the evdev module
-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'
 
-SUBDIRS = src man include
+SUBDIRS = src man
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xorg-evdev.pc
-
 dist_xorgconf_DATA = 10-evdev.conf
 
 .PHONY: ChangeLog INSTALL

README.md

@@ -1,18 +1,8 @@
-xf86-input-evdev - Generic Linux input driver for the Xorg X server
--------------------------------------------------------------------
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-  https://lists.x.org/mailman/listinfo/xorg
+xf86-input-evdev - Generic Linux input driver for the XLibre X server
+---------------------------------------------------------------------
 
 The primary development code repository can be found at:
 
-  https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
+  https://github.com/X11Libre/xf86-input-evdev
 
 Please submit bug reports and requests to merge patches there.
-
-For patch submission instructions, see:
-
-  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-

configure.ac

@@ -22,10 +22,10 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xf86-input-evdev],
-        [2.11.0],
-        [https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/issues],
-        [xf86-input-evdev])
+AC_INIT([xlibre-xf86-input-evdev],
+        [25.0.0],
+        [https://github.com/X11Libre/xf86-input-evdev/issues],
+        [xlibre-xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -44,43 +44,22 @@ XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18] xproto [inputproto >= 2.1.99.3])
-PKG_CHECK_MODULES(UDEV, libudev, [AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0] xproto [inputproto >= 2.1.99.3])
+PKG_CHECK_MODULES(UDEV, libudev,
+    [HAVE_UDEV=yes], [HAVE_UDEV=no])
+AS_IF([test "$HAVE_UDEV" = "yes"],
+    [AC_DEFINE([HAVE_LIBUDEV], [1], [Define if libudev is available])])
 
 PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
 PKG_CHECK_MODULES(MTDEV, mtdev)
 
 # Define a configure option for an alternate input module directory
-AC_ARG_WITH(xorg-module-dir,
-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-            [moduledir="$withval"],
-            [moduledir="$libdir/xorg/modules"])
-inputdir=${moduledir}/input
-AC_SUBST(inputdir)
+PKG_PROG_PKG_CONFIG([0.25])
+xlibre_input_drivers_dir=`$PKG_CONFIG --variable=input_drivers_dir xlibre-server`
+AC_SUBST(xlibre_input_drivers_dir)
 
-AC_ARG_WITH(xorg-conf-dir,
-            AC_HELP_STRING([--with-xorg-conf-dir=DIR],
-                           [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
-            [xorgconfdir="$withval"],
-            [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
+xorgconfdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`
 AC_SUBST(xorgconfdir)
 
-# X Server SDK location is required to install evdev header files
-# This location is also relayed in the xorg-evdev.pc file
-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-
-# Workaround overriding sdkdir to be able to create a tarball when user has no
-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
-AC_SUBST([sdkdir])
-
-DRIVER_NAME=evdev
-AC_SUBST([DRIVER_NAME])
-
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 man/Makefile
-                 include/Makefile
-                 xorg-evdev.pc])
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile man/evdev.man])
 AC_OUTPUT

include/Makefile.am

@@ -1 +0,0 @@
-sdk_HEADERS = evdev-properties.h

include/evdev-properties.h

@@ -56,10 +56,6 @@
 /* BOOL, 2 values [x, y], 1 inverts axis */
 #define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
 
-/* Reopen attempts. */
-/* CARD8 */
-#define EVDEV_PROP_REOPEN "Evdev Reopen Attempts" /* OBSOLETE */
-
 /* Run-time calibration */
 /* CARD32, 4 values [minx, maxx, miny, maxy], or no values for unset */
 #define EVDEV_PROP_CALIBRATION "Evdev Axis Calibration"

man/Makefile.am

@@ -1,37 +1,7 @@
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-# 
-
 drivermandir = $(DRIVER_MAN_DIR)
-
-driverman_PRE = $(DRIVER_NAME).man
-
-driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
-
-EXTRA_DIST = $(DRIVER_NAME).man
+driverman_DATA = evdev.$(DRIVER_MAN_SUFFIX)
 
 CLEANFILES = $(driverman_DATA)
 
-SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(DRIVER_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+	cp $< $@

man/evdev.man.in

@@ -1,8 +1,8 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH EVDEV __drivermansuffix__ 2016-11-17 __vendorversion__
+.TH EVDEV @DRIVER_MAN_SUFFIX@ 2016-11-17 "@PACKAGE_STRING@" "X Version 11"
 .SH NAME
-evdev \- Generic Linux input driver for Xorg
+evdev \- Generic Linux input driver for XLibre
 .SH SYNOPSIS
 .nf
 .B "Section \*qInputDevice\*q"
@@ -17,7 +17,7 @@ evdev \- Generic Linux input driver for Xorg
 .fi
 .SH DESCRIPTION
 .B evdev
-is an Xorg input driver for Linux\'s generic event devices.
+is an XLibre input driver for Linux\'s generic event devices.
 It therefore supports all input devices that the kernel knows about,
 including most mice, keyboards, tablets, and touchscreens.
 .B evdev
@@ -363,7 +363,7 @@ Value range 0-32, 0 disables a value.
 .SH AUTHORS
 Kristian Høgsberg, Peter Hutterer
 .SH "SEE ALSO"
-.BR Xorg (__appmansuffix__),
-.BR xorg.conf (__filemansuffix__),
-.BR Xserver (__appmansuffix__),
-.BR X (__miscmansuffix__)
+.BR XLibre (@APP_MAN_SUFFIX@),
+.BR xorg.conf (@FILE_MAN_SUFFIX@),
+.BR Xserver (@APP_MAN_SUFFIX@),
+.BR X (@MISC_MAN_SUFFIX@)

src/Makefile.am

@@ -28,17 +28,16 @@
 AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
 AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBEVDEV_CFLAGS)
 
-@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS)
-@DRIVER_NAME@_drv_ladir = @inputdir@
+evdev_drv_la_LTLIBRARIES = evdev_drv.la
+evdev_drv_la_LDFLAGS = -module -avoid-version
+evdev_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS)
+evdev_drv_ladir = @xlibre_input_drivers_dir@
 
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
-                               @DRIVER_NAME@.h \
+evdev_drv_la_SOURCES = evdev.c \
+                               evdev.h \
                                emuMB.c \
                                emuThird.c \
                                emuWheel.c \
                                draglock.c \
                                apple.c \
                                axis_labels.h
-

src/apple.c

@@ -24,9 +24,7 @@
  *	Peter Hutterer (peter.hutterer@redhat.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <evdev.h>
 #include <evdev-properties.h>

src/axis_labels.h

@@ -21,9 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xserver-properties.h>
 

src/draglock.c

@@ -32,9 +32,7 @@
 
 /* Draglock code */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "evdev.h"
 
 #include <xf86.h>

src/emuMB.c

@@ -30,10 +30,7 @@
 
 /* Middle mouse button emulation code. */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 #include "evdev.h"
 
 #include <X11/Xatom.h>
@@ -188,11 +185,7 @@ EvdevMBEmuTimer(InputInfoPtr pInfo)
     int id;
     int mapped_id;
 
-#if HAVE_THREADED_INPUT
     input_lock();
-#else
-    int sigstate = xf86BlockSIGIO();
-#endif
 
     pEvdev->emulateMB.pending = FALSE;
     if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) {
@@ -208,11 +201,7 @@ EvdevMBEmuTimer(InputInfoPtr pInfo)
                     pEvdev->emulateMB.state);
     }
 
-#if HAVE_THREADED_INPUT
     input_unlock();
-#else
-    xf86UnblockSIGIO(sigstate);
-#endif
     return 0;
 }
 
@@ -277,7 +266,7 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
 }
 
 
-void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
+void EvdevMBEmuWakeupHandler(void *data, int i)
 {
     InputInfoPtr pInfo = (InputInfoPtr)data;
     EvdevPtr     pEvdev = (EvdevPtr)pInfo->private;
@@ -291,7 +280,7 @@ void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
     }
 }
 
-void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS)
+void EvdevMBEmuBlockHandler(void *data, void *waitTime)
 {
     InputInfoPtr    pInfo = (InputInfoPtr) data;
     EvdevPtr        pEvdev= (EvdevPtr) pInfo->private;
@@ -337,7 +326,7 @@ EvdevMBEmuOn(InputInfoPtr pInfo)
 
     RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
                                     EvdevMBEmuWakeupHandler,
-                                    (pointer)pInfo);
+                                    (void*)pInfo);
 }
 
 void
@@ -348,7 +337,7 @@ EvdevMBEmuFinalize(InputInfoPtr pInfo)
 
     RemoveBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
                                   EvdevMBEmuWakeupHandler,
-                                  (pointer)pInfo);
+                                  (void*)pInfo);
 
 }
 

src/emuThird.c

@@ -29,10 +29,7 @@
  * generated.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 #include "evdev.h"
 
 #include <X11/Xatom.h>
@@ -84,24 +81,16 @@ Evdev3BEmuPostButtonEvent(InputInfoPtr pInfo, int button, enum ButtonAction act)
  * @param arg The InputInfoPtr for this device.
  */
 CARD32
-Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg)
+Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, void *arg)
 {
     InputInfoPtr      pInfo    = (InputInfoPtr)arg;
     EvdevPtr          pEvdev   = pInfo->private;
     struct emulate3B *emu3B    = &pEvdev->emulate3B;
 
-#if HAVE_THREADED_INPUT
     input_lock();
-#else
-    int sigstate = xf86BlockSIGIO();
-#endif
     emu3B->state = EM3B_EMULATING;
     Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_PRESS);
-#if HAVE_THREADED_INPUT
     input_unlock();
-#else
-    xf86UnblockSIGIO(sigstate);
-#endif
     return 0;
 }
 

src/emuWheel.c

@@ -30,9 +30,7 @@
 */
 
 /* Mouse wheel emulation code. */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "evdev.h"
 
 #include <X11/Xatom.h>
@@ -210,9 +208,7 @@ EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
 	    ((up_button > 0) && (up_button <= EVDEV_MAXBUTTONS)) &&
 	    ((down_button > 0) && (down_button <= EVDEV_MAXBUTTONS))) {
 
-	    /* Use xstrdup to allocate a string for us */
-	    msg = xstrdup("buttons XX and YY");
-
+	    msg = strdup("buttons XX and YY");
 	    if (msg)
 		sprintf(msg, "buttons %d and %d", up_button, down_button);
 

src/evdev.c

@@ -28,10 +28,7 @@
  *	Thomas H.P. Andersen (phomes@gmail.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 #include "evdev.h"
 #include "axis_labels.h"
 
@@ -704,12 +701,7 @@ EvdevProcessTouch(InputInfoPtr pInfo)
 static int
 num_slots(EvdevPtr pEvdev)
 {
-    int value;
-
-    if (pEvdev->mtdev)
-        value = pEvdev->mtdev->caps.slot.maximum + 1;
-    else
-        value = libevdev_get_num_slots(pEvdev->dev);
+    int value = pEvdev->mtdev ? pEvdev->mtdev->caps.slot.maximum + 1 : libevdev_get_num_slots(pEvdev->dev);
 
     /* If we don't know how many slots there are, assume at least 10 */
     return value > 1 ? value : 10;
@@ -2701,16 +2693,9 @@ _X_EXPORT InputDriverRec EVDEV = {
 #endif
 };
 
-static void
-EvdevUnplug(pointer	p)
-{
-}
+static void EvdevUnplug(void *p) { }
 
-static pointer
-EvdevPlug(pointer	module,
-          pointer	options,
-          int		*errmaj,
-          int		*errmin)
+static void *EvdevPlug(void *module, void *options, int *errmaj, int *errmin)
 {
     xf86AddInputDriver(&EVDEV, module, 0);
     return module;

src/evdev.h

@@ -28,9 +28,7 @@
  *	Oliver McFadden (oliver.mcfadden@nokia.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifndef EVDEV_H
 #define EVDEV_H
@@ -70,22 +68,6 @@
 #define LED_CNT (LED_MAX+1)
 #endif
 
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18
-#define LogMessageVerbSigSafe xf86MsgVerb
-#endif
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
-#define HAVE_THREADED_INPUT	1
-#endif
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24
-#define BLOCK_HANDLER_ARGS     	void *data, void *waitTime
-#define WAKEUP_HANDLER_ARGS	void *data, int i
-#else
-#define BLOCK_HANDLER_ARGS	pointer data, struct timeval **waitTime, pointer LastSelectMask
-#define WAKEUP_HANDLER_ARGS	void *data, int i, pointer LastSelectMask
-#endif
-
 #define EVDEV_MAXBUTTONS 32
 #define EVDEV_MAXQUEUE 32
 
@@ -280,14 +262,14 @@ unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code);
 /* Middle Button emulation */
 int  EvdevMBEmuTimer(InputInfoPtr);
 BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
-void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS);
-void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS);
+void EvdevMBEmuWakeupHandler(void *data, int i);
+void EvdevMBEmuBlockHandler(void *data, void *waitTime);
 void EvdevMBEmuPreInit(InputInfoPtr);
 void EvdevMBEmuOn(InputInfoPtr);
 void EvdevMBEmuFinalize(InputInfoPtr);
 
 /* Third button emulation */
-CARD32 Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg);
+CARD32 Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, void *arg);
 BOOL Evdev3BEmuFilterEvent(InputInfoPtr, int, BOOL);
 void Evdev3BEmuPreInit(InputInfoPtr pInfo);
 void Evdev3BEmuOn(InputInfoPtr);

xorg-evdev.pc.in

@@ -1,6 +0,0 @@
-sdkdir=@sdkdir@
-
-Name: xorg-evdev
-Description: X.Org evdev input driver.
-Version: @PACKAGE_VERSION@
-Cflags: -I${sdkdir}