Update to xf86-input-joystick 1.6.0

2011-07-02 21:03:42 +00:00 · 2011-07-02 21:03:42 +00:00 · 6b7dd51a4a
commit 6b7dd51a4a
parent 7d2cdbd9f3
30 changed files with 3051 additions and 2365 deletions
--- a/driver/xf86-input-joystick/COPYING
+++ b/driver/xf86-input-joystick/COPYING
@ -1,12 +1,41 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
+                                                                          
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is  hereby granted without fee, provided that
+the  above copyright   notice appear  in   all  copies and  that both  that
+copyright  notice   and   this  permission   notice  appear  in  supporting
+documentation, and that   the  name of  Sascha   Hlusiak  not  be  used  in
+advertising or publicity pertaining to distribution of the software without
+specific,  written      prior  permission.     Sascha   Hlusiak   makes  no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.                   
+                                                                            
+SASCHA  HLUSIAK  DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+EVENT  SHALL SASCHA  HLUSIAK  BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
+PERFORMANCE OF THIS SOFTWARE.

-Please submit updated COPYING files to the Xorg bugzilla:
+Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
+Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
+                                                                           
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is  hereby granted without fee, provided that
+the  above copyright   notice appear  in   all  copies and  that both  that
+copyright  notice   and   this  permission   notice  appear  in  supporting
+documentation, and that  the  names  of copyright holders not  be  used  in
+advertising or publicity pertaining to distribution of the software without
+specific,  written      prior  permission.  The copyright holders  make  no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.                   
+                                                                           
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+EVENT  SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT   OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
+PERFORMANCE OF THIS SOFTWARE.

-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
--- a/driver/xf86-input-joystick/ChangeLog
+++ b/driver/xf86-input-joystick/ChangeLog
@ -1,3 +1,429 @@
+commit bd6c54fe672a913334bfba1ca5dc0f2e0f1f1152
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Wed Apr 20 20:55:24 2011 +0200
+
+    joystick 1.6.0
+    
+    Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
+
+commit f1b8ef560049f1bb1bca9caa12c1529c9f992a09
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Wed Apr 20 20:48:28 2011 +0200
+
+    Updated man page to reflect latest changes
+
+commit aa78e01edabb27d1b5dcd4ffe2be32878a45e342
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Wed Apr 20 20:47:33 2011 +0200
+
+    Added xorg.conf.d example snipped
+    
+    Not installed by default, left for distributors.
+    
+    Copy 50-joystick-all.conf to /etc/X11/xorg.conf.d/ and modify to your needs.
+
+commit 29d3745e73d266db173828f40231cb78ec1c383a
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Wed Apr 20 19:48:28 2011 +0200
+
+    Revert "config: fdi file must be installed in $(datadir)/hal/fdi/policy/20thirdparty"
+    
+    The fdi file was never meant to be installed by default but exists merely as an
+    example and documentation for distributors who may decide to ship it by default or
+    install it in share/doc/...
+    
+    This reverts commit 1d67a2da26fa3ba0b8f5498da89c01aeaa551515.
+
+commit 4358209e7e4383b4ebdec93cc116bb1c21d373a7
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Wed Apr 20 19:33:10 2011 +0200
+
+    Free pInfo->private only once to fix server crash on unplug (bug #35391)
+    
+    The hotplugged keyboard device and the main device share the same pInfo->private data
+    and the same jstkCoreUnInit, so the data is freed twice. Furthermore, since the keyboard
+    device will delete itself, we must not delete it from within the deletion of the main device.
+    
+    Freeing pInfo->private is done by the main device, hopefully done independently of the order
+    in which the two devices will be removed by the server.
+    
+    Should fix bug #35391
+
+commit 3f03fa76f8fb152210c6ed80191f34e428af2c00
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Apr 6 21:02:49 2011 +1000
+
+    joystick 1.5.99.901
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8c7ad54d6d869bb4202aee8408c72ed72bf929a7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 17:00:28 2010 +1000
+
+    Support input ABI 12
+    
+    This commit adds support for input ABI 12, consisting of a number of
+    changes:
+    - requires an X server with an ABI of 12
+    - valuators have a per-mode setting
+    - new PreInit prototype.
+    
+    Because of the new PreInit prototype, the hotplug system has been switched
+    around too (should have probably been done in a separate commit before,
+    but...).
+    
+    The old hotplug mechanism added a separate ModuleInfoRec for the keyboard
+    part of the driver. This isn't feasable for InputClass configurations, the
+    driver part may get overwritten.
+    
+    On entering the driver, after checking a few default values, hotplug the
+    keyboard device (wacom-style) and let it initialize. Because NIDR calls
+    DEVICE_INIT and DEVICE_ON the keyboard must initialise the private pointer
+    and pass it back to the original device.
+    
+    Call order is:
+    NewInputDeviceRequest
+     - jstkCorePreInit
+       - jstkKeyboardHotplug
+         - NewInputDeviceRequest
+           - jstkCorePreInit
+             immediately return jstkKeyboardPreInit()
+           - keyboard DEVICE_INIT
+           - keyboard DEVICE_ON
+         return keyboard device
+       - copy keyboard->priv to joystick->priv
+       - finish jstkCorePreInit as normal
+       - joystick DEVICE_INIT
+       - joystick DEVICE_ON
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit f2050e6be5b6b3f8c429060992cc3ead0cfe86c1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 16:51:15 2010 +1000
+
+    Get the option values from pInfo instead of from the IDevRec.
+    
+    Doesn't matter which one we take, but ABI 12 dropped the IDevRec.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit df0567d2fa2d67a00dce78a89803e8925d20e324
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 16:48:50 2010 +1000
+
+    Don't call xf86OptionListReport()
+    
+    All options used by the driver will show up in the log anyway.
+    And new xserver versions will call this for debugging purposes for us.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit 135aaf612bcb591ae1692ae47b2d36a814230cbe
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 15:19:08 2010 +1000
+
+    Purge use of XI_PRIVATE macro.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit 29a486ba56bc6279297a716b018ba24880680e82
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 15:14:47 2010 +1000
+
+    Drop close_proc, conversion_proc, reverse_conversion_proc
+    
+    All three aren't called by the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit 0674bdfdb67e9195af7cb5982ae2eda0fa03ce57
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 15:09:32 2010 +1000
+
+    Don't handle history_size in the driver.
+    
+    This has been handled in the server for quite a while now, just initialize
+    with the defaults and ignore it otherwise.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit 39205d76cb45242ee9b47594ec5be7edc509edc7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 15:08:49 2010 +1000
+
+    Require server 1.9, drop pre-ABI 11 support.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit 074dc4a2a06aebae144afc21de5c4f8bc365937d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 15:04:44 2010 +1000
+
+    Remove usage of XI86_POINTER_CAPABLE flag.
+    
+    Flag was write-only for a number of server generations already.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit 107e4b14d90d06864247c7878ee0cc5f59e4bc5a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 14:47:31 2010 +1000
+
+    Replace LocalDevicePtr with InputInfoPtr
+    
+    Both typedefs describe the same struct, LocalDevicePtr has been removed with
+    input ABI 12.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Trevor Woerner <twoerner@gmail.com>
+
+commit a23a4a77c7157c516a8194e05e9f07b64d8e8089
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Dec 14 15:03:45 2010 +1000
+
+    Bump to 1.5.99
+
+commit cd6b81d377a5d541100996fa4e2ac2decffe65f1
+Author: Trevor Woerner <twoerner@gmail.com>
+Date:   Sun Oct 17 21:26:16 2010 -0400
+
+    Code cleanup, bad structure initialization.
+    
+    The InputDriverRec data structure in xserver/hw/xfree86/common/xf86Xinput.h
+    no longer contains an integer refCount member; as per commit
+    d568221710959cf7d783e6ff0fb80fb43a231124.
+    
+    Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 38363bde5d94c9a8f163fde31ede067f6d0d1669
+Author: Trevor Woerner <twoerner@gmail.com>
+Date:   Sun Oct 17 21:25:56 2010 -0400
+
+    Deprecated code cleanup.
+    
+    Replace calls to deprecated functions (Xfree(), Xcalloc(), Xmalloc(), etc)
+    with calls to standard dynamic memory functions (free(), calloc(), malloc(),
+    etc) in driver code.
+    
+    Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d209590c06e7a4df9d921ff53cb9792e9beb1aeb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jun 11 22:00:45 2010 -0400
+
+    COPYING: replace stub file with Copyright notices
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1d67a2da26fa3ba0b8f5498da89c01aeaa551515
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jun 11 21:50:34 2010 -0400
+
+    config: fdi file must be installed in $(datadir)/hal/fdi/policy/20thirdparty
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 09ca64e76568868e8f9c7bf48e8858669fc5aaa7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jun 11 21:47:23 2010 -0400
+
+    config: EXTRA_DIST is redundant
+    
+    sdkdir provides the install path for sdk_HEADERS primary
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 55783bf0cd5e0ae29b008dd3fc3a47c66eabffbd
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jun 11 17:46:37 2010 -0400
+
+    config: upgrade to util-macros 1.8 for additional man page support
+    
+    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    The value of MAN_SUBST is the same for all X.Org packages.
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    Use $(AM_V_GEN)$(SED) to support silent rule
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 342908f4d06c8000789d659b9f8871e56812b78e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jun 11 17:41:59 2010 -0400
+
+    config: fix warnings, m4 quoting and layout
+    
+    Fix some m4 quoting
+    Fix some autoconf warnings
+    Regroup statements per section
+    Add comments
+    Remove unused NDEBUG define
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e98f0d0349222a4d981086f944398d32a548d953
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Apr 18 15:37:29 2010 -0400
+
+    config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+    
+    XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+    AC_PROG_C_C99. This sets gcc with -std=gnu99.
+    If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c6908579b56b7d8c478ebe8c07e2a68a30c5de44
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Apr 18 15:36:32 2010 -0400
+
+    config: remove unrequired AC_HEADER_STDC
+    
+    Autoconf says:
+    "This macro is obsolescent, as current systems have conforming
+    header files. New programs need not use this macro".
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ab6308ed177fc341ba0cca3e4a9048f858d80007
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Apr 18 15:35:45 2010 -0400
+
+    config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+    
+    Regroup AC statements at the top.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2252c78fb11b09c688b1b2cc82a542fc2470b8e2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Apr 18 15:26:16 2010 -0400
+
+    config: update AC_PREREQ statement to 2.60
+    
+    Unrelated to the previous patches, the new value simply reflects
+    the reality that the minimum level for autoconf to configure
+    all x.org modules is 2.60 dated June 2006.
+    
+    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 25722aa12bfbb5675a02d7d8520ae83fdc5735c8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Apr 18 15:24:59 2010 -0400
+
+    config: remove AH_TOP autoheader statement
+    
+    The generated config.h does not need to include xorg-server.h
+    for the content it provides.
+    Add #include <xorg-server.h> in .[hc] files as needed.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3de065d6822206695c0aee2fd68cd9db8b2f3063
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Feb 11 10:08:07 2010 -0500
+
+    config: move CWARNFLAGS from configure.ac to Makefile.am
+    
+    Compiler warning flags should be explicitly set in the makefile
+    rather than being merged with other packages compiler flags.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 30d1089cffc9afd9fd468a6c30989e77c7884248
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 15 15:08:26 2010 -0800
+
+    Update Sun license notices to current X.Org standard form
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit efe94ccfb4505f18a44b39ada256df8ba16b3ec5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Dec 28 15:05:39 2009 -0500
+
+    configure.ac: use backticks rather than $() for cmd subs
+    
+    Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+    
+    Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+    Acked-by: Daniel Stone <daniel@fooishbar.org>
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ad0abb97a19e311988deffd385ca69e96bd106a4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Nov 23 09:25:05 2009 -0500
+
+    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+    
+    Now that the INSTALL file is generated.
+    Allows running make maintainer-clean.
+
+commit 260c441981c1fe1c6e076bde1a6a26328e6b5675
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:41:41 2009 -0400
+
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Automake 'foreign' option is specified in configure.ac.
+    Remove from Makefile.am
+
+commit 877f13a6056cc8b17a73a5d4c839cd8b30065f9b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:09:09 2009 -0400
+
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Add missing INSTALL file. Use standard GNU file on building tarball
+    README may have been updated
+    Remove AUTHORS file as it is empty and no content available yet.
+    Remove NEWS file as it is empty and no content available yet.
+
+commit 9fc986bd5dc3bd1741b1ad4e4da152edfaf928d9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Oct 26 12:54:20 2009 -0400
+
+    Several driver modules do not have a ChangeLog target in Makefile.am #23814
+    
+    The git generated ChangeLog replaces the hand written one.
+    Update configure.ac to xorg-macros level 1.3.
+    Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+    Update Makefile.am to add ChangeLog target if missing
+    Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+    This is a pre-req for the INSTALL_CMD
+
+commit cd4e5ab0c64f477c343ab161ec309c42b9737450
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Oct 22 12:34:16 2009 -0400
+
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
+
+commit eaf8d1a1d87af9f67ca3e3d0436bb9d9a7cfc17a
+Author: Sascha Hlusiak <saschahlusiak@arcor.de>
+Date:   Sat Oct 31 12:41:15 2009 +0100
+
+    Bump to 1.5.0
+    
+    Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
+
 commit 657c01c8ebb9e0571d498356e6d3d03917199328
 Author: Sascha Hlusiak <saschahlusiak@arcor.de>
 Date:   Wed Oct 7 09:24:39 2009 +0200
--- a/driver/xf86-input-joystick/INSTALL
+++ b/driver/xf86-input-joystick/INSTALL
@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
--- a/driver/xf86-input-joystick/Makefile.am
+++ b/driver/xf86-input-joystick/Makefile.am
@ -18,19 +18,19 @@
 #  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.

-AUTOMAKE_OPTIONS = foreign
 DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg
 SUBDIRS = src man config include
+MAINTAINERCLEANFILES = ChangeLog INSTALL

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-joystick.pc

-EXTRA_DIST = ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL

-.PHONY: ChangeLog
+INSTALL:
+	$(INSTALL_CMD)

 ChangeLog:
 	$(CHANGELOG_CMD)

-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
--- a/driver/xf86-input-joystick/Makefile.in
+++ b/driver/xf86-input-joystick/Makefile.in
@ -43,9 +43,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@ -59,8 +59,8 @@ host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/xorg-joystick.pc.in $(top_srcdir)/configure COPYING \
-	ChangeLog config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+	ChangeLog INSTALL config.guess config.sub depcomp install-sh \
+	ltmain.sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -101,12 +101,14 @@ am__remove_distdir = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@ -149,6 +151,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -167,6 +170,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@ -187,6 +191,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@ -207,7 +212,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@ -237,13 +241,11 @@ sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign
 DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg
 SUBDIRS = src man config include
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-joystick.pc
-EXTRA_DIST = ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@ -708,12 +710,15 @@ uninstall-info: uninstall-info-recursive
 	uninstall-pkgconfigDATA


-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)

 ChangeLog:
 	$(CHANGELOG_CMD)

-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/driver/xf86-input-joystick/aclocal.m4
+++ b/driver/xf86-input-joystick/aclocal.m4
--- a/driver/xf86-input-joystick/config.h.in
+++ b/driver/xf86-input-joystick/config.h.in
@ -1,7 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */

-#include "xorg-server.h"
-
 /* Compile BSD usbhid backend */
 #undef BSD_BACKEND

@ -65,9 +63,6 @@
 /* Compile Linux joystick backend */
 #undef LINUX_BACKEND

-/* Disable some debugging code */
-#undef NDEBUG
-
 /* Name of package */
 #undef PACKAGE

--- a/driver/xf86-input-joystick/config/50-joystick-all.conf
+++ b/driver/xf86-input-joystick/config/50-joystick-all.conf
@ -0,0 +1,51 @@
+# Example xorg.conf.d snippet that assigns the joystick driver
+# to all joysticks. See xorg.conf.d(5) for more information on
+# InputClass.
+# DO NOT EDIT THIS FILE, your distribution will likely overwrite
+# it when updating. Copy (and rename) this file into
+# /etc/X11/xorg.conf.d first.
+# Additional options may be added in the form of
+#   Option "OptionName" "value"
+#
+
+Section "InputClass"
+	Identifier "joystick-all"
+
+	# UNCOMMENT TO ENABLE HOTPLUGGING OF JOYSTICKS
+#	Driver "joystick"
+#	MatchIsJoystick "on"
+#	MatchDevicePath "/dev/input/event*"
+
+	Option "MapButton1" "button=1"
+	Option "MapButton2" "button=2"
+	Option "MapButton3" "button=3"
+
+	Option "MapAxis1"   "mode=relative axis=+1x deadzone=5000"
+	Option "MapAxis2"   "mode=relative axis=+1y deadzone=5000"
+	Option "MapAxis3"   "mode=relative axis=+1zx deadzone=5000"
+	Option "MapAxis4"   "mode=relative axis=+1zy deadzone=5000"
+	Option "MapAxis5"   "mode=accelerated axis=+1x deadzone=5000"
+	Option "MapAxis6"   "mode=accelerated axis=+1y deadzone=5000"
+
+        
+	# Map Alt+Tab to button #4
+#	Option "MapButton4" "key=64+23"
+
+	# Button 8 will slow down all movement to factor 0.3
+#	Option "MapButton8" "amplify=0.3"
+
+	# Button 9 will disable all events except button #9 itself
+#	Option "MapButton9" "disable-all"
+
+	# Map button #10 to Space
+#	Option "MapButton10" "key=65"
+
+	# Map axis #1 and #2 to the keycodes for Left, Right, Up and Down rather 
+	# than pointer movement
+#	Option "MapAxis1" "mode=accelerated keylow=113 keyhigh=114"
+#	Option "MapAxis2" "mode=accelerated keylow=111 keyhigh=116"
+
+#	Option "XkbLayout" "de"
+#	Option "XkbVariant" "nodeadkeys"
+#	Option "AutoRepeat" "400 25"
+EndSection
--- a/driver/xf86-input-joystick/config/Makefile.am
+++ b/driver/xf86-input-joystick/config/Makefile.am
@ -1 +1 @@
-EXTRA_DIST = 50-x11-input-joystick.fdi
+EXTRA_DIST = 50-x11-input-joystick.fdi 50-joystick-all.conf
--- a/driver/xf86-input-joystick/config/Makefile.in
+++ b/driver/xf86-input-joystick/config/Makefile.in
@ -22,9 +22,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@ -53,6 +53,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@ -95,6 +96,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -113,6 +115,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@ -133,6 +136,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@ -153,7 +157,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@ -183,7 +186,7 @@ sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = 50-x11-input-joystick.fdi
+EXTRA_DIST = 50-x11-input-joystick.fdi 50-joystick-all.conf
 all: all-am

 .SUFFIXES:
@ -196,9 +199,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  config/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  config/Makefile
+	  $(AUTOMAKE) --foreign  config/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
--- a/driver/xf86-input-joystick/configure
+++ b/driver/xf86-input-joystick/configure
--- a/driver/xf86-input-joystick/configure.ac
+++ b/driver/xf86-input-joystick/configure.ac
@ -20,70 +20,73 @@
 #
 # Process this file with autoconf to produce a configure script

-AC_PREREQ(2.57)
+# Initialize Autoconf
+AC_PREREQ([2.60])
 AC_INIT([xf86-input-joystick],
-        1.5.0,
+        [1.6.0],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        xf86-input-joystick)
-
+        [xf86-input-joystick])
 AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])

+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-AM_CONFIG_HEADER([config.h])
-
-# Checks for programs.
+# Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-AC_PROG_CC
-XORG_CWARNFLAGS

-AH_TOP([#include "xorg-server.h"])
-
-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"])
-
-AC_ARG_ENABLE(debug,
-            AS_HELP_STRING([--enable-debug],
-                           [Enable debugging (default: enabled)]),
-			   [DEBUGGING=$enableval], [DEBUGGING=yes])
-if test "x$DEBUGGING" = xyes; then
-    AC_DEFINE(DEBUG, 1, [Enable debugging code])
-else
-    AC_DEFINE(NDEBUG, 1, [Disable some debugging code])
-fi
-AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
-
-inputdir=${moduledir}/input
-AC_SUBST(inputdir)
+# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS

 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
 XORG_DRIVER_CHECK_EXT(XKB, kbproto)

 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, 
-               [xorg-server >= 1.3.99.901] xproto $REQUIRED_MODULES)
-XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
-xorg_sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.2] xproto $REQUIRED_MODULES)
+
+DRIVER_NAME=joystick
+AC_SUBST([DRIVER_NAME])
+
+# -----------------------------------------------------------------------------
+#			Configuration options
+# -----------------------------------------------------------------------------
+# Define a configure option for an alternate input module directory
+AC_ARG_WITH(xorg-module-dir,
+            AS_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)
+
+# Define a configure option for an alternate X Server SDK Headers
+# X Server SDK location is required to install joystick header files
 AC_ARG_WITH(sdkdir,
-	AC_HELP_STRING([--with-sdkdir=<path>],
-		[Xorg X Server sdk headers (default is autodetected)]),
-	[sdkdir="$withval"], [sdkdir="${xorg_sdkdir}"])
+            AS_HELP_STRING([--with-sdkdir=<path>],
+                           [Xorg X Server sdk headers (default is autodetected)]),
+            [sdkdir="$withval"],
+            [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
 AC_SUBST(sdkdir)

-# Checks for libraries.
+# Define a configure option to enable code debugging
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
+                                    [Enable debugging (default: disabled)]),
+                                    [DEBUGGING=$enableval], [DEBUGGING=no])
+if test "x$DEBUGGING" = xyes; then
+   AC_DEFINE(DEBUG, 1, [Enable debugging code])
+fi
+AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])

