xserver-xorg-input-elographics: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
src/.cvsignore | 6 ++++++
5 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit b81e0064d99dd22d2bea8eaf65a9331da9166ab0
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:56 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 253fecf..e6c8681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version for X11R7 release.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 27df2a3..0cfd86e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit 8317c2502e8cafb82b61754bbfe9e3c101a7699f
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:50 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+This is a stub file. This package has not yet had its complete licensing
+information compiled. Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit 2d672e739310333da2bc480acc7afe6b09400d0b
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:14 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index f1bd720..253fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for final X11R7 release candidate.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index f75ec32..27df2a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit 1870d409267f67b8e1a7497deea8721a26ce9cb9
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:29 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..f1bd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * man/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit ffe759062efc75f69bc254ddbd595322f88fd1ad
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:30 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index 749c638..e56beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC3 release.
+
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 1ec6b94..f75ec32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit 15ec88033a6020f442746ff178bf87406fc2555d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:05 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 1cc1dfb..749c638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Remove extraneous AC_MSG_RESULT.
+
2005-11-29 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 4adbd94..1ec6b94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
commit d882f2f5febc0bae5cd8fe5bbfeb37f756fa4eb7
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:29:55 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..1cc1dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 44a56d2..4adbd94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,7 @@ AC_SUBST([DRIVER_NAME])
AM_CONFIG_HEADER([config.h])
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit 4f8ade63683986e30ffd9281b0e58bc990b4d05c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:06 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @DRIVER_NAME@.man
commit 46f8d88b896cb0415dd85640ae454640e82c2742
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:03 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 970d941ec49ff81012a77f4f33ddc21f318626e5
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:11 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 95aa90b..44a56d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit b471db40377061af89f87634e31ced3d5ba8c98e
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:49 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index a276480..95aa90b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,13 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, xorg-server xproto)
+PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
commit d371e549a4989280187a7394c64abe20c403b0db
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:00 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index ddada1f..a276480 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit b4809879c5b3697321cd5816ef2d0e0355c1064d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:01:51 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 1845452d66d56b059504c746062b5713fa4dc16c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:27 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @DRIVER_NAME@.man
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
commit aafac4990d3b5a84a4417fd3695ab9491cd061ff
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:08:55 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 3b14c96..ddada1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,7 @@ # Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/man/Makefile.am b/man/Makefile.am
index 9ecb395..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,21 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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.
-
-dist_man_MANS = @DRIVER_NAME@.4
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER 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.
+#
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @DRIVER_NAME@.man
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+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
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit 3d1ff1b859ab45975dcbeb22b4f313e5aed21849
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:02:21 2005 +0000
Update elographics manpage to list supported options. (Debian #075)
diff --git a/man/elographics.man b/man/elographics.man
index 55d9150..f47aaa1 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,7 +1,7 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
+.TH elographics __drivermansuffix__ __vendorversion__
.SH NAME
elographics \- Elographics input driver
.SH SYNOPSIS
@@ -18,23 +18,64 @@ elographics \- Elographics input driver
.B EndSection
.SH DESCRIPTION
.B elographics
-is an __xservername__ input driver for Elographics devices...
+is an __xservername__ input driver for Elographics touchscreen devices.
.PP
The
.B elographics
driver functions as a pointer input device, and may be used as the
X server's core pointer.
-THIS MAN PAGE NEEDS TO BE FILLED IN.
-.SH SUPPORTED HARDWARE
-What is supported...
-.SH CONFIGURATION DETAILS
+.SH "SUPPORTED HARDWARE"
+E271\-2210 and E271\-2200 devices are supported.
+E281\-2310 and compatible devices are supported with some features
+unavailable.
+.SH "CONFIGURATION DETAILS"
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
section only covers configuration details specific to this driver.
.PP
-Config details...
+The following driver options are supported:
+.TP
+.BI "Option \*qDevice\*q \*q" string \*q
+The device that is attached to the touchscreen interface. Default is
+"/dev/ttyS1".
+.TP
+.BI "Option \*qDeviceName\*q \*q" string \*q
+Set the X11 device name for the touchscreen. Default is "TOUCHSCREEN".
+.TP
+.BI "Option \*qMinX\*q \*q" integer \*q
+Set the minimum value for the touchscreen X axis. Default is 600.
+.TP
+.BI "Option \*qMaxX\*q \*q" integer \*q
+Set the maximum value for the touchscreen X axis. Default is 3000.
+.TP
+.BI "Option \*qMinY\*q \*q" integer \*q
+Set the minimum value for the touchscreen Y axis. Default is 600.
+.TP
+.BI "Option \*qMaxY\*q \*q" integer \*q
+Set the maximum value for the touchscreen Y axis. Default is 3000.
+.TP
+.BI "Option \*qScreenNo\*q \*q" integer \*q
+The screen to attach to the touchscreen when running with multiple screens.
+Default is screen 0.
+.TP
+.BI "Option \*qPortraitMode\*q \*q" string \*q
+Set the X/Y axis orientation. The default is "Landscape"
+but you can rotate clockwise ("Portrait") or
+counter\-clockwise ("PortraitCCW").
+.TP
+.BI "Option \*qSwapXY\*q \*q" boolean \*q
+Swap the X and Y axis on the display. Default is false.
+.TP
+.BI "Option \*qUntouchDelay\*q \*q" integer \*q
+The period that finger must be released for an untouch
+event to occur. Default: 5 (50ms).
+.TP
+.BI "Option \*qReportDelay\*q \*q" integer \*q
+Delay between report packets. Default: 1 (10ms).
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHORS
-Authors include...
+Authors include:
Patrick Lecoanet
+.PP
+This manpage was written by Lee Maguire on behalf of the Debian Project.
commit 6d7d6af9ac22ba89bdd48cbe3901fb47eab89b6e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:38 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
diff --git a/autogen.sh b/autogen.sh
index b1376df..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,12 @@
#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
autoreconf -v --install || exit 1
-./configure --enable-maintainer-mode "$@"
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
commit 5410d26cb4a8df005a1ee9cb7f4ec05d5371b0e0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 14:07:22 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
drivers
diff --git a/configure.ac b/configure.ac
index 28ea9cb..3b14c96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ # Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
# Checks for libraries.
commit f61c90d5044b256497ea55fe032e3e67866cd27f
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:40 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
diff --git a/configure.ac b/configure.ac
index bd52252..28ea9cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 0.1.0,
- [ajax@freedesktop.org],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -81,4 +81,6 @@ # Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+XORG_RELEASE_VERSION
+
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit c81438a87f7848219d1a5755f02a784dfda92601
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 20:03:21 2005 +0000
Make the module dir configurable
diff --git a/configure.ac b/configure.ac
index ab8dfe7..bd52252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,15 +61,20 @@ #if test "x$XKB" = "xyes" ; then
# AC_DEFINE(XKB,1,[Enable XKB support])
#fi
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+inputdir=${moduledir}/input
+AC_SUBST(inputdir)
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto)
-inputdir=$(pkg-config --variable=moduledir xorg-server)/input
-AC_SUBST([inputdir])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
-AC_SUBST([INCLUDES])
# Checks for libraries.
commit 9bf5e9b174d7c1e9c0633f0e170e5c15ba39c80f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 02:20:59 2005 +0000
Update all input drivers to pass distcheck
diff --git a/configure.ac b/configure.ac
index 7cf73e5..ab8dfe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AC_INIT([xf86-input-elographics],
xf86-input-elographics)
AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -35,7 +36,6 @@ DRIVER_NAME=elographics
AC_SUBST([DRIVER_NAME])
AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(.)
# Checks for programs.
AC_PROG_LIBTOOL
@@ -62,13 +62,12 @@ # AC_DEFINE(XKB,1,[Enable XKB support
#fi
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, xorg-server)
+PKG_CHECK_MODULES(XORG, xorg-server xproto)
inputdir=$(pkg-config --variable=moduledir xorg-server)/input
AC_SUBST([inputdir])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
diff --git a/man/Makefile.am b/man/Makefile.am
index 037c760..9ecb395 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,4 +18,4 @@ # ADAM JACKSON BE LIABLE FOR ANY CLAIM,
# 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.
-man_MANS = @DRIVER_NAME@.4
+dist_man_MANS = @DRIVER_NAME@.4
diff --git a/src/Makefile.am b/src/Makefile.am
index 2221bbc..c1d44bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,4 +28,4 @@ # TODO: -nostdlib/-Bstatic/-lgcc platfor
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c
+@DRIVER_NAME@_drv_la_SOURCES = xf86Elo.c
commit 7a0b4563a7adcd55248385201cf3753c1b41015a
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 06:15:08 2005 +0000
Build skeletons for input drivers. Should basically work.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7052905
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..b1376df
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+autoreconf -v --install || exit 1
+./configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..7cf73e5
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,80 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-input-elographics],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-input-elographics)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+DRIVER_NAME=elographics
+AC_SUBST([DRIVER_NAME])
+
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
+#
+#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
+# [Build XInput support (default: yes)]),
+# [XINPUT=$enableval],[XINPUT=yes])
+#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
+#if test "x$XINPUT" = "xyes" ; then
+# AC_DEFINE(XINPUT,1,[Enable XInput support])
+#fi
+#
+#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
+# [Build XKB support (default: yes)]),
+# [XKB=$enableval],[XKB=yes])
+#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
+#if test "x$XKB" = "xyes" ; then
+# AC_DEFINE(XKB,1,[Enable XKB support])
+#fi
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, xorg-server)
+inputdir=$(pkg-config --variable=moduledir xorg-server)/input
+AC_SUBST([inputdir])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..037c760
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,21 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+
+man_MANS = @DRIVER_NAME@.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..2221bbc
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,31 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+@DRIVER_NAME@_drv_ladir = @inputdir@
+
+@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c
commit f431f54c20f49bf7b97d4f2372c4e67539302fa8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:37:59 2005 +0000
Prep input drivers for modularizing by adding guarded #include "config.h"
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 4eddf16..f0c5618 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -46,6 +46,10 @@
*******************************************************************************
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86Version.h"
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
#define XFREE86_V4
commit cd258fd520d115a605affda749b4fd5f416c05e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 08:53:45 2005 +0000
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 8bdd509..4eddf16 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -58,7 +58,7 @@ #include <unistd.h>
#include <errno.h>
#endif
-#include <X11/misc.h>
+#include "misc.h"
#include "xf86.h"
#if !defined(DGUX)
#include "xf86_ansic.h"
@@ -103,7 +103,7 @@ #include "xf86Xinput.h"
#endif /* defined(sun) && !defined(i386) */
#if !defined(sun) || defined(i386)
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include "exevents.h"
commit 32567780acdea6626cb15ba5e38da1414c99ed68
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 22:43:22 2005 +0000
Change all misc.h and os.h references to <X11/foo.h>.
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 4eddf16..8bdd509 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -58,7 +58,7 @@ #include <unistd.h>
#include <errno.h>
#endif
-#include "misc.h"
+#include <X11/misc.h>
#include "xf86.h"
#if !defined(DGUX)
#include "xf86_ansic.h"
@@ -103,7 +103,7 @@ #include "xf86Xinput.h"
#endif /* defined(sun) && !defined(i386) */
#if !defined(sun) || defined(i386)
-#include "os.h"
+#include <X11/os.h>
#include "osdep.h"
#include "exevents.h"
commit fe9ef3971d71d3a0433248bc410f8c2583971c77
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jun 27 18:32:54 2005 +0000
Various input drivers set their InputDriverRec to be static when doing a
loadable build, and the same symbol can't be both static and _X_EXPORT.
Pointed out by Alan Coopersmith.
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 4ec95b9..4eddf16 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1787,9 +1787,6 @@ #endif
return local;
}
-#ifdef XFree86LOADER
-static
-#endif
_X_EXPORT InputDriverRec ELOGRAPHICS = {
1, /* driver version */
"elographics", /* driver name */
commit 281313f638e1f06a961c940b814b428e21f415de
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:17:01 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index af60516..4ec95b9 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1790,7 +1790,7 @@ #endif
#ifdef XFree86LOADER
static
#endif
-InputDriverRec ELOGRAPHICS = {
+_X_EXPORT InputDriverRec ELOGRAPHICS = {
1, /* driver version */
"elographics", /* driver name */
NULL, /* identify */
@@ -1836,7 +1836,7 @@ static XF86ModuleVersionInfo version_rec
* is setup after the pattern <module_name>ModuleData.
* Do not change it.
*/
-XF86ModuleData elographicsModuleData = { &version_rec, Plug, Unplug };
+_X_EXPORT XF86ModuleData elographicsModuleData = { &version_rec, Plug, Unplug };
#endif
#endif /* XFREE86_V4 */
commit 349fefb716abd06a7f83c516b941b791d86d6f13
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:33 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index c7c5ef3..af60516 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -73,17 +73,17 @@ #endif
#else /* XFREE86_V4 */
-#include "Xos.h"
+#include <X11/Xos.h>
#include <signal.h>
#include <stdio.h>
#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "inputstr.h"
#include "scrnintstr.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#if defined(sun) && !defined(i386)
#include <errno.h>
commit 01dc1c093d816ed484b91c0497666bd8a440e3b4
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 22 04:59:31 2004 +0000
Bug #506: Fix pointer behaviour when using multiple Elographics
touchscreens, from Miroslav Halas.
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 09ceb40..c7c5ef3 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -720,7 +720,7 @@ xf86EloConvert(LocalDevicePtr local,
return FALSE;
}
- DBG(3, ErrorF("EloConvert: v0(%d), v1(%d)\n", v0, v1));
+ DBG(3, ErrorF("EloConvert: Screen(%d) - v0(%d), v1(%d)\n", priv->screen_no, v0, v1));
if (priv->swap_axes) {
input_x = v1;
@@ -733,17 +733,23 @@ xf86EloConvert(LocalDevicePtr local,
*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
+ */
#ifdef XFREE86_V4
/*
* 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);
+/* xf86XInputSetScreen(local, priv->screen_no, *x, *y); */
#endif
- DBG(3, ErrorF("EloConvert: x(%d), y(%d)\n", *x, *y));
+ DBG(3, ErrorF("EloConvert: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, *x, *y));
return TRUE;
}
@@ -780,6 +786,18 @@ xf86EloReadInput(LocalDevicePtr local)
EloPrivatePtr priv = (EloPrivatePtr)(local->private);
int cur_x, cur_y;
int state;
+#ifdef XFREE86_V4
+ 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 */
+ int x; /* output */
+ int y; /* output */
+#endif
DBG(4, ErrorF("Entering ReadInput\n"));
/*
@@ -803,6 +821,32 @@ xf86EloReadInput(LocalDevicePtr local)
cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
state = priv->packet_buf[2] & 0x07;
+ /*
+ * 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
+ */
+#ifdef XFREE86_V4
+ /*
+ * 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, x, 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 v0 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, &x, &y);
+ DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y));
+ xf86XInputSetScreen(local, priv->screen_no, x, y);
+ DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y));
+#endif
+
/*
* Send events.
*
commit 9a0f97bdde8102e82b51ea77bc03175008d9df77
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Jul 26 22:52:31 2004 +0000
- Use xf86RemoveEnabledDevice() in the DEVICE_OFF case too. Fixes a lock-up
after server reset.
- Call InitPtrFeedbackClassDeviceStruct() during DEVICE_INIT phase, in
order to avoid a segfault in the X server caused by 'xset q'.
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 6ea52a4..09ceb40 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1165,13 +1165,13 @@ #endif
*
***************************************************************************
*/
-#if 0
+
static void
xf86EloPtrControl(DeviceIntPtr dev,
PtrCtrl *ctrl)
{
}
-#endif
+
/*
@@ -1283,7 +1283,10 @@ #endif
ErrorF("Unable to allocate Elographics touchscreen FocusClassDeviceStruct\n");
return !Success;
}
-
+ if (InitPtrFeedbackClassDeviceStruct(dev, xf86EloPtrControl) == FALSE) {
+ ErrorF("unable to init ptr feedback\n");
+ return !Success;
+ }
/*
* Device reports motions on 2 axes in absolute coordinates.
* Axes min and max values are reported in raw coordinates.
@@ -1466,7 +1469,11 @@ #endif
DBG(2, ErrorF("Elographics touchscreen close...\n"));
dev->public.on = FALSE;
if (local->fd >= 0) {
- RemoveEnabledDevice(local->fd);
+#ifdef XFREE86_V4
+ xf86RemoveEnabledDevice(local);
+#else
+ RemoveEnabledDevice(local->fd);
+#endif
}
SYSCALL(close(local->fd));
local->fd = -1;
commit 1935b4e30e802f262a83e8f54bbd79495c91105d
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:03 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/elographics.man b/man/elographics.man
index 4e78d67..55d9150 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
@@ -18,7 +18,7 @@ elographics \- Elographics input driver
.B EndSection
.SH DESCRIPTION
.B elographics
-is an XFree86 input driver for Elographics devices...
+is an __xservername__ input driver for Elographics devices...
.PP
The
.B elographics
@@ -28,13 +28,13 @@ THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
What is supported...
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
section only covers configuration details specific to this driver.
.PP
Config details...
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHORS
Authors include...
Patrick Lecoanet
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 8c57432..6ea52a4 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */
/*
*******************************************************************************
@@ -1772,7 +1772,7 @@ static XF86ModuleVersionInfo version_rec
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
commit 7802f66b7de5f23346db1375e6ed05798090b5c3
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:51 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/man/elographics.man b/man/elographics.man
index d219a08..4e78d67 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 004b8b4..8c57432 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
/*
*******************************************************************************
commit d32fb56460dc7964a0b71bcad09109e9a35a3f51
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:33 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/man/elographics.man b/man/elographics.man
index 4e78d67..d219a08 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 8c57432..004b8b4 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */
/*
*******************************************************************************
commit 79d5c25f6b29453b61783967180ce6fd94c67f84
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:00 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/elographics.man b/man/elographics.man
index 2148319..4e78d67 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 41df6e8..8c57432 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
/*
*******************************************************************************
commit 9a9dded704fc947f9a7d7a070e6a472739c6bb08
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:34 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/man/elographics.man b/man/elographics.man
index 4e78d67..2148319 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 8c57432..41df6e8 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
+/* $XFree86$ */
/*
*******************************************************************************
Reply to: