diff options
| author | Keith Packard <keithp@keithp.com> | 2009-12-02 15:28:07 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-02 15:28:07 -0800 |
| commit | 98c8b752254a27ab1aaf881b36bfda0f74929d0a (patch) | |
| tree | f16beffdbaece4ab8c18b31c88fbe22f770142fc | |
| parent | 0e084d8c71e697a5cf5d5d7c749455ae14bd6eb7 (diff) | |
| parent | 91c1bd78f7240c92702828f8e5a6b6ce944b9e36 (diff) | |
Merge remote branch 'whot/master'
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | dix/devices.c | 4 | ||||
| -rw-r--r-- | dix/events.c | 9 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 2 | ||||
| -rw-r--r-- | xkb/xkbAccessX.c | 2 |
5 files changed, 18 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index fcd8875af..6cdef15fb 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" diff --git a/dix/devices.c b/dix/devices.c index 3634eece0..6329d2810 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)); @@ -908,6 +907,9 @@ CloseDownDevices(void) DeleteInputDeviceRequest(dev); } + CloseDevice(inputInfo.pointer); + CloseDevice(inputInfo.keyboard); + inputInfo.devices = NULL; inputInfo.off_devices = NULL; inputInfo.keyboard = NULL; diff --git a/dix/events.c b/dix/events.c index 015c2b19f..7e0867c82 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; } /** diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 40f65bdbf..e1283f97f 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"); diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 2fc764290..0d8e4eb2d 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, |