-# Checks for header files.
+# -----------------------------------------------------------------------------
+#		Determine which joystick backend to build
+# -----------------------------------------------------------------------------
 linux_backend=yes
 AC_CHECK_HEADERS([linux/joystick.h],, [linux_backend=no])
 AM_CONDITIONAL(LINUX_BACKEND, [test "x$linux_backend" = xyes])
@ -111,27 +114,22 @@ AM_CONDITIONAL(EVDEV_BACKEND, [test "x$evdev_backend" = xyes])
 if test "x$evdev_backend" = xyes; then
    AC_DEFINE(EVDEV_BACKEND, 1, [Compile Linux evdev backend])
 fi
+# -----------------------------------------------------------------------------

-AC_HEADER_STDC
+AC_CONFIG_FILES([Makefile
+                src/Makefile
+                man/Makefile
+                config/Makefile
+                include/Makefile
+                xorg-joystick.pc])
+AC_OUTPUT

-DRIVER_NAME=joystick
-AC_SUBST([DRIVER_NAME])
+# -----------------------------------------------------------------------------

-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
-AC_OUTPUT([Makefile
-           src/Makefile
-           man/Makefile
-           config/Makefile
-           include/Makefile
-           xorg-joystick.pc])
-
-echo 
-echo Building Linux joystick backend: $linux_backend
-echo Building Linux evdev backend: $evdev_backend
-echo Building BSD usbhid backend: $bsd_backend
+AS_ECHO() 
+AS_ECHO("Building Linux joystick backend: $linux_backend")
+AS_ECHO("Building Linux evdev backend: $evdev_backend")
+AS_ECHO("Building BSD usbhid backend: $bsd_backend")

 if test "x$linux_backend" != "xyes" -a \
 	"x$bsd_backend" != "xyes" -a \
--- a/driver/xf86-input-joystick/include/Makefile.am
+++ b/driver/xf86-input-joystick/include/Makefile.am
@ -18,6 +18,4 @@
 #  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.

-EXTRA_DIST = joystick-properties.h
-
 sdk_HEADERS = joystick-properties.h
--- a/driver/xf86-input-joystick/include/Makefile.in
+++ b/driver/xf86-input-joystick/include/Makefile.in
@ -43,9 +43,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@ -86,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@ -128,6 +129,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -146,6 +148,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@ -166,6 +169,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@ -186,7 +190,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@ -216,7 +219,6 @@ sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = joystick-properties.h
 sdk_HEADERS = joystick-properties.h
 all: all-am

@ -230,9 +232,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/Makefile
+	  $(AUTOMAKE) --foreign  include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
--- a/driver/xf86-input-joystick/man/Makefile.am
+++ b/driver/xf86-input-joystick/man/Makefile.am
@ -1,27 +1,24 @@
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-# 
-# The above copyright notice and this permission notice 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 OPEN GROUP 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.
-# 
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# 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)
@ -34,25 +31,8 @@ EXTRA_DIST = @DRIVER_NAME@.man

 CLEANFILES = $(driverman_DATA)

-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(DRIVER_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
--- a/driver/xf86-input-joystick/man/Makefile.in
+++ b/driver/xf86-input-joystick/man/Makefile.in
@ -16,28 +16,25 @@

 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-# 
-# The above copyright notice and this permission notice 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 OPEN GROUP 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.
-# 
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# 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.
 # 

 srcdir = @srcdir@
@ -49,9 +46,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@ -89,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@ -131,6 +129,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -149,6 +148,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@ -162,13 +162,14 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = sed
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@ -189,7 +190,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@ -224,22 +224,6 @@ driverman_PRE = @DRIVER_NAME@.man
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 EXTRA_DIST = @DRIVER_NAME@.man
 CLEANFILES = $(driverman_DATA)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-XORGMANNAME = X Version 11
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 all: all-am

@ -254,9 +238,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  man/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  man/Makefile
+	  $(AUTOMAKE) --foreign  man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@ -425,8 +409,9 @@ uninstall-am: uninstall-drivermanDATA uninstall-info-am
 	uninstall-info-am


+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(DRIVER_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/driver/xf86-input-joystick/man/joystick.man
+++ b/driver/xf86-input-joystick/man/joystick.man
@ -4,14 +4,19 @@
 .SH NAME
 joystick \- Joystick input driver
 .SH SYNOPSIS
+Snipped for xorg.conf.d(5):
+
 .nf
-.B "Section \*qInputDevice\*q"
-.BI "  Identifier \*q" devname \*q
-.B  "  Driver \*qjoystick\*q"
-.BI "  Option \*qDevice\*q   \*q" devpath \*q
+.B "Section \*qInputClass\*q"
+.BI "  Identifier \*q" joystick-all \*q
+.BI  "  Driver \*q" joystick \*q
+.BI "  Option \*qMatchIsJoystick\*q   \*q" on \*q
+.BI "  Option \*qMatchDevicePath \*q" /dev/input/event* \*q
 \ \ ...
 .B EndSection
 .fi
+
+
 .SH DESCRIPTION
 .B joystick
 is an __xservername__ input driver for Joysticks. There are 3 backends available that are used in the following order, if support was found:
@ -314,33 +319,21 @@ The keys for the first two axes will be generated in an interval according to th
 The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.

 .SH "NOTES"
-The driver does not do hotplugging on it's own. The joystick needs to be plugged in when the driver is loaded.
-If the joystick is unplugged, the device will be automatically deactivated.
-.P
-There is an example hal policy in
-.I ${sourcecode}/config/50-x11-input-joystick.fdi
-which will take care of hotplugging. Place it in
-.I /etc/hal/fdi/policy 
-and customize it to your needs. Pass custom options to the driver using x11_options properties. This requires xorg-server-1.5 or 
-higher.
-.P
-Make sure you add the 
-.I \*qSendCoreEvents\*q
-keyword to the device entry of your
-.B ServerLayout
-section of the 
-.I xorg.conf
-file, otherwise the device won't report core pointer and core key events.
+Configuration through
+.I InputClass
+sections is recommended in X servers 1.8 and later. See xorg.conf.d(5) for more details. An example xorg.conf.d snipped is provided in 
+.I ${sourcecode}/config/50-joystick-all.conf

-Example: 
-.nf
-.BI "    InputDevice     " "\*qJoystick1\*q     \*qSendCoreEvents\*q"
-.fi
+Configuration through hal fdi files is recommended in X servers 1.5,
+1.6 and 1.7. An example hal policy file is still provided in 
+.I ${sourcecode}/config/50-x11-input-joystick.fdi
+to be placed in
+.IR /etc/hal/fdi/policy .


 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), xmodmap(1)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorg.conf.d(5), Xserver(__appmansuffix__), X(__miscmansuffix__), xmodmap(1)
 .SH AUTHORS
-Sascha Hlusiak (2007-2009),
+Sascha Hlusiak (2007-2011),
 .fi
 Frederic Lepied (1995-1999)
--- a/driver/xf86-input-joystick/src/Makefile.am
+++ b/driver/xf86-input-joystick/src/Makefile.am
@ -24,7 +24,8 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = $(XORG_CFLAGS)
+
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)

@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
--- a/driver/xf86-input-joystick/src/Makefile.in
+++ b/driver/xf86-input-joystick/src/Makefile.in
@ -34,6 +34,12 @@
 #  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.

+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -43,9 +49,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@ -116,6 +122,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@ -158,6 +165,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -176,6 +184,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@ -196,6 +205,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@ -216,7 +226,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@ -246,13 +255,7 @@ sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
-# this is obnoxious:
-# -module lets us name the module exactly how we want
-# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
-# _ladir passes a dummy rpath to libtool so the thing will actually link
-# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version $(am__append_2)
@DRIVER_NAME@_drv_ladir = @inputdir@
@ -278,9 +281,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
--- a/driver/xf86-input-joystick/src/backend_bsd.c
+++ b/driver/xf86-input-joystick/src/backend_bsd.c
@ -30,6 +30,7 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
--- a/driver/xf86-input-joystick/src/backend_evdev.c
+++ b/driver/xf86-input-joystick/src/backend_evdev.c
@ -29,6 +29,7 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
--- a/driver/xf86-input-joystick/src/backend_joystick.c
+++ b/driver/xf86-input-joystick/src/backend_joystick.c
@ -32,6 +32,7 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
--- a/driver/xf86-input-joystick/src/jstk.c
+++ b/driver/xf86-input-joystick/src/jstk.c
@ -26,6 +26,7 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <stdio.h>
 #include <xorgVersion.h>

@ -44,9 +45,7 @@
 #include "jstk_key.h"
 #include "jstk_options.h"
 #include "jstk_properties.h"
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
-    #include <xserver-properties.h>
-#endif
+#include <xserver-properties.h>

 #ifdef LINUX_BACKEND
    #include "backend_joystick.h"
@ -63,40 +62,6 @@
    char debug_level = 0;
 #endif

-
-/*
- ***************************************************************************
- *
- * jstkConvertProc --
- *
- * Convert valuators to X and Y.
- *
- ***************************************************************************
- */
-
-static Bool
-jstkConvertProc(LocalDevicePtr	local,
-                int             first,
-                int             num,
-                int             v0,
-                int             v1,
-                int             v2,
-                int             v3,
-                int             v4,
-                int             v5,
-                int*            x,
-                int*            y)
-{
-    if (first != 0 || num != 2)
-        return FALSE;
-
-    *x = v0;
-    *y = v1;
-
-    return TRUE;
-}
-
-
 /*
 ***************************************************************************
 *
@ -147,21 +112,21 @@ jstkOpenDevice(JoystickDevPtr priv, BOOL probe)
 */

 static void
