xserver-xorg-input-void: Changes to 'upstream-unstable'
.cvsignore | 19 ---------------
.gitignore | 20 ++++++++++++++++
COPYING | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-------
ChangeLog | 45 -------------------------------------
Makefile.am | 11 +++++++++
README | 20 ++++++++++++++++
configure.ac | 2 -
man/.cvsignore | 2 -
man/.gitignore | 2 +
man/Makefile.am | 1
man/void.man | 2 -
src/.cvsignore | 6 -----
src/.gitignore | 6 +++++
src/void.c | 29 ++++++++++++++++++++----
14 files changed, 144 insertions(+), 88 deletions(-)
New commits:
commit c1932081e5a6ba2f6196b8f862fe246668e92124
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 25 08:52:53 2009 +1000
void 1.2.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8b0119d..ecb863d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-void],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-void)
commit 2154cf5b31c7868e32e1cdc6865ed32c2bff5e88
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Feb 5 17:30:18 2009 -0200
Janitor: update for ABI_XINPUT_VERSION >= 5
This driver should be seen as the simplest possible input
driver, and somewhat as a skeleton/model for newer ones.
Having it at least compiling with current xorg sdk is a plus.
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/void.c b/src/void.c
index a5a47be..ce005d0 100644
--- a/src/void.c
+++ b/src/void.c
@@ -57,6 +57,7 @@
/******************************************************************************
* Function/Macro keys variables
*****************************************************************************/
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
static KeySym void_map[] =
{
NoSymbol, NoSymbol, NoSymbol, NoSymbol,
@@ -130,6 +131,7 @@ static KeySymsRec void_keysyms = {
/* map minKeyCode maxKeyCode width */
void_map, 8, 255, 1
};
+#endif /* GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 */
static const char *DEFAULTS[] = {
NULL
@@ -172,6 +174,10 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
InputInfoPtr pInfo;
unsigned char map[MAXBUTTONS + 1];
int i;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+ XkbRMLVOSet rmlvo;
+#endif
+ Bool result;
pInfo = device->public.devicePrivate;
@@ -202,7 +208,16 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
return !Success;
}
*/
- if (InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, NULL, BellProc, KeyControlProc) == FALSE) {
+
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+ memset(&rmlvo, 0, sizeof(XkbRMLVOSet));
+ result = InitKeyboardDeviceStruct(device, &rmlvo,
+ BellProc, KeyControlProc);
+#else
+ result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms,
+ NULL, BellProc, KeyControlProc);
+#endif
+ if (!result) {
ErrorF("unable to init keyboard device\n");
return !Success;
}
commit 48295279acfcd2b6902daa49a5eb944318240586
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 29 14:54:32 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..b6aa07d
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-input-void - null input driver for Xorg 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-void
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-input-void
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 2d53d8bf892c39e9a327676da37e766d51557877
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:24:27 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/void.man b/man/void.man
index 39b7e9f..9054363 100644
--- a/man/void.man
+++ b/man/void.man
@@ -24,6 +24,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
driver doesn't have any configuration options in addition to those.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHORS
Authors include...
commit 2ad046c73fd4bf1b880cc19899d161b07608c8c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 22:24:22 2008 +0930
Check for XINPUT ABI 3.
diff --git a/src/void.c b/src/void.c
index bf5848c..a5a47be 100644
--- a/src/void.c
+++ b/src/void.c
@@ -209,7 +209,9 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
if (InitValuatorClassDeviceStruct(device,
2,
- xf86GetMotionEvents,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
0,
Absolute) == FALSE) {
InitValuatorAxisStruct(device,
commit b57f5e54c8a2ee15d83be98a739e16b2595fdf28
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:18:51 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 4e43b6206bc719d68ced1ca793ca4e3b938d8e8e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 7 12:36:56 2007 -0700
Version bump: 1.1.1
diff --git a/configure.ac b/configure.ac
index 3be079b..8b0119d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-void],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-void)
commit 1d64a7f636320786e5e5e76e8371d6d666bd0849
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 7 09:48:34 2007 -0700
Clear compiler & sparse warnings
void.c:41:9: warning: preprocessor token NEED_XF86_TYPES redefined
/usr/X11R7/include/xorg/xorg-server.h:69:9: this was the original definition
void.c:298:35: warning: Using plain integer as NULL pointer
diff --git a/src/void.c b/src/void.c
index 6b09b8a..bf5848c 100644
--- a/src/void.c
+++ b/src/void.c
@@ -38,7 +38,7 @@
#include <misc.h>
#include <xf86.h>
-#define NEED_XF86_TYPES
+#define NEED_XF86_TYPES 1
#if !defined(DGUX)
#include <xisb.h>
#endif
@@ -295,7 +295,7 @@ xf86VoidInit(InputDriverPtr drv,
pInfo->fd = -1;
pInfo->dev = NULL;
pInfo->private_flags = 0;
- pInfo->always_core_feedback = 0;
+ pInfo->always_core_feedback = NULL;
pInfo->conf_idev = dev;
/* Collect the options, and process the common options. */
commit 3b25347c21b833bea42223529b8c005e3ff1ea59
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 7 09:42:30 2007 -0700
Fill in COPYING file with licenses & copyrights from source files
diff --git a/COPYING b/COPYING
index 7f33cbf..6d25ee3 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,63 @@
-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 1999 by Frederic Lepied, France. <Lepied@XFree86.org>
-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 Frederic Lepied not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Frederic Lepied 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
+FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FREDERIC LEPIED 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:
+Copyright 2005 Adam Jackson.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.
+
+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.
commit 0faf80c838d87102abce4b25783f0118d3c2f8dd
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 7 09:36:14 2007 -0700
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e6d6e35..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/void.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 7052905..4f9559c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+EXTRA_DIST = autogen.sh ChangeLog
+
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit 4df595e80daf14a8b88989fb75f0e8c8cbe2f54a
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:26 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 d29387397cc315ca02a54e178d1d410a458ab214
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 28 17:41:54 2007 -0700
Add *~ to .gitignore to skip over 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 b5dc10b2ce19fb99c76b6e79dd364d366e4678f8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 28 17:41:08 2007 -0700
Don't fill in motion_history_proc for new input ABI
diff --git a/src/void.c b/src/void.c
index 6903101..6b09b8a 100644
--- a/src/void.c
+++ b/src/void.c
@@ -283,8 +283,10 @@ xf86VoidInit(InputDriverPtr drv,
pInfo->flags = XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
pInfo->device_control = xf86VoidControlProc;
pInfo->read_input = NULL;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
pInfo->motion_history_proc = xf86GetMotionEvents;
pInfo->history_size = 0;
+#endif
pInfo->control_proc = NULL;
pInfo->close_proc = NULL;
pInfo->switch_mode = NULL;
commit 464a489e9a9e4a79946c5ddac44e9b9c7a6dc8cc
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:43 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 1552640781b0215124df4d3f535336471a0175df
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 22:13:21 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in xf86VoidVersionRec
diff --git a/src/void.c b/src/void.c
index 07a781c..6903101 100644
--- a/src/void.c
+++ b/src/void.c
@@ -358,7 +358,7 @@ static XF86ModuleVersionInfo xf86VoidVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
Reply to: