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

Update to xf86-input-penmount 1.5.0

Browse Source
This commit is contained in:
matthieu 2011-11-05 13:54:08 +00:00
parent 6a9eba6ba5
commit 0dd14d82d9
12 changed files with 1687 additions and 825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
driver/xf86-input-penmount/ChangeLog
View File

@ -1,3 +1,189 @@
commit 30bf5a6bb20b8ad703f305bcde0ade2a99328b6c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 28 10:38:27 2011 +1000
penmount 1.5.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f0158bd0eb8efe2e051bb00d98d17b6071224062
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 28 10:37:53 2011 +1000
Require server 1.10 instead of manual ABI checks
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6658e9ad22923e8bb90ff84c079e870a8e416976
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:34:06 2010 +1000
Support (and require) input ABI 12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 55f9e93bb67bda172de9ba71c465d2fbd0a80410
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:33:11 2010 +1000
Move default_options up
no functional changes, prep work for ABI 12
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 79c7b3641c9b42ff13c0472707d20133707aa96f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:30:08 2010 +1000
Add TS_Raw and TS_Scaled defines
The use of these is driver-internal, they used to be in the server but not
since ABI 12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 4ac7e6e92ae7ae935b1a79aaa63a0343bb6ed08d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:29:23 2010 +1000
Drop driver-specific motion history size handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit ad6785f44be7d5bc6ba27ea3e05a688d9b672ddd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:23:40 2010 +1000
Drop write-only flags POINTER_CAPABLE and SEND_DRAG_EVENTS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 0fbd6613c9eb7fbf1e820982551380652e040233
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:23:07 2010 +1000
Drop close_proc, conversion_proc.
Both aren't called by the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 84fc05ccc0a0477d9e11eb3486d1a64735ae7050
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:20:05 2010 +1000
Fix compiler warning, unused variable "map".
xf86PM.c: In function 'DeviceControl':
xf86PM.c:530:16: warning: unused variable 'map'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit f2bd17021c5efb9118b813a6586da423aa5d2f4d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:19:20 2010 +1000
Drop libc wrappers for free, malloc
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 22cd19a9e91fcd722cc30a3b8d21725512169219
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:17:38 2010 +1000
unifdef XFree86LOADER
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit f3c472b4b5596685c1c094a51876dcc06be3a968
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:17:24 2010 +1000
Require server 1.9, drop earlier ABI support
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
commit 8d4b4b7a827d9dd48d598c39ba5d3229dc45d3d4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:22:16 2010 +1000
Purge CVS tags
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 68a9e64e780f2ac01a6e6700e271dcaebe7f7e86
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 14:15:56 2010 +1000
Bump to 1.4.99
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af7e7c0aa603b67b12e4046bcda9bc58026cd82b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Oct 27 22:21:20 2010 -0700
Remove refcnt field from InputDriverRec.
Wasn't used in the server and is now removed.
Fixes compiler error:
"xf86PM.c", line 59: too many struct/union initializers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 63d1539957f1618af8ebca520f61ca712070d950
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 18 19:39:08 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
Use the appropriate platform version of sed
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 6dab63a36c5b89fa2de1128538b88e2bbce9a34c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Apr 12 13:36:10 2010 -0400
config: disable inadvertently re-enabled static library creation
AC_DISABLE_STATIC must be places before AC_PROG_LIBTOOL,
requirement which is not documented in libtool.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit a1d3a8a54d96b23adf1dd819726e80be1bc0eebb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 6 09:03:20 2010 -0500
config: remove unused sdkdir variable
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 5902c15cac1ee0c163256e132f85b8720aed845e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Mar 5 11:57:47 2010 -0500
Configuration upgrades, .gitignore, INSTALL file
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f
Author: Julien Cristau <jcristau@debian.org> Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 3 23:41:39 2010 +0100 Date: Wed Mar 3 23:41:39 2010 +0100

291
driver/xf86-input-penmount/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.

10
driver/xf86-input-penmount/Makefile.am
View File