-jstkReadProc(LocalDevicePtr local)
+jstkReadProc(InputInfoPtr pInfo)
 {
    JOYSTICKEVENT event;
    int number;
    int i, r;

-    JoystickDevPtr priv = local->private;
+    JoystickDevPtr priv = pInfo->private;

    do {
        if ((priv->read_proc == NULL) || 
            ((r=priv->read_proc(priv, &event, &number))==0)) {
            xf86Msg(X_WARNING, "JOYSTICK: Read failed. Deactivating device.\n");

-            if (local->fd >= 0)
-                RemoveEnabledDevice(local->fd);
+            if (pInfo->fd >= 0)
+                RemoveEnabledDevice(pInfo->fd);
            return;
        }

@ -174,7 +139,7 @@ jstkReadProc(LocalDevicePtr local)
            switch (priv->button[number].mapping) {
            case JSTK_MAPPING_BUTTON:
                if (priv->mouse_enabled == TRUE) {
-                    xf86PostButtonEvent(local->dev, 0,
+                    xf86PostButtonEvent(pInfo->dev, 0,
                        priv->button[number].buttonnumber,
                        priv->button[number].pressed, 0, 0);
                }
@ -187,7 +152,7 @@ jstkReadProc(LocalDevicePtr local)
                if (priv->button[number].pressed == 0) 
                    priv->button[number].currentspeed = 1.0;
                else if (priv->mouse_enabled == TRUE)
-                    jstkStartButtonAxisTimer(local, number);
+                    jstkStartButtonAxisTimer(pInfo, number);
                break;

            case JSTK_MAPPING_KEY:
@ -258,7 +223,7 @@ jstkReadProc(LocalDevicePtr local)
                          priv->axis[number].mapping));

            if (priv->axis[number].valuator != -1)
-                xf86PostMotionEvent(local->dev, 1, priv->axis[number].valuator, 
+                xf86PostMotionEvent(pInfo->dev, 1, priv->axis[number].valuator,
                                    1, priv->axis[number].value);

            switch (priv->axis[number].mapping) {
@ -272,12 +237,12 @@ jstkReadProc(LocalDevicePtr local)
                    if (priv->axis[number].value == 0)
                        priv->axis[number].currentspeed = 1.0;
                    if (priv->mouse_enabled == TRUE)
-                        jstkStartAxisTimer(local, number);
+                        jstkStartAxisTimer(pInfo, number);
                    break;

                case JSTK_TYPE_ABSOLUTE:
                    if (priv->mouse_enabled == TRUE)
-                        jstkHandleAbsoluteAxis(local, number);
+                        jstkHandleAbsoluteAxis(pInfo, number);
                    break;
                default:
                    break;
@ -286,9 +251,9 @@ jstkReadProc(LocalDevicePtr local)

            case JSTK_MAPPING_KEY: if (priv->keys_enabled == TRUE) {
                if (priv->axis[number].type == JSTK_TYPE_ACCELERATED) {
-                    jstkHandlePWMAxis(local, number);
+                    jstkHandlePWMAxis(pInfo, number);
                } else if (priv->axis[number].type == JSTK_TYPE_BYVALUE) {
-                    jstkStartAxisTimer(local, number);
+                    jstkStartAxisTimer(pInfo, number);
                }
                break;
            }
@ -327,12 +292,10 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
                      int                what)
 {
    int i;
-    LocalDevicePtr   local = (LocalDevicePtr)pJstk->public.devicePrivate;
-    JoystickDevPtr   priv  = (JoystickDevPtr)XI_PRIVATE(pJstk);
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+    InputInfoPtr     pInfo = (InputInfoPtr)pJstk->public.devicePrivate;
+    JoystickDevPtr   priv  = pInfo->private;
    Atom             btn_labels[BUTTONMAP_SIZE+1] = {0}; /* TODO: fillme */
    Atom             axes_labels[MAXAXES] = {0}; /* TODO: fillme */
-#endif

    switch (what) {
    case DEVICE_INIT: {
@ -355,9 +318,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
            
            
        if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
            btn_labels,
-#endif
            buttonmap) == FALSE) {
            ErrorF("unable to allocate Button class device\n");
            return !Success;
@ -373,71 +334,48 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
            priv->axis[i].valuator = m++;
        }

-        if (InitValuatorClassDeviceStruct(pJstk, 
-                                          m,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-                                          axes_labels,
-#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
-                                          xf86GetMotionEvents, 
-#endif
-                                          local->history_size,
+        if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
+                                          GetMotionHistorySize(),
                                          Relative) == FALSE) {
            ErrorF("unable to allocate Valuator class device\n"); 
            return !Success;
        } else {
            InitValuatorAxisStruct(pJstk,
                                   0, /* valuator num */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                   XIGetKnownProperty(AXIS_LABEL_PROP_REL_X),
-#endif
                                   0, /* min val */
                                   screenInfo.screens[0]->width, /* max val */
                                   1, /* resolution */
                                   0, /* min_res */
-                                   1); /* max_res */
+                                   1, /* max_res */
+                                   Absolute);
            InitValuatorAxisStruct(pJstk,
                                   1, /* valuator num */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                   XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y),
-#endif
                                   0, /* min val */
                                   screenInfo.screens[0]->height, /* max val */
                                   1, /* resolution */
                                   0, /* min_res */
-                                   1); /* max_res */
+                                   1, /* max_res */
+                                   Absolute);
            for (i=0; i<MAXAXES; i++) 
                if (priv->axis[i].valuator != -1)
            {
                InitValuatorAxisStruct(pJstk,
                                       priv->axis[i].valuator,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                       axes_labels[i],
-#endif
                                       -32768, /* min val */
                                       32767,  /* max val */
                                       1, /* resolution */
                                       0, /* min_res */
-                                       1); /* max_res */
+                                       1, /* max_res */
+                                       Absolute);
            }
            /* allocate the motion history buffer if needed */
-            xf86MotionHistoryAllocate(local);
+            xf86MotionHistoryAllocate(pInfo);
        }

-
-        if (priv->keyboard_device != NULL)
-        {
-            DBG(2, ErrorF("Activating keyboard device\n"));
-            xf86ActivateDevice(priv->keyboard_device);
-            priv->keyboard_device->dev->inited = 
-                (priv->keyboard_device->device_control(priv->keyboard_device->dev, DEVICE_INIT) == Success);
-            xf86EnableDevice(priv->keyboard_device->dev);
-            DBG(2, ErrorF("Keyboard device activated\n"));
-        }
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
 	jstkInitProperties(pJstk, priv);
-#endif

        break;
    }
@ -448,8 +386,8 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,

        if (jstkOpenDevice(priv, FALSE) != -1) {
            pJstk->public.on = TRUE;
-            local->fd = priv->fd;
-            AddEnabledDevice(local->fd);
+            pInfo->fd = priv->fd;
+            AddEnabledDevice(pInfo->fd);
        } else return !Success;
        break;

@ -471,9 +409,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
            TimerCancel(priv->axis[i].timer);
        }

-        if (local->fd >= 0)
-            RemoveEnabledDevice(local->fd);
-        local->fd = -1;
+        if (pInfo->fd >= 0)
+            RemoveEnabledDevice(pInfo->fd);
+        pInfo->fd = -1;
        if (priv->close_proc)
            priv->close_proc(priv);
        pJstk->public.on = FALSE;
@ -487,19 +425,6 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
    return Success;
 }

-
-
-
-_X_EXPORT InputDriverRec JSTK_KEYBOARD = {
-    1,
-    "joystick_keyboard",
-    NULL,
-    jstkKeyboardPreInit,
-    jstkKeyboardUnInit,
-    NULL,
-    0
-};
-
 /*
 ***************************************************************************
 *
@ -507,41 +432,41 @@ _X_EXPORT InputDriverRec JSTK_KEYBOARD = {
 *
 * Called when a device will be instantiated
 *
+ * This is a tad complicated. NewInputDeviceRequest(), which we use to
+ * hotplug a keyboard device,. enables the device, so we need to make sure
+ * that all options for the dependent device are set correctly.
+ *
+ * This means that we parse the keyboard-specific options into the
+ * keyboard device's PreInit, and re-use the keyboard's priv field.
+ *
 ***************************************************************************
 */

-static InputInfoPtr
-jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+static int
+jstkCorePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 {
-    LocalDevicePtr      local = NULL;
+    InputInfoPtr        keyboard_device;
    JoystickDevPtr      priv = NULL;
    char                *s;
    int                 i, j;

-    local = xf86AllocateInput(drv, 0);
-    if (!local) {
-        goto SetupProc_fail;
-    }
+    s = xf86CheckStrOption(pInfo->options, "_source", "");
+    if (strcmp(s, "_driver/joystick") == 0)
+        return jstkKeyboardPreInit(drv, pInfo, flags);

-    local->private = (JoystickDevPtr)xalloc(sizeof(JoystickDevRec));
-    priv = (JoystickDevPtr)local->private;
+    pInfo->device_control = jstkDeviceControlProc;
+    pInfo->read_input = jstkReadProc;
+    pInfo->control_proc = NULL;
+    pInfo->switch_mode = NULL;
+    pInfo->fd = -1;
+    pInfo->dev = NULL;
+    pInfo->type_name = XI_JOYSTICK;

-    local->name   = dev->identifier;
-    local->flags  = XI86_POINTER_CAPABLE;
-    local->flags |= XI86_SEND_DRAG_EVENTS;
-    local->device_control = jstkDeviceControlProc;
-    local->read_input = jstkReadProc;
-    local->close_proc = NULL;
-    local->control_proc = NULL;
-    local->switch_mode = NULL;
-    local->conversion_proc = jstkConvertProc;
-    local->fd = -1;
-    local->dev = NULL;
-    local->private = priv;
-    local->type_name = XI_JOYSTICK;
-    local->history_size = 0;
-    local->always_core_feedback = NULL;
-    local->conf_idev = dev;
+    keyboard_device = jstkKeyboardHotplug(pInfo, flags);
+    if (!keyboard_device)
+        return BadAlloc;
+
+    pInfo->private = priv = keyboard_device->private;

    priv->fd = -1;
    priv->open_proc = NULL;
@ -554,9 +479,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
    priv->mouse_enabled = TRUE;
    priv->keys_enabled = TRUE;
    priv->amplify = 1.0f;
-    priv->keyboard_device = NULL;
-    priv->repeat_delay = 0;
-    priv->repeat_interval = 0;
+    priv->keyboard_device = keyboard_device;
    priv->num_axes    = MAXAXES;
    priv->num_buttons = MAXBUTTONS;

@ -614,81 +537,39 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
    priv->axis[5].type      = JSTK_TYPE_ACCELERATED;
    priv->axis[5].mapping   = JSTK_MAPPING_Y;

-    xf86CollectInputOptions(local, NULL, NULL);
-    xf86OptionListReport(local->options);
-
    /* Joystick device is mandatory */
-    priv->device = xf86SetStrOption(dev->commonOptions, "Device", NULL);
+    priv->device = xf86SetStrOption(pInfo->options, "Device", NULL);
    if (!priv->device)
-        priv->device = xf86SetStrOption(dev->commonOptions, "Path", NULL);
+        priv->device = xf86SetStrOption(pInfo->options, "Path", NULL);

    if (!priv->device) {
-        xf86Msg (X_ERROR, "%s: No Device specified.\n", local->name);
+        xf86Msg (X_ERROR, "%s: No Device specified.\n", pInfo->name);
        goto SetupProc_fail;
    }

-    xf86ProcessCommonOptions(local, local->options);
-
 #if DEBUG
-    debug_level = xf86SetIntOption(dev->commonOptions, "DebugLevel", 0);
+    debug_level = xf86SetIntOption(pInfo->options, "DebugLevel", 0);
    if (debug_level > 0) {
        xf86Msg(X_CONFIG, "%s: debug level set to %d\n", 
-                local->name, debug_level);
+                pInfo->name, debug_level);
    }
 #else
-    if (xf86SetIntOption(dev->commonOptions, "DebugLevel", 0) != 0) {
+    if (xf86SetIntOption(pInfo->options, "DebugLevel", 0) != 0) {
        xf86Msg(X_WARNING, "%s: DebugLevel: Compiled without debugging support!\n", 
-                local->name);
+                pInfo->name);
    }
 #endif

-    /* Parse option for autorepeat */
-    if ((s = xf86SetStrOption(dev->commonOptions, "AutoRepeat", NULL))) {
-        int delay, rate;
-        if (sscanf(s, "%d %d", &delay, &rate) != 2) {
-            xf86Msg(X_ERROR, "%s: \"%s\" is not a valid AutoRepeat value", 
-                    local->name, s);
-        } else {
-            priv->repeat_delay = delay;
-            if (rate != 0)
-                priv->repeat_interval = 1000/rate;
-            else priv->repeat_interval = 0;
-            DBG(1, xf86Msg(X_CONFIG, "Autorepeat set to delay=%d, interval=%d\n",
-                           priv->repeat_delay,priv->repeat_interval));
-        }
-        xfree(s);
-    }
-    
-    priv->rmlvo.rules = xf86SetStrOption(dev->commonOptions, "xkb_rules", NULL);
-    if (!priv->rmlvo.rules)
-	priv->rmlvo.rules = xf86SetStrOption(dev->commonOptions, "XkbRules", "evdev");
-
-    priv->rmlvo.model = xf86SetStrOption(dev->commonOptions, "xkb_model", NULL);
-    if (!priv->rmlvo.model)
-	priv->rmlvo.model = xf86SetStrOption(dev->commonOptions, "XkbModel", "evdev");
-
-    priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "xkb_layout", NULL);
-    if (!priv->rmlvo.layout)
-	priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "XkbLayout", "us");
-
-    priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "xkb_variant", NULL);
-    if (!priv->rmlvo.variant)
-	priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "XkbVariant", "");
-
-    priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "xkb_options", NULL);
-    if (!priv->rmlvo.options)
-	priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "XkbOptions", "");
-
-    priv->mouse_enabled = xf86SetBoolOption(dev->commonOptions, "StartMouseEnabled", TRUE);
-    priv->keys_enabled = xf86SetBoolOption(dev->commonOptions, "StartKeysEnabled", TRUE);
+    priv->mouse_enabled = xf86SetBoolOption(pInfo->options, "StartMouseEnabled", TRUE);
+    priv->keys_enabled = xf86SetBoolOption(pInfo->options, "StartKeysEnabled", TRUE);

    /* Process button mapping options */
    for (i=0; i<MAXBUTTONS; i++) {
        char p[64];
        sprintf(p,"MapButton%d",i+1);
-        s = xf86SetStrOption(dev->commonOptions, p, NULL);
+        s = xf86SetStrOption(pInfo->options, p, NULL);
        if (s != NULL) {
-            jstkParseButtonOption(s, priv, i, local->name);
+            jstkParseButtonOption(s, priv, i, pInfo->name);
        }
        DBG(1, xf86Msg(X_CONFIG, "Button %d mapped to %d\n", i+1, 
                       priv->button[i].mapping));
@ -698,9 +579,9 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
    for (i=0; i<MAXAXES; i++) {
        char p[64];
        sprintf(p,"MapAxis%d",i+1);
-        s = xf86SetStrOption(dev->commonOptions, p, NULL);
+        s = xf86SetStrOption(pInfo->options, p, NULL);
        if (s != NULL) {
-            jstkParseAxisOption(s, priv, &priv->axis[i], local->name);
+            jstkParseAxisOption(s, priv, &priv->axis[i], pInfo->name);
        }
        DBG(1, xf86Msg(X_CONFIG, 
                       "Axis %d type is %d, mapped to %d, amplify=%.3f\n", i+1, 
@ -709,23 +590,17 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
                       priv->axis[i].amplify));
    }

-    /* return the LocalDevice */
-    local->flags |= XI86_CONFIGURED;
-
-    priv->keyboard_device = jstkKeyboardPreInit(&JSTK_KEYBOARD, dev, flags);
-    if (priv->keyboard_device) {
-        priv->keyboard_device->private = priv;
-    }
-
-    return (local);
+    return Success;

 SetupProc_fail:
-    if (priv)
-        xfree(priv);
-    if (local)
-        local->private = NULL;
-    return NULL;
-/*    return (local); */ /* Makes X segfault on error */
+    if (priv) {
+        free(priv);
+        if (keyboard_device)
+            keyboard_device->private = NULL;
+    }
+    if (pInfo)
+        pInfo->private = NULL;
+    return BadValue;
 }


@ -736,26 +611,39 @@ SetupProc_fail:
 * jstkCoreUnInit --
 *
 * Called when a device is unplugged and needs to be removed
