xserver-xorg-input-fpit: Changes to 'upstream-experimental'
.gitignore | 6 ++++++
ChangeLog | 45 ---------------------------------------------
Makefile.am | 8 ++++++++
README | 20 ++++++++++++++++++++
configure.ac | 17 ++++++++++-------
man/.gitignore | 2 --
man/fpit.man | 2 +-
src/.gitignore | 6 ------
src/Makefile.am | 2 ++
src/xf86Fpit.c | 20 ++++++++++++--------
10 files changed, 59 insertions(+), 69 deletions(-)
New commits:
commit 3cabac9b8d43269dabcd65dbe7477981a3945daa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 18 11:28:19 2009 +1000
fpit 1.3.0
diff --git a/configure.ac b/configure.ac
index add1b4d..41cd92e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-fpit],
- 1.2.0,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-fpit)
commit f4ffa85973d2c3306994f93902d1159d8831a0d0
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Feb 2 20:02:18 2009 -0200
Janitor: make distcheck, .gitignore.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..d019074 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
Makefile
Makefile.in
*.la
@@ -18,3 +20,7 @@ ltmain.sh
missing
stamp-h1
*~
+*.4
+xf86-input-fpit-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 7ca30f3..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/xf86Fpit.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-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:
- Update package version number for final X11R7 release candidate.
-
-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:
- Update package version number for X11R7 RC3 release.
-
-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:
- Only build dlloader modules by default.
-
-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:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 6da3bf1..c4ac853 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,11 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = readme.txt
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 7ba075e..add1b4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=fpit
-AC_SUBST([DRIVER_NAME])
-
+# 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)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -77,16 +78,18 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
+XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=fpit
+AC_SUBST([DRIVER_NAME])
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/Makefile.am b/src/Makefile.am
index 1789a7a..d90c25c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,8 @@
# -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.
+AM_CFLAGS = $(XORG_CFLAGS)
+
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
commit 05333d30eec20f699ce6c487e9efd30a4f8e12f7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:19:03 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..1dd4ab7
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-input-fpit - Fujitsu Stylistic Tablet PC 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
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-input-fpit
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-input-fpit
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit b3cde1b14703c81ee387a125d381044b6ed0156a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:13:25 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/fpit.man b/man/fpit.man
index 1809d2b..097ff33 100644
--- a/man/fpit.man
+++ b/man/fpit.man
@@ -151,7 +151,7 @@ For Stylistic 3400:
.fi
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHORS
Original FPIT port:
Rob Tsuk <rob@tsuk.com> and John Apfelbaum <johnapf@linuxslate.com>
commit 118466f0b94a686545ae9a8ef4da028ff406b04b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 15:36:15 2008 +0930
Fix build, xf86Version.h -> xorgVersion.h
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 20be86a..528ebb9 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -55,7 +55,7 @@
#include "config.h"
#endif
-#include <xf86Version.h>
+#include <xorgVersion.h>
#include <unistd.h>
#include <errno.h>
commit e8620e98b8dce2e5dfe6f24fedc8b3942927bff1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 22:07:38 2008 +0930
Check for XINPUT ABI 3.
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 5b1d060..20be86a 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -434,7 +434,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
ErrorF("Unable to allocate PtrFeedBackClassDeviceStruct\n");
}
- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE) {
+ if (InitValuatorClassDeviceStruct(dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
+ local->history_size, Absolute) == FALSE) {
ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n");
return !Success;
}
commit 95676d89c7954cc5550ed386b784b470034320cc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 30 13:30:59 2008 +1030
Set is_core_pointer to 0 by default.
Server 1.4 does not do physical core devices.
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 81d70a1..5b1d060 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -231,7 +231,7 @@ static void xf86FpitReadInput(LocalDevicePtr local)
{
FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
int len, loop;
- int is_core_pointer = 1;
+ int is_core_pointer = 0;
int x, y, buttons, prox;
DeviceIntPtr device;
int conv_x, conv_y;
commit 01a4da993a2ecd0f017baef49b6e57b82c05316d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 14 10:50:54 2008 +1030
Don't crash with xserver 1.4
xf86IsCorePointer() is gone.
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 531b0bd..81d70a1 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -231,7 +231,7 @@ static void xf86FpitReadInput(LocalDevicePtr local)
{
FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
int len, loop;
- int is_core_pointer;
+ int is_core_pointer = 1;
int x, y, buttons, prox;
DeviceIntPtr device;
int conv_x, conv_y;
@@ -319,7 +319,9 @@ static void xf86FpitReadInput(LocalDevicePtr local)
prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
buttons = (priv->fpitData[loop] & BUTTON_BITS);
device = local->dev;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
is_core_pointer = xf86IsCorePointer(device);
+#endif
xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);
commit 2823f7c3f3784a1a398b8d5a9157c2e5263b6285
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 8 16:00:36 2008 +0930
Revert "Don't call xf86IsCorePointer."
This reverts commit 9ea880913d5775454311b0257bbaebf773cd4285.
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 0378e37..531b0bd 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -231,6 +231,7 @@ static void xf86FpitReadInput(LocalDevicePtr local)
{
FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
int len, loop;
+ int is_core_pointer;
int x, y, buttons, prox;
DeviceIntPtr device;
int conv_x, conv_y;
@@ -318,18 +319,15 @@ static void xf86FpitReadInput(LocalDevicePtr local)
prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
buttons = (priv->fpitData[loop] & BUTTON_BITS);
device = local->dev;
+ is_core_pointer = xf86IsCorePointer(device);
xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);
/* coordinates are ready we can send events */
- if (prox!=priv->fpitOldProximity) { /* proximity changed */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- if (xf86IsCorePointer(device) == 0)
-#endif
- xf86PostProximityEvent(device, prox, 0, 2, x, y);
- }
+ if (prox!=priv->fpitOldProximity) /* proximity changed */
+ if (!is_core_pointer) xf86PostProximityEvent(device, prox, 0, 2, x, y);
if (priv->fpitOldX != x || priv->fpitOldY != y) /* position changed */
xf86PostMotionEvent(device, 1, 0, 2, x, y);
Reply to: