.cvsignore | 19 -------
.gitignore | 20 +++++++
COPYING | 26 ++++++---
configure.ac | 2
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.am | 1
src/.cvsignore | 6 --
src/.gitignore | 6 ++
src/xf86Elo.c | 146 +++++++++++++++++++++++++++++---------------------------
10 files changed, 124 insertions(+), 106 deletions(-)
New commits:
commit 174a043bbad20de2959cc08736f894ef56536ece
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed May 21 15:00:44 2008 -0400
elographics 1.2.1
diff --git a/configure.ac b/configure.ac
index 8f5d602..24ab647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit 0133d754c10341ca5b572beeee72488b8f5ae8a8
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date: Thu May 1 12:03:44 2008 +0930
Don't divide by zero. #14902
X.Org Bug 14902 <http://bugs.freedesktop.org/show_bug.cgi?id=14902>
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index d52c712..2a76849 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -723,6 +723,9 @@ xf86EloConvert(LocalDevicePtr local,
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;
commit d639f87a52aac179ef9d0908c012e79baf5fa245
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Thu Mar 20 15:30:00 2008 -0400
elographics 1.2.0
diff --git a/configure.ac b/configure.ac
index 0cfd86e..8f5d602 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.0.0.5,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit 6726525b14d1ad222e16e30deffc37404dc196b4
Author: Matthieu Herrb <[EMAIL PROTECTED]>
Date: Sat Mar 8 22:55:12 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 72408c2404246b9cb4698bd45be439be8ced3c23
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date: Thu Feb 28 09:30:24 2008 +1030
Wrap the content of ReadInput into a loop. Bug #14109
There may be more than one packet waiting for us at a time, so loop until we
don't get one anymore.
This patch is untested for lack of a device, but should fix
X.Org Bug 14109 <http:/bugs.freedesktop.org/show_bug.cgi?id=14109>
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 7eff0fd..d52c712 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -804,69 +804,67 @@ xf86EloReadInput(LocalDevicePtr local)
/*
* Try to get a packet.
*/
- if (xf86EloGetPacket(priv->packet_buf,
+ while (xf86EloGetPacket(priv->packet_buf,
&priv->packet_buf_p,
&priv->checksum,
- local->fd) != Success) {
- return;
- }
-
- /*
- * Process only ELO_TOUCHs here.
- */
- if (priv->packet_buf[1] == ELO_TOUCH) {
- /*
- * First stick together the various pieces.
- */
- 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;
-
- /*
- * 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
- */
+ local->fd) == Success) {
+ /*
+ * Process only ELO_TOUCHs here.
+ */
+ if (priv->packet_buf[1] == ELO_TOUCH) {
+ /*
+ * First stick together the various pieces.
+ */
+ 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;
+
+ /*
+ * 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));
+ /*
+ * 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.
- *
- * We *must* generate a motion before a button change if pointer
- * 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, x, y);
-
- /*
- * Emit a button press or release.
- */
- if (state == ELO_PRESS || state == ELO_RELEASE) {
- xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, x, y);
- }
-
- DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n",
- cur_x, cur_y,
- (state == ELO_PRESS) ? "Press" : ((state == ELO_RELEASE) ?
"Release" : "Stream")));
+ /*
+ * Send events.
+ *
+ * We *must* generate a motion before a button change if pointer
+ * 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, x, y);
+
+ /*
+ * Emit a button press or release.
+ */
+ if (state == ELO_PRESS || state == ELO_RELEASE) {
+ xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0,
2, x, y);
+ }
+
+ DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n",
+ cur_x, cur_y,
+ (state == ELO_PRESS) ? "Press" : ((state == ELO_RELEASE)
? "Release" : "Stream")));
+ }
}
}
commit ed8626d307bb49ced738ac4a5b1d469cef030596
Author: Benjamin Close <[EMAIL PROTECTED]>
Date: Wed Jan 9 09:58:11 2008 +1030
Remove reliance on xf86_ansic.h
xf86_ansic.h is no longer part of the xorg hence this causes
compilations failures on some architectures
Found by: Tinderbox
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 0dc7b5c..7eff0fd 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -64,9 +64,6 @@
#include "misc.h"
#include "xf86.h"
-#if !defined(DGUX)
-#include "xf86_ansic.h"
-#endif
#include "xf86_OSproc.h"
#include "xf86Xinput.h"
#include "exevents.h"
commit 79a2199b8c753aeca6cc9cbbf69e568558a61853
Author: Jaroslaw Siebert <[EMAIL PROTECTED]>
Date: Fri Dec 28 16:16:01 2007 +1030
Bug #13248: use -1, -1 as min/max value for valuators.
If we specify a min/max value for our valuators, the X server will clip any
coordinates at these values.
This fixes the second issue reported in #13248
X.Org Bugzilla #13248 <https://bugs.freedesktop.org/show_bug.cgi?id=13248>
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index a068c04..0dc7b5c 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1348,11 +1348,12 @@ xf86EloControl(DeviceIntPtr dev,
return !Success;
}
else {
- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
+ /* I will map coordinates myself */
+ InitValuatorAxisStruct(dev, 0, -1, -1,
9500,
0 /* min_res */,
9500 /* max_res */);
- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
+ InitValuatorAxisStruct(dev, 1, -1, -1,
10500,
0 /* min_res */,
10500 /* max_res */);
commit 0e04b7142a04fa5e4af57a8056c6010ba49c1359
Author: Jaroslaw Siebert <[EMAIL PROTECTED]>
Date: Fri Dec 28 16:13:09 2007 +1030
Bug #13248: pass the correct coordinates to the DDX.
cur_x and cur_y are the packets we get from the deviec, but after scaling
the
actual coordinates we need to only deal with x and y.
This fixes one issue reported Bug #13248.
X.Org Bugzilla #13248 <https://bugs.freedesktop.org/attachment.cgi?id=13248>
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 3e936af..a068c04 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -858,13 +858,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(local->dev, TRUE, 0, 2, x, 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(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, x, y);
}
DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n",
commit e4071358e3047127fe0476cab3e9fb63e180e940
Author: Daniel Drake <[EMAIL PROTECTED]>
Date: Fri Dec 28 16:04:11 2007 +1030
Bug #9803: Don't allow zero-sized width/height.
A bad configuration can result in height or width being zero. This
potentially
causes a divide-by-zero error in xf86EloConvert().
Detect the bad configuration early on and produce a meaningful error
message.
X.Org Bugzilla #9803 <https://bugs.freedesktop.org/show_bug.cgi?id=9803>
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 7449abd..3e936af 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1691,6 +1691,7 @@ xf86EloInit(InputDriverPtr drv,
EloPrivatePtr priv=NULL;
char *str;
int portrait = 0;
+ int height, width;
local = xf86EloAllocate(drv);
if (!local) {
@@ -1757,11 +1758,21 @@ xf86EloInit(InputDriverPtr drv,
str = "Landscape";
}
xf86Msg(X_CONFIG, "Elographics device will work in %s mode\n", str);
-
- if (priv->max_x - priv->min_x <= 0) {
+
+ width = priv->max_x - priv->min_x;
+ height = priv->max_y - priv->min_y;
+ if (width == 0) {
+ xf86Msg(X_ERROR, "Elographics: Cannot configure touchscreen with width
0\n");
+ return local;
+ }
+ else if (width < 0) {
xf86Msg(X_INFO, "Elographics: reverse x mode (minimum x position >=
maximum x position)\n");
- }
- if (priv->max_y - priv->min_y <= 0) {
+ }
+ if (height == 0) {
+ xf86Msg(X_ERROR, "Elographics: Cannot configure touchscreen with height
0\n");
+ return local;
+ }
+ else if (height < 0) {
xf86Msg(X_INFO, "Elographics: reverse y mode (minimum y position >=
maximum y position)\n");
}
commit 768c17328041e2f3e59d25251772cb3be164ba71
Author: Daniel Drake <[EMAIL PROTECTED]>
Date: Tue May 29 11:58:00 2007 -0800
Bug #11087: xf86-input-elographics COPYING file
X.Org Bugzilla #11087 <https://bugs.freedesktop.org/show_bug.cgi?id=11087>
diff --git a/COPYING b/COPYING
index 7f33cbf..84c78d6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,20 @@
-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.
+Copyright 1995, 1999 by Patrick Lecoanet, France. <[EMAIL PROTECTED]>
-Please submit updated COPYING files to the Xorg bugzilla:
+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, and that the name of Patrick Lecoanet not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Patrick Lecoanet makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PATRICK LECOANET BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit 24aa22caacb99d6bb0b1187e3ad618ce3fba70c2
Author: James Cloos <[EMAIL PROTECTED]>
Date: Mon Sep 3 05:52:07 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 6c08d0ebdedfabccf8aa5883757baefe68d66881
Author: James Cloos <[EMAIL PROTECTED]>
Date: Thu Aug 23 19:25:25 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -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
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 9770760ddcbe14b0631ad1a6e25626c5560e4b81
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Mon Aug 6 23:12:51 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in version_rec
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index f0c5618..7449abd 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1825,7 +1825,7 @@ static XF86ModuleVersionInfo version_rec = {
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 0, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
