.cvsignore | 19
ChangeLog | 56 --
Makefile.am | 11
Makefile.in | 15
config.h.in | 6
configure | 300 ++++++++++-
configure.ac | 8
debian/changelog | 11
debian/control | 2
debian/rules | 2
src/acecad.c | 1495 ++++++++++++++++++++++++++++++-------------------------
src/acecad.h | 20
12 files changed, 1185 insertions(+), 760 deletions(-)
New commits:
commit 03f83165591523f60610e23b4655095c5783b2fd
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Sat May 12 23:46:23 2007 +1000
Upload 1.2.0 to unstable.
autoreconf too.
.cvsignore is no longer needed, remove it as well.
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/Makefile.in b/Makefile.in
index d50b00f..4e1ed97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -214,6 +214,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
@@ -455,6 +457,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 \
@@ -574,6 +579,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)
@@ -636,7 +642,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 \
@@ -648,6 +654,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..76ed7b5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -32,6 +32,12 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Using the Linux input subsystem */
+#undef LINUX_INPUT
+
+/* Using sysfs to probe devices */
+#undef LINUX_SYSFS
+
/* Name of package */
#undef PACKAGE
diff --git a/configure b/configure
index 2f96983..6e0b682 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-acecad 1.1.1.
+# Generated by GNU Autoconf 2.61 for xf86-input-acecad 1.2.0.
#
# 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-acecad'
PACKAGE_TARNAME='xf86-input-acecad'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='xf86-input-acecad 1.1.1'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='xf86-input-acecad 1.2.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1412,7 +1412,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-acecad 1.1.1 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-acecad 1.2.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-acecad 1.1.1:";;
+ short | recursive ) echo "Configuration of xf86-input-acecad 1.2.0:";;
esac
cat <<\_ACEOF
@@ -1594,7 +1594,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-acecad configure 1.1.1
+xf86-input-acecad configure 1.2.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1608,7 +1608,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-acecad $as_me 1.1.1, which was
+It was created by xf86-input-acecad $as_me 1.2.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2280,7 +2280,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-acecad'
- VERSION='1.1.1'
+ VERSION='1.2.0'
cat >>confdefs.h <<_ACEOF
@@ -20515,6 +20515,286 @@ _ACEOF
fi
+if test "${ac_cv_header_linux_input_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for linux/input.h" >&5
+echo $ECHO_N "checking for linux/input.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_linux_input_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking linux/input.h usability" >&5
+echo $ECHO_N "checking linux/input.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <linux/input.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking linux/input.h presence" >&5
+echo $ECHO_N "checking linux/input.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <linux/input.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: accepted by the compiler,
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: linux/input.h: accepted by the compiler, rejected by
the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the
compiler's result" >&5
+echo "$as_me: WARNING: linux/input.h: proceeding with the compiler's result"
>&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: present but cannot be
compiled" >&5
+echo "$as_me: WARNING: linux/input.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: check for missing
prerequisite headers?" >&5
+echo "$as_me: WARNING: linux/input.h: check for missing prerequisite
headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: see the Autoconf
documentation" >&5
+echo "$as_me: WARNING: linux/input.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: section \"Present But
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: linux/input.h: section \"Present But Cannot Be
Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the
preprocessor's result" >&5
+echo "$as_me: WARNING: linux/input.h: proceeding with the preprocessor's
result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/input.h: in the future, the
compiler will take precedence" >&5
+echo "$as_me: WARNING: linux/input.h: in the future, the compiler will take
precedence" >&2;}
+ ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for linux/input.h" >&5
+echo $ECHO_N "checking for linux/input.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_linux_input_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_linux_input_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6; }
+
+fi
+if test $ac_cv_header_linux_input_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LINUX_INPUT 1
+_ACEOF
+
+
+fi
+
+
+if test "${ac_cv_header_sysfs_libsysfs_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for sysfs/libsysfs.h" >&5
+echo $ECHO_N "checking for sysfs/libsysfs.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sysfs_libsysfs_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sysfs_libsysfs_h" >&5
+echo "${ECHO_T}$ac_cv_header_sysfs_libsysfs_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sysfs/libsysfs.h usability" >&5
+echo $ECHO_N "checking sysfs/libsysfs.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sysfs/libsysfs.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sysfs/libsysfs.h presence" >&5
+echo $ECHO_N "checking sysfs/libsysfs.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sysfs/libsysfs.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: accepted by the
compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: accepted by the compiler, rejected by
the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: proceeding with the
compiler's result" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: proceeding with the compiler's
result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: present but cannot be
compiled" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: check for missing
prerequisite headers?" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: check for missing prerequisite
headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: see the Autoconf
documentation" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: section \"Present
But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: section \"Present But Cannot Be
Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: proceeding with the
preprocessor's result" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: proceeding with the preprocessor's
result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sysfs/libsysfs.h: in the future, the
compiler will take precedence" >&5
+echo "$as_me: WARNING: sysfs/libsysfs.h: in the future, the compiler will take
precedence" >&2;}
+ ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for sysfs/libsysfs.h" >&5
+echo $ECHO_N "checking for sysfs/libsysfs.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sysfs_libsysfs_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_sysfs_libsysfs_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sysfs_libsysfs_h" >&5
+echo "${ECHO_T}$ac_cv_header_sysfs_libsysfs_h" >&6; }
+
+fi
+if test $ac_cv_header_sysfs_libsysfs_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LINUX_SYSFS 1
+_ACEOF
+
+
+fi
+
+
@@ -21060,7 +21340,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-acecad $as_me 1.1.1, which was
+This file was extended by xf86-input-acecad $as_me 1.2.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21113,7 +21393,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-acecad config.status 1.1.1
+xf86-input-acecad config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index b1330c1..78afae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-acecad (1:1.1.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-acecad (1:1.2.0-1) unstable; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -19,7 +19,14 @@ xserver-xorg-input-acecad (1:1.1.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Drop linux-kernel-headers from Build-Depends.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 4 May 2007 16:37:38 +0300
+ [ Drew Parsons ]
+ * New upstream version 1.2.0.
+ * Include upstream commit 1af7e022be2bcbcf50d12c0c3847a853a911347c,
+ it looks useful.
+ * autoreconf to update for new configure.ac
+ * Upstream Changelog no longer included.
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Sat, 12 May 2007 23:44:50 +1000
xserver-xorg-input-acecad (1:1.1.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index de4a3af..595ab28 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-acecad
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-acecad
diff --git a/debian/rules b/debian/rules
index 75bb86a..e9bf029 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs ChangeLog
+ dh_installchangelogs
dh_install --sourcedir=debian/tmp --list-missing
--exclude=acecad_drv.la --exclude=usr/share/man/man4
dh_installman
dh_link
commit 1af7e022be2bcbcf50d12c0c3847a853a911347c
Author: Paul Vojta <[EMAIL PROTECTED]>
Date: Mon Apr 30 11:45:53 2007 -0700
Off-by-one (and comment) fix.
Just a quick patch:
diff --git a/src/acecad.c b/src/acecad.c
index 1c0b4f7..c146105 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -185,7 +185,7 @@ IsUSBLine(int fd)
}
}
-/* Heavily inspired by synpatics/eventcomm.c */
+/* Heavily inspired by synaptics/eventcomm.c */
#define DEV_INPUT_EVENT "/dev/input/event"
#define EV_DEV_NAME_MAXLEN 64
@@ -196,8 +196,8 @@ static Bool
fd_query_acecad(int fd, char *ace_name) {
char name[256] = "Unknown";
int cmp_at = strlen(ace_name);
- if (cmp_at > 256)
- cmp_at = 256;
+ if (cmp_at > 255)
+ cmp_at = 255;
ioctl(fd, EVIOCGNAME(sizeof(name)), name);
name[cmp_at] = '\0';
if (xf86NameCmp(name, ace_name) == 0)
commit cc6bc3b848dfa312baf0cf4037b3e600d59a8f7e
Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
Date: Sun Apr 29 05:09:41 2007 +0200
Bump to 1.2.0.
diff --git a/configure.ac b/configure.ac
index 2f55c00..a4943e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-acecad],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-acecad)
commit 405fac1dd34bbbfa8a2dd1a0ac2664871d914e1f
Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
Date: Sun Apr 29 05:02:03 2007 +0200
Simplify flag setup.
diff --git a/src/acecad.c b/src/acecad.c
index c401f80..1c0b4f7 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -367,7 +367,6 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86OptionListReport(local->options);
priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 );
- priv->flags &= ~AUTODEV_FLAG;
s = xf86FindOptionValue(local->options, "Device");
if (!s || (s && (xf86NameCmp(s, "auto-dev") == 0))) {
@@ -406,8 +405,6 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
} else
#endif
{
- priv->flags &= ~USB_FLAG;
-
local->read_input = ReadInput;
msgtype = X_DEFAULT;
@@ -455,13 +452,9 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
s = xf86FindOptionValue(local->options, "Mode");
msgtype = s ? X_CONFIG : X_DEFAULT;
- if (s && (xf86NameCmp(s, "Relative") == 0))
- {
- priv->flags = priv->flags & ~ABSOLUTE_FLAG;
- }
- else
+ if (!(s && (xf86NameCmp(s, "relative") == 0)))
{
- priv->flags = priv->flags | ABSOLUTE_FLAG;
+ priv->flags |= ABSOLUTE_FLAG;
}
xf86Msg(msgtype, "%s is in %s mode\n", local->name, (priv->flags &
ABSOLUTE_FLAG) ? "absolute" : "relative");
commit ac08aacf4693e2ed824c15c9d243e7e9c5750cc3
Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
Date: Sun Apr 29 04:44:27 2007 +0200
More whitespace/coding style cleanups.
diff --git a/src/acecad.c b/src/acecad.c
index 73e88d7..c401f80 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -336,7 +336,7 @@ static InputInfoPtr
AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
{
LocalDevicePtr local = xf86AllocateInput(drv, 0);
- AceCadPrivatePtr priv = xcalloc (1, sizeof (AceCadPrivateRec));
+ AceCadPrivatePtr priv = xcalloc (1, sizeof(AceCadPrivateRec));
int speed;
int msgtype;
char *s;
@@ -344,7 +344,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
if ((!local) || (!priv))
goto SetupProc_fail;
- memset(priv,0,sizeof (AceCadPrivateRec));
+ memset(priv, 0, sizeof(AceCadPrivateRec));
local->name = dev->identifier;
local->type_name = "ACECAD Tablet";
@@ -367,7 +367,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86OptionListReport(local->options);
priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 );
- priv->flags &= ~ AUTODEV_FLAG;
+ priv->flags &= ~AUTODEV_FLAG;
s = xf86FindOptionValue(local->options, "Device");
if (!s || (s && (xf86NameCmp(s, "auto-dev") == 0))) {
@@ -393,7 +393,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86ErrorFVerb( 6, "tty port opened successfully\n" );
#ifdef LINUX_INPUT
- if(IsUSBLine(local->fd)){
+ if (IsUSBLine(local->fd)) {
priv->flags |= USB_FLAG;
local->read_input = USBReadInput;
@@ -485,7 +485,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
}
RemoveEnabledDevice (local->fd);
local->fd = -1;
- return (local);
+ return local;
/*
* If something went wrong, cleanup and return NULL
@@ -497,7 +497,7 @@ SetupProc_fail:
XisbFree (priv->buffer);
if (priv)
xfree (priv);
- return (NULL);
+ return NULL;
}
static Bool
@@ -546,7 +546,7 @@ DeviceOn (DeviceIntPtr dev)
local->fd = xf86OpenSerial(local->options);
if (local->fd == -1)
#endif
- return (!Success);
+ return !Success;
}
priv->flags |= AVAIL_FLAG;
@@ -557,7 +557,7 @@ DeviceOn (DeviceIntPtr dev)
{
xf86CloseSerial(local->fd);
local->fd = -1;
- return (!Success);
+ return !Success;
}
/* Rets qu'a l'envoyer a la tablette */
@@ -568,7 +568,7 @@ DeviceOn (DeviceIntPtr dev)
xf86FlushInput(local->fd);
xf86AddEnabledDevice (local);
dev->public.on = TRUE;
- return (Success);
+ return Success;
}
static Bool
@@ -593,7 +593,7 @@ DeviceOff (DeviceIntPtr dev)
xf86RemoveEnabledDevice (local);
dev->public.on = FALSE;
- return (Success);
+ return Success;
}
static Bool
@@ -603,7 +603,7 @@ DeviceClose (DeviceIntPtr dev)
xf86MsgVerb(X_INFO, 4, "%s Device Close\n", local->name);
- return (Success);
+ return Success;
}
static void
@@ -709,7 +709,7 @@ DeviceInit (DeviceIntPtr dev)
xf86Msg(X_INFO, "%s Increment: %d\n", local->name, priv->acecadInc);
- return (Success);
+ return Success;
}
static void
@@ -957,7 +957,7 @@ USBReadInput (LocalDevicePtr local)
}
#endif
- static void
+static void
CloseProc (LocalDevicePtr local)
{
}
@@ -967,7 +967,7 @@ CloseProc (LocalDevicePtr local)
* This function converts the device's valuator outputs to x and y coordinates
* to simulate mouse events.
*/
- static Bool
+static Bool
ConvertProc (LocalDevicePtr local, int first, int num,
int v0, int v1, int v2, int v3, int v4, int v5,
int *x, int *y)
@@ -980,7 +980,7 @@ ConvertProc (LocalDevicePtr local, int first, int num,
}
- static Bool
+static Bool
ReverseConvertProc (LocalDevicePtr local,
int x, int y,
int *valuators)
@@ -998,7 +998,7 @@ ReverseConvertProc (LocalDevicePtr local,
XisbWrite (priv->buffer, (unsigned char *)(str), strlen(str))
- static Bool
+static Bool
QueryHardware (AceCadPrivatePtr priv)
{
@@ -1044,7 +1044,7 @@ QueryHardware (AceCadPrivatePtr priv)
#define LONG(x) ((x)/BITS_PER_LONG)
#ifdef LINUX_INPUT
- static Bool
+static Bool
USBQueryHardware (LocalDevicePtr local)
{
AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
@@ -1088,13 +1088,13 @@ USBQueryHardware (LocalDevicePtr local)
}
#endif
- static void
+static void
NewPacket (AceCadPrivatePtr priv)
{
priv->packeti = 0;
}
- static Bool
+static Bool
AceCadGetPacket (AceCadPrivatePtr priv)
{
int count = 0;
commit 9b9b1d03609996dc3220870fa6e226c46c888c83
Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
Date: Sun Apr 29 04:42:04 2007 +0200
Centralize the success code for the probe routine.
diff --git a/src/acecad.c b/src/acecad.c
index 07211d6..73e88d7 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -273,10 +273,7 @@ AceCadAutoDevProbe(LocalDevicePtr local, int verb)
if (np < 0 || np >= EV_DEV_NAME_MAXLEN) {
xf86MsgVerb(X_WARNING, verb, "%s: unable to manage event
device %d\n", local->name, i);
} else {
- xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
- local->name, fname);
- xf86ReplaceStrOption(local->options, "Device", fname);
- return TRUE;
+ goto ProbeFound;
}
} else
xf86MsgVerb(X_WARNING, verb, "%s: no Acecad devices found via
sysfs\n", local->name);
@@ -314,10 +311,7 @@ AceCadAutoDevProbe(LocalDevicePtr local, int verb)
is_acecad = fd_query_acecad(fd, ace_name);
SYSCALL(close(fd));
if (is_acecad) {
- xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
- local->name, fname);
- xf86ReplaceStrOption(local->options, "Device", fname);
- return TRUE;
+ goto ProbeFound;
}
}
xf86MsgVerb(X_WARNING, verb, "%s: no Acecad event device found (checked %d
nodes, no device name started with '%s')\n",
@@ -328,6 +322,12 @@ AceCadAutoDevProbe(LocalDevicePtr local, int verb)
if (i > max_skip && !have_evdev)
xf86MsgVerb(X_WARNING, verb, "%s: The evdev kernel module seems to be
missing\n", local->name);
return FALSE;
+
+ProbeFound:
+ xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n",
+ local->name, fname);
+ xf86ReplaceStrOption(local->options, "Device", fname);
+ return TRUE;
}
#endif
commit 93736ac2bf92ad342255a64120c2685f4074a0e9
Author: Giuseppe Bilotta <[EMAIL PROTECTED]>
Date: Sat Apr 28 15:32:32 2007 +0200
Keep track of device availability.
Don't spam the log with errors about the device not being available, just
inform the user when the device is available again.
diff --git a/src/acecad.c b/src/acecad.c
index bd23bf9..07211d6 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -539,7 +539,8 @@ DeviceOn (DeviceIntPtr dev)
local->fd = xf86OpenSerial(local->options);
if (local->fd == -1)
{
- xf86Msg(X_WARNING, "%s: cannot open input device %s\n", local->name,
xf86FindOptionValue(local->options, "Device"));
+ xf86Msg(X_WARNING, "%s: cannot open input device %s: %s\n",
local->name, xf86FindOptionValue(local->options, "Device"), strerror(errno));
+ priv->flags &= ~AVAIL_FLAG;
#ifdef LINUX_INPUT
if ((priv->flags & AUTODEV_FLAG) && AceCadAutoDevProbe(local, 4))
local->fd = xf86OpenSerial(local->options);
@@ -547,6 +548,7 @@ DeviceOn (DeviceIntPtr dev)
#endif
return (!Success);
}
+ priv->flags |= AVAIL_FLAG;
if (!(priv->flags & USB_FLAG)) {
@@ -822,19 +824,34 @@ USBReadInput (LocalDevicePtr local)
int z = priv->acecadOldZ;
int prox = priv->acecadOldProximity;
int buttons = priv->acecadOldButtons;
- int is_core_pointer;
-
- is_core_pointer = xf86IsCorePointer(local->dev);
+ int is_core_pointer = xf86IsCorePointer(local->dev);
+ /* Is autodev active? */
+ int autodev = priv->flags & AUTODEV_FLAG;
+ /* Was the device available last time we checked? */
+ int avail = priv->flags & AVAIL_FLAG;
SYSCALL(len = read(local->fd, eventbuf, sizeof(eventbuf)));
if (len <= 0) {
- xf86Msg(X_ERROR, "%s: error reading device: %s\n", local->name,
strerror(errno));
- if (NOTAVAIL && (priv->flags & AUTODEV_FLAG) &&
AceCadAutoDevProbe(local, 4)) {
- DeviceOff(local->dev);
- DeviceOn(local->dev);
+ if (avail) {
+ xf86Msg(X_ERROR, "%s: error reading device %s: %s\n", local->name,
xf86FindOptionValue(local->options, "Device"), strerror(errno));
+ }
+ if (NOTAVAIL) {
+ priv->flags &= ~AVAIL_FLAG;
+ if(autodev) {
+ if (AceCadAutoDevProbe(local, 4)) {
+ DeviceOff(local->dev);
+ DeviceOn(local->dev);
+ }
+ }
}
return;
+ } else {
+ if (!avail) {
+ /* If the device wasn't available last time we checked */
+ xf86Msg(X_INFO, "%s: device %s is available again\n", local->name,
xf86FindOptionValue(local->options, "Device"));
+ priv->flags |= AVAIL_FLAG;
+ }
}
for (event = (struct input_event *)eventbuf;
@@ -892,7 +909,7 @@ USBReadInput (LocalDevicePtr local)
* whereas 2.4.x sends EV_ABS/ABS_MISC. We have to support both.
*/
if (!( (event->type == EV_SYN && event->code == SYN_REPORT) ||
- (event->type == EV_ABS && event->code == ABS_MISC)
+ (event->type == EV_ABS && event->code == ABS_MISC)
)) {
continue;
}
@@ -940,7 +957,7 @@ USBReadInput (LocalDevicePtr local)
}
#endif
-static void
+ static void
CloseProc (LocalDevicePtr local)
{
}
@@ -950,7 +967,7 @@ CloseProc (LocalDevicePtr local)
* This function converts the device's valuator outputs to x and y coordinates
* to simulate mouse events.
*/
-static Bool
+ static Bool
ConvertProc (LocalDevicePtr local, int first, int num,
int v0, int v1, int v2, int v3, int v4, int v5,
int *x, int *y)
@@ -963,7 +980,7 @@ ConvertProc (LocalDevicePtr local, int first, int num,
}
-static Bool
+ static Bool
ReverseConvertProc (LocalDevicePtr local,
int x, int y,
int *valuators)
@@ -981,7 +998,7 @@ ReverseConvertProc (LocalDevicePtr local,
XisbWrite (priv->buffer, (unsigned char *)(str), strlen(str))
-static Bool
+ static Bool
QueryHardware (AceCadPrivatePtr priv)
{
@@ -1027,7 +1044,7 @@ QueryHardware (AceCadPrivatePtr priv)
#define LONG(x) ((x)/BITS_PER_LONG)
#ifdef LINUX_INPUT
-static Bool
+ static Bool
USBQueryHardware (LocalDevicePtr local)
{
AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
@@ -1071,13 +1088,13 @@ USBQueryHardware (LocalDevicePtr local)
}
#endif
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