+ * This is a bit tricky, because the keyboard device and the main device
+ * share the same private data, which must be freed only once, which is done
+ * by the main device.
+ * 
 *
 ***************************************************************************
 */

 static void
 jstkCoreUnInit(InputDriverPtr    drv,
-               LocalDevicePtr    local,
+               InputInfoPtr      pInfo,
               int               flags)
 {
-    JoystickDevPtr device = (JoystickDevPtr) local->private;
-
-    if (device->keyboard_device != NULL)
-    {
-        xf86DisableDevice(device->keyboard_device->dev, TRUE);
-        device->keyboard_device = NULL;
+    if (pInfo->private) {
+	JoystickDevPtr priv = (JoystickDevPtr) pInfo->private;
+	if (priv->keyboard_device == pInfo) {
+	    /* this is the keyboard device */
+	    /* Unlink from private data to notify that the 
+	     * keyboard device is no more, but don't free */
+	    priv->keyboard_device = NULL;
+	} else {
+	    /* freeing main device
+	       if keyboard still exists, notify keyboard device that it's
+	       private data is gone */
+	    if (priv->keyboard_device)
+		priv->keyboard_device->private = NULL;
+	    
+	    free (priv);
+	}
    }

-    xfree (device);
-    local->private = NULL;
-    xf86DeleteInput(local, 0);
+    pInfo->private = NULL;
+    xf86DeleteInput(pInfo, 0);
 }


@ -767,11 +655,9 @@ _X_EXPORT InputDriverRec JOYSTICK = {
    NULL,
    jstkCorePreInit,
    jstkCoreUnInit,
-    NULL,
-    0
+    NULL
 };

-
 /*
 ***************************************************************************
 *
@ -789,7 +675,6 @@ jstkDriverPlug(pointer  module,
               int      *errmin)
 {
    xf86AddInputDriver(&JOYSTICK, module, 0);
-    xf86AddInputDriver(&JSTK_KEYBOARD, module, 0);
    return module;
 }

--- a/driver/xf86-input-joystick/src/jstk.h
+++ b/driver/xf86-input-joystick/src/jstk.h
@ -55,17 +55,6 @@
 #define XI_JOYSTICK "JOYSTICK"
 #endif

-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
-typedef struct {
-    char *rules;
-    char *model;
-    char *layout;
-    char *variant;
-    char *options;
-} XkbRMLVOSet;
-#endif
-
-

 typedef enum _JOYSTICKEVENT {
    EVENT_NONE=0,
@ -117,7 +106,7 @@ typedef struct _JoystickDevRec {
    jstkReadDataProc read_proc; /* Callback for reading data from the backend */
    void         *devicedata; /* Extra platform device dependend data */
    char         *device;     /* Name of the device */
-    LocalDevicePtr keyboard_device; /* Slave device for keyboard events */
+    InputInfoPtr keyboard_device; /* Slave device for keyboard events */

    OsTimerPtr   timer;       /* Timer for axis movement */
    Bool         timerrunning;
--- a/driver/xf86-input-joystick/src/jstk_axis.c
+++ b/driver/xf86-input-joystick/src/jstk_axis.c
@ -27,6 +27,7 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <xf86Xinput.h>
 #include <xf86_OSproc.h>
 #include <math.h>
@ -55,7 +56,8 @@ jstkAxisTimer(OsTimerPtr        timer,
 {
    #define NEXTTIMER 15
    DeviceIntPtr          device = (DeviceIntPtr)arg;
-    JoystickDevPtr        priv = (JoystickDevPtr)XI_PRIVATE(device);
+    InputInfoPtr          pInfo = device->public.devicePrivate;
+    JoystickDevPtr        priv  = pInfo->private;

    int sigstate, i;
    int nexttimer;
@ -266,7 +268,7 @@ jstkAxisTimer(OsTimerPtr        timer,
 ***********************************************************************
 */
 void
-jstkStartAxisTimer(LocalDevicePtr device, int number) 
+jstkStartAxisTimer(InputInfoPtr device, int number)
 {
    int pixel;
    JoystickDevPtr priv = device->private;
@ -298,7 +300,7 @@ jstkStartAxisTimer(LocalDevicePtr device, int number)
 */

 void
-jstkStartButtonAxisTimer(LocalDevicePtr device, int number) 
+jstkStartButtonAxisTimer(InputInfoPtr device, int number)
 {
    int pixel;
    JoystickDevPtr priv = device->private;
@ -338,7 +340,7 @@ jstkStartButtonAxisTimer(LocalDevicePtr device, int number)
 ***********************************************************************
 */
 void
-jstkHandleAbsoluteAxis(LocalDevicePtr device, int number) 
+jstkHandleAbsoluteAxis(InputInfoPtr device, int number)
 {
    JoystickDevPtr priv = device->private;
    int i,x,y;
@ -406,7 +408,8 @@ jstkPWMAxisTimer(OsTimerPtr        timer,
                 pointer           arg)
 {
    DeviceIntPtr          device = (DeviceIntPtr)arg;
-    JoystickDevPtr        priv = (JoystickDevPtr)XI_PRIVATE(device);
+    InputInfoPtr          pInfo = device->public.devicePrivate;
+    JoystickDevPtr        priv  = pInfo->private;

    int sigstate, i;
    int nexttimer;
@ -535,7 +538,7 @@ jstkPWMAxisTimer(OsTimerPtr        timer,
 ***********************************************************************
 */
 void
-jstkHandlePWMAxis(LocalDevicePtr device, int number) 
+jstkHandlePWMAxis(InputInfoPtr device, int number)
 {
    JoystickDevPtr priv = device->private;
    if (priv->axis[number].timerrunning) return;
--- a/driver/xf86-input-joystick/src/jstk_axis.h
+++ b/driver/xf86-input-joystick/src/jstk_axis.h
@ -24,9 +24,9 @@
 #ifndef _XF86JSTK_AXIS_H_INCLUDED_
 #define _XF86JSTK_AXIS_H_INCLUDED_

-void jstkStartAxisTimer(LocalDevicePtr device, int number);
-void jstkStartButtonAxisTimer(LocalDevicePtr device, int number);
-void jstkHandleAbsoluteAxis(LocalDevicePtr device, int number);
-void jstkHandlePWMAxis(LocalDevicePtr device, int number);
+void jstkStartAxisTimer(InputInfoPtr device, int number);
+void jstkStartButtonAxisTimer(InputInfoPtr device, int number);
+void jstkHandleAbsoluteAxis(InputInfoPtr device, int number);
+void jstkHandlePWMAxis(InputInfoPtr device, int number);

 #endif
--- a/driver/xf86-input-joystick/src/jstk_key.c
+++ b/driver/xf86-input-joystick/src/jstk_key.c
@ -28,6 +28,7 @@
 #endif


+#include <xorg-server.h>
 #include <xf86.h>
 #include <xf86Xinput.h>
 #include <X11/extensions/XKBsrv.h>
@ -38,9 +39,7 @@
 #include "jstk.h"
 #include "jstk_key.h"

-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
 #include <xkbsrv.h>
-#endif

 #define MIN_KEYCODE 8
 #define GLYPHS_PER_KEY 2
@ -51,280 +50,6 @@
 #define KanaMask	Mod4Mask
 #define ScrollLockMask	Mod5Mask

-
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
-static KeySym map[] = {
-    /* 0x00 */  NoSymbol,       NoSymbol,
-    /* 0x01 */  XK_Escape,      NoSymbol,
-    /* 0x02 */  XK_1,           XK_exclam,
-    /* 0x03 */  XK_2,           XK_at,
-    /* 0x04 */  XK_3,           XK_numbersign,
-    /* 0x05 */  XK_4,           XK_dollar,
-    /* 0x06 */  XK_5,           XK_percent,
-    /* 0x07 */  XK_6,           XK_asciicircum,
-    /* 0x08 */  XK_7,           XK_ampersand,
-    /* 0x09 */  XK_8,           XK_asterisk,
-    /* 0x0a */  XK_9,           XK_parenleft,
-    /* 0x0b */  XK_0,           XK_parenright,
-    /* 0x0c */  XK_minus,       XK_underscore,
-    /* 0x0d */  XK_equal,       XK_plus,
-    /* 0x0e */  XK_BackSpace,   NoSymbol,
-    /* 0x0f */  XK_Tab,         XK_ISO_Left_Tab,
-    /* 0x10 */  XK_Q,           NoSymbol,
-    /* 0x11 */  XK_W,           NoSymbol,
-    /* 0x12 */  XK_E,           NoSymbol,
-    /* 0x13 */  XK_R,           NoSymbol,
-    /* 0x14 */  XK_T,           NoSymbol,
-    /* 0x15 */  XK_Y,           NoSymbol,
-    /* 0x16 */  XK_U,           NoSymbol,
-    /* 0x17 */  XK_I,           NoSymbol,
-    /* 0x18 */  XK_O,           NoSymbol,
-    /* 0x19 */  XK_P,           NoSymbol,
-    /* 0x1a */  XK_bracketleft, XK_braceleft,
-    /* 0x1b */  XK_bracketright,XK_braceright,
-    /* 0x1c */  XK_Return,      NoSymbol,
-    /* 0x1d */  XK_Control_L,   NoSymbol,
-    /* 0x1e */  XK_A,           NoSymbol,
-    /* 0x1f */  XK_S,           NoSymbol,
-    /* 0x20 */  XK_D,           NoSymbol,
-    /* 0x21 */  XK_F,           NoSymbol,
-    /* 0x22 */  XK_G,           NoSymbol,
-    /* 0x23 */  XK_H,           NoSymbol,
-    /* 0x24 */  XK_J,           NoSymbol,
-    /* 0x25 */  XK_K,           NoSymbol,
-    /* 0x26 */  XK_L,           NoSymbol,
-    /* 0x27 */  XK_semicolon,   XK_colon,
-    /* 0x28 */  XK_quoteright,  XK_quotedbl,
-    /* 0x29 */  XK_quoteleft,	XK_asciitilde,
-    /* 0x2a */  XK_Shift_L,     NoSymbol,
-    /* 0x2b */  XK_backslash,   XK_bar,
-    /* 0x2c */  XK_Z,           NoSymbol,
-    /* 0x2d */  XK_X,           NoSymbol,
-    /* 0x2e */  XK_C,           NoSymbol,
-    /* 0x2f */  XK_V,           NoSymbol,
-    /* 0x30 */  XK_B,           NoSymbol,
-    /* 0x31 */  XK_N,           NoSymbol,
-    /* 0x32 */  XK_M,           NoSymbol,
-    /* 0x33 */  XK_comma,       XK_less,
-    /* 0x34 */  XK_period,      XK_greater,
-    /* 0x35 */  XK_slash,       XK_question,
-    /* 0x36 */  XK_Shift_R,     NoSymbol,
-    /* 0x37 */  XK_KP_Multiply, NoSymbol,
-    /* 0x38 */  XK_Alt_L,	XK_Meta_L,
-    /* 0x39 */  XK_space,       NoSymbol,
-    /* 0x3a */  XK_Caps_Lock,   NoSymbol,
-    /* 0x3b */  XK_F1,          NoSymbol,
-    /* 0x3c */  XK_F2,          NoSymbol,
-    /* 0x3d */  XK_F3,          NoSymbol,
-    /* 0x3e */  XK_F4,          NoSymbol,
-    /* 0x3f */  XK_F5,          NoSymbol,
-    /* 0x40 */  XK_F6,          NoSymbol,
-    /* 0x41 */  XK_F7,          NoSymbol,
-    /* 0x42 */  XK_F8,          NoSymbol,
-    /* 0x43 */  XK_F9,          NoSymbol,
-    /* 0x44 */  XK_F10,         NoSymbol,
-    /* 0x45 */  XK_Num_Lock,    NoSymbol,
-    /* 0x46 */  XK_Scroll_Lock,	NoSymbol,
-    /* These KP keys should have the KP_7 keysyms in the numlock
-     * modifer... ? */
-    /* 0x47 */  XK_KP_Home,	XK_KP_7,
-    /* 0x48 */  XK_KP_Up,	XK_KP_8,
-    /* 0x49 */  XK_KP_Prior,	XK_KP_9,
-    /* 0x4a */  XK_KP_Subtract, NoSymbol,
-    /* 0x4b */  XK_KP_Left,	XK_KP_4,
-    /* 0x4c */  XK_KP_Begin,	XK_KP_5,
-    /* 0x4d */  XK_KP_Right,	XK_KP_6,
-    /* 0x4e */  XK_KP_Add,      NoSymbol,
-    /* 0x4f */  XK_KP_End,	XK_KP_1,
-    /* 0x50 */  XK_KP_Down,	XK_KP_2,
-    /* 0x51 */  XK_KP_Next,	XK_KP_3,
-    /* 0x52 */  XK_KP_Insert,	XK_KP_0,
-    /* 0x53 */  XK_KP_Delete,	XK_KP_Decimal,
-    /* 0x54 */  NoSymbol,	NoSymbol,
-    /* 0x55 */  XK_F13,		NoSymbol,
-    /* 0x56 */  XK_less,	XK_greater,
-    /* 0x57 */  XK_F11,		NoSymbol,
-    /* 0x58 */  XK_F12,		NoSymbol,
-    /* 0x59 */  XK_F14,		NoSymbol,
-    /* 0x5a */  XK_F15,		NoSymbol,
-    /* 0x5b */  XK_F16,		NoSymbol,
-    /* 0x5c */  XK_F17,		NoSymbol,
-    /* 0x5d */  XK_F18,		NoSymbol,
-    /* 0x5e */  XK_F19,		NoSymbol,
-    /* 0x5f */  XK_F20,		NoSymbol,
-    /* 0x60 */  XK_KP_Enter,	NoSymbol,
-    /* 0x61 */  XK_Control_R,	NoSymbol,
-    /* 0x62 */  XK_KP_Divide,	NoSymbol,
-    /* 0x63 */  XK_Print,	XK_Sys_Req,
-    /* 0x64 */  XK_Alt_R,	XK_Meta_R,
-    /* 0x65 */  NoSymbol,	NoSymbol, /* KEY_LINEFEED */
-    /* 0x66 */  XK_Home,	NoSymbol,
-    /* 0x67 */  XK_Up,		NoSymbol,
-    /* 0x68 */  XK_Prior,	NoSymbol,
-    /* 0x69 */  XK_Left,	NoSymbol,
-    /* 0x6a */  XK_Right,	NoSymbol,
-    /* 0x6b */  XK_End,		NoSymbol,
-    /* 0x6c */  XK_Down,	NoSymbol,
-    /* 0x6d */  XK_Next,	NoSymbol,
-    /* 0x6e */  XK_Insert,	NoSymbol,
-    /* 0x6f */  XK_Delete,	NoSymbol,
-    /* 0x70 */  NoSymbol,	NoSymbol, /* KEY_MACRO */
-    /* 0x71 */  NoSymbol,	NoSymbol,
-    /* 0x72 */  NoSymbol,	NoSymbol,
-    /* 0x73 */  NoSymbol,	NoSymbol,
-    /* 0x74 */  NoSymbol,	NoSymbol,
-    /* 0x75 */  XK_KP_Equal,	NoSymbol,
-    /* 0x76 */  NoSymbol,	NoSymbol,
-    /* 0x77 */  NoSymbol,	NoSymbol,
-    /* 0x78 */  XK_F21,		NoSymbol,
-    /* 0x79 */  XK_F22,		NoSymbol,
-    /* 0x7a */  XK_F23,		NoSymbol,
-    /* 0x7b */  XK_F24,		NoSymbol,
-    /* 0x7c */  XK_KP_Separator, NoSymbol,
-    /* 0x7d */  XK_Meta_L,	NoSymbol,
-    /* 0x7e */  XK_Meta_R,	NoSymbol,
-    /* 0x7f */  XK_Multi_key,	NoSymbol,
-    /* 0x80 */  NoSymbol,	NoSymbol,
-    /* 0x81 */  NoSymbol,	NoSymbol,
-    /* 0x82 */  NoSymbol,	NoSymbol,
-    /* 0x83 */  NoSymbol,	NoSymbol,
-    /* 0x84 */  NoSymbol,	NoSymbol,
-    /* 0x85 */  NoSymbol,	NoSymbol,
-    /* 0x86 */  NoSymbol,	NoSymbol,
-    /* 0x87 */  NoSymbol,	NoSymbol,
-    /* 0x88 */  NoSymbol,	NoSymbol,
-    /* 0x89 */  NoSymbol,	NoSymbol,
-    /* 0x8a */  NoSymbol,	NoSymbol,
-    /* 0x8b */  NoSymbol,	NoSymbol,
-    /* 0x8c */  NoSymbol,	NoSymbol,
-    /* 0x8d */  NoSymbol,	NoSymbol,
-    /* 0x8e */  NoSymbol,	NoSymbol,
-    /* 0x8f */  NoSymbol,	NoSymbol,
-    /* 0x90 */  NoSymbol,	NoSymbol,
-    /* 0x91 */  NoSymbol,	NoSymbol,
-    /* 0x92 */  NoSymbol,	NoSymbol,
-    /* 0x93 */  NoSymbol,	NoSymbol,
-    /* 0x94 */  NoSymbol,	NoSymbol,
-    /* 0x95 */  NoSymbol,	NoSymbol,
-    /* 0x96 */  NoSymbol,	NoSymbol,
-    /* 0x97 */  NoSymbol,	NoSymbol,
-    /* 0x98 */  NoSymbol,	NoSymbol,
-    /* 0x99 */  NoSymbol,	NoSymbol,
-    /* 0x9a */  NoSymbol,	NoSymbol,
-    /* 0x9b */  NoSymbol,	NoSymbol,
-    /* 0x9c */  NoSymbol,	NoSymbol,
-    /* 0x9d */  NoSymbol,	NoSymbol,
-    /* 0x9e */  NoSymbol,	NoSymbol,
-    /* 0x9f */  NoSymbol,	NoSymbol,
-    /* 0xa0 */  NoSymbol,	NoSymbol,
-    /* 0xa1 */  NoSymbol,	NoSymbol,
-    /* 0xa2 */  NoSymbol,	NoSymbol,
-    /* 0xa3 */  NoSymbol,	NoSymbol,
-    /* 0xa4 */  NoSymbol,	NoSymbol,
-    /* 0xa5 */  NoSymbol,	NoSymbol,
-    /* 0xa6 */  NoSymbol,	NoSymbol,
-    /* 0xa7 */  NoSymbol,	NoSymbol,
-    /* 0xa8 */  NoSymbol,	NoSymbol,
-    /* 0xa9 */  NoSymbol,	NoSymbol,
-    /* 0xaa */  NoSymbol,	NoSymbol,
-    /* 0xab */  NoSymbol,	NoSymbol,
-    /* 0xac */  NoSymbol,	NoSymbol,
-    /* 0xad */  NoSymbol,	NoSymbol,
-    /* 0xae */  NoSymbol,	NoSymbol,
-    /* 0xaf */  NoSymbol,	NoSymbol,
-    /* 0xb0 */  NoSymbol,	NoSymbol,
-    /* 0xb1 */  NoSymbol,	NoSymbol,
-    /* 0xb2 */  NoSymbol,	NoSymbol,
-    /* 0xb3 */  NoSymbol,	NoSymbol,
-    /* 0xb4 */  NoSymbol,	NoSymbol,
-    /* 0xb5 */  NoSymbol,	NoSymbol,
-    /* 0xb6 */  NoSymbol,	NoSymbol,
-    /* 0xb7 */  NoSymbol,	NoSymbol,
-    /* 0xb8 */  NoSymbol,	NoSymbol,
-    /* 0xb9 */  NoSymbol,	NoSymbol,
-    /* 0xba */  NoSymbol,	NoSymbol,
-    /* 0xbb */  NoSymbol,	NoSymbol,
-    /* 0xbc */  NoSymbol,	NoSymbol,
-    /* 0xbd */  NoSymbol,	NoSymbol,
-    /* 0xbe */  NoSymbol,	NoSymbol,
-    /* 0xbf */  NoSymbol,	NoSymbol,
-    /* 0xc0 */  NoSymbol,	NoSymbol,
-    /* 0xc1 */  NoSymbol,	NoSymbol,
-    /* 0xc2 */  NoSymbol,	NoSymbol,
-    /* 0xc3 */  NoSymbol,	NoSymbol,
-    /* 0xc4 */  NoSymbol,	NoSymbol,
-    /* 0xc5 */  NoSymbol,	NoSymbol,
-    /* 0xc6 */  NoSymbol,	NoSymbol,
-    /* 0xc7 */  NoSymbol,	NoSymbol,
-    /* 0xc8 */  NoSymbol,	NoSymbol,
-    /* 0xc9 */  NoSymbol,	NoSymbol,
-    /* 0xca */  NoSymbol,	NoSymbol,
-    /* 0xcb */  NoSymbol,	NoSymbol,
-    /* 0xcc */  NoSymbol,	NoSymbol,
-    /* 0xcd */  NoSymbol,	NoSymbol,
-    /* 0xce */  NoSymbol,	NoSymbol,
-    /* 0xcf */  NoSymbol,	NoSymbol,
-    /* 0xd0 */  NoSymbol,	NoSymbol,
-    /* 0xd1 */  NoSymbol,	NoSymbol,
-    /* 0xd2 */  NoSymbol,	NoSymbol,
-    /* 0xd3 */  NoSymbol,	NoSymbol,
-    /* 0xd4 */  NoSymbol,	NoSymbol,
-    /* 0xd5 */  NoSymbol,	NoSymbol,
-    /* 0xd6 */  NoSymbol,	NoSymbol,
-    /* 0xd7 */  NoSymbol,	NoSymbol,
-    /* 0xd8 */  NoSymbol,	NoSymbol,
-    /* 0xd9 */  NoSymbol,	NoSymbol,
-    /* 0xda */  NoSymbol,	NoSymbol,
-    /* 0xdb */  NoSymbol,	NoSymbol,
-    /* 0xdc */  NoSymbol,	NoSymbol,
-    /* 0xdd */  NoSymbol,	NoSymbol,
-    /* 0xde */  NoSymbol,	NoSymbol,
-    /* 0xdf */  NoSymbol,	NoSymbol,
-    /* 0xe0 */  NoSymbol,	NoSymbol,
-    /* 0xe1 */  NoSymbol,	NoSymbol,
-    /* 0xe2 */  NoSymbol,	NoSymbol,
-    /* 0xe3 */  NoSymbol,	NoSymbol,
-    /* 0xe4 */  NoSymbol,	NoSymbol,
-    /* 0xe5 */  NoSymbol,	NoSymbol,
-    /* 0xe6 */  NoSymbol,	NoSymbol,
-    /* 0xe7 */  NoSymbol,	NoSymbol,
-    /* 0xe8 */  NoSymbol,	NoSymbol,
-    /* 0xe9 */  NoSymbol,	NoSymbol,
-    /* 0xea */  NoSymbol,	NoSymbol,
-    /* 0xeb */  NoSymbol,	NoSymbol,
-    /* 0xec */  NoSymbol,	NoSymbol,
-    /* 0xed */  NoSymbol,	NoSymbol,
-    /* 0xee */  NoSymbol,	NoSymbol,
-    /* 0xef */  NoSymbol,	NoSymbol,
-    /* 0xf0 */  NoSymbol,	NoSymbol,
-    /* 0xf1 */  NoSymbol,	NoSymbol,
-    /* 0xf2 */  NoSymbol,	NoSymbol,
-    /* 0xf3 */  NoSymbol,	NoSymbol,
-    /* 0xf4 */  NoSymbol,	NoSymbol,
-    /* 0xf5 */  NoSymbol,	NoSymbol,
-    /* 0xf6 */  NoSymbol,	NoSymbol,
-    /* 0xf7 */  NoSymbol,	NoSymbol,
-};
-
-static struct { KeySym keysym; CARD8 mask; } modifiers[] = {
-    { XK_Shift_L,		ShiftMask },
-    { XK_Shift_R,		ShiftMask },
-    { XK_Control_L,		ControlMask },
-    { XK_Control_R,		ControlMask },
-    { XK_Caps_Lock,		LockMask },
-    { XK_Alt_L,		AltMask },
-    { XK_Alt_R,		AltMask },
-    { XK_Meta_L,		Mod4Mask },
-    { XK_Meta_R,		Mod4Mask },
-    { XK_Num_Lock,		NumLockMask },
-    { XK_Scroll_Lock,	ScrollLockMask },
-    { XK_Mode_switch,	AltLangMask }
-};
-#endif
-
-
-
 static void
 jstkKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl)
 {
@ -346,46 +71,11 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
    XkbSrvInfoPtr xkbi;
    XkbControlsPtr ctrls;

-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+    if (!InitKeyboardDeviceStruct(pJstk, &priv->rmlvo, NULL, jstkKbdCtrl))
    {
-        if (!InitKeyboardDeviceStruct(pJstk, &priv->rmlvo, NULL, jstkKbdCtrl))
-        {
-            ErrorF("unable to init keyboard device\n");
-            return !Success;
-        }
-    }
-#else
-    KeySymsRec keySyms;
-    CARD8 modMap[MAP_LENGTH];
-    KeySym sym;
-    int i, j;
-    XkbComponentNamesRec xkbnames;
-
-    memset(modMap, 0, sizeof(modMap));
-    memset(&xkbnames, 0, sizeof(xkbnames));
-
-    keySyms.map        = map;
-    keySyms.mapWidth   = GLYPHS_PER_KEY;
-    keySyms.minKeyCode = MIN_KEYCODE;
-    keySyms.maxKeyCode = MIN_KEYCODE + (sizeof(map) / sizeof(map[0])) / GLYPHS_PER_KEY - 1;
-
-    for (i = 0; i < (sizeof(map) / sizeof(map[0])) / GLYPHS_PER_KEY; i++) {
-        sym = map[i * GLYPHS_PER_KEY];
-        for (j = 0; j < sizeof(modifiers)/sizeof(modifiers[0]); j++) {
-            if (modifiers[j].keysym == sym)
-                modMap[i + MIN_KEYCODE] = modifiers[j].mask;
-        }
-    }
-
-    ErrorF("%s, %s, %s, %s, %s\n", priv->rmlvo.rules, priv->rmlvo.model, priv->rmlvo.layout, priv->rmlvo.variant, priv->rmlvo.options);
-    XkbSetRulesDflts(priv->rmlvo.rules, priv->rmlvo.model,
-            priv->rmlvo.layout, priv->rmlvo.variant,
-            priv->rmlvo.options);
-    if (!XkbInitKeyboardDeviceStruct(pJstk, &xkbnames,
-                &keySyms, modMap, NULL,
-                jstkKbdCtrl))
+        ErrorF("unable to init keyboard device\n");
        return !Success;
-#endif
+    }

    /* Set Autorepeat and Delay */
    if ((priv->repeat_delay || priv->repeat_interval) && 
@ -417,7 +107,7 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
 ***************************************************************************
 */
 void
-jstkGenerateKeys(LocalDevicePtr device, KEYSCANCODES keys, char pressed)
+jstkGenerateKeys(InputInfoPtr device, KEYSCANCODES keys, char pressed)
 {
    int i;
    unsigned int k;
@ -447,11 +137,12 @@ jstkGenerateKeys(LocalDevicePtr device, KEYSCANCODES keys, char pressed)
 *
 ***************************************************************************
 */
-static Bool
+Bool
 jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
                              int                what)
 {
-    JoystickDevPtr priv  = (JoystickDevPtr)XI_PRIVATE(dev);
+    InputInfoPtr pInfo = dev->public.devicePrivate;
+    JoystickDevPtr priv  = pInfo->private;
    if (!priv) {
        DBG(2, ErrorF("jstkKeyboardDeviceControlProc: priv == NULL\n"));
        return !Success;
@ -489,65 +180,116 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
 *
 * jstkKeyboardPreInit --
 *
- * Called manually to create a keyboard device for the joystick
+ * See comment in jstkCorePreInit() for details.
 *
 ***************************************************************************
 */
-InputInfoPtr
-jstkKeyboardPreInit(InputDriverPtr drv, IDevPtr _dev, int flags)
+
+int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 {
-    LocalDevicePtr local = NULL;
-    IDevPtr dev = NULL;
+    JoystickDevPtr priv = NULL;
+    char *s;
+
+    pInfo->private = priv = calloc(1, sizeof(JoystickDevRec));
+    if (!priv)
+        return BadAlloc;
+
+    pInfo->device_control = jstkKeyboardDeviceControlProc;
+    pInfo->read_input = NULL;
+    pInfo->control_proc = NULL;
+    pInfo->switch_mode = NULL;
+    pInfo->fd = -1;
+    pInfo->type_name = XI_JOYSTICK;
+
+    /* parse keyboard-related options */
+    priv->repeat_delay = 0;
+    priv->repeat_interval = 0;
+
+    /* Parse option for autorepeat */
+    if ((s = xf86SetStrOption(pInfo->options, "AutoRepeat", NULL))) {
+        int delay, rate;
+        if (sscanf(s, "%d %d", &delay, &rate) != 2) {
+            xf86Msg(X_ERROR, "%s: \"%s\" is not a valid AutoRepeat value",
+                    pInfo->name, s);
+        } else {
+            priv->repeat_delay = delay;
+            if (rate != 0)
+                priv->repeat_interval = 1000/rate;
+            else priv->repeat_interval = 0;
+            DBG(1, xf86Msg(X_CONFIG, "Autorepeat set to delay=%d, interval=%d\n",
+                           priv->repeat_delay,priv->repeat_interval));
+        }
+        free(s);
+    }
+
+    priv->rmlvo.rules = xf86SetStrOption(pInfo->options, "xkb_rules", NULL);
+    if (!priv->rmlvo.rules)
+	priv->rmlvo.rules = xf86SetStrOption(pInfo->options, "XkbRules", "evdev");
+
+    priv->rmlvo.model = xf86SetStrOption(pInfo->options, "xkb_model", NULL);
+    if (!priv->rmlvo.model)
+	priv->rmlvo.model = xf86SetStrOption(pInfo->options, "XkbModel", "evdev");
+
+    priv->rmlvo.layout = xf86SetStrOption(pInfo->options, "xkb_layout", NULL);
+    if (!priv->rmlvo.layout)
+	priv->rmlvo.layout = xf86SetStrOption(pInfo->options, "XkbLayout", "us");
+
+    priv->rmlvo.variant = xf86SetStrOption(pInfo->options, "xkb_variant", NULL);
+    if (!priv->rmlvo.variant)
+	priv->rmlvo.variant = xf86SetStrOption(pInfo->options, "XkbVariant", "");
+
+    priv->rmlvo.options = xf86SetStrOption(pInfo->options, "xkb_options", NULL);
+    if (!priv->rmlvo.options)
+	priv->rmlvo.options = xf86SetStrOption(pInfo->options, "XkbOptions", "");
+
+    return Success;
+}
+
+InputInfoPtr
+jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
+{
+    int rc;
    char name[512] = {0};
+    InputAttributes *attrs = NULL;
+    InputOption *options;
+    InputOption *iopts = NULL, *tmp;
+    DeviceIntPtr dev;

-    local = xf86AllocateInput(drv, 0);
-    if (!local) {
-        goto SetupProc_fail;
-    }
-
-    dev = xcalloc(sizeof(IDevRec), 1);
-    strcpy(name, _dev->identifier);
+    /* duplicate option list, append to name */
+    options = xf86OptionListDuplicate(pInfo->options);
+    strcpy(name, pInfo->name);
    strcat(name, " (keys)");
-    dev->identifier = xstrdup(name);
-    dev->driver = xstrdup(_dev->driver);
-    dev->commonOptions = (pointer)xf86optionListDup(_dev->commonOptions);
-    dev->extraOptions = (pointer)xf86optionListDup(_dev->extraOptions);
+    options = xf86ReplaceStrOption(options, "Name", name);
+    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");

-    local->name   = dev->identifier;
-    local->flags  = XI86_KEYBOARD_CAPABLE;
-    local->device_control = jstkKeyboardDeviceControlProc;
-    local->read_input = NULL;
-    local->close_proc = NULL;
-    local->control_proc = NULL;
-    local->switch_mode = NULL;
-    local->conversion_proc = NULL;
-    local->fd = -1;
-    local->dev = NULL;
-    local->private = NULL;
-    local->type_name = XI_JOYSTICK;
-    local->history_size = 0;
-    local->always_core_feedback = 0;
-    local->conf_idev = dev;
+    while(options)
+    {
+        tmp = calloc(1, sizeof(InputOption));

-    xf86CollectInputOptions(local, NULL, NULL);
-    xf86OptionListReport(local->options);
-    xf86ProcessCommonOptions(local, local->options);
-
-
-    /* return the LocalDevice */
-    local->flags |= XI86_CONFIGURED;
-
-    return (local);
-
-SetupProc_fail:
-    if (local)
-        local->private = NULL;
-    if (dev) {
-        if (dev->identifier) xfree(dev->identifier);
-        if (dev->driver) xfree(dev->driver);
-        xfree(dev);
+        tmp->key = xf86OptionName(options);
+        tmp->value = xf86OptionValue(options);
+        tmp->next = iopts;
+        iopts = tmp;
+        options = xf86NextOption(options);
    }
-    return NULL;
+
+    /* duplicate attribute list */
+    attrs = DuplicateInputAttributes(pInfo->attrs);
+
+    rc = NewInputDeviceRequest(iopts, attrs, &dev);
+
+    while(iopts)
+    {
+        tmp = iopts->next;
+        free(iopts->key);
+        free(iopts->value);
+        free(iopts);
+        iopts = tmp;
+    }
+
+    FreeInputAttributes(attrs);
+
+    return (rc == Success) ? dev->public.devicePrivate : NULL;
 }


@ -562,15 +304,15 @@ SetupProc_fail:
 */
 void
 jstkKeyboardUnInit(InputDriverPtr    drv,
-                   LocalDevicePtr    local,
+                   InputInfoPtr      pInfo,
                   int               flags)
 {
-    JoystickDevPtr device = (JoystickDevPtr) local->private;
+    JoystickDevPtr device = (JoystickDevPtr) pInfo->private;
    DBG(2, ErrorF("jstkKeyboardUnInit.\n"));

    device->keyboard_device = NULL;
-    local->private = NULL;
+    pInfo->private = NULL;

-    xf86DeleteInput(local, 0);
+    xf86DeleteInput(pInfo, 0);
 }

--- a/driver/xf86-input-joystick/src/jstk_key.h
+++ b/driver/xf86-input-joystick/src/jstk_key.h
@ -25,9 +25,10 @@
 #ifndef __JSTK_KEY_H_INCLUDED__
 #define __JSTK_KEY_H_INCLUDED__

-void jstkGenerateKeys(LocalDevicePtr device, KEYSCANCODES keys, char pressed);
-
-InputInfoPtr jstkKeyboardPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
-void jstkKeyboardUnInit(InputDriverPtr drv, LocalDevicePtr local, int flags);
+void jstkGenerateKeys(InputInfoPtr device, KEYSCANCODES keys, char pressed);

+int jstkKeyboardPreInit(InputDriverPtr pInfo, InputInfoPtr dev, int flags);
+void jstkKeyboardUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
+Bool jstkKeyboardDeviceControlProc(DeviceIntPtr dev, int what);
+InputInfoPtr jstkKeyboardHotplug(InputInfoPtr dev, int flags);
 #endif
--- a/driver/xf86-input-joystick/src/jstk_options.c
+++ b/driver/xf86-input-joystick/src/jstk_options.c
@ -26,6 +26,7 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@ -154,7 +155,7 @@ jstkParseButtonOption(const char* org,
        xf86Msg(X_WARNING, "%s: error parsing button parameter.\n", 
                name);
    }
-    xfree(param);
+    free(param);
 }


@ -292,5 +293,5 @@ jstkParseAxisOption(const char* org,
        }else xf86Msg(X_WARNING, "%s: error parsing deadzone.\n", 
                      name);
    }
-    xfree(param);
+    free(param);
 }
--- a/driver/xf86-input-joystick/src/jstk_properties.c
+++ b/driver/xf86-input-joystick/src/jstk_properties.c
@ -25,12 +25,9 @@
 #include "config.h"
 #endif

+#include <xorg-server.h>
 #include <xf86Module.h>

-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
-
-
-
 #include <misc.h>
 #include <xf86.h>
 #include <X11/Xatom.h>
@ -456,5 +453,3 @@ jstkInitProperties(DeviceIntPtr pJstk, JoystickDevPtr priv)

    return TRUE;
 }
-
-#endif