@ -18,13 +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
CLEANFILES = ChangeLog MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = ChangeLog .PHONY: ChangeLog INSTALL
.PHONY: ChangeLog INSTALL:
$(INSTALL_CMD)
ChangeLog: ChangeLog:
$(CHANGELOG_CMD) $(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL

28
driver/xf86-input-penmount/Makefile.in
View File

@ -42,9 +42,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -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
@ -151,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@
@ -167,10 +168,12 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ 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@
@ -219,10 +222,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
CLEANFILES = ChangeLog MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = ChangeLog
all: config.h all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -464,6 +465,9 @@ distdir: $(DISTFILES)
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -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 -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -583,7 +587,6 @@ install-strip:
mostlyclean-generic: mostlyclean-generic:
clean-generic: clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic: distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -591,6 +594,7 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am clean-am: clean-generic clean-libtool mostlyclean-am
@ -646,7 +650,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \ check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ 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-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \ distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \ distuninstallcheck dvi dvi-am html html-am info info-am \
@ -658,11 +662,15 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am tags tags-recursive uninstall uninstall-am uninstall-info-am
.PHONY: ChangeLog INSTALL
.PHONY: ChangeLog INSTALL:
$(INSTALL_CMD)
ChangeLog: ChangeLog:
$(CHANGELOG_CMD) $(CHANGELOG_CMD)
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:

737
driver/xf86-input-penmount/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

957
driver/xf86-input-penmount/configure vendored
View File

File diff suppressed because it is too large Load Diff

55
driver/xf86-input-penmount/configure.ac
View File

@ -20,37 +20,39 @@
# #
# 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-penmount], AC_INIT([xf86-input-penmount],
1.4.1, [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-penmount) [xf86-input-penmount])
# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
DRIVER_NAME=penmount # Initialize libtool
AC_SUBST([DRIVER_NAME])
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_CC
XORG_DEFAULT_OPTIONS
# Initialize Autoheader
AH_TOP([#include "xorg-server.h"]) AH_TOP([#include "xorg-server.h"])
# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
# Require 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
# 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"])
@ -62,12 +64,13 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages # Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries. # Define an Automake variable for the driver name
DRIVER_NAME=penmount
AC_SUBST([DRIVER_NAME])
# Checks for header files. AC_CONFIG_FILES([Makefile
AC_HEADER_STDC man/Makefile
src/Makefile])
AC_OUTPUT([Makefile src/Makefile man/Makefile]) AC_OUTPUT

27
driver/xf86-input-penmount/man/Makefile.am
View File

@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.3 2008/08/23 15:27:33 matthieu Exp $ # $Id: Makefile.am,v 1.4 2011/11/05 13:54:08 matthieu Exp $
# #
# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Copyright 2005 Sun Microsystems, Inc. All rights reserved.
# #
@ -26,34 +26,13 @@
# #
drivermandir = $(DRIVER_MAN_DIR) drivermandir = $(DRIVER_MAN_DIR)
driverman_PRE = @DRIVER_NAME@.man driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA) CLEANFILES = $(driverman_DATA)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX): .man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

36
driver/xf86-input-penmount/man/Makefile.in
View File

@ -14,7 +14,7 @@
@SET_MAKE@ @SET_MAKE@
# $Id: Makefile.in,v 1.4 2010/05/24 08:44:00 matthieu Exp $ # $Id: Makefile.in,v 1.5 2011/11/05 13:54:08 matthieu Exp $
# #
# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Copyright 2005 Sun Microsystems, Inc. All rights reserved.
# #
@ -50,9 +50,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -144,6 +144,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@
@ -157,13 +158,15 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SED = sed SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ 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@
@ -217,22 +220,6 @@ driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA) CLEANFILES = $(driverman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
all: all-am all: all-am
@ -247,9 +234,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 \
@ -418,8 +405,9 @@ uninstall-am: uninstall-drivermanDATA uninstall-info-am
uninstall-info-am uninstall-info-am
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX): .man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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:

13
driver/xf86-input-penmount/src/Makefile.in
View File

@ -43,9 +43,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -153,6 +153,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@
@ -169,10 +170,12 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ 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@
@ -245,9 +248,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 \

161
driver/xf86-input-penmount/src/xf86PM.c
View File

@ -37,7 +37,6 @@
* in this Software without prior written authorization from Metro Link. * in this Software without prior written authorization from Metro Link.
* *
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.c,v 1.2 2000/08/11 19:10:46 dawes Exp $ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -55,6 +54,26 @@
#include <string.h> #include <string.h>
#include "xf86PM.h" #include "xf86PM.h"
#define TS_Raw 60
#define TS_Scaled 61
/*
* Be sure to set vmin appropriately for your device's protocol. You want to
* read a full packet before returning
*/
static char *default_options[] =
{
/* "Device", "/dev/ttyS1",*/
"BaudRate", "19200",
"StopBits", "1",
"DataBits", "8",
"Parity", "None",
"Vmin", "3",
"Vtime", "1",
"FlowControl", "None",
NULL,
};
_X_EXPORT InputDriverRec PENMOUNT = { _X_EXPORT InputDriverRec PENMOUNT = {
1, 1,
"penmount", "penmount",
@ -62,13 +81,9 @@ _X_EXPORT InputDriverRec PENMOUNT = {
PenMountPreInit, PenMountPreInit,
/*PenMountUnInit*/NULL, /*PenMountUnInit*/NULL,
NULL, NULL,
0 default_options
}; };
#ifdef XFree86LOADER
static XF86ModuleVersionInfo VersionRec = static XF86ModuleVersionInfo VersionRec =
{ {
"penmount", "penmount",
@ -100,27 +115,6 @@ _X_EXPORT XF86ModuleData penmountModuleData = {
NULL NULL
}; };
#endif /* XFree86LOADER */
/*
* Be sure to set vmin appropriately for your device's protocol. You want to
* read a full packet before returning
*/
static const char *default_options[] =
{
/* "Device", "/dev/ttyS1",*/
"BaudRate", "19200",
"StopBits", "1",
"DataBits", "8",
"Parity", "None",
"Vmin", "3",
"Vtime", "1",
"FlowControl", "None",
NULL,
};
/***************************************************************************** /*****************************************************************************
* Function Definitions * Function Definitions
****************************************************************************/ ****************************************************************************/
@ -145,9 +139,7 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
* Device reports button press for 1 button. * Device reports button press for 1 button.
*/ */
if (InitButtonClassDeviceStruct (dev, 1, if (InitButtonClassDeviceStruct (dev, 1,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
&btn_label, &btn_label,
#endif
map) == FALSE) map) == FALSE)
{ {
ErrorF ("Unable to allocate PenMount ButtonClassDeviceStruct\n"); ErrorF ("Unable to allocate PenMount ButtonClassDeviceStruct\n");
@ -158,14 +150,8 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
* Device reports motions on 2 axes in absolute coordinates. * Device reports motions on 2 axes in absolute coordinates.
* Axes min and max values are reported in raw coordinates. * Axes min and max values are reported in raw coordinates.
*/ */
if (InitValuatorClassDeviceStruct (dev, 2, if (InitValuatorClassDeviceStruct (dev, 2, axis_labels,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 GetMotionHistorySize(), Absolute) == FALSE)
axis_labels,
#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
pInfo->history_size, Absolute) == FALSE)
{ {
ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n"); ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n");
return !Success; return !Success;
@ -194,22 +180,18 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo)
min_y = 0; min_y = 0;
} }
InitValuatorAxisStruct (dev, 0, InitValuatorAxisStruct (dev, 0, axis_labels[0],
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axis_labels[0],
#endif
min_x, max_x, min_x, max_x,
9500, 9500,
0 /* min_res */ , 0 /* min_res */ ,
9500 /* max_res */ ); 9500 /* max_res */,
InitValuatorAxisStruct (dev, 1, Absolute);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 InitValuatorAxisStruct (dev, 1, axis_labels[1],
axis_labels[1],
#endif
min_y, max_y, min_y, max_y,
10500, 10500,
0 /* min_res */ , 0 /* min_res */ ,
10500 /* max_res */ ); 10500 /* max_res */,
Absolute);
} }
if (InitProximityClassDeviceStruct (dev) == FALSE) if (InitProximityClassDeviceStruct (dev) == FALSE)
@ -432,20 +414,14 @@ DMC9512_ProcessDeviceOn(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr
return Success; return Success;
} }
static InputInfoPtr static int
PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{ {
InputInfoPtr pInfo; PenMountPrivatePtr priv = calloc (1, sizeof (PenMountPrivateRec));
PenMountPrivatePtr priv = xcalloc (1, sizeof (PenMountPrivateRec));
char *s; char *s;
if (!priv) if (!priv)
return NULL; return BadAlloc;
if (!(pInfo = xf86AllocateInput(drv, 0))) {
xfree(priv);
return NULL;
}
priv->min_x = 0; priv->min_x = 0;
priv->max_x = 1024; priv->max_x = 1024;
@ -466,16 +442,8 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->device_control = DeviceControl; pInfo->device_control = DeviceControl;
pInfo->read_input = ReadInput; pInfo->read_input = ReadInput;
pInfo->control_proc = ControlProc; pInfo->control_proc = ControlProc;
pInfo->close_proc = CloseProc;
pInfo->switch_mode = SwitchMode; pInfo->switch_mode = SwitchMode;
pInfo->conversion_proc = ConvertProc;
pInfo->dev = NULL;
pInfo->private = priv; pInfo->private = priv;
pInfo->private_flags = 0;
pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
pInfo->conf_idev = dev;
xf86CollectInputOptions(pInfo, default_options, NULL);
xf86OptionListReport( pInfo->options ); xf86OptionListReport( pInfo->options );
@ -526,22 +494,20 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
/* this results in an xstrdup that must be freed later */ /* this results in an xstrdup that must be freed later */
pInfo->name = xf86SetStrOption( pInfo->options, "DeviceName", "PenMount"); pInfo->name = xf86SetStrOption( pInfo->options, "DeviceName", "PenMount");
xf86ProcessCommonOptions(pInfo, pInfo->options);
pInfo->flags |= XI86_CONFIGURED; return Success;
return (pInfo);
SetupProc_fail: SetupProc_fail:
if ((pInfo) && (pInfo->fd)) if ((pInfo) && (pInfo->fd))
xf86CloseSerial (pInfo->fd); xf86CloseSerial (pInfo->fd);
if ((pInfo) && (pInfo->name)) if ((pInfo) && (pInfo->name))
xfree (pInfo->name); free (pInfo->name);
if ((priv) && (priv->buffer)) if ((priv) && (priv->buffer))
XisbFree (priv->buffer); XisbFree (priv->buffer);
if (priv) if (priv)
xfree (priv); free (priv);
return (pInfo); return BadValue;
} }
static Bool static Bool
@ -549,8 +515,6 @@ DeviceControl (DeviceIntPtr dev, int mode)
{ {
InputInfoPtr pInfo = dev->public.devicePrivate; InputInfoPtr pInfo = dev->public.devicePrivate;
PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private); PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private);
unsigned char map[] =
{0, 1};
switch (mode) switch (mode)
{ {
@ -895,15 +859,6 @@ ControlProc (InputInfoPtr pInfo, xDeviceCtl * control)
return (Success); return (Success);
} }
/*
* the CloseProc should not need to be tailored to your device
*/
static void
CloseProc (InputInfoPtr pInfo)
{
}
/* /*
* The SwitchMode function may need to be tailored for your device * The SwitchMode function may need to be tailored for your device
*/ */
@ -919,52 +874,10 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
priv->reporting_mode = mode; priv->reporting_mode = mode;
return (Success); return (Success);
} }
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
{
xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
return (Success);
}
#endif
else else
return (!Success); return (!Success);
} }
/*
* The ConvertProc function may need to be tailored for your device.
* This function converts the device's valuator outputs to x and y coordinates
* to simulate mouse events.
*/
static Bool
ConvertProc (InputInfoPtr pInfo,
int first,
int num,
int v0,
int v1,
int v2,
int v3,
int v4,
int v5,
int *x,
int *y)
{
PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private);
if (priv->reporting_mode == TS_Raw)
{
*x = xf86ScaleAxis (v0, 0, priv->screen_width, priv->min_x,
priv->max_x);
*y = xf86ScaleAxis (v1, 0, priv->screen_height, priv->min_y,
priv->max_y);
}
else
{
*x = v0;
*y = v1;
}
return (TRUE);
}
/* /*
* the QueryHardware fuction should be tailored to your device to * the QueryHardware fuction should be tailored to your device to
* verify the device is attached and functional and perform any * verify the device is attached and functional and perform any

7
driver/xf86-input-penmount/src/xf86PM.h
View File

@ -27,7 +27,6 @@
* in this Software without prior written authorization from Metro Link. * in this Software without prior written authorization from Metro Link.
* *
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.h,v 1.2 1999/08/22 05:57:37 dawes Exp $ */
#ifndef _PENMOUNT_H_ #ifndef _PENMOUNT_H_
#define _PENMOUNT_H_ #define _PENMOUNT_H_
@ -86,16 +85,14 @@ static Bool DeviceControl (DeviceIntPtr, int);
static void ReadInput (InputInfoPtr); static void ReadInput (InputInfoPtr);
static void DMC9000_ReadInput (InputInfoPtr); static void DMC9000_ReadInput (InputInfoPtr);
static int ControlProc (InputInfoPtr, xDeviceCtl *); static int ControlProc (InputInfoPtr, xDeviceCtl *);
static void CloseProc (InputInfoPtr);
static int SwitchMode (ClientPtr, DeviceIntPtr, int); static int SwitchMode (ClientPtr, DeviceIntPtr, int);
static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *);
static Bool QueryHardware (PenMountPrivatePtr); static Bool QueryHardware (PenMountPrivatePtr);
static Bool PenMountGetPacket (PenMountPrivatePtr priv); static Bool PenMountGetPacket (PenMountPrivatePtr priv);
static Bool DMC9000_PenMountGetPacket (PenMountPrivatePtr priv); static Bool DMC9000_PenMountGetPacket (PenMountPrivatePtr priv);
static Bool PenMountSendPacket (PenMountPrivatePtr priv, unsigned char *buf, int len ); static Bool PenMountSendPacket (PenMountPrivatePtr priv, unsigned char *buf, int len );
static InputInfoPtr static int
PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags); PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
static void static void
PenMountPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl); PenMountPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl);