xserver-xorg-input-joystick: Changes to 'debian-unstable'
.gitignore | 2
ChangeLog | 167 ++++++++++++++
Makefile.am | 11
Makefile.in | 17 +
config.h.in | 6
config.sub | 14 -
configure | 112 ++++++---
configure.ac | 14 +
debian/changelog | 6
debian/control | 2
man/.gitignore | 2
man/Makefile.in | 2
man/joystick.man | 96 +++++++-
src/Makefile.in | 2
src/bsd_jstk.c | 371 ++++++++++++++++----------------
src/jstk.c | 599 ++++++++++++++++++++++++++++-------------------------
src/jstk.h | 67 ++---
src/jstk_axis.c | 537 ++++++++++++++++++++++++++---------------------
src/jstk_axis.h | 1
src/jstk_options.c | 326 +++++++++++++++++-----------
src/jstk_options.h | 9
src/linux_jstk.c | 180 ++++++++-------
22 files changed, 1533 insertions(+), 1010 deletions(-)
New commits:
commit 21587da618583921813c785e596dcaa5acfe4951
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Aug 16 17:49:25 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 164aebf..80f6592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-input-joystick (1:1.2.3-1) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.2.3-1) unstable; urgency=low
* New upstream release.
+ * Add myself to uploaders.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <bgoglin@debian.org> Thu, 16 Aug 2007 17:46:39 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 16 Aug 2007 17:48:57 +0200
xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2846603..3500cfd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-joystick
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick
commit 792e1cb392aa2636dd13fd4f4c50836beee20a9d
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Aug 16 17:46:45 2007 +0200
New upstream release
diff --git a/Makefile.in b/Makefile.in
index dac60ae..0caba2a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,6 +116,8 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
+DEBUG_FALSE = @DEBUG_FALSE@
+DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
@@ -218,6 +220,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+EXTRA_DIST = autogen.sh ChangeLog
+CLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -459,6 +463,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -578,6 +585,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -640,7 +648,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -652,6 +660,13 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
# 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:
diff --git a/config.h.in b/config.h.in
index a6aea89..b0104ce 100644
--- a/config.h.in
+++ b/config.h.in
@@ -2,6 +2,9 @@
#include "xorg-server.h"
+/* Enable debugging code */
+#undef DEBUG
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -32,6 +35,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Disable some debugging code */
+#undef NDEBUG
+
/* Name of package */
#undef PACKAGE
diff --git a/config.sub b/config.sub
index fab0aa3..387c18d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,7 +276,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -368,7 +367,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1371,9 +1366,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index a6ee897..40af917 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-joystick 1.2.1.
+# Generated by GNU Autoconf 2.61 for xf86-input-joystick 1.2.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-joystick'
PACKAGE_TARNAME='xf86-input-joystick'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='xf86-input-joystick 1.2.1'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='xf86-input-joystick 1.2.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -877,6 +877,8 @@ LINUX_TRUE
LINUX_FALSE
BSD_TRUE
BSD_FALSE
+DEBUG_TRUE
+DEBUG_FALSE
inputdir
PKG_CONFIG
XORG_CFLAGS
@@ -1416,7 +1418,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-joystick 1.2.1 to adapt to many kinds of systems.
+\`configure' configures xf86-input-joystick 1.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1486,7 +1488,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-joystick 1.2.1:";;
+ short | recursive ) echo "Configuration of xf86-input-joystick 1.2.3:";;
esac
cat <<\_ACEOF
@@ -1502,6 +1504,7 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-debug Enable debugging (default: enabled)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1598,7 +1601,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-joystick configure 1.2.1
+xf86-input-joystick configure 1.2.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1612,7 +1615,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-joystick $as_me 1.2.1, which was
+It was created by xf86-input-joystick $as_me 1.2.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2284,7 +2287,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-joystick'
- VERSION='1.2.1'
+ VERSION='1.2.3'
cat >>confdefs.h <<_ACEOF
@@ -4353,7 +4356,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4356 "configure"' > conftest.$ac_ext
+ echo '#line 4359 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7085,11 +7088,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7088: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7091: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7092: \$? = $ac_status" >&5
+ echo "$as_me:7095: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7353,11 +7356,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7356: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7359: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7360: \$? = $ac_status" >&5
+ echo "$as_me:7363: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7457,11 +7460,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7460: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7463: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7464: \$? = $ac_status" >&5
+ echo "$as_me:7467: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9754,7 +9757,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9757 "configure"
+#line 9760 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9854,7 +9857,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9857 "configure"
+#line 9860 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12190,11 +12193,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12193: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12197: \$? = $ac_status" >&5
+ echo "$as_me:12200: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12294,11 +12297,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12297: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12300: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12301: \$? = $ac_status" >&5
+ echo "$as_me:12304: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13855,11 +13858,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13858: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13862: \$? = $ac_status" >&5
+ echo "$as_me:13865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13959,11 +13962,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13962: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13966: \$? = $ac_status" >&5
+ echo "$as_me:13969: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16146,11 +16149,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16149: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16152: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16153: \$? = $ac_status" >&5
+ echo "$as_me:16156: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16414,11 +16417,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16420: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16421: \$? = $ac_status" >&5
+ echo "$as_me:16424: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16518,11 +16521,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16521: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16525: \$? = $ac_status" >&5
+ echo "$as_me:16528: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20006,6 +20009,38 @@ else
moduledir="$libdir/xorg/modules"
fi
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval=$enable_debug; DEBUGGING=$enableval
+else
+ DEBUGGING=yes
+fi
+
+if test "x$DEBUGGING" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG 1
+_ACEOF
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
+
+fi
+
+
+if test "x$DEBUGGING" = xyes; then
+ DEBUG_TRUE=
+ DEBUG_FALSE='#'
+else
+ DEBUG_TRUE='#'
+ DEBUG_FALSE=
+fi
+
+
inputdir=${moduledir}/input
@@ -20800,6 +20835,13 @@ echo "$as_me: error: conditional \"BSD\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21100,7 +21142,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-joystick $as_me 1.2.1, which was
+This file was extended by xf86-input-joystick $as_me 1.2.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21153,7 +21195,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-joystick config.status 1.2.1
+xf86-input-joystick config.status 1.2.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21482,6 +21524,8 @@ LINUX_TRUE!$LINUX_TRUE$ac_delim
LINUX_FALSE!$LINUX_FALSE$ac_delim
BSD_TRUE!$BSD_TRUE$ac_delim
BSD_FALSE!$BSD_FALSE$ac_delim
+DEBUG_TRUE!$DEBUG_TRUE$ac_delim
+DEBUG_FALSE!$DEBUG_FALSE$ac_delim
inputdir!$inputdir$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
XORG_CFLAGS!$XORG_CFLAGS$ac_delim
@@ -21502,7 +21546,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/debian/changelog b/debian/changelog
index c413987..164aebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-input-joystick (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.2.3-1) UNRELEASED; urgency=low
+ * New upstream release.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 24 Apr 2007 00:59:08 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 16 Aug 2007 17:46:39 +0200
xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low
diff --git a/man/Makefile.in b/man/Makefile.in
index ec23fb7..f33eb12 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -109,6 +109,8 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
+DEBUG_FALSE = @DEBUG_FALSE@
+DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
diff --git a/src/Makefile.in b/src/Makefile.in
index 5100497..bd851c9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -129,6 +129,8 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
+DEBUG_FALSE = @DEBUG_FALSE@
+DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
commit 13c850fe77b0a9a8a719bedfa1439e96972a730b
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Aug 12 13:01:16 2007 +0200
configure.ac: prepared for 1.2.3 release
diff --git a/configure.ac b/configure.ac
index 76e0e10..88b5315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-joystick],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-joystick)
commit 3651cc8ee6257a5c8f098c603b892aff45ee1e68
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Aug 12 12:49:59 2007 +0200
Added --enable-debug option to configure script
The options --enable-debug and --disable-debug control if additional debugging messages shall be included in the binary, that can made
visible with the "DebugLevel" option in the xorg.conf. Default: Enabled.
diff --git a/configure.ac b/configure.ac
index f6653bb..76e0e10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,18 @@ AC_ARG_WITH(xorg-module-dir,
[[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)
diff --git a/src/jstk.c b/src/jstk.c
index 4be8fbe..a15985d 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -499,7 +499,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
}
#else
if (xf86SetIntOption(dev->commonOptions, "DebugLevel", 0) != 0) {
- xf86Msg(X_WARNING, "%s: DebugLevel: Compiled without Debug support!\n",
+ xf86Msg(X_WARNING, "%s: DebugLevel: Compiled without debugging support!\n",
local->name);
}
#endif
diff --git a/src/jstk.h b/src/jstk.h
index 7a9293c..d17f5af 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -37,17 +37,8 @@
#undef DBG
#endif
-#ifdef DEBUG
- #undef DEBUG
-#endif
-#define DEBUG 1
-
-/**
- * DEBUG Makros
- **/
-
#if DEBUG
- extern int debug_level;
+ extern int debug_level;
#define DBG(lvl, f) {if ((lvl) <= debug_level) f;}
#else
#define DBG(lvl, f)
commit ca6968c1800ed30aec78b1e474c2b0ede77cd301
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Aug 12 00:04:35 2007 +0200
Explained new key generation features for axes in man page.
Explained the behaviour of accelerated vs relative axes that are mapped to keys. Added example to man page.
diff --git a/man/joystick.man b/man/joystick.man
index 0544d82..0fcda91 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -116,7 +116,7 @@ will be reported as an additional valuator.
Where
.I <axis>
is one of:
-.B X, Y, ZX, ZY
+.B X, Y, ZX, ZY, KEY (see keylow/keyhigh)
and
.I <factor>
@@ -128,18 +128,26 @@ Negative values will invert the movement. Default: 1.0
.TP 7
.BI "\*qkeyhigh="<keycode>[,<keycode>[,<keycode>[,<keycode>]]]
When the axis is moved out of the deadzone, a series of keydown events according
-to the direction of the movement is generated. When the axis is released, keyup events will be generated. You can specify up to 4 keycodes for each direction. The behaviour is not changed by the specified
-.BR mode ,
-the value in
-.B axis
-is ignored.
+to the direction of the movement is generated. When the axis is released, keyup events will be generated. You can specify up to 4 keycodes for each direction.
.B keylow
defines the keys to be generated when the axis is moved in negative direction (ie. left or up),
.B keyhigh
defines the keys to be generated when the axis is moved in positive direction (ie. right or down).
-The keys will be autorepeated according to current keyboard settings.
+If
+.B mode
+is set to
+.IR relative :
+The driver will emulate autorepeat according to the current value of the axis. A keydown and subsequent keyup event will be generated in short time intervals. To modify that interval and the autorepeat speed, supply the
+.BI "\*qaxis="[<factor>]KEY \*q
+parameter.
+
+If
+.B mode
+is set to
+.IR accelerated :
+One keydown event is generated, when the axis is moved out of the deadzone, the keyup event is generated, when the axis moves back to the deadzone. The keys will be autorepeated according to the keyboard settings.
See special section about key events below.
.TP 7
@@ -234,14 +242,17 @@ is for the
.IR "space " key.
.nf
-.BI " Option \*qMapAxis1\*q \*q" "mode=accelerated keylow=100 keyhigh=102" \*q
-.BI " Option \*qMapAxis2\*q \*q" "mode=accelerated keylow=98 keyhigh=104" \*q
+.BI " Option \*qMapAxis1\*q \*q" "mode=relative keylow=100 keyhigh=102 axis=0.5key" \*q
+.BI " Option \*qMapAxis2\*q \*q" "mode=relative keylow=98 keyhigh=104" \*q
+.BI " Option \*qMapAxis3\*q \*q" "mode=accelerated keylow=100 keyhigh=102" \*q
+.BI " Option \*qMapAxis4\*q \*q" "mode=accelerated keylow=98 keyhigh=104" \*q
.fi
-will map the first axis to the arrow keys
+will map the first and third axis to the arrow keys
.IR left " and " right
-and the second axis to the arrow keys
+and the second and fourth axis to the arrow keys
.IR up " and " down .
-The keys 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.
+The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
+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 "VALUATORS"
The driver reports relative cursor movement as valuators 0 and 1.
commit e24622b48e4304a7b8f9de5bdec0e0633821fa7b
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sat Aug 11 23:27:57 2007 +0200
Key autorepeat added for axes with mode=relative
If axis is set to relative and keylow and keyhigh are assigned, autorepeat for these keys is emulated with a speed relative to the
value of the axis (keydown and keyup are generated frequently). A factor for this autorepeat speed can be assigned by
"axis=<factor>key".
If mode is "accelerated", the axis behaves like a button: only one keydown and one keyup, X does autorepeat for the key.
diff --git a/src/jstk.c b/src/jstk.c
index e4209d0..4be8fbe 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -85,39 +85,6 @@ jstkConvertProc(LocalDevicePtr local,
/*
***************************************************************************
*
- * jstkGenerateKeys
- *
- * Generates a series of keydown or keyup events of the specified
- * KEYSCANCODES
- *
- ***************************************************************************
- */
-static void
-jstkGenerateKeys(LocalDevicePtr local, KEYSCANCODES keys, char pressed)
-{
- int i;
- unsigned int k;
- JoystickDevPtr priv = local->private;
- if (priv->keys_enabled == FALSE) return;
-
- for (i=0;i<MAXKEYSPERBUTTON;i++) {
- if (pressed != 0)
- k = keys[i];
- else k = keys[MAXKEYSPERBUTTON - i - 1];
-
- if (k != 0) {
- DBG(2, ErrorF("Generating key %s event with keycode %d\n",
- (pressed)?"press":"release", k));
- xf86PostKeyboardEvent(local->dev, k, pressed);
- }
- }
-}
-
-
-
-/*
- ***************************************************************************
- *
* jstkReadProc --
*
* Called when data is available to read from the device
@@ -170,9 +137,10 @@ jstkReadProc(LocalDevicePtr local)
break;
case MAPPING_KEY:
- jstkGenerateKeys(local,
- priv->button[number].keys,
- priv->button[number].pressed);
+ if (priv->keys_enabled == TRUE)
+ jstkGenerateKeys(local->dev,
+ priv->button[number].keys,
+ priv->button[number].pressed);
break;
case MAPPING_SPEED_MULTIPLY:
@@ -262,19 +230,25 @@ jstkReadProc(LocalDevicePtr local)
} /* switch (priv->axis[number].type) */
break; /* case MAPPING_ZY */
- case MAPPING_KEY:
- if ((priv->axis[number].value > 0) !=
- (priv->axis[number].oldvalue > 0))
- jstkGenerateKeys(local,
- priv->axis[number].keys_high,
- (priv->axis[number].value > 0) ? 1 : 0);
-
- if ((priv->axis[number].value < 0) !=
- (priv->axis[number].oldvalue < 0))
- jstkGenerateKeys(local,
- priv->axis[number].keys_low,
- (priv->axis[number].value < 0) ? 1:0);
+ case MAPPING_KEY: if (priv->keys_enabled == TRUE) {
+ if (priv->axis[number].type == TYPE_ACCELERATED) {
+ if ((priv->axis[number].value > 0) !=
+ (priv->axis[number].oldvalue > 0))
+ jstkGenerateKeys(local->dev,
+ priv->axis[number].keys_high,
+ (priv->axis[number].value > 0) ? 1:0);
+
+ if ((priv->axis[number].value < 0) !=
+ (priv->axis[number].oldvalue < 0))
+ jstkGenerateKeys(local->dev,
+ priv->axis[number].keys_low,
+ (priv->axis[number].value < 0) ? 1:0);
+ } else if (priv->axis[number].type == TYPE_BYVALUE) {
+ if (priv->keys_enabled == TRUE)
+ jstkStartAxisTimer(local, number);
+ }
break;
+ }
case MAPPING_NONE:
default:
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index 78c4f29..dd2df0f 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -109,6 +109,7 @@ jstkAxisTimer(OsTimerPtr timer,
break;
case MAPPING_ZX:
case MAPPING_ZY:
+ case MAPPING_KEY:
axis->subpixel += p2;
break;
default:
@@ -128,6 +129,24 @@ jstkAxisTimer(OsTimerPtr timer,
case MAPPING_ZY:
movezy += (int)axis->subpixel;
break;
+
+ case MAPPING_KEY: if ((priv->keys_enabled == TRUE) &&
+ (priv->axis[i].type == TYPE_BYVALUE)) {
+ int num;
+ num = abs((int)axis->subpixel);
+ if ((int)axis->subpixel < 0) {
+ for (i=0; i<num; i++) {
+ jstkGenerateKeys(device, axis->keys_low, 1);
+ jstkGenerateKeys(device, axis->keys_low, 0);
+ }
+ } else {
+ for (i=0; i<num; i++) {
+ jstkGenerateKeys(device, axis->keys_high, 1);
+ jstkGenerateKeys(device, axis->keys_high, 0);
+ }
+ }
+ break;
+ }
default:
break;
}
@@ -363,3 +382,34 @@ jstkHandleAbsoluteAxis(LocalDevicePtr device, int number)
}
}
+
+
+
+/*
+ ***************************************************************************
+ *
+ * jstkGenerateKeys
+ *
+ * Generates a series of keydown or keyup events of the specified
+ * KEYSCANCODES
+ *
+ ***************************************************************************
+ */
+void
+jstkGenerateKeys(DeviceIntPtr device, KEYSCANCODES keys, char pressed)
+{
+ int i;
+ unsigned int k;
+
+ for (i=0;i<MAXKEYSPERBUTTON;i++) {
+ if (pressed != 0)
+ k = keys[i];
+ else k = keys[MAXKEYSPERBUTTON - i - 1];
+
+ if (k != 0) {
+ DBG(2, ErrorF("Generating key %s event with keycode %d\n",
+ (pressed)?"press":"release", k));
+ xf86PostKeyboardEvent(device, k, pressed);
+ }
+ }
+}
diff --git a/src/jstk_axis.h b/src/jstk_axis.h
index cb2b502..4ba45b4 100644
--- a/src/jstk_axis.h
+++ b/src/jstk_axis.h
@@ -27,5 +27,6 @@
void jstkStartAxisTimer(LocalDevicePtr device, int number);
void jstkStartButtonAxisTimer(LocalDevicePtr device, int number);
void jstkHandleAbsoluteAxis(LocalDevicePtr device, int number);
+void jstkGenerateKeys(DeviceIntPtr device, KEYSCANCODES keys, char pressed);
#endif
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 9180c8e..369c5d1 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -79,7 +79,9 @@ jstkGetAxisMapping(float *value, const char* param, const char* name)
if (param[0] == '-')
*value *= -1.0;
}
- if (strstr(param, "zx") != NULL)
+ if (strstr(param, "key") != NULL)
+ return MAPPING_KEY;
+ else if (strstr(param, "zx") != NULL)
return MAPPING_ZX;
else if (strstr(param, "zy") != NULL)
return MAPPING_ZY;
commit 38297b06226f115ca4a25557bcb7f8c936424abc
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sat Aug 11 22:32:54 2007 +0200
Fixed button mapping to an axis needing amplify value.
Button mapping without amplify value like "axis=x" used uninitialized value for amplify,
making an amplify value mandatory. With no amplify value, 1.0 is assumed.
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 8991813..9180c8e 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -128,6 +128,7 @@ jstkParseButtonOption(const char* org,
button->buttonnumber = jstkGetButtonNumberInMap(priv, value);
} else if (sscanf(param, "axis=%15s", p) == 1) {
p[15]='\0';
+ fvalue = 1.0f;
button->mapping = jstkGetAxisMapping(&fvalue, p, name);
button->amplify = fvalue;
button->currentspeed = 1.0f;
commit dd396931b76c682f03323566f28b248afb1cb79d
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sat Aug 11 22:22:49 2007 +0200
Move subpixel movement from global to per axis/button.
Reply to: