xserver: Branch 'master' - 7 commits
Keith Packard
keithp at kemper.freedesktop.org
Wed Dec 2 15:28:16 PST 2009
configure.ac | 14 +++++++++-----
dix/devices.c | 4 +++-
dix/events.c | 9 +++------
hw/xfree86/common/xf86Config.c | 2 +-
xkb/xkbAccessX.c | 2 ++
5 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a
Merge: 0e084d8... 91c1bd7...
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 2 15:28:07 2009 -0800
Merge remote branch 'whot/master'
commit 91c1bd78f7240c92702828f8e5a6b6ce944b9e36
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sat Nov 28 21:32:47 2009 -0500
configure.ac: error while checking for XDMXCONFIG_DEP
Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4
The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES]
was not quoted.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
Tested-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/configure.ac b/configure.ac
index fcd8875..6cdef15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1881,11 +1881,15 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
dnl DMX DDX
-PKG_CHECK_MODULES([DMXMODULES],
- [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
- PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes],
- [have_dmx=no]),
- [have_dmx=no])
+PKG_CHECK_MODULES(
+ [DMXMODULES],
+ [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
+ [PKG_CHECK_MODULES(
+ [XDMXCONFIG_DEP],
+ [xaw7 xmu xt xpm x11],
+ [have_dmx=yes],
+ [have_dmx=no])],
+ [have_dmx=no])
AC_MSG_CHECKING([whether to build Xdmx DDX])
if test "x$DMX" = xauto; then
DMX="$have_dmx"
commit 761ae22f880bd79550ccf93d321b8a28b3755956
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Dec 1 14:38:19 2009 +1000
xfree86: tell users to disable AutoAddDevices, not AllowEmptyInput.
Technically, disabling AEI is the right suggestion. AEI off forces the
server to init the built-in defaults for input devices (or pick the first
one from the config file). At the same time, hotplugging is still available
with AEI off.
Unfortunatly, in the vast majority of cases users want to simply disable
hotplugging or have a working server while the local HAL configuration is
broken or missing. Disabling AEI will lead to duplicate events, triple
keystrokes, etc. once the configuration works again.
It's not actually required to remove AEI once hotplugging works again,
though it will in many cases lead to a setup that appears broken.
Asking users to disable AutoAddDevices instead means those users disable
hotplugging, can then fix the HAL setup and they _must_ remove the config
line again to test if hotplugging works again. Which doesn't leave them with
a broken config once everything is working nice and dandy. Less bugreports,
everybody wins.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Acked-by: Dan Nicholson <dbn.lists at gmail.com>
Acked-by: Daniel Stone <daniel at fooishbar.org>
Acked-by: Rémi Cardona <remi at gentoo.org>
Acked-by: James Cloos <cloos at jhcloos.com>
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 40f65bd..e1283f9 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1456,7 +1456,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
#ifdef CONFIG_HAL
xf86Msg(X_INFO, "The server relies on HAL to provide the list of "
"input devices.\n\tIf no devices become available, "
- "reconfigure HAL or disable AllowEmptyInput.\n");
+ "reconfigure HAL or disable AutoAddDevices.\n");
#else
xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n"
"\tTry disabling AllowEmptyInput.\n");
commit b584c224a888c9e7f92d7e49021f74232a727c7f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Oct 30 12:11:41 2009 +1000
Set the source and deviceid for key repeat events (#24785)
X.Org Bug 24785 <http://bugs.freedesktop.org/show_bug.cgi?id=24785>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Acked-by: Adam Jackson <ajax at redhat.com>
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 2fc7642..0d8e4eb 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -131,6 +131,8 @@ AccessXKeyboardEvent(DeviceIntPtr keybd,
event.time = GetTimeInMillis();
event.length = sizeof(DeviceEvent);
event.key_repeat = isRepeat;
+ event.sourceid = keybd->id;
+ event.deviceid = keybd->id;
if (xkbDebugFlags&0x8) {
DebugF("[xkb] AXKE: Key %d %s\n", keyCode,
commit 66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Nov 27 16:20:13 2009 +1000
dix: remove core devices when shutting down. (#25028)
NewInputDeviceRequest (and RemoveDevice) have checks in place to not allow
removal of the VCP/VCK. When shutting down, they need to be cleaned up
nonetheless to free the memory associated.
X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/devices.c b/dix/devices.c
index bb7b23b..6329d28 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -907,6 +907,9 @@ CloseDownDevices(void)
DeleteInputDeviceRequest(dev);
}
+ CloseDevice(inputInfo.pointer);
+ CloseDevice(inputInfo.keyboard);
+
inputInfo.devices = NULL;
inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL;
commit 83d90b90bcb71c89750f92a177361e53dd261414
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Nov 27 16:08:44 2009 +1000
dix: remove some obsolete comment.
The "counterpart to biggest hack" included checking for the motion history
function - which is unified in 1.7. Hence the check (which is already
removed) would evaluate to true anyway, and this comment isn't needed.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/devices.c b/dix/devices.c
index 3634eec..bb7b23b 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -686,7 +686,6 @@ FreeDeviceClass(int type, pointer *class)
{
ValuatorClassPtr *v = (ValuatorClassPtr*)class;
- /* Counterpart to 'biggest hack ever' in init. */
if ((*v)->motion)
xfree((*v)->motion);
xfree((*v));
commit c20c8897272427cb3f755a3e28e80a9ad46f08a1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Nov 27 16:01:53 2009 +1000
dix: fix memory leak, free event list on shutdown. (#25028)
X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/events.c b/dix/events.c
index 015c2b1..7e0867c 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5080,12 +5080,9 @@ InitEvents(void)
void
CloseDownEvents(void)
{
- int len;
- EventListPtr list;
-
- len = GetEventList(&list);
- while(len--)
- xfree(list[len].event);
+ FreeEventList(InputEventList, InputEventListLen);
+ InputEventListLen = 0;
+ InputEventList = NULL;
}
/**
More information about the xorg-commit
mailing list