xserver-xorg-input-void: Changes to 'upstream-unstable'
Makefile.am | 2 +-
configure.ac | 35 ++++++-----------------------------
man/void.man | 7 ++-----
src/void.c | 58 ++++++++++++++++++++++++++++++----------------------------
4 files changed, 39 insertions(+), 63 deletions(-)
New commits:
commit 1377264aaf712025ee695eb51b0ec076ee29bea8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 11 11:36:23 2009 +1000
void 1.3.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 5b03f86..a73a3b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-void],
- 1.2.0,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-void)
commit 1f8f6431bf84228b3c5877be8e20eeb43dcab64d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 10 11:25:21 2009 +1000
Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 9135ad2..5b03f86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,16 +35,16 @@ AM_MAINTAINER_MODE
DRIVER_NAME=void
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)
+# 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"])
@@ -65,8 +65,5 @@ AC_SUBST([CFLAGS])
# Checks for header files.
AC_HEADER_STDC
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit 6b476f2e22337e6d0b4f0e6194ed25e0ed0f9330
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 17:05:56 2009 +1000
Don't pass an empty RMLVO to InitKeyboardDeviceStruct.
Passing in NULL is ok, an empty one isn't.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/void.c b/src/void.c
index c4016a0..c741d87 100644
--- a/src/void.c
+++ b/src/void.c
@@ -177,9 +177,6 @@ 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;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[MAXBUTTONS] = {0};
@@ -215,8 +212,7 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- memset(&rmlvo, 0, sizeof(XkbRMLVOSet));
- result = InitKeyboardDeviceStruct(device, &rmlvo,
+ result = InitKeyboardDeviceStruct(device, NULL,
BellProc, KeyControlProc);
#else
result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms,
commit 6bc27d6b56336c6dbaad026fb0478f7e620c6258
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 14:52:11 2009 +1000
Remove some unused variables from configure.
diff --git a/configure.ac b/configure.ac
index 3ce517c..9135ad2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,14 +57,11 @@ inputdir=${moduledir}/input
AC_SUBST(inputdir)
# 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)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
-# Checks for libraries.
-
# Checks for header files.
AC_HEADER_STDC
commit df567ec35b67ae83269e97d377e4c4e060c6eb63
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 14:49:15 2009 +1000
man: void is only necessary for server < 1.4
1.4 and input hotplug introduced virtual core devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/void.man b/man/void.man
index 3faed5a..b04fdf3 100644
--- a/man/void.man
+++ b/man/void.man
@@ -16,8 +16,8 @@ void \- null input driver
is an dummy/null __xservername__ input driver. It doesn't connect to any
physical device, and it never delivers any events. It functions as
both a pointer and keyboard device, and may be used as X server's core
-pointer and/or core keyboard. It's purpose is to allow the X server
-to operate without a core pointer and/or core keyboard.
+pointer and/or core keyboard. It's purpose is to allow X servers pre
+version 1.4 to operate without a core pointer and/or core keyboard.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
commit a2ce16486c63e48446cc0fb0e5ea4153cae98e90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 14:48:05 2009 +1000
Remove RCS tags, some useless comments, empty AUTHORS from man.
diff --git a/man/void.man b/man/void.man
index 9054363..3faed5a 100644
--- a/man/void.man
+++ b/man/void.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.man,v 1.1 2001/01/24 00:06:38 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VOID __drivermansuffix__ __vendorversion__
@@ -25,5 +24,3 @@ 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__), Xserver(__appmansuffix__), X(__miscmansuffix__).
-.SH AUTHORS
-Authors include...
diff --git a/src/void.c b/src/void.c
index aeed18d..c4016a0 100644
--- a/src/void.c
+++ b/src/void.c
@@ -21,8 +21,6 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.c,v 1.1 1999/11/19 13:54:57 hohndel Exp $ */
-
/* Input device which doesn't output any event. This device can be used
* as a core pointer or as a core keyboard.
*/
@@ -408,11 +406,3 @@ _X_EXPORT XF86ModuleData voidModuleData = {
};
#endif /* XFree86LOADER */
-
-/*
- * Local variables:
- * change-log-default-name: "~/xinput.log"
- * c-file-style: "bsd"
- * End:
- */
-/* end of void.c */
commit 7d62e4c5d4dc158be6224b5a048f206d2ff7b0ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 8 15:10:34 2009 +1000
void doesn't require randrproto or inputproto.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 14dc5d3..3ce517c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,10 +56,6 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
-# Checks for extensions
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-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)
commit e1e98ad7d6b813854420206bca6c88356656c299
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 8 15:09:10 2009 +1000
Remove long-obsolete chunks from configure.ac.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index b9efc24..14dc5d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,24 +48,6 @@ XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
-
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
commit f8bd425aeff224b01bede7ec4b4731132de1a1bd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 8 14:51:17 2009 +1000
Replace changelog command with CHANGELOG_CMD from m4 macros.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 4f9559c..061da14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,6 @@ 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index ecb863d..b9efc24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,12 +35,16 @@ AM_MAINTAINER_MODE
DRIVER_NAME=void
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"])
@@ -88,5 +92,6 @@ AC_HEADER_STDC
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit fb5ef37927c9c440c0ded515cea6ccaca418d00b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 19 08:29:59 2009 +1000
Remove obsolete chunk, focus/key class is added by InitKeyboardDeviceStruct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/void.c b/src/void.c
index 9d49308..aeed18d 100644
--- a/src/void.c
+++ b/src/void.c
@@ -215,18 +215,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
ErrorF("unable to allocate Button class device\n");
return !Success;
}
-
-/*
- if (InitFocusClassDeviceStruct(device) == FALSE) {
- ErrorF("unable to init Focus class device\n");
- return !Success;
- }
-
- if (InitKeyClassDeviceStruct(device, &void_keysyms, NULL) == FALSE) {
- ErrorF("unable to init key class device\n");
- return !Success;
- }
-*/
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
memset(&rmlvo, 0, sizeof(XkbRMLVOSet));
commit 1c549f65bdcb735f45000d88ec5e6016fe00b72d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 19 08:38:14 2009 +1000
Adjust for ABI_XINPUT_VERSION >= 7
diff --git a/src/void.c b/src/void.c
index ce005d0..9d49308 100644
--- a/src/void.c
+++ b/src/void.c
@@ -52,6 +52,11 @@
#include <xf86Module.h>
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+#include <X11/Xatom.h>
+#include <xserver-properties.h>
+#endif
+
#define MAXBUTTONS 3
/******************************************************************************
@@ -178,7 +183,18 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
XkbRMLVOSet rmlvo;
#endif
Bool result;
-
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ Atom btn_labels[MAXBUTTONS] = {0};
+ Atom axes_labels[2] = {0};
+
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+ 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);
+#endif
+
pInfo = device->public.devicePrivate;
switch (what)
@@ -192,6 +208,9 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
if (InitButtonClassDeviceStruct(device,
MAXBUTTONS,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ btn_labels,
+#endif
map) == FALSE) {
ErrorF("unable to allocate Button class device\n");
return !Success;
@@ -224,6 +243,9 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
if (InitValuatorClassDeviceStruct(device,
2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
@@ -231,12 +253,18 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
Absolute) == FALSE) {
InitValuatorAxisStruct(device,
0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[0],
+#endif
0, /* min val */1, /* max val */
1, /* resolution */
0, /* min_res */
1); /* max_res */
InitValuatorAxisStruct(device,
1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[1],
+#endif
0, /* min val */1, /* max val */
1, /* resolution */
0, /* min_res */
Reply to: