Update xf86-input-elographics to 1.3.0
This commit is contained in:
matthieu
parent
4bd8172e0b
commit
e4b75af760
@ -1,3 +1,97 @@
|
||||
commit 7c324ede65c17e5c747b28f40b9fd19f21b79d9d
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Mon Jun 27 14:48:11 2011 +1000
|
||||
|
||||
elographics 1.3.0
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 6c9a801a5c1d7e694ff7f4f097599f2b96357982
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Mon Jun 27 14:47:32 2011 +1000
|
||||
|
||||
Require server 1.10
|
||||
|
||||
And remove the manual input ABI check.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 6fd22a9d64f07a480d177e877189a3a3ebf7cb90
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:34:46 2010 +1000
|
||||
|
||||
Support input ABI 12
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 3dac6ffa77c046b3d754f0a1105fe8ecc7377911
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:33:55 2010 +1000
|
||||
|
||||
Remove refcount field, dropped from the server
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 447f547fbb7d11ec56ea578292908192175b3828
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:29:36 2010 +1000
|
||||
|
||||
Drop close_proc, conversion_proc, reverse_conversion_proc
|
||||
|
||||
All three are not called by the server anymore.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 61b249e75e357fc8974e3892517f251ecf36fda5
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:27:24 2010 +1000
|
||||
|
||||
Drop driver-specific motion history size handling.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 8d90c971582b90c96901036203841064cb9f7a84
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:27:05 2010 +1000
|
||||
|
||||
Require server 1.9, drop earlier ABI support
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 7f35fe7d26c48622896fec8cab475f510601802b
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:23:15 2010 +1000
|
||||
|
||||
Replace LocalDevicePtr with InputInfoPtr
|
||||
|
||||
Both describe the same struct, LocalDevicePtr has been removed from the
|
||||
server.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 0f3df8923d4d48b24b565becefa12d676c48a61a
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:21:23 2010 +1000
|
||||
|
||||
unifdef XFree86LOADER
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
|
||||
commit 787c1a94dec338da8585b7fad37f1b5fc973b2ad
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Dec 3 09:35:06 2010 +1000
|
||||
|
||||
Bump to 1.2.99
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 607aed76023e71509b260dc23da7c150c1eff825
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed Jun 9 12:18:14 2010 +1000
|
||||
|
||||
@ -42,9 +42,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = .
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
|
||||
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
@ -55,7 +55,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog config.guess \
|
||||
config.sub depcomp install-sh ltmain.sh missing
|
||||
@ -149,6 +149,7 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -169,6 +170,7 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
|
||||
762
driver/xf86-input-elographics/aclocal.m4
vendored
762
driver/xf86-input-elographics/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
539
driver/xf86-input-elographics/configure
vendored
539
driver/xf86-input-elographics/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.62 for xf86-input-elographics 1.2.4.
|
||||
# Generated by GNU Autoconf 2.62 for xf86-input-elographics 1.3.0.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xf86-input-elographics'
|
||||
PACKAGE_TARNAME='xf86-input-elographics'
|
||||
PACKAGE_VERSION='1.2.4'
|
||||
PACKAGE_STRING='xf86-input-elographics 1.2.4'
|
||||
PACKAGE_VERSION='1.3.0'
|
||||
PACKAGE_STRING='xf86-input-elographics 1.3.0'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
ac_unique_file="Makefile.am"
|
||||
@ -915,6 +915,8 @@ FILE_MAN_DIR
|
||||
MISC_MAN_DIR
|
||||
DRIVER_MAN_DIR
|
||||
ADMIN_MAN_DIR
|
||||
XORG_MAN_PAGE
|
||||
MAN_SUBSTS
|
||||
CHANGELOG_CMD
|
||||
LIBOBJS
|
||||
LTLIBOBJS'
|
||||
@ -931,7 +933,6 @@ enable_libtool_lock
|
||||
with_pic
|
||||
with_tags
|
||||
with_xorg_module_dir
|
||||
with_release_version
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
@ -1503,7 +1504,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xf86-input-elographics 1.2.4 to adapt to many kinds of systems.
|
||||
\`configure' configures xf86-input-elographics 1.3.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1574,7 +1575,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xf86-input-elographics 1.2.4:";;
|
||||
short | recursive ) echo "Configuration of xf86-input-elographics 1.3.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1602,8 +1603,6 @@ Optional Packages:
|
||||
--with-xorg-module-dir=DIR
|
||||
Default xorg module directory
|
||||
[default=$libdir/xorg/modules]
|
||||
--with-release-version=STRING
|
||||
Use release version string in package name
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
@ -1689,7 +1688,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xf86-input-elographics configure 1.2.4
|
||||
xf86-input-elographics configure 1.3.0
|
||||
generated by GNU Autoconf 2.62
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@ -1703,7 +1702,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xf86-input-elographics $as_me 1.2.4, which was
|
||||
It was created by xf86-input-elographics $as_me 1.3.0, which was
|
||||
generated by GNU Autoconf 2.62. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2354,7 +2353,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xf86-input-elographics'
|
||||
VERSION='1.2.4'
|
||||
VERSION='1.3.0'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -4428,7 +4427,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4431 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4430 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7536,11 +7535,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7538: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7543: \$? = $ac_status" >&5
|
||||
echo "$as_me:7542: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7826,11 +7825,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7829: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7828: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7833: \$? = $ac_status" >&5
|
||||
echo "$as_me:7832: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7930,11 +7929,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7933: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7932: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7937: \$? = $ac_status" >&5
|
||||
echo "$as_me:7936: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -10330,7 +10329,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10333 "configure"
|
||||
#line 10332 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10430,7 +10429,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10433 "configure"
|
||||
#line 10432 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12839,11 +12838,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12842: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12841: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12846: \$? = $ac_status" >&5
|
||||
echo "$as_me:12845: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -12943,11 +12942,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12946: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12945: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12950: \$? = $ac_status" >&5
|
||||
echo "$as_me:12949: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -14526,11 +14525,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14529: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14528: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14533: \$? = $ac_status" >&5
|
||||
echo "$as_me:14532: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -14630,11 +14629,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14633: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14632: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14637: \$? = $ac_status" >&5
|
||||
echo "$as_me:14636: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -16845,11 +16844,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16848: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16847: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16852: \$? = $ac_status" >&5
|
||||
echo "$as_me:16851: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17135,11 +17134,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17138: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17137: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17142: \$? = $ac_status" >&5
|
||||
echo "$as_me:17141: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17239,11 +17238,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17242: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17241: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17246: \$? = $ac_status" >&5
|
||||
echo "$as_me:17245: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -20722,19 +20721,329 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast -Wformat=2"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
|
||||
$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
|
||||
if test "${ac_cv_prog_cc_c99+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
|
||||
ac_cv_prog_cc_c99=no
|
||||
ac_save_CC=$CC
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <wchar.h>
|
||||
#include <stdio.h>
|
||||
|
||||
// Check varargs macros. These examples are taken from C99 6.10.3.5.
|
||||
#define debug(...) fprintf (stderr, __VA_ARGS__)
|
||||
#define showlist(...) puts (#__VA_ARGS__)
|
||||
#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
|
||||
static void
|
||||
test_varargs_macros (void)
|
||||
{
|
||||
int x = 1234;
|
||||
int y = 5678;
|
||||
debug ("Flag");
|
||||
debug ("X = %d\n", x);
|
||||
showlist (The first, second, and third items.);
|
||||
report (x>y, "x is %d but y is %d", x, y);
|
||||
}
|
||||
|
||||
// Check long long types.
|
||||
#define BIG64 18446744073709551615ull
|
||||
#define BIG32 4294967295ul
|
||||
#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
|
||||
#if !BIG_OK
|
||||
your preprocessor is broken;
|
||||
#endif
|
||||
#if BIG_OK
|
||||
#else
|
||||
your preprocessor is broken;
|
||||
#endif
|
||||
static long long int bignum = -9223372036854775807LL;
|
||||
static unsigned long long int ubignum = BIG64;
|
||||
|
||||
struct incomplete_array
|
||||
{
|
||||
int datasize;
|
||||
double data[];
|
||||
};
|
||||
|
||||
struct named_init {
|
||||
int number;
|
||||
const wchar_t *name;
|
||||
double average;
|
||||
};
|
||||
|
||||
typedef const char *ccp;
|
||||
|
||||
static inline int
|
||||
test_restrict (ccp restrict text)
|
||||
{
|
||||
// See if C++-style comments work.
|
||||
// Iterate through items via the restricted pointer.
|
||||
// Also check for declarations in for loops.
|
||||
for (unsigned int i = 0; *(text+i) != '\0'; ++i)
|
||||
continue;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Check varargs and va_copy.
|
||||
static void
|
||||
test_varargs (const char *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start (args, format);
|
||||
va_list args_copy;
|
||||
va_copy (args_copy, args);
|
||||
|
||||
const char *str;
|
||||
int number;
|
||||
float fnumber;
|
||||
|
||||
while (*format)
|
||||
{
|
||||
switch (*format++)
|
||||
{
|
||||
case 's': // string
|
||||
str = va_arg (args_copy, const char *);
|
||||
break;
|
||||
case 'd': // int
|
||||
number = va_arg (args_copy, int);
|
||||
break;
|
||||
case 'f': // float
|
||||
fnumber = va_arg (args_copy, double);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
va_end (args_copy);
|
||||
va_end (args);
|
||||
}
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
// Check bool.
|
||||
_Bool success = false;
|
||||
|
||||
// Check restrict.
|
||||
if (test_restrict ("String literal") == 0)
|
||||
success = true;
|
||||
char *restrict newvar = "Another string";
|
||||
|
||||
// Check varargs.
|
||||
test_varargs ("s, d' f .", "string", 65, 34.234);
|
||||
test_varargs_macros ();
|
||||
|
||||
// Check flexible array members.
|
||||
struct incomplete_array *ia =
|
||||
malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
|
||||
ia->datasize = 10;
|
||||
for (int i = 0; i < ia->datasize; ++i)
|
||||
ia->data[i] = i * 1.234;
|
||||
|
||||
// Check named initializers.
|
||||
struct named_init ni = {
|
||||
.number = 34,
|
||||
.name = L"Test wide string",
|
||||
.average = 543.34343,
|
||||
};
|
||||
|
||||
ni.number = 58;
|
||||
|
||||
int dynamic_array[ni.number];
|
||||
dynamic_array[ni.number - 1] = 543;
|
||||
|
||||
// work around unused variable warnings
|
||||
return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
|
||||
|| dynamic_array[ni.number - 1] != 543);
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
|
||||
do
|
||||
CC="$ac_save_CC $ac_arg"
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_prog_cc_c99=$ac_arg
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext
|
||||
test "x$ac_cv_prog_cc_c99" != "xno" && break
|
||||
done
|
||||
rm -f conftest.$ac_ext
|
||||
CC=$ac_save_CC
|
||||
|
||||
fi
|
||||
# AC_CACHE_VAL
|
||||
case "x$ac_cv_prog_cc_c99" in
|
||||
x)
|
||||
{ $as_echo "$as_me:$LINENO: result: none needed" >&5
|
||||
$as_echo "none needed" >&6; } ;;
|
||||
xno)
|
||||
{ $as_echo "$as_me:$LINENO: result: unsupported" >&5
|
||||
$as_echo "unsupported" >&6; } ;;
|
||||
*)
|
||||
CC="$CC $ac_cv_prog_cc_c99"
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
|
||||
$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether __clang__ is declared" >&5
|
||||
$as_echo_n "checking whether __clang__ is declared... " >&6; }
|
||||
if test "${ac_cv_have_decl___clang__+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef __clang__
|
||||
(void) __clang__;
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_have_decl___clang__=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_have_decl___clang__=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___clang__" >&5
|
||||
$as_echo "$ac_cv_have_decl___clang__" >&6; }
|
||||
if test $ac_cv_have_decl___clang__ = yes; then
|
||||
CLANGCC="yes"
|
||||
else
|
||||
CLANGCC="no"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5
|
||||
$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; }
|
||||
if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef __INTEL_COMPILER
|
||||
(void) __INTEL_COMPILER;
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_have_decl___INTEL_COMPILER=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_have_decl___INTEL_COMPILER=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5
|
||||
$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; }
|
||||
if test $ac_cv_have_decl___INTEL_COMPILER = yes; then
|
||||
INTELCC="yes"
|
||||
else
|
||||
INTELCC="no"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
|
||||
$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
|
||||
if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
@ -20793,6 +21102,20 @@ else
|
||||
SUNCC="no"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast -Wformat=2"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
CWARNFLAGS="-v"
|
||||
fi
|
||||
@ -21067,12 +21390,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto \$REQUIRED_MODULES\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xorg-server xproto $REQUIRED_MODULES") 2>&5
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.10.0 xproto \$REQUIRED_MODULES\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.10.0 xproto $REQUIRED_MODULES") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto $REQUIRED_MODULES" 2>/dev/null`
|
||||
pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.10.0 xproto $REQUIRED_MODULES" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@ -21085,12 +21408,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_XORG_LIBS="$XORG_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto \$REQUIRED_MODULES\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xorg-server xproto $REQUIRED_MODULES") 2>&5
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.10.0 xproto \$REQUIRED_MODULES\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xorg-server >= 1.10.0 xproto $REQUIRED_MODULES") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto $REQUIRED_MODULES" 2>/dev/null`
|
||||
pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.10.0 xproto $REQUIRED_MODULES" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@ -21109,14 +21432,14 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server xproto $REQUIRED_MODULES"`
|
||||
XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.10.0 xproto $REQUIRED_MODULES"`
|
||||
else
|
||||
XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto $REQUIRED_MODULES"`
|
||||
XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.10.0 xproto $REQUIRED_MODULES"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XORG_PKG_ERRORS" >&5
|
||||
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto $REQUIRED_MODULES) were not met:
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.10.0 xproto $REQUIRED_MODULES) were not met:
|
||||
|
||||
$XORG_PKG_ERRORS
|
||||
|
||||
@ -21127,7 +21450,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
|
||||
and XORG_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
$as_echo "$as_me: error: Package requirements (xorg-server xproto $REQUIRED_MODULES) were not met:
|
||||
$as_echo "$as_me: error: Package requirements (xorg-server >= 1.10.0 xproto $REQUIRED_MODULES) were not met:
|
||||
|
||||
$XORG_PKG_ERRORS
|
||||
|
||||
@ -21356,6 +21679,78 @@ fi
|
||||
DRIVER_NAME=elographics
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
|
||||
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
||||
if test "${ac_cv_path_SED+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
||||
for ac_i in 1 2 3 4 5 6 7; do
|
||||
ac_script="$ac_script$as_nl$ac_script"
|
||||
done
|
||||
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
|
||||
$as_unset ac_script || ac_script=
|
||||
if test -z "$SED"; then
|
||||
ac_path_SED_found=false
|
||||
# Loop through the user's path and test for each of PROGNAME-LIST
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_prog in sed gsed; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
||||
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
||||
# Check for GNU ac_path_SED and select it if it is found.
|
||||
# Check for GNU $ac_path_SED
|
||||
case `"$ac_path_SED" --version 2>&1` in
|
||||
*GNU*)
|
||||
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
|
||||
*)
|
||||
ac_count=0
|
||||
$as_echo_n 0123456789 >"conftest.in"
|
||||
while :
|
||||
do
|
||||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||
mv "conftest.tmp" "conftest.in"
|
||||
cp "conftest.in" "conftest.nl"
|
||||
$as_echo '' >> "conftest.nl"
|
||||
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||
ac_count=`expr $ac_count + 1`
|
||||
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
||||
# Best one so far, save it but keep looking for a better one
|
||||
ac_cv_path_SED="$ac_path_SED"
|
||||
ac_path_SED_max=$ac_count
|
||||
fi
|
||||
# 10*(2^10) chars as input seems more than enough
|
||||
test $ac_count -gt 10 && break
|
||||
done
|
||||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||
esac
|
||||
|
||||
$ac_path_SED_found && break 3
|
||||
done
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
if test -z "$ac_cv_path_SED"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
|
||||
$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
else
|
||||
ac_cv_path_SED=$SED
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
|
||||
$as_echo "$ac_cv_path_SED" >&6; }
|
||||
SED="$ac_cv_path_SED"
|
||||
rm -f conftest.sed
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -21427,21 +21822,25 @@ fi
|
||||
|
||||
|
||||
|
||||
XORG_MAN_PAGE="X Version 11"
|
||||
|
||||
MAN_SUBSTS="\
|
||||
-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
|
||||
-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|\$(prefix)|g' \
|
||||
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
|
||||
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
|
||||
|
||||
|
||||
|
||||
# Check whether --with-release-version was given.
|
||||
if test "${with_release_version+set}" = set; then
|
||||
withval=$with_release_version; RELEASE_VERSION="$withval"
|
||||
else
|
||||
RELEASE_VERSION=""
|
||||
fi
|
||||
|
||||
if test "x$RELEASE_VERSION" != "x"; then
|
||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||
{ $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
|
||||
$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
||||
fi
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||
@ -21930,7 +22329,7 @@ exec 6>&1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xf86-input-elographics $as_me 1.2.4, which was
|
||||
This file was extended by xf86-input-elographics $as_me 1.3.0, which was
|
||||
generated by GNU Autoconf 2.62. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -21983,7 +22382,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_version="\\
|
||||
xf86-input-elographics config.status 1.2.4
|
||||
xf86-input-elographics config.status 1.3.0
|
||||
configured by $0, generated by GNU Autoconf 2.62,
|
||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([xf86-input-elographics],
|
||||
1.2.4,
|
||||
1.3.0,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-input-elographics)
|
||||
|
||||
@ -58,7 +58,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
|
||||
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
|
||||
|
||||
# Checks for pkg-config packages
|
||||
PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
|
||||
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
|
||||
XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
|
||||
|
||||
|
||||
@ -49,9 +49,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ..
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
|
||||
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
@ -141,6 +141,18 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
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_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -161,6 +173,7 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
@ -218,18 +231,6 @@ CLEANFILES = $(driverman_DATA)
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
|
||||
all: all-am
|
||||
|
||||
|
||||
@ -43,9 +43,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ..
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
|
||||
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
@ -151,6 +151,7 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -171,6 +172,7 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
|
||||
@ -50,20 +50,13 @@
|
||||
#include "xorgVersion.h"
|
||||
|
||||
|
||||
#ifndef XFree86LOADER
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
#include "misc.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Xinput.h"
|
||||
#include "exevents.h"
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
#include "xf86Module.h"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* models to be treated specially.
|
||||
@ -310,73 +303,6 @@ xf86EloGetPacket(unsigned char *buffer,
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
***************************************************************************
|
||||
*
|
||||
* xf86EloConvert --
|
||||
* Convert extended valuators to x and y suitable for core motion
|
||||
* events. Return True if ok and False if the requested conversion
|
||||
* can't be done for the specified valuators.
|
||||
*
|
||||
***************************************************************************
|
||||
*/
|
||||
static Bool
|
||||
xf86EloConvert(LocalDevicePtr local,
|
||||
int first,
|
||||
int num,
|
||||
int v0,
|
||||
int v1,
|
||||
int v2,
|
||||
int v3,
|
||||
int v4,
|
||||
int v5,
|
||||
int *x,
|
||||
int *y)
|
||||
{
|
||||
EloPrivatePtr priv = (EloPrivatePtr) local->private;
|
||||
int width = priv->max_x - priv->min_x;
|
||||
int height = priv->max_y - priv->min_y;
|
||||
int input_x, input_y;
|
||||
|
||||
if (first != 0 || num != 2) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
DBG(3, ErrorF("EloConvert: Screen(%d) - v0(%d), v1(%d)\n", priv->screen_no, v0, v1));
|
||||
|
||||
if (width == 0) width = 1;
|
||||
if (height == 0) height = 1;
|
||||
|
||||
if (priv->swap_axes) {
|
||||
input_x = v1;
|
||||
input_y = v0;
|
||||
}
|
||||
else {
|
||||
input_x = v0;
|
||||
input_y = v1;
|
||||
}
|
||||
*x = (priv->screen_width * (input_x - priv->min_x)) / width;
|
||||
*y = (priv->screen_height -
|
||||
(priv->screen_height * (input_y - priv->min_y)) / height);
|
||||
|
||||
/*
|
||||
* MHALAS: Based on the description in xf86XInputSetScreen
|
||||
* this code must be called from ReadInput BEFORE any events
|
||||
* are posted but this method is called FROM xf86PostMotionEvent
|
||||
* Therefore I have moved this method into xf86EloReadInput
|
||||
*/
|
||||
/*
|
||||
* Need to check if still on the correct screen.
|
||||
* This call is here so that this work can be done after
|
||||
* calib and before posting the event.
|
||||
*/
|
||||
/* xf86XInputSetScreen(local, priv->screen_no, *x, *y); */
|
||||
|
||||
DBG(3, ErrorF("EloConvert: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, *x, *y));
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
***************************************************************************
|
||||
@ -404,21 +330,11 @@ xf86EloConvert(LocalDevicePtr local,
|
||||
***************************************************************************
|
||||
*/
|
||||
static void
|
||||
xf86EloReadInput(LocalDevicePtr local)
|
||||
xf86EloReadInput(InputInfoPtr pInfo)
|
||||
{
|
||||
EloPrivatePtr priv = (EloPrivatePtr)(local->private);
|
||||
EloPrivatePtr priv = (EloPrivatePtr)(pInfo->private);
|
||||
int cur_x, cur_y;
|
||||
int state;
|
||||
#if GET_ABI_MAJOR(XINPUT_ABI) == 0
|
||||
int first = 0; /* since convert is expecting 0 */
|
||||
int num = 2; /* since convert is expecting 0 */
|
||||
int v0 = 0; /* = cur_x - based on the debug output this is what v0 is */
|
||||
int v1 = 0; /* = cur_y based on the debug output this is what v0 is */
|
||||
int v2 = 0; /* not used in convert */
|
||||
int v3 = 0; /* not used in convert */
|
||||
int v4 = 0; /* not used in convert */
|
||||
int v5 = 0; /* not used in convert */
|
||||
#endif
|
||||
|
||||
DBG(4, ErrorF("Entering ReadInput\n"));
|
||||
|
||||
@ -427,11 +343,11 @@ xf86EloReadInput(LocalDevicePtr local)
|
||||
* one packet worth of data in the OS buffer.
|
||||
*/
|
||||
do {
|
||||
if(xf86EloGetPacket(priv->packet_buf,
|
||||
if(xf86EloGetPacket(priv->packet_buf,
|
||||
&priv->packet_buf_p,
|
||||
&priv->checksum,
|
||||
local->fd) != Success)
|
||||
continue;
|
||||
pInfo->fd) != Success)
|
||||
continue;
|
||||
|
||||
/*
|
||||
* Process only ELO_TOUCHs here.
|
||||
@ -443,31 +359,6 @@ xf86EloReadInput(LocalDevicePtr local)
|
||||
cur_x = WORD_ASSEMBLY(priv->packet_buf[3], priv->packet_buf[4]);
|
||||
cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
|
||||
state = priv->packet_buf[2] & 0x07;
|
||||
#if GET_ABI_MAJOR(XINPUT_ABI) == 0
|
||||
/*
|
||||
* MHALAS: Based on the description in xf86XInputSetScreen
|
||||
* this code must be called from ReadInput BEFORE any events
|
||||
* are posted but this method is called FROM xf86PostMotionEvent
|
||||
* Therefore I have moved this method into xf86EloReadInput
|
||||
*/
|
||||
/*
|
||||
* Need to check if still on the correct screen.
|
||||
* This call is here so that this work can be done after
|
||||
* calib and before posting the event.
|
||||
*/
|
||||
|
||||
DBG(3, ErrorF("EloConvert Before Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
|
||||
v0 = cur_x; /* based on the debug output this is what v0 is */
|
||||
v1 = cur_y; /* based on the debug output this is what v1 is */
|
||||
/*
|
||||
* Use the conversion method to send correct coordinates
|
||||
* since it contains all necessary logic
|
||||
*/
|
||||
xf86EloConvert(local, first, num, v0, v1, v2, v3, v4, v5, &cur_x, &cur_y);
|
||||
DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
|
||||
xf86XInputSetScreen(local, priv->screen_no, cur_x, cur_y);
|
||||
DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Send events.
|
||||
@ -476,13 +367,13 @@ xf86EloReadInput(LocalDevicePtr local)
|
||||
* location has changed as DIX assumes this. This is why we always
|
||||
* emit a motion, regardless of the kind of packet processed.
|
||||
*/
|
||||
xf86PostMotionEvent(local->dev, TRUE, 0, 2, cur_x, cur_y);
|
||||
xf86PostMotionEvent(pInfo->dev, TRUE, 0, 2, cur_x, cur_y);
|
||||
|
||||
/*
|
||||
* Emit a button press or release.
|
||||
*/
|
||||
if (state == ELO_PRESS || state == ELO_RELEASE) {
|
||||
xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, cur_x, cur_y);
|
||||
xf86PostButtonEvent(pInfo->dev, TRUE, 1, state == ELO_PRESS, 0, 2, cur_x, cur_y);
|
||||
}
|
||||
|
||||
DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n",
|
||||
@ -490,7 +381,7 @@ xf86EloReadInput(LocalDevicePtr local)
|
||||
(state == ELO_PRESS) ? "Press" : ((state == ELO_RELEASE) ? "Release" : "Stream")));
|
||||
}
|
||||
}
|
||||
while (xf86WaitForInput(local->fd, 0) > 0); /* don't wait, just check */
|
||||
while (xf86WaitForInput(pInfo->fd, 0) > 0); /* don't wait, just check */
|
||||
}
|
||||
|
||||
|
||||
@ -778,15 +669,13 @@ static Bool
|
||||
xf86EloControl(DeviceIntPtr dev,
|
||||
int mode)
|
||||
{
|
||||
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
|
||||
EloPrivatePtr priv = (EloPrivatePtr)(local->private);
|
||||
InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
|
||||
EloPrivatePtr priv = (EloPrivatePtr)(pInfo->private);
|
||||
unsigned char map[] = { 0, 1 };
|
||||
unsigned char req[ELO_PACKET_SIZE];
|
||||
unsigned char reply[ELO_PACKET_SIZE];
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
Atom btn_label;
|
||||
Atom axis_labels[2] = { 0, 0 };
|
||||
#endif
|
||||
|
||||
switch(mode) {
|
||||
|
||||
@ -804,11 +693,7 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
/*
|
||||
* Device reports button press for up to 1 button.
|
||||
*/
|
||||
if (InitButtonClassDeviceStruct(dev, 1,
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
&btn_label,
|
||||
#endif
|
||||
map) == FALSE) {
|
||||
if (InitButtonClassDeviceStruct(dev, 1, &btn_label, map) == FALSE) {
|
||||
ErrorF("Unable to allocate Elographics touchscreen ButtonClassDeviceStruct\n");
|
||||
return !Success;
|
||||
}
|
||||
@ -828,35 +713,27 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
* max and min values scaled from the approximate size of the
|
||||
* screen to fit one meter.
|
||||
*/
|
||||
if (InitValuatorClassDeviceStruct(dev, 2,
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
axis_labels,
|
||||
#endif
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
|
||||
xf86GetMotionEvents,
|
||||
#endif
|
||||
local->history_size, Absolute) == FALSE) {
|
||||
if (InitValuatorClassDeviceStruct(dev, 2, axis_labels,
|
||||
GetMotionHistorySize(), Absolute) == FALSE) {
|
||||
ErrorF("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
|
||||
return !Success;
|
||||
}
|
||||
else {
|
||||
/* I will map coordinates myself */
|
||||
InitValuatorAxisStruct(dev, 0,
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
axis_labels[0],
|
||||
#endif
|
||||
-1, -1,
|
||||
9500,
|
||||
0 /* min_res */,
|
||||
9500 /* max_res */);
|
||||
9500 /* max_res */,
|
||||
Absolute);
|
||||
InitValuatorAxisStruct(dev, 1,
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
axis_labels[1],
|
||||
#endif
|
||||
-1, -1,
|
||||
10500,
|
||||
0 /* min_res */,
|
||||
10500 /* max_res */);
|
||||
10500 /* max_res */,
|
||||
Absolute);
|
||||
}
|
||||
|
||||
if (InitFocusClassDeviceStruct(dev) == FALSE) {
|
||||
@ -866,7 +743,7 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
/*
|
||||
* Allocate the motion events buffer.
|
||||
*/
|
||||
xf86MotionHistoryAllocate(local);
|
||||
xf86MotionHistoryAllocate(pInfo);
|
||||
|
||||
|
||||
DBG(2, ErrorF("Done.\n"));
|
||||
@ -876,11 +753,11 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
case DEVICE_ON:
|
||||
DBG(2, ErrorF("Elographics touchscreen on...\n"));
|
||||
|
||||
if (local->fd < 0) {
|
||||
if (pInfo->fd < 0) {
|
||||
|
||||
DBG(2, ErrorF("Elographics touchscreen opening : %s\n", priv->input_dev));
|
||||
local->fd = xf86OpenSerial(local->options);
|
||||
if (local->fd < 0) {
|
||||
pInfo->fd = xf86OpenSerial(pInfo->options);
|
||||
if (pInfo->fd < 0) {
|
||||
Error("Unable to open Elographics touchscreen device");
|
||||
return !Success;
|
||||
}
|
||||
@ -893,7 +770,7 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
*/
|
||||
memset(req, 0, ELO_PACKET_SIZE);
|
||||
req[1] = tolower(ELO_PARAMETER);
|
||||
if (xf86EloSendQuery(req, reply, local->fd) != Success) {
|
||||
if (xf86EloSendQuery(req, reply, pInfo->fd) != Success) {
|
||||
priv->is_a_2310 = 1;
|
||||
ErrorF("Not at the specified rate or model 2310, will continue\n");
|
||||
}
|
||||
@ -903,7 +780,7 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
*/
|
||||
memset(req, 0, ELO_PACKET_SIZE);
|
||||
req[1] = tolower(ELO_ID);
|
||||
if (xf86EloSendQuery(req, reply, local->fd) == Success) {
|
||||
if (xf86EloSendQuery(req, reply, pInfo->fd) == Success) {
|
||||
xf86EloPrintIdent(reply, priv);
|
||||
}
|
||||
else {
|
||||
@ -918,7 +795,7 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
req[1] = ELO_MODE;
|
||||
req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE;
|
||||
req[4] = ELO_TRACKING_MODE;
|
||||
if (xf86EloSendControl(req, local->fd) != Success) {
|
||||
if (xf86EloSendControl(req, pInfo->fd) != Success) {
|
||||
DBG(2, ErrorF("Unable to change Elographics touchscreen operating mode... Maybe it's GeneralTouch touchscreen...\n"));
|
||||
}
|
||||
|
||||
@ -929,11 +806,11 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
req[1] = ELO_REPORT;
|
||||
req[2] = priv->untouch_delay;
|
||||
req[3] = priv->report_delay;
|
||||
if (xf86EloSendControl(req, local->fd) != Success) {
|
||||
if (xf86EloSendControl(req, pInfo->fd) != Success) {
|
||||
DBG(2, ErrorF("Unable to change Elographics touchscreen reports timings... Maybe it's GeneralTouch touchscreen...\n"));
|
||||
}
|
||||
}
|
||||
xf86AddEnabledDevice(local);
|
||||
xf86AddEnabledDevice(pInfo);
|
||||
dev->public.on = TRUE;
|
||||
}
|
||||
|
||||
@ -948,11 +825,11 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
case DEVICE_OFF:
|
||||
DBG(2, ErrorF("Elographics touchscreen off...\n"));
|
||||
dev->public.on = FALSE;
|
||||
if (local->fd >= 0) {
|
||||
xf86RemoveEnabledDevice(local);
|
||||
if (pInfo->fd >= 0) {
|
||||
xf86RemoveEnabledDevice(pInfo);
|
||||
}
|
||||
SYSCALL(close(local->fd));
|
||||
local->fd = -1;
|
||||
SYSCALL(close(pInfo->fd));
|
||||
pInfo->fd = -1;
|
||||
DBG(2, ErrorF("Done\n"));
|
||||
return Success;
|
||||
|
||||
@ -963,11 +840,11 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
case DEVICE_CLOSE:
|
||||
DBG(2, ErrorF("Elographics touchscreen close...\n"));
|
||||
dev->public.on = FALSE;
|
||||
if (local->fd >= 0) {
|
||||
xf86RemoveEnabledDevice(local);
|
||||
if (pInfo->fd >= 0) {
|
||||
xf86RemoveEnabledDevice(pInfo);
|
||||
}
|
||||
SYSCALL(close(local->fd));
|
||||
local->fd = -1;
|
||||
SYSCALL(close(pInfo->fd));
|
||||
pInfo->fd = -1;
|
||||
DBG(2, ErrorF("Done\n"));
|
||||
return Success;
|
||||
|
||||
@ -984,22 +861,14 @@ xf86EloControl(DeviceIntPtr dev,
|
||||
*
|
||||
***************************************************************************
|
||||
*/
|
||||
static LocalDevicePtr
|
||||
xf86EloAllocate(InputDriverPtr drv, IDevPtr dev)
|
||||
static int
|
||||
xf86EloAllocate(InputDriverPtr drv, InputInfoPtr pInfo)
|
||||
{
|
||||
LocalDevicePtr local;
|
||||
EloPrivatePtr priv;
|
||||
|
||||
priv = malloc(sizeof(EloPrivateRec));
|
||||
if (!priv)
|
||||
return NULL;
|
||||
|
||||
local = xf86AllocateInput(drv, 0);
|
||||
|
||||
if (!local) {
|
||||
free(priv);
|
||||
return NULL;
|
||||
}
|
||||
return BadAlloc;
|
||||
|
||||
priv->input_dev = strdup(ELO_PORT);
|
||||
priv->min_x = 0;
|
||||
@ -1017,40 +886,32 @@ xf86EloAllocate(InputDriverPtr drv, IDevPtr dev)
|
||||
priv->packet_buf_p = 0;
|
||||
priv->swap_axes = 0;
|
||||
|
||||
local->name = xstrdup(dev->identifier);
|
||||
local->flags = 0 /* XI86_NO_OPEN_ON_INIT */;
|
||||
local->device_control = xf86EloControl;
|
||||
local->read_input = xf86EloReadInput;
|
||||
local->control_proc = NULL;
|
||||
local->close_proc = NULL;
|
||||
local->switch_mode = NULL;
|
||||
local->conversion_proc = xf86EloConvert;
|
||||
local->reverse_conversion_proc = NULL;
|
||||
local->fd = -1;
|
||||
local->atom = 0;
|
||||
local->dev = NULL;
|
||||
local->private = priv;
|
||||
local->type_name = "Elographics TouchScreen";
|
||||
local->history_size = 0;
|
||||
pInfo->flags = 0 /* XI86_NO_OPEN_ON_INIT */;
|
||||
pInfo->device_control = xf86EloControl;
|
||||
pInfo->read_input = xf86EloReadInput;
|
||||
pInfo->control_proc = NULL;
|
||||
pInfo->switch_mode = NULL;
|
||||
pInfo->private = priv;
|
||||
pInfo->type_name = "Elographics TouchScreen";
|
||||
|
||||
return local;
|
||||
return Success;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
xf86EloUninit(InputDriverPtr drv,
|
||||
LocalDevicePtr local,
|
||||
InputInfoPtr pInfo,
|
||||
int flags)
|
||||
{
|
||||
EloPrivatePtr priv = (EloPrivatePtr) local->private;
|
||||
EloPrivatePtr priv = (EloPrivatePtr) pInfo->private;
|
||||
|
||||
free(priv->input_dev);
|
||||
free(priv);
|
||||
local->private = NULL;
|
||||
xf86DeleteInput(local, 0);
|
||||
pInfo->private = NULL;
|
||||
xf86DeleteInput(pInfo, 0);
|
||||
}
|
||||
|
||||
static const char *default_options[] = {
|
||||
static char *default_options[] = {
|
||||
"BaudRate", "9600",
|
||||
"StopBits", "1",
|
||||
"DataBits", "8",
|
||||
@ -1059,46 +920,41 @@ static const char *default_options[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
static InputInfoPtr
|
||||
static int
|
||||
xf86EloInit(InputDriverPtr drv,
|
||||
IDevPtr dev,
|
||||
InputInfoPtr pInfo,
|
||||
int flags)
|
||||
{
|
||||
LocalDevicePtr local=NULL;
|
||||
EloPrivatePtr priv=NULL;
|
||||
char *str;
|
||||
int portrait = 0;
|
||||
int height, width;
|
||||
char *opt_model;
|
||||
Model* model;
|
||||
int rc;
|
||||
|
||||
|
||||
local = xf86EloAllocate(drv, dev);
|
||||
if (!local) {
|
||||
return NULL;
|
||||
}
|
||||
priv = local->private;
|
||||
local->conf_idev = dev;
|
||||
rc = xf86EloAllocate(drv, pInfo);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
xf86CollectInputOptions(local, default_options, NULL);
|
||||
/* Process the common options. */
|
||||
xf86ProcessCommonOptions(local, local->options);
|
||||
priv = pInfo->private;
|
||||
|
||||
str = xf86FindOptionValue(local->options, "Device");
|
||||
str = xf86FindOptionValue(pInfo->options, "Device");
|
||||
if (!str) {
|
||||
xf86Msg(X_ERROR, "%s: No Device specified in Elographics module config.\n",
|
||||
dev->identifier);
|
||||
pInfo->name);
|
||||
if (priv) {
|
||||
if (priv->input_dev) {
|
||||
free(priv->input_dev);
|
||||
}
|
||||
free(priv);
|
||||
}
|
||||
return local;
|
||||
return BadValue;
|
||||
}
|
||||
priv->input_dev = strdup(str);
|
||||
|
||||
opt_model = xf86SetStrOption(local->options, "Model", NULL);
|
||||
opt_model = xf86SetStrOption(pInfo->options, "Model", NULL);
|
||||
model = SupportedModels;
|
||||
priv->model = MODEL_UNKNOWN;
|
||||
while(model->type != MODEL_UNKNOWN && opt_model)
|
||||
@ -1111,27 +967,27 @@ xf86EloInit(InputDriverPtr drv,
|
||||
model++;
|
||||
}
|
||||
|
||||
local->name = xf86SetStrOption(local->options, "DeviceName", XI_TOUCHSCREEN);
|
||||
xf86Msg(X_CONFIG, "Elographics X device name: %s\n", local->name);
|
||||
priv->screen_no = xf86SetIntOption(local->options, "ScreenNo", 0);
|
||||
pInfo->name = xf86SetStrOption(pInfo->options, "DeviceName", XI_TOUCHSCREEN);
|
||||
xf86Msg(X_CONFIG, "Elographics X device name: %s\n", pInfo->name);
|
||||
priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0);
|
||||
xf86Msg(X_CONFIG, "Elographics associated screen: %d\n", priv->screen_no);
|
||||
priv->untouch_delay = xf86SetIntOption(local->options, "UntouchDelay", ELO_UNTOUCH_DELAY);
|
||||
priv->untouch_delay = xf86SetIntOption(pInfo->options, "UntouchDelay", ELO_UNTOUCH_DELAY);
|
||||
xf86Msg(X_CONFIG, "Elographics untouch delay: %d ms\n", priv->untouch_delay*10);
|
||||
priv->report_delay = xf86SetIntOption(local->options, "ReportDelay", ELO_REPORT_DELAY);
|
||||
priv->report_delay = xf86SetIntOption(pInfo->options, "ReportDelay", ELO_REPORT_DELAY);
|
||||
xf86Msg(X_CONFIG, "Elographics report delay: %d ms\n", priv->report_delay*10);
|
||||
priv->max_x = xf86SetIntOption(local->options, "MaxX", 3000);
|
||||
priv->max_x = xf86SetIntOption(pInfo->options, "MaxX", 3000);
|
||||
xf86Msg(X_CONFIG, "Elographics maximum x position: %d\n", priv->max_x);
|
||||
priv->min_x = xf86SetIntOption(local->options, "MinX", 0);
|
||||
priv->min_x = xf86SetIntOption(pInfo->options, "MinX", 0);
|
||||
xf86Msg(X_CONFIG, "Elographics minimum x position: %d\n", priv->min_x);
|
||||
priv->max_y = xf86SetIntOption(local->options, "MaxY", 3000);
|
||||
priv->max_y = xf86SetIntOption(pInfo->options, "MaxY", 3000);
|
||||
xf86Msg(X_CONFIG, "Elographics maximum y position: %d\n", priv->max_y);
|
||||
priv->min_y = xf86SetIntOption(local->options, "MinY", 0);
|
||||
priv->min_y = xf86SetIntOption(pInfo->options, "MinY", 0);
|
||||
xf86Msg(X_CONFIG, "Elographics minimum y position: %d\n", priv->min_y);
|
||||
priv->swap_axes = xf86SetBoolOption(local->options, "SwapXY", 0);
|
||||
priv->swap_axes = xf86SetBoolOption(pInfo->options, "SwapXY", 0);
|
||||
if (priv->swap_axes) {
|
||||
xf86Msg(X_CONFIG, "Elographics device will work with X and Y axes swapped\n");
|
||||
}
|
||||
debug_level = xf86SetIntOption(local->options, "DebugLevel", 0);
|
||||
debug_level = xf86SetIntOption(pInfo->options, "DebugLevel", 0);
|
||||
if (debug_level) {
|
||||
#if DEBUG
|
||||
xf86Msg(X_CONFIG, "Elographics debug level sets to %d\n", debug_level);
|
||||
@ -1139,7 +995,7 @@ xf86EloInit(InputDriverPtr drv,
|
||||
xf86Msg(X_INFO, "Elographics debug not available\n");
|
||||
#endif
|
||||
}
|
||||
str = xf86SetStrOption(local->options, "PortraitMode", "Landscape");
|
||||
str = xf86SetStrOption(pInfo->options, "PortraitMode", "Landscape");
|
||||
if (strcmp(str, "Portrait") == 0) {
|
||||
portrait = 1;
|
||||
}
|
||||
@ -1156,14 +1012,14 @@ xf86EloInit(InputDriverPtr drv,
|
||||
height = priv->max_y - priv->min_y;
|
||||
if (width == 0) {
|
||||
xf86Msg(X_ERROR, "Elographics: Cannot configure touchscreen with width 0\n");
|
||||
return local;
|
||||
return BadValue;
|
||||
}
|
||||
else if (width < 0) {
|
||||
xf86Msg(X_INFO, "Elographics: reverse x mode (minimum x position >= maximum x position)\n");
|
||||
}
|
||||
if (height == 0) {
|
||||
xf86Msg(X_ERROR, "Elographics: Cannot configure touchscreen with height 0\n");
|
||||
return local;
|
||||
return BadValue;
|
||||
}
|
||||
else if (height < 0) {
|
||||
xf86Msg(X_INFO, "Elographics: reverse y mode (minimum y position >= maximum y position)\n");
|
||||
@ -1190,9 +1046,7 @@ xf86EloInit(InputDriverPtr drv,
|
||||
priv->swap_axes = (priv->swap_axes==0) ? 1 : 0;
|
||||
}
|
||||
|
||||
/* mark the device configured */
|
||||
local->flags |= XI86_CONFIGURED;
|
||||
return local;
|
||||
return Success;
|
||||
}
|
||||
|
||||
_X_EXPORT InputDriverRec ELOGRAPHICS = {
|
||||
@ -1202,10 +1056,9 @@ _X_EXPORT InputDriverRec ELOGRAPHICS = {
|
||||
xf86EloInit, /* pre-init */
|
||||
xf86EloUninit, /* un-init */
|
||||
NULL, /* module */
|
||||
0 /* ref count */
|
||||
default_options
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
static pointer
|
||||
Plug(pointer module,
|
||||
pointer options,
|
||||
@ -1243,4 +1096,3 @@ static XF86ModuleVersionInfo version_rec = {
|
||||
*/
|
||||
_X_EXPORT XF86ModuleData elographicsModuleData = { &version_rec, Plug, Unplug };
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user