xserver-xorg-input-acecad: Changes to 'upstream-unstable'
.cvsignore | 19 ----------------
COPYING | 27 +++++++++++++++-------
README | 13 +++++++----
configure.ac | 14 ++++-------
man/.cvsignore | 2 -
src/.cvsignore | 6 -----
src/acecad.c | 67 +++++++++++++++++++++++++++++++++++++--------------------
src/acecad.h | 1
8 files changed, 76 insertions(+), 73 deletions(-)
New commits:
commit da1d7acc20a1b9ef4450b40781f1f207d9fa4e3d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:44:10 2009 +1000
acecad 1.4.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 4be9c2b..900eed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-acecad],
- 1.3.0,
+ 1.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-acecad)
commit c51255043e97ff65adebb7527c6b5b68fa2ff038
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 11 11:54:31 2009 +1000
Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 1787cb4..4be9c2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,16 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
@@ -96,8 +96,4 @@ AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
DRIVER_NAME=acecad
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit f6d158802c2a3a0083d110428699027939276e44
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:33:41 2009 +1000
Remove redefinition of read()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 65b3088..61e4c21 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -100,9 +100,6 @@
* Local Variables
****************************************************************************/
-#undef read
-#define read(a,b,c) xf86ReadSerial((a),(b),(c))
-
/* max number of input events to read in one read call */
#define MAX_EVENTS 50
@@ -878,7 +875,7 @@ USBReadInput (LocalDevicePtr local)
/* Was the device available last time we checked? */
int avail = priv->flags & AVAIL_FLAG;
- SYSCALL(len = read(local->fd, eventbuf, sizeof(eventbuf)));
+ SYSCALL(len = xf86ReadSerial(local->fd, eventbuf, sizeof(eventbuf)));
if (len <= 0) {
if (avail) {
commit 26c7872b49674d40a8d6b74915257c90a9708dd0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:32:08 2009 +1000
Remove unused code from TearDownProc
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 9ab396b..65b3088 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -155,18 +155,6 @@ SetupProc( pointer module,
static void
TearDownProc( pointer p )
{
-#if 0
- LocalDevicePtr local = (LocalDevicePtr) p;
- AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
-
- DeviceOff (local->dev);
-
- xf86CloseSerial (local->fd);
- XisbFree (priv->buffer);
- xfree (priv);
- xfree (local->name);
- xfree (local);
-#endif
}
static const char *default_options[] =
commit b54f57f070ae02d480857d0616b879809cc652df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:30:30 2009 +1000
unifdef XFree86LOADER, this isn't optional anymore anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 9d735a1..9ab396b 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -117,7 +117,6 @@ _X_EXPORT InputDriverRec ACECAD =
0
};
-#ifdef XFree86LOADER
static XF86ModuleVersionInfo VersionRec =
{
"acecad",
@@ -169,7 +168,6 @@ TearDownProc( pointer p )
xfree (local);
#endif
}
-#endif
static const char *default_options[] =
{
commit 2bd6c562d123cbbe613ebbd90eb4af1d1525d347
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:28:28 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 529436d..9d735a1 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -23,7 +23,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c,v 1.4 2003/10/30 00:40:45 dawes Exp $ */
#include "config.h"
diff --git a/src/acecad.h b/src/acecad.h
index 9acfca2..c4befb9 100644
--- a/src/acecad.h
+++ b/src/acecad.h
@@ -23,7 +23,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.2tsi Exp $ */
#ifndef _ACECAD_H_
#define _ACECAD_H_
commit 1a9ad110aa6df430fbf9ded35d8dbb8a75ee1872
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 12:27:32 2009 +1000
remove un-used _ACECAD_C_ define
diff --git a/src/acecad.c b/src/acecad.c
index 1dac489..529436d 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -35,7 +35,6 @@
#define XORG_BOTCHED_INPUT 0
#endif
-#define _ACECAD_C_
/*****************************************************************************
* Standard Headers
****************************************************************************/
commit e7c779b05b92ae1fb4a2891727d85a309d53b832
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
xf86-input-acecad: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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/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/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
commit a87f59f431c86272e45fdc3ed328fd30be1db2ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 22 13:36:54 2009 +1000
Cope with ABI_XINPUT_VERSION 7 - requires button/axes labels.
We don't have an atom for relative pressure, so if the device is set to
relative, we export the axis as REL_Z instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 63c5aaf..1dac489 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -78,6 +78,11 @@
#endif
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+#include <X11/Xatom.h>
+#include <xserver-properties.h>
+#endif
+
/* Previously found in xf86Xinput.h */
#ifdef DBG
#undef DBG
@@ -627,13 +632,36 @@ DeviceInit (DeviceIntPtr dev)
int rx, ry;
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
- unsigned char map[] =
- {0, 1, 2, 3};
+ unsigned char map[] = {0, 1, 2, 3};
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ Atom btn_labels[3];
+ Atom axes_labels[3];
+
+ btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+ btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+ btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+
+ if ((priv->flags & ABSOLUTE_FLAG))
+ {
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+ } else
+ {
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Z);
+ }
+#endif
xf86MsgVerb(X_INFO, 4, "%s Init\n", local->name);
/* 3 boutons */
- if (InitButtonClassDeviceStruct (dev, 3, map) == FALSE)
+ if (InitButtonClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ btn_labels,
+#endif
+ map) == FALSE)
{
xf86Msg(X_ERROR, "%s: unable to allocate ButtonClassDeviceStruct\n", local->name);
return !Success;
@@ -653,6 +681,9 @@ DeviceInit (DeviceIntPtr dev)
/* 3 axes */
if (InitValuatorClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
@@ -668,6 +699,9 @@ DeviceInit (DeviceIntPtr dev)
InitValuatorAxisStruct(dev,
0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[0],
+#endif
0, /* min val */
#if XORG_BOTCHED_INPUT
screenInfo.screens[0]->width,
@@ -679,6 +713,9 @@ DeviceInit (DeviceIntPtr dev)
1000); /* max_res */
InitValuatorAxisStruct(dev,
1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[1],
+#endif
0, /* min val */
#if XORG_BOTCHED_INPUT
screenInfo.screens[0]->height,
@@ -690,6 +727,9 @@ DeviceInit (DeviceIntPtr dev)
1000); /* max_res */
InitValuatorAxisStruct(dev,
2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[2],
+#endif
0, /* min val */
priv->acecadMaxZ, /* max val */
1000, /* resolution */
commit 8da028291921a3948486c60ad8c7a52c4f431a56
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 11 19:25:11 2009 -0700
Fill in COPYING file, add SubmittingPatches URL to README
diff --git a/COPYING b/COPYING
index 7f33cbf..17024b0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,21 @@
-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 (c) 2001 Edouard TISSERANT <tissered@esstin.u-nancy.fr>
+Parts inspired from Shane Watts <shane@bofh.asn.au> XFree86 3 Acecad Driver
+Thanks to Emily, from AceCad, For giving me documents.
-Please submit updated COPYING files to the Xorg bugzilla:
+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
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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 X CONSORTIUM 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.
diff --git a/README b/README
index 5028b73..d8eb385 100644
--- a/README
+++ b/README
@@ -1,20 +1,25 @@
xf86-input-acecad - Acecad Flair input driver for the Xorg X server
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/driver/xf86-input-acecad
http://cgit.freedesktop.org/xorg/driver/xf86-input-acecad
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
+
Reply to: