andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'whot/master'

Browse Source
This commit is contained in:
Keith Packard 2009-12-02 15:28:07 -08:00
commit 98c8b75225
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -1881,11 +1881,15 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes]) AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
dnl DMX DDX dnl DMX DDX
PKG_CHECK_MODULES([DMXMODULES], PKG_CHECK_MODULES(
[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], [DMXMODULES],
PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes], [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
[have_dmx=no]), [PKG_CHECK_MODULES(
[have_dmx=no]) [XDMXCONFIG_DEP],
[xaw7 xmu xt xpm x11],
[have_dmx=yes],
[have_dmx=no])],
[have_dmx=no])
AC_MSG_CHECKING([whether to build Xdmx DDX]) AC_MSG_CHECKING([whether to build Xdmx DDX])
if test "x$DMX" = xauto; then if test "x$DMX" = xauto; then
DMX="$have_dmx" DMX="$have_dmx"

4
dix/devices.c
View File

@ -686,7 +686,6 @@ FreeDeviceClass(int type, pointer *class)
{ {
ValuatorClassPtr *v = (ValuatorClassPtr*)class; ValuatorClassPtr *v = (ValuatorClassPtr*)class;
/* Counterpart to 'biggest hack ever' in init. */
if ((*v)->motion) if ((*v)->motion)
xfree((*v)->motion); xfree((*v)->motion);
xfree((*v)); xfree((*v));
@ -908,6 +907,9 @@ CloseDownDevices(void)
DeleteInputDeviceRequest(dev); DeleteInputDeviceRequest(dev);
} }
CloseDevice(inputInfo.pointer);
CloseDevice(inputInfo.keyboard);
inputInfo.devices = NULL; inputInfo.devices = NULL;
inputInfo.off_devices = NULL; inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL; inputInfo.keyboard = NULL;

9
dix/events.c
View File

@ -5080,12 +5080,9 @@ InitEvents(void)
void void
CloseDownEvents(void) CloseDownEvents(void)
{ {
int len; FreeEventList(InputEventList, InputEventListLen);
EventListPtr list; InputEventListLen = 0;
InputEventList = NULL;
len = GetEventList(&list);
while(len--)
xfree(list[len].event);
} }
/** /**

2
hw/xfree86/common/xf86Config.c
View File

@ -1456,7 +1456,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
#ifdef CONFIG_HAL #ifdef CONFIG_HAL
xf86Msg(X_INFO, "The server relies on HAL to provide the list of " xf86Msg(X_INFO, "The server relies on HAL to provide the list of "
"input devices.\n\tIf no devices become available, " "input devices.\n\tIf no devices become available, "
"reconfigure HAL or disable AllowEmptyInput.\n"); "reconfigure HAL or disable AutoAddDevices.\n");
#else #else
xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n"
"\tTry disabling AllowEmptyInput.\n"); "\tTry disabling AllowEmptyInput.\n");

2
xkb/xkbAccessX.c
View File

@ -131,6 +131,8 @@ AccessXKeyboardEvent(DeviceIntPtr keybd,
event.time = GetTimeInMillis(); event.time = GetTimeInMillis();
event.length = sizeof(DeviceEvent); event.length = sizeof(DeviceEvent);
event.key_repeat = isRepeat; event.key_repeat = isRepeat;
event.sourceid = keybd->id;
event.deviceid = keybd->id;
if (xkbDebugFlags&0x8) { if (xkbDebugFlags&0x8) {
DebugF("[xkb] AXKE: Key %d %s\n", keyCode, DebugF("[xkb] AXKE: Key %d %s\n", keyCode,