qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-input-acecad 1.5.0.

Browse Source
This commit is contained in:
matthieu 2011-05-07 08:35:18 +00:00
parent a1517de675
commit 6c17fba165
13 changed files with 2408 additions and 1891 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

413
driver/xf86-input-acecad/ChangeLog
View File

@ -1,3 +1,416 @@
commit ba7205b258a92886e2b2b269bd92a607b50a9984
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu May 5 00:23:24 2011 +0200
acecad 1.5.0
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit f8e87eaf4031774ad319bff3756494728614d73d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 10:44:20 2010 +1000
The driver doesn't need libXext
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit db1153d0d463da2e1e894beebbcb293141fa3ac5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 10:36:48 2010 +1000
Bump to 1.4.99
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 802dd194dc8a571f600e05a93505681ae1ce13c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 25 13:01:53 2010 +1000
Add mode field to InitValuatorAxisStruct
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f85c4b580c074f7054eac98753d1f4e91f08305e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:26:47 2010 +1000
Adjust to new PreInit for ABI 12.
Most of the init is now handled by the server, not by the driver.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ca93073692a4b8fab32945d76a1d1d16a435c800
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:33:01 2010 +1000
Use a local variable for history_size.
Field was removed from InputInfoRec in ABI and the server hasn't actually
accessed this field for quite a while.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 053f56d3086082f8335cef906baba23ef8482a73
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:23:19 2010 +1000
Purge close_proc, hasn't been called by the server for ages.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b4e69d500dc0087bedafd7221abcb8e62800b84a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:20:00 2010 +1000
Move default_options up, preparation work for ABI 12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eab975ab3e576a6d223df07f0d9501e7bed317f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:10:08 2010 +1000
Remove libc wrapper usage for xcalloc, xfree, etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a48b52684e184cac7979247c4a5af4250a9aa809
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:08:41 2010 +1000
Replace LocalDevicePtr with InputInfoPtr.
LocalDevicePtr was removed with input ABI 12, but InputInfoPtr has been
around for years anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e8963e7b157aa61331824e57c16f467b2570c6b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 10:04:41 2010 +1000
Remove usage of XI86_POINTER_CAPABLE.
Flag was a write-only flag in both the server and the driver has now been
removed from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e282087cfe70917232ff520929ccbdbe6b4c521e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Oct 27 22:19:19 2010 -0700
Remove refcnt field from InputDriverRec.
Wasn't used in the server and is now removed.
Fixes compiler error:
"acecad.c", line 111: too many struct/union initializers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 96a383c95f8d97b966249eccb31734375df2c295
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 9 16:34:03 2010 -0400
config: requires RANDR through xf86.h
The xf86.h file contains external declarations specific to RANDR
Will not compile if this extension is not installed.
Because this is an optional extension, XORG_DRIVER_CHECK_EXT
must be used.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit af91ec0384790896ccece958fbd6aeb192102691
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 9 16:32:39 2010 -0400
config: requires xext, kb and input extensions through xf86.h
The xf86.h file includes headers from these protocols.
Will not compile if these extensions are not installed.
Because these extensions are always defined in the server, XORG_DRIVER_CHECK_EXT
should not be used.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit e0ae1a1068508dabe046c124c480591371573b31
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 19:26:56 2010 -0400
config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
It depends on util-macros 1.8
The existing statement can now be removed from the configuration file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 23d6e6ad46a4636bf47be127eb770458d45904db
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 19:25:22 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
The existing statement can now be removed from the configuration file.
Use Automake recommened $() for makefile variables.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit bb15c68091a78871196aa9366b22c00589601fb4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon May 10 20:40:45 2010 -0400
config: acecad does not use the input protocol
There is no need to PKG_CHECK_MODULES inputproto
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 25cf54dc5973be1427daf33e9bc6d907ccebc596
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon May 10 21:17:43 2010 -0400
config: AC_PROG_SED is required explicitly on Solaris
It sets the SED env variable with an appropriate sed program path
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 72b78672b172453f14811a3c1877a88292b496b3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Apr 17 19:04:02 2010 -0400
man: Use Autoconf provided $(AM_V_GEN)$(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit e2795bba90fb0b332d6ba8c3f453e4f6359fb24e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Apr 16 15:09:19 2010 -0400
config: optional extension check for inputproto not required
The check should be in PKG_CHECK_MODULES permanently.
The XORG_DRIVER_CHECK_EXT will add inputproto to PKG_CHECK_MODULES
only if the extension is available. By definition, this extension
is always available and the acecad driver cannot function without it.
This is evidenced by the absence of XINPUT conditional code.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 6751ab441bd35916926e24607599509a610a00be
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 20:01:51 2010 -0400
config: remove extension check for unused RANDR extension
The randr protocol is not used, no randr*.h are included.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit a86cb44b1dfe5ccfb05879ca49caf4288df540e4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 16:41:35 2010 -0400
config: fix checking for extensions section
A hidden dependency on statement order was discovered.
The REQUIRE_MODULES variable was removed but needed.
Comments added to clarify the situation.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit e9770dfe4e54993c2c53922fe9b37976e4e147cd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Apr 12 16:42:08 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.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 35fd1d69c7377d26eae631033b93bccd1b7fd1d7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Apr 10 22:13:17 2010 -0400
config: fix warnings and layout
Minor upgrades. Layout and comment statements.
Remove AC_PROG_CC as it overrides AC_PROG_C_C99 from
XORG_STRICT_OPTION.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 47dc3a9b851de8dd4b915ca8da43e7c744ee1730
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 08:41:27 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 9071703d43771a57bab00e33238fd0f99e9ce302
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Apr 10 20:41:06 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
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 0b601a14627538877ee89492e4b884da8152ff4c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Apr 10 19:46:47 2010 -0400
config: simplify configuration regarding sysfs headers and library.
Replace deprecated AC_HEADER_CHECK with AC_CHECK_HEADERS
AC_CHECK_LIB ensures sysfs library is present and adds -lsysfs
AC_CHECK_HEADERS verifies sysfs and linux input headers are present
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 64a899b00564fd16250068da1eab1e3dacdd3477
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Apr 12 09:13:39 2010 -0400
config: add conditional inclusion of config.h
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit d0a76a2343f8e3c07db3de7874fc8c2f38f98f09
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Apr 9 14:12:28 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.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b64d7594acf3e41f8ac0868d972be0e75fdcb35b
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 1119b9057b41435cfdde6822e3a637a2c18e7ca1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:13:24 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit cf02cd53e7152c4effe036abb8b2849b88f4f54b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 276cfbdc35ec63da046391a07a760a6844f9db6b
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 258301f0346a343b27ea716ff60099eddd1a02ad
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:08 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 cb547fb807f05a7e0a45ebfabaf5d02802296788
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 3f64aba434c97ee7c6433994375b3038201d805a
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 934a53decdb9d0d8890e7d6d6b67d4c0c64fbc4f
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 0f7ea63f28fb5314a58f9179bab6269f5184579f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 11 12:06:19 2009 +1000
Remove some unused crap from configure
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da1d7acc20a1b9ef4450b40781f1f207d9fa4e3d commit da1d7acc20a1b9ef4450b40781f1f207d9fa4e3d
Author: Peter Hutterer <peter.hutterer@who-t.net> Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:44:10 2009 +1000 Date: Wed Sep 9 12:44:10 2009 +1000

291
driver/xf86-input-acecad/INSTALL Normal file
View File

@ -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.

11
driver/xf86-input-acecad/Makefile.am
View File

@ -18,14 +18,15 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # 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. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man SUBDIRS = src man
EXTRA_DIST = ChangeLog MAINTAINERCLEANFILES = ChangeLog INSTALL
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog .PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog: ChangeLog:
$(CHANGELOG_CMD) $(CHANGELOG_CMD)
dist-hook: ChangeLog dist-hook: ChangeLog INSTALL

21
driver/xf86-input-acecad/Makefile.in
View File

@ -57,7 +57,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \ $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
config.sub depcomp install-sh ltmain.sh missing config.sub depcomp install-sh ltmain.sh missing
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -90,12 +90,14 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@ AR = @AR@
@ -132,8 +134,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
HAVE_LIBSYSFS_FALSE = @HAVE_LIBSYSFS_FALSE@ INSTALL_CMD = @INSTALL_CMD@
HAVE_LIBSYSFS_TRUE = @HAVE_LIBSYSFS_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -150,6 +151,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
@ -170,6 +172,7 @@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@ XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@ XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ ac_ct_F77 = @ac_ct_F77@
@ -190,7 +193,6 @@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@ docdir = @docdir@
dvidir = @dvidir@ dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -219,10 +221,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man SUBDIRS = src man
EXTRA_DIST = ChangeLog MAINTAINERCLEANFILES = ChangeLog INSTALL
MAINTAINERCLEANFILES = ChangeLog
all: config.h all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -662,12 +662,15 @@ uninstall-info: uninstall-info-recursive
tags tags-recursive uninstall uninstall-am uninstall-info-am tags tags-recursive uninstall uninstall-am uninstall-info-am
.PHONY: ChangeLog .PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog: ChangeLog:
$(CHANGELOG_CMD) $(CHANGELOG_CMD)
dist-hook: ChangeLog dist-hook: ChangeLog INSTALL
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

1123
driver/xf86-input-acecad/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

17
driver/xf86-input-acecad/config.h.in
View File

@ -1,13 +1,17 @@
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
#include "xorg-server.h"
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define to 1 if you have the `sysfs' library (-lsysfs). */
#undef HAVE_LIBSYSFS
/* Define to 1 if you have the <linux/input.h> header file. */
#undef HAVE_LINUX_INPUT_H
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
@ -23,6 +27,9 @@
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* Define to 1 if you have the <sysfs/libsysfs.h> header file. */
#undef HAVE_SYSFS_LIBSYSFS_H
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
@ -32,12 +39,6 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Using the Linux input subsystem */
#undef LINUX_INPUT
/* Using sysfs to probe devices */
#undef LINUX_SYSFS
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE

2095
driver/xf86-input-acecad/configure vendored
View File

File diff suppressed because it is too large Load Diff

82
driver/xf86-input-acecad/configure.ac
View File

@ -20,80 +20,56 @@
# #
# Process this file with autoconf to produce a configure script # Process this file with autoconf to produce a configure script
AC_PREREQ(2.57) # Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-acecad], AC_INIT([xf86-input-acecad],
1.4.0, [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-acecad) [xf86-input-acecad])
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.) AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS # Initialize libtool
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_CC
# 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 XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"]) # Checks for libraries.
AC_CHECK_LIB([sysfs], [sysfs_close_bus])
#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers]) # Checks for header files.
# AC_CHECK_HEADERS([linux/input.h sysfs/libsysfs.h])
#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
# [Build XInput support (default: yes)]),
# [XINPUT=$enableval],[XINPUT=yes])
#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
#if test "x$XINPUT" = "xyes" ; then
# AC_DEFINE(XINPUT,1,[Enable XInput support])
#fi
#
#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
# [Build XKB support (default: yes)]),
# [XKB=$enableval],[XKB=yes])
#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
#if test "x$XKB" = "xyes" ; then
# AC_DEFINE(XKB,1,[Enable XKB support])
#fi
# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
# Obtain compiler/linker options from server and required extensions
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto kbproto inputproto $REQUIRED_MODULES)
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir, AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR], AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]), [Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"], [moduledir="$withval"],
[moduledir="$libdir/xorg/modules"]) [moduledir="$libdir/xorg/modules"])
inputdir=${moduledir}/input inputdir=${moduledir}/input
AC_SUBST(inputdir) AC_SUBST(inputdir)
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_CHECK([linux/input.h],
[AC_DEFINE([LINUX_INPUT], [1], [Using the Linux input subsystem])]
)
AC_CHECK_HEADER(sysfs/libsysfs.h, HAVE_LIBSYSFS=yes, HAVE_LIBSYSFS=no)
if test x$HAVE_LIBSYSFS = xyes; then
AC_DEFINE(LINUX_SYSFS, 1, [Using sysfs to probe devices])
fi
AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
DRIVER_NAME=acecad DRIVER_NAME=acecad
AC_SUBST([DRIVER_NAME]) AC_SUBST([DRIVER_NAME])
AC_OUTPUT([Makefile src/Makefile man/Makefile]) AC_CONFIG_FILES([Makefile
man/Makefile
src/Makefile])
AC_OUTPUT

34
driver/xf86-input-acecad/man/Makefile.in
View File

@ -89,6 +89,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@ AR = @AR@
@ -125,8 +126,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
HAVE_LIBSYSFS_FALSE = @HAVE_LIBSYSFS_FALSE@ INSTALL_CMD = @INSTALL_CMD@
HAVE_LIBSYSFS_TRUE = @HAVE_LIBSYSFS_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -143,6 +143,18 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
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'
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
@ -163,6 +175,7 @@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@ XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@ XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ ac_ct_F77 = @ac_ct_F77@
@ -183,7 +196,6 @@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@ docdir = @docdir@
dvidir = @dvidir@ dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -221,18 +233,6 @@ CLEANFILES = $(driverman_DATA)
# Strings to replace in man pages # Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@ XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11 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 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
all: all-am all: all-am
@ -247,9 +247,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile $(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

8
driver/xf86-input-acecad/src/Makefile.am
View File

@ -24,15 +24,11 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end # -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 # _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. # 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_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
if HAVE_LIBSYSFS
@DRIVER_NAME@_drv_la_LIBADD = -lsysfs
endif
@DRIVER_NAME@_drv_ladir = @inputdir@ @DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h

28
driver/xf86-input-acecad/src/Makefile.in
View File

@ -34,6 +34,12 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # 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. # 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@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
@ -74,7 +80,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)" am__installdirs = "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)"
@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL) @DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(@DRIVER_NAME@_drv_la_LTLIBRARIES) LTLIBRARIES = $(@DRIVER_NAME@_drv_la_LTLIBRARIES)
@DRIVER_NAME@_drv_la_DEPENDENCIES = @DRIVER_NAME@_drv_la_LIBADD =
am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo
@DRIVER_NAME@_drv_la_OBJECTS = $(am_@DRIVER_NAME@_drv_la_OBJECTS) @DRIVER_NAME@_drv_la_OBJECTS = $(am_@DRIVER_NAME@_drv_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@ -99,6 +105,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@ AR = @AR@
@ -135,8 +142,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
HAVE_LIBSYSFS_FALSE = @HAVE_LIBSYSFS_FALSE@ INSTALL_CMD = @INSTALL_CMD@
HAVE_LIBSYSFS_TRUE = @HAVE_LIBSYSFS_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -153,6 +159,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
@ -173,6 +180,7 @@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@ XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@ XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ ac_ct_F77 = @ac_ct_F77@
@ -193,7 +201,6 @@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@ docdir = @docdir@
dvidir = @dvidir@ dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -222,16 +229,9 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
# 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)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@HAVE_LIBSYSFS_TRUE@@DRIVER_NAME@_drv_la_LIBADD = -lsysfs
@DRIVER_NAME@_drv_ladir = @inputdir@ @DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h
all: all-am all: all-am
@ -247,9 +247,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

156
driver/xf86-input-acecad/src/acecad.c
View File

@ -24,8 +24,11 @@
* *
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include <xorg-server.h>
#include <xorgVersion.h> #include <xorgVersion.h>
#define XORG_VERSION_BOTCHED XORG_VERSION_NUMERIC(1,4,0,0,0) #define XORG_VERSION_BOTCHED XORG_VERSION_NUMERIC(1,4,0,0,0)
#if XORG_VERSION_CURRENT >= XORG_VERSION_BOTCHED #if XORG_VERSION_CURRENT >= XORG_VERSION_BOTCHED
@ -38,7 +41,7 @@
* Standard Headers * Standard Headers
****************************************************************************/ ****************************************************************************/
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
#include <asm/types.h> #include <asm/types.h>
#include <linux/input.h> #include <linux/input.h>
#ifndef EV_SYN #ifndef EV_SYN
@ -68,9 +71,9 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
#include <fcntl.h> #include <fcntl.h>
#ifdef LINUX_SYSFS #ifdef HAVE_SYSFS_LIBSYSFS_H
#include <sysfs/libsysfs.h> #include <sysfs/libsysfs.h>
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
@ -103,6 +106,18 @@
/* max number of input events to read in one read call */ /* max number of input events to read in one read call */
#define MAX_EVENTS 50 #define MAX_EVENTS 50
static const char *default_options[] =
{
"BaudRate", "9600",
"StopBits", "1",
"DataBits", "8",
"Parity", "Odd",
"Vmin", "1",
"Vtime", "10",
"FlowControl", "Xoff",
NULL
};
_X_EXPORT InputDriverRec ACECAD = _X_EXPORT InputDriverRec ACECAD =
{ {
1, 1,
@ -111,7 +126,9 @@ _X_EXPORT InputDriverRec ACECAD =
AceCadPreInit, AceCadPreInit,
NULL, NULL,
NULL, NULL,
0 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
default_options
#endif
}; };
static XF86ModuleVersionInfo VersionRec = static XF86ModuleVersionInfo VersionRec =
@ -154,19 +171,7 @@ TearDownProc( pointer p )
{ {
} }
static const char *default_options[] = #ifdef HAVE_LINUX_INPUT_H
{
"BaudRate", "9600",
"StopBits", "1",
"DataBits", "8",
"Parity", "Odd",
"Vmin", "1",
"Vtime", "10",
"FlowControl", "Xoff",
NULL
};
#ifdef LINUX_INPUT
static int static int
IsUSBLine(int fd) IsUSBLine(int fd)
{ {
@ -207,13 +212,13 @@ fd_query_acecad(int fd, char *ace_name) {
static char ace_name_default[7] = "acecad"; static char ace_name_default[7] = "acecad";
#ifdef LINUX_SYSFS #ifdef HAVE_SYSFS_LIBSYSFS_H
static char usb_bus_name[4] = "usb"; static char usb_bus_name[4] = "usb";
static char acecad_driver_name[11] = "usb_acecad"; static char acecad_driver_name[11] = "usb_acecad";
#endif #endif
static Bool static Bool
AceCadAutoDevProbe(LocalDevicePtr local, int verb) AceCadAutoDevProbe(InputInfoPtr local, int verb)
{ {
/* We are trying to find the right eventX device */ /* We are trying to find the right eventX device */
int i = 0; int i = 0;
@ -224,7 +229,7 @@ AceCadAutoDevProbe(LocalDevicePtr local, int verb)
char fname[EV_DEV_NAME_MAXLEN]; char fname[EV_DEV_NAME_MAXLEN];
int np; int np;
#ifdef LINUX_SYSFS #ifdef HAVE_SYSFS_LIBSYSFS_H
struct sysfs_bus *usb_bus = NULL; struct sysfs_bus *usb_bus = NULL;
struct sysfs_driver *acecad_driver = NULL; struct sysfs_driver *acecad_driver = NULL;
struct sysfs_device *candidate = NULL; struct sysfs_device *candidate = NULL;
@ -326,28 +331,25 @@ ProbeFound:
#endif #endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
static int NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr dev, int flags);
static InputInfoPtr static InputInfoPtr
AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
{ {
LocalDevicePtr local = xf86AllocateInput(drv, 0); InputInfoPtr local = xf86AllocateInput(drv, 0);
AceCadPrivatePtr priv = xcalloc (1, sizeof(AceCadPrivateRec)); AceCadPrivatePtr priv = calloc (1, sizeof(AceCadPrivateRec));
int speed;
int msgtype;
char *s;
if ((!local) || (!priv)) if ((!local))
goto SetupProc_fail; goto SetupProc_fail;
memset(priv, 0, sizeof(AceCadPrivateRec));
local->name = dev->identifier; local->name = dev->identifier;
local->type_name = XI_TABLET; local->type_name = XI_TABLET;
local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; local->flags = XI86_SEND_DRAG_EVENTS;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
local->motion_history_proc = xf86GetMotionEvents; local->motion_history_proc = xf86GetMotionEvents;
#endif #endif
local->control_proc = NULL; local->control_proc = NULL;
local->close_proc = CloseProc;
local->switch_mode = NULL; local->switch_mode = NULL;
local->conversion_proc = ConvertProc; local->conversion_proc = ConvertProc;
local->reverse_conversion_proc = ReverseConvertProc; local->reverse_conversion_proc = ReverseConvertProc;
@ -355,18 +357,43 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
local->private = priv; local->private = priv;
local->private_flags = 0; local->private_flags = 0;
local->conf_idev = dev; local->conf_idev = dev;
local->device_control = DeviceControl;
/*local->always_core_feedback = 0;*/ /*local->always_core_feedback = 0;*/
xf86CollectInputOptions(local, default_options, NULL); xf86CollectInputOptions(local, default_options, NULL);
xf86OptionListReport(local->options); xf86OptionListReport(local->options);
if (NewAceCadPreInit(drv, local, flags) == Success)
return local;
SetupProc_fail:
return NULL;
}
static int
NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
#else
static int
AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
#endif
{
AceCadPrivatePtr priv = calloc (1, sizeof(AceCadPrivateRec));
int speed;
int msgtype;
char *s;
if (!priv)
return BadAlloc;
memset(priv, 0, sizeof(AceCadPrivateRec));
local->device_control = DeviceControl;
priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 ); priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 );
s = xf86FindOptionValue(local->options, "Device"); s = xf86FindOptionValue(local->options, "Device");
if (!s || (s && (xf86NameCmp(s, "auto-dev") == 0))) { if (!s || (s && (xf86NameCmp(s, "auto-dev") == 0))) {
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
priv->flags |= AUTODEV_FLAG; priv->flags |= AUTODEV_FLAG;
if (!AceCadAutoDevProbe(local, 0)) if (!AceCadAutoDevProbe(local, 0))
{ {
@ -387,7 +414,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
} }
xf86ErrorFVerb( 6, "tty port opened successfully\n" ); xf86ErrorFVerb( 6, "tty port opened successfully\n" );
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
if (IsUSBLine(local->fd)) { if (IsUSBLine(local->fd)) {
priv->flags |= USB_FLAG; priv->flags |= USB_FLAG;
@ -456,11 +483,11 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86Msg(msgtype, "%s is in %s mode\n", local->name, (priv->flags & ABSOLUTE_FLAG) ? "absolute" : "relative"); xf86Msg(msgtype, "%s is in %s mode\n", local->name, (priv->flags & ABSOLUTE_FLAG) ? "absolute" : "relative");
DBG (9, XisbTrace (priv->buffer, 1)); DBG (9, XisbTrace (priv->buffer, 1));
local->history_size = xf86SetIntOption(local->options , "HistorySize", 0);
xf86ProcessCommonOptions(local, local->options); xf86ProcessCommonOptions(local, local->options);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
local->flags |= XI86_CONFIGURED; local->flags |= XI86_CONFIGURED;
#endif
if (local->fd != -1) if (local->fd != -1)
{ {
@ -474,7 +501,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
} }
RemoveEnabledDevice (local->fd); RemoveEnabledDevice (local->fd);
local->fd = -1; local->fd = -1;
return local; return Success;
/* /*
* If something went wrong, cleanup and return NULL * If something went wrong, cleanup and return NULL
@ -485,12 +512,12 @@ SetupProc_fail:
if ((priv) && (priv->buffer)) if ((priv) && (priv->buffer))
XisbFree (priv->buffer); XisbFree (priv->buffer);
if (priv) { if (priv) {
xfree (priv); free (priv);
if (local) if (local)
local->private = NULL; local->private = NULL;
} }
xf86DeleteInput(local, 0); xf86DeleteInput(local, 0);
return NULL; return BadAlloc;
} }
static Bool static Bool
@ -524,7 +551,7 @@ static Bool
DeviceOn (DeviceIntPtr dev) DeviceOn (DeviceIntPtr dev)
{ {
char buffer[256]; char buffer[256];
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
xf86MsgVerb(X_INFO, 4, "%s Device On\n", local->name); xf86MsgVerb(X_INFO, 4, "%s Device On\n", local->name);
@ -534,7 +561,7 @@ DeviceOn (DeviceIntPtr dev)
{ {
xf86Msg(X_WARNING, "%s: cannot open input device %s: %s\n", local->name, xf86FindOptionValue(local->options, "Device"), strerror(errno)); xf86Msg(X_WARNING, "%s: cannot open input device %s: %s\n", local->name, xf86FindOptionValue(local->options, "Device"), strerror(errno));
priv->flags &= ~AVAIL_FLAG; priv->flags &= ~AVAIL_FLAG;
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
if ((priv->flags & AUTODEV_FLAG) && AceCadAutoDevProbe(local, 4)) if ((priv->flags & AUTODEV_FLAG) && AceCadAutoDevProbe(local, 4))
local->fd = xf86OpenSerial(local->options); local->fd = xf86OpenSerial(local->options);
if (local->fd == -1) if (local->fd == -1)
@ -567,7 +594,7 @@ DeviceOn (DeviceIntPtr dev)
static Bool static Bool
DeviceOff (DeviceIntPtr dev) DeviceOff (DeviceIntPtr dev)
{ {
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
xf86MsgVerb(X_INFO, 4, "%s Device Off\n", local->name); xf86MsgVerb(X_INFO, 4, "%s Device Off\n", local->name);
@ -592,7 +619,7 @@ DeviceOff (DeviceIntPtr dev)
static Bool static Bool
DeviceClose (DeviceIntPtr dev) DeviceClose (DeviceIntPtr dev)
{ {
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
xf86MsgVerb(X_INFO, 4, "%s Device Close\n", local->name); xf86MsgVerb(X_INFO, 4, "%s Device Close\n", local->name);
@ -602,7 +629,7 @@ DeviceClose (DeviceIntPtr dev)
static void static void
ControlProc(DeviceIntPtr dev, PtrCtrl *ctrl) ControlProc(DeviceIntPtr dev, PtrCtrl *ctrl)
{ {
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
xf86MsgVerb(X_INFO, 4, "%s Control Proc\n", local->name); xf86MsgVerb(X_INFO, 4, "%s Control Proc\n", local->name);
} }
@ -611,9 +638,10 @@ static Bool
DeviceInit (DeviceIntPtr dev) DeviceInit (DeviceIntPtr dev)
{ {
int rx, ry; int rx, ry;
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
unsigned char map[] = {0, 1, 2, 3}; unsigned char map[] = {0, 1, 2, 3};
int history_size;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[3]; Atom btn_labels[3];
Atom axes_labels[3]; Atom axes_labels[3];
@ -659,6 +687,7 @@ DeviceInit (DeviceIntPtr dev)
return !Success; return !Success;
} }
history_size = xf86SetIntOption(local->options , "HistorySize", 0);
/* 3 axes */ /* 3 axes */
if (InitValuatorClassDeviceStruct (dev, 3, if (InitValuatorClassDeviceStruct (dev, 3,
@ -668,7 +697,7 @@ DeviceInit (DeviceIntPtr dev)
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents, xf86GetMotionEvents,
#endif #endif
local->history_size, history_size,
((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity)
== FALSE) == FALSE)
{ {
@ -691,7 +720,11 @@ DeviceInit (DeviceIntPtr dev)
#endif #endif
1000, /* resolution */ 1000, /* resolution */
0, /* min_res */ 0, /* min_res */
1000); /* max_res */ 1000 /* max_res */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
, Absolute
#endif
);
InitValuatorAxisStruct(dev, InitValuatorAxisStruct(dev,
1, 1,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@ -705,7 +738,11 @@ DeviceInit (DeviceIntPtr dev)
#endif #endif
1000, /* resolution */ 1000, /* resolution */
0, /* min_res */ 0, /* min_res */
1000); /* max_res */ 1000 /* max_res */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
, Absolute
#endif
);
InitValuatorAxisStruct(dev, InitValuatorAxisStruct(dev,
2, 2,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@ -715,7 +752,11 @@ DeviceInit (DeviceIntPtr dev)
priv->acecadMaxZ, /* max val */ priv->acecadMaxZ, /* max val */
1000, /* resolution */ 1000, /* resolution */
0, /* min_res */ 0, /* min_res */
1000); /* max_res */ 1000 /* max_res */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
, Absolute
#endif
);
} }
@ -752,7 +793,7 @@ DeviceInit (DeviceIntPtr dev)
} }
static void static void
ReadInput (LocalDevicePtr local) ReadInput (InputInfoPtr local)
{ {
int x, y, z; int x, y, z;
int prox, buttons; int prox, buttons;
@ -851,10 +892,10 @@ ReadInput (LocalDevicePtr local)
/*xf86Msg(X_INFO, "ACECAD Tablet Sortie Read Input\n");*/ /*xf86Msg(X_INFO, "ACECAD Tablet Sortie Read Input\n");*/
} }
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
#define set_bit(byte,nb,bit) (bit ? byte | (1<<nb) : byte & (~(1<<nb))) #define set_bit(byte,nb,bit) (bit ? byte | (1<<nb) : byte & (~(1<<nb)))
static void static void
USBReadInput (LocalDevicePtr local) USBReadInput (InputInfoPtr local)
{ {
int len; int len;
struct input_event * event; struct input_event * event;
@ -1008,18 +1049,13 @@ USBReadInput (LocalDevicePtr local)
} }
#endif #endif
static void
CloseProc (LocalDevicePtr local)
{
}
/* /*
* The ConvertProc function may need to be tailored for your device. * The ConvertProc function may need to be tailored for your device.
* This function converts the device's valuator outputs to x and y coordinates * This function converts the device's valuator outputs to x and y coordinates
* to simulate mouse events. * to simulate mouse events.
*/ */
static Bool static Bool
ConvertProc (LocalDevicePtr local, int first, int num, ConvertProc (InputInfoPtr local, int first, int num,
int v0, int v1, int v2, int v3, int v4, int v5, int v0, int v1, int v2, int v3, int v4, int v5,
int *x, int *y) int *x, int *y)
{ {
@ -1036,7 +1072,7 @@ ConvertProc (LocalDevicePtr local, int first, int num,
static Bool static Bool
ReverseConvertProc (LocalDevicePtr local, ReverseConvertProc (InputInfoPtr local,
int x, int y, int x, int y,
int *valuators) int *valuators)
{ {
@ -1100,9 +1136,9 @@ QueryHardware (AceCadPrivatePtr priv)
#define OFF(x) ((x)%BITS_PER_LONG) #define OFF(x) ((x)%BITS_PER_LONG)
#define LONG(x) ((x)/BITS_PER_LONG) #define LONG(x) ((x)/BITS_PER_LONG)
#ifdef LINUX_INPUT #ifdef HAVE_LINUX_INPUT_H
static Bool static Bool
USBQueryHardware (LocalDevicePtr local) USBQueryHardware (InputInfoPtr local)
{ {
AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private; AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
unsigned long bit[EV_MAX][NBITS(KEY_MAX)]; unsigned long bit[EV_MAX][NBITS(KEY_MAX)];

20
driver/xf86-input-acecad/src/acecad.h
View File

@ -100,21 +100,23 @@ static Bool DeviceOn (DeviceIntPtr);
static Bool DeviceOff (DeviceIntPtr); static Bool DeviceOff (DeviceIntPtr);
static Bool DeviceClose (DeviceIntPtr); static Bool DeviceClose (DeviceIntPtr);
static Bool DeviceInit (DeviceIntPtr); static Bool DeviceInit (DeviceIntPtr);
static void ReadInput (LocalDevicePtr); static void ReadInput (InputInfoPtr);
static void CloseProc (LocalDevicePtr); static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *);
static Bool ConvertProc (LocalDevicePtr, int, int, int, int, int, int, int, int, int *, int *); static Bool ReverseConvertProc(InputInfoPtr , int , int , int*);
static Bool ReverseConvertProc(LocalDevicePtr , int , int , int*);
static Bool QueryHardware (AceCadPrivatePtr); static Bool QueryHardware (AceCadPrivatePtr);
static void NewPacket (AceCadPrivatePtr priv); static void NewPacket (AceCadPrivatePtr priv);
static Bool AceCadGetPacket (AceCadPrivatePtr); static Bool AceCadGetPacket (AceCadPrivatePtr);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
static InputInfoPtr AceCadPreInit(InputDriverPtr, IDevPtr , int); static InputInfoPtr AceCadPreInit(InputDriverPtr, IDevPtr , int);
#ifdef LINUX_INPUT #else
static void USBReadInput (LocalDevicePtr); static int AceCadPreInit(InputDriverPtr, InputInfoPtr , int);
static Bool USBQueryHardware (LocalDevicePtr); #endif
#ifdef HAVE_LINUX_INPUT_H
static void USBReadInput (InputInfoPtr);
static Bool USBQueryHardware (InputInfoPtr);
static int IsUSBLine(int); static int IsUSBLine(int);
static Bool fd_query_acecad(int, char*); static Bool fd_query_acecad(int, char*);
static Bool AceCadAutoDevProbe(LocalDevicePtr, int); static Bool AceCadAutoDevProbe(InputInfoPtr, int);
#endif #endif
#endif #endif