xserver-xorg-input-aiptek: Changes to 'upstream-experimental'
.gitignore | 76 +++++++++++++++++++++----
COPYING | 33 ++++++++---
Makefile.am | 11 ++-
configure.ac | 81 ++++++++++-----------------
man/Makefile.am | 61 ++++++--------------
src/Makefile.am | 4 -
src/xf86Aiptek.c | 161 +++++++++++++++++++++++++++++++++++++++----------------
src/xf86Aiptek.h | 6 +-
8 files changed, 267 insertions(+), 166 deletions(-)
New commits:
commit 799d13a3ac1f15ebca3625183340379840beb2f3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:28:26 2010 -0400
xf86-input-aiptek 1.3.1
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index dfd7f1c..2038c23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ([2.60])
AC_INIT([xf86-input-aiptek],
- [1.3.0],
+ [1.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-aiptek])
AC_CONFIG_SRCDIR([Makefile.am])
commit 209b9147799079981db4abebdbac093dec59d5a5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 19:35:46 2010 -0400
config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
It depends on util-macros 1.8
The existing statement can now be removed from the configuration file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index ca0deb0..dfd7f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
-AC_PROG_INSTALL
-
# Checks for libraries.
AC_CHECK_LIB([m],[sqrt])
commit 7a08e526ad7ebe2702269d5a0a048f62b1bfbca1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 19:34:40 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8d37120..ca0deb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ AC_PROG_LIBTOOL
# Initialize X.Org macros
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index c020b58..d10f548 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,22 +32,6 @@ EXTRA_DIST = @DRIVER_NAME@.man
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
.man.$(DRIVER_MAN_SUFFIX):
commit e4976108867158f0c90cd1023595f858bea1ea56
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Apr 17 18:52:54 2010 -0400
man: Use Autoconf provided $(AM_V_GEN)$(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index 29fcf92..c020b58 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,8 +32,6 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@@ -53,4 +51,4 @@ MAN_SUBSTS = \
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit 39f1c78b01fb8f2c0450f02c8f5a6329dff6dd04
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 10:46:42 2010 -0400
config: fix warnings, m4 quoting and layout
Fix some m4 quoting
Fix some autoconf warnings
Regroup statements per section
Add comments
Upgrade X.Org macros to 1.4 for INSTALL file copying
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index b2ec1e9..8d37120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,43 +20,31 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.60)
+AC_PREREQ([2.60])
AC_INIT([xf86-input-aiptek],
- 1.3.0,
+ [1.3.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-input-aiptek)
-
+ [xf86-input-aiptek])
AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_AUX_DIR(.)
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
-
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-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 extensions
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
+# Initialize X.Org macros
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
+XORG_DEFAULT_OPTIONS
-# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
+# Checks for programs.
+AC_PROG_INSTALL
# Checks for libraries.
AC_CHECK_LIB([m],[sqrt])
@@ -64,7 +52,26 @@ AC_CHECK_LIB([m],[sqrt])
# Checks for header files.
AC_CHECK_HEADERS([linux/input.h])
+# Store the list of server defined extensions in REQUIRED_MODULES
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
+
+# Obtain compiler/linker options from server and required extensions
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
+
+# Define a configure option for an alternate input module directory
+AC_ARG_WITH(xorg-module-dir,
+ AS_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)
+
DRIVER_NAME=aiptek
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([Makefile src/Makefile man/Makefile])
+AC_CONFIG_FILES([Makefile
+ man/Makefile
+ src/Makefile])
+AC_OUTPUT
commit 43cdbc01fb1f7197134434b7db00705e4e6c8d56
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 10:24:16 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6b3b68e..b2ec1e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
-
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
commit e97e0199a722bdfa30ef0ba070f421e01987ce25
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 10:22:35 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements at the top.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3cca447..6b3b68e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,9 @@ AC_INIT([xf86-input-aiptek],
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
@@ -38,8 +39,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER([config.h])
-
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
commit a4da6aa6996c7030b48b39eafbadeed8e512010e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 15 10:20:43 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9ba51c4..3cca447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ(2.60)
AC_INIT([xf86-input-aiptek],
1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit c0aa30c9d92617d0febe521780588e095569216a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Apr 11 14:04:39 2010 -0400
config: use AC_CHECK_LIB to verify library and add -lm to LIBS
Ensures library is present and contains the desired symbol.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e03b13c..9ba51c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
# Checks for libraries.
+AC_CHECK_LIB([m],[sqrt])
# Checks for header files.
AC_CHECK_HEADERS([linux/input.h])
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b8f60a..80ad025 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,5 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
@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_LIBADD = -lm
@DRIVER_NAME@_drv_la_SOURCES = xf86Aiptek.c xf86Aiptek.h
commit 0d88d9fb6f1200126212dd45cbddc08f3b75ebfb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Apr 11 10:59:21 2010 -0400
config: replace hard-coded -DLINUX_INPUT with proper AC_CHECK_HEADERS
Not all platforms have Linux kernel input subsystem.
Automake AC_CHECK_HEADERS is designed for that purpose.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6395548..e03b13c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
# Checks for libraries.
# Checks for header files.
-AC_HEADER_STDC
+AC_CHECK_HEADERS([linux/input.h])
DRIVER_NAME=aiptek
AC_SUBST([DRIVER_NAME])
diff --git a/src/Makefile.am b/src/Makefile.am
index abae1f4..0b8f60a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@
# _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) $(CWARNFLAGS) -DLINUX_INPUT
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index bd78121..c282bf3 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -117,10 +117,6 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include "xf86Aiptek.h"
#include <errno.h>
#include <string.h>
@@ -2264,7 +2260,7 @@ xf86AiptekInit(InputDriverPtr drv,
xf86Msg(X_CONFIG, "%s is in %s mode\n", local->name,
(device->flags & ABSOLUTE_FLAG) ? "absolute" : "relative");
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
/* The define-name is accurate; the XFree86 keyword is not. We are
* reading from a Linux kernel "Input" device. The Input device
* layer generally supports mice, joysticks, and keyboards. As
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index 810185b..8a8b5cc 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -40,8 +40,11 @@
#ifndef _AIPTEK_H_
#define _AIPTEK_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
# include <asm/types.h>
# include <linux/input.h>
# ifndef EV_MSC
commit 2996458c2fc88671ba8626de984b2f082042dc62
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Apr 11 10:21:40 2010 -0400
config: remove AH_TOP autoheader statement
The generated config.h does not need to include xorg-server.h
for the content it provides.
Add #include <xorg-server.h> in .[hc] files as needed.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7c090f8..6395548 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,6 @@ AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index 2842775..810185b 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -56,6 +56,7 @@
# endif
#endif
+#include <xorg-server.h>
#include <xorgVersion.h>
#ifndef XFree86LOADER
commit be8297b5edd06e8cbf41b06da4588d5f548e627b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 09:41:05 2010 -0400
COPYING: replace stub file with Copyright notices
Copyright 2003 by Bryan W. Headley
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..9b3372c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,29 @@
-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 2003 by Bryan W. Headley. <bwheadley@earthlink.net>
-Please submit updated COPYING files to the Xorg bugzilla:
+Lineage: This driver is based on both the xf86HyperPen and xf86Wacom tablet
+ drivers.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+ xf86HyperPen -- modified from xf86Summa (c) 1996 Steven Lang
+ (c) 2000 Roland Jansen
+ (c) 2000 Christian Herzog (button & 19200 baud support)
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+ xf86Wacom -- (c) 1995-2001 Frederic Lepied
-http://lists.freedesktop.org/mailman/listinfo/xorg
+
+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 Bryan W. Headley not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission. Bryan W. Headley makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+ *
+BRYAN W. HEADLEY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL BRYAN W. HEADLEY 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 ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
commit d87747df73114953ac39f3d77ca146adc3b80088
Author: Olivier Samyn <code@oleastre.be>
Date: Wed Feb 24 00:24:02 2010 +0100
aiptek: Add keyboard feedback struct initialization.
Without a call to InitKbdFeedbackClassDeviceStruct, no keyboard events
are seen by xev. This adds the call and required callback functions.
Signed-off-by: Olivier Samyn <code@oleastre.be>
[This patch only fixes the case for X server 1.6 and earlier.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index c53ccde..bd78121 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1569,6 +1569,23 @@ xf86AiptekOpenDevice(DeviceIntPtr pDriver)
}
/*
+ * xf86AiptekBellCallback
+ */
+static void
+xf86AiptekBellCallback(int pct, DeviceIntPtr di, pointer ctrl, int x)
+{
+}
+
+/*
+ * xf86AiptekKbdCtrlCallback
+ */
+static void
+xf86AiptekKbdCtrlCallback(DeviceIntPtr di, KeybdCtrl* ctrl)
+{
+}
+
+
+/*
* xf86AiptekProc
*
* Call dispatcher for this driver.
@@ -1648,6 +1665,15 @@ xf86AiptekProc(DeviceIntPtr pAiptek, int requestCode)
ErrorF("Unable to init Key Class Device\n");
return !Success;
}
+
+ if(InitKbdFeedbackClassDeviceStruct(pAiptek,
+ xf86AiptekBellCallback,
+ xf86AiptekKbdCtrlCallback) == FALSE)
+ {
+ ErrorF("Unable to init Keyboard Feedback Class Device\n");
+ return !Success;
+ }
+
#endif
/* we don't label the axes here, done later in
commit deb7cb9c89c64f61c870b5eaf8029a600077aecc
Author: Olivier Samyn <code@oleastre.be>
Date: Wed Feb 24 00:12:42 2010 +0100
aiptek: Initialize the keymap with 256 items.
X.Org keymap requires at least 256 defined entries. This patch
initialize the keymap with the required entries count.
Signed-off-by: Olivier Samyn <code@oleastre.be>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index bb5aa21..c53ccde 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -174,7 +174,7 @@ static int linux_inputDevice_keyMap[] =
*
* This is a list of X keystrokes the macro keys can send.
*/
-static KeySym aiptek_map[] =
+static KeySym aiptek_map[256] =
{
/* 0x00 .. 0x07 */
NoSymbol,NoSymbol,NoSymbol,NoSymbol,NoSymbol,NoSymbol,NoSymbol,NoSymbol,
@@ -192,7 +192,7 @@ static KeySym aiptek_map[] =
static KeySymsRec keysyms =
{
/* map minKeyCode maxKC width */
- aiptek_map, 8, 0x27, 1
+ aiptek_map, 8, 0xff, 1
};
#endif
commit 01d39e1efea68797b27231fecc8535b440e87ae4
Author: Olivier Samyn <code@oleastre.be>
Date: Sun Feb 21 00:22:28 2010 +0100
aiptek: Change index offset for generated key events.
Since the first 8 elements in the xorg key map are NoSymbol, and the first
linux kernel element index is 0, the first keysym is at offset 8 and not 7.
Signed-off-by: Olivier Samyn <code@oleastre.be>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index e70d58f..bb5aa21 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -461,11 +461,11 @@ xf86AiptekSendEvents(LocalDevicePtr local, int r_z)
*/
/* Keyboard 'make' (press) event */
- xf86PostKeyEvent(local->dev, i+7, TRUE,
+ xf86PostKeyEvent(local->dev, i+8, TRUE,
bAbsolute, 0, 5,
x, y, common->currentValues.button, xTilt, yTilt);
/* Keyboard 'break' (depress) event */
- xf86PostKeyEvent(local->dev, i+7, FALSE,
+ xf86PostKeyEvent(local->dev, i+8, FALSE,
bAbsolute, 0, 5,
x, y, common->currentValues.button, xTilt, yTilt);
break;
commit 823d606ca716253ac55ed46ee1559fd17adc0988
Author: Olivier Samyn <code@oleastre.be>
Date: Sun Feb 21 00:17:57 2010 +0100
aiptek: Correct linux keymap to keysym index loop.
Makes the loop iterate over all elements of the linux key map, and if the
current macroKey matches, generate a key event.
Signed-off-by: Olivier Samyn <code@oleastre.be>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 4ec9c4a..e70d58f 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -452,26 +452,26 @@ xf86AiptekSendEvents(LocalDevicePtr local, int r_z)
sizeof(linux_inputDevice_keyMap[0]);
++i)
{
- if (linux_inputDevice_keyMap[0]==common->currentValues.macroKey)
+ if (linux_inputDevice_keyMap[i]==common->currentValues.macroKey)
{
+ /* First available Keycode begins at 8 => macro+8.
+ * It's pervasive throughout the Xinput drivers, and
+ * no, I don't know why they purposively waste the first 8
+ * positions of the KeySym map...
+ */
+
+ /* Keyboard 'make' (press) event */
+ xf86PostKeyEvent(local->dev, i+7, TRUE,
+ bAbsolute, 0, 5,
+ x, y, common->currentValues.button, xTilt, yTilt);
+ /* Keyboard 'break' (depress) event */
+ xf86PostKeyEvent(local->dev, i+7, FALSE,
+ bAbsolute, 0, 5,
+ x, y, common->currentValues.button, xTilt, yTilt);
break;
}
}
- /* First available Keycode begins at 8 => macro+7.
- * It's pervasive throughout the Xinput drivers, and
- * no, I don't know why they purposively waste the first 8
- * positions of the KeySym map...
- */
-
- /* Keyboard 'make' (press) event */
- xf86PostKeyEvent(local->dev, i+7, TRUE,
- bAbsolute, 0, 5,
- x, y, common->currentValues.button, xTilt, yTilt);
- /* Keyboard 'break' (depress) event */
- xf86PostKeyEvent(local->dev, i+7, FALSE,
- bAbsolute, 0, 5,
- x, y, common->currentValues.button, xTilt, yTilt);
}
/* As the coordinates are ready, we can send events to X */
commit 8b2eb587cc2ec96e54c28def4fa9388d7bd49c91
Author: Olivier Samyn <code@oleastre.be>
Date: Wed Feb 17 21:35:11 2010 +0100
aiptek: Uses event->code instead of event->value
From the Linux input documentation, on a key press or release event,
the actual key code is contained in the event->code field.
Signed-off-by: Olivier Samyn <code@oleastre.be>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 96873ab..4ec9c4a 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -866,7 +866,7 @@ xf86AiptekHIDReadInput(LocalDevicePtr local)
default:
{
++eventsInMessage;
- common->currentValues.macroKey = event->value;
+ common->currentValues.macroKey = event->code;
}
break;
}
commit a7460d35743b7343a6dcce13f14cfd28428385bf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Feb 11 10:08:07 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 17e2ad2..7c090f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
-XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
diff --git a/src/Makefile.am b/src/Makefile.am
index 42eb63b..abae1f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +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) -DLINUX_INPUT
+
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) -DLINUX_INPUT
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
commit 2701762143f7ccdfb95e2b19f963b80d011a3f72
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:05:05 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..29fcf92 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,28 +1,25 @@
# $Id$
#
# 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.
+#
+# 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:
+#
+# 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 NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS 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.
#
drivermandir = $(DRIVER_MAN_DIR)
commit 77d46f0a4527ba7919c58b13934a7b9a07a7a810
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d3c11b3..17e2ad2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,6 @@ 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)
XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
commit 7de1580b327e2395ae1e393c59c2e6900680981b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index d451f3e..4c278ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
commit 4c6d7d9a91d35473de9fe8a2aac93747c0d794d1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:40 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 882733f..d451f3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# 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
.PHONY: ChangeLog INSTALL
commit 80327029754b63738ee21709b3847681df6278c5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index 8b7c3c7..882733f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,9 +21,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index b1cc2a1..d3c11b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_INIT([xf86-input-aiptek],
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 59bc379e87489f95f89851e2b5b27bdc680c656f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:20 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/Makefile.am b/Makefile.am
index 6a0325e..8b7c3c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,6 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-EXTRA_DIST = ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
diff --git a/configure.ac b/configure.ac
index 6a807a6..b1cc2a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,15 +33,17 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# 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])])
+m4_ifndef([XORG_MACROS_VERSION],
Reply to: