README | 20 ++++++++++++++++++++ configure.ac | 2 +- man/Makefile.am | 1 - man/void.man | 2 +- src/void.c | 21 +++++++++++++++++++-- 5 files changed, 41 insertions(+), 5 deletions(-)
New commits: commit c1932081e5a6ba2f6196b8f862fe246668e92124 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Wed Feb 25 08:52:53 2009 +1000 void 1.2.0 Signed-off-by: Peter Hutterer <peter.hutte...@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 <p...@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 <p...@mandriva.com.br> Signed-off-by: Peter Hutterer <peter.hutte...@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.coopersm...@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.coopersm...@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 <pe...@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 <matth...@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. # -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org