xserver: Branch 'server-1.7-nominations' - 4 commits
Peter Hutterer
whot at kemper.freedesktop.org
Wed Oct 21 17:26:14 PDT 2009
Makefile.am | 5 +++++
configure.ac | 9 +++++++--
hw/dmx/dmxwindow.c | 3 +--
hw/dmx/input/dmxinputinit.c | 22 +++++++++++-----------
hw/kdrive/linux/tslib.c | 4 ----
5 files changed, 24 insertions(+), 19 deletions(-)
New commits:
commit d6d3620faf23ce9adc2b91a1255f16344fc9894e
Author: Lee Leahu <freedesktop-bugs at dyweni.com>
Date: Mon Oct 19 15:43:59 2009 -0500
dmxDestroyWindow() - must call the X's native DetroyWindow()
Don't really know why this section was disabled, but without it,
certain pPicture resources do not get free'd until later in the
FreeClientResources() process after the screen has been free'd -
resulting in seg fault.
With this patch, all resources normally free'd using vanilla X are
now also being freed correctly by Xdmx.
https://bugs.freedesktop.org/show_bug.cgi?id=24576
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit f713f447a2110718dfc091380699362d76f0cd6c)
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 24acc08..ec9a29a 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -419,10 +419,9 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
pWinPriv->windowDestroyed(pWindow);
#endif
-#if 0
if (pScreen->DestroyWindow)
ret = pScreen->DestroyWindow(pWindow);
-#endif
+
DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen);
return ret;
commit d1da013b323a1131d561e85af4488c6e3dbf2dba
Author: Lee Leahu <freedesktop-bugs at dyweni.com>
Date: Sat Oct 17 00:45:44 2009 -0500
dmx: when setting up device axis, use the correct counter number
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 664a8e37fd83141974b772980f680b94e48b4f87)
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index d8402e8..5656016 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -474,9 +474,9 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
Relative);
for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, axis_labels[i],
- info.minval[0], info.maxval[0],
- info.res[0],
- info.minres[0], info.maxres[0]);
+ info.minval[i], info.maxval[i],
+ info.res[i],
+ info.minres[i], info.maxres[i]);
} else if (info.numRelAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
axis_labels,
@@ -484,20 +484,20 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
Relative);
for (i = 0; i < info.numRelAxes; i++)
InitValuatorAxisStruct(pDevice, i, axis_labels[i],
- info.minval[0],
- info.maxval[0], info.res[0],
- info.minres[0], info.maxres[0]);
+ info.minval[i],
+ info.maxval[i], info.res[i],
+ info.minres[i], info.maxres[i]);
} else if (info.numAbsAxes) {
InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
axis_labels,
dmxPointerGetMotionBufferSize(),
Absolute);
for (i = 0; i < info.numAbsAxes; i++)
- InitValuatorAxisStruct(pDevice, i+info.numRelAxes,
- axis_labels[i + info.numRelAxes],
- info.minval[i+1], info.maxval[i+1],
- info.res[i+1], info.minres[i+1],
- info.maxres[i+1]);
+ InitValuatorAxisStruct(pDevice, i,
+ axis_labels[i],
+ info.minval[i], info.maxval[i],
+ info.res[i], info.minres[i],
+ info.maxres[i]);
}
}
if (info.focusClass) InitFocusClassDeviceStruct(pDevice);
commit c16f3ae484e4b0438d0fdf504c6344a7985cb1df
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Sep 24 11:25:28 2009 +1000
kdrive: silence tslib compiler warnings
tslib.c: In function 'TslibInit':
tslib.c:157: warning: unused variable 'tsDev'
tslib.c:156: warning: unused variable 'inputent'
tslib.c:155: warning: unused variable 'inputdir'
tslib.c:154: warning: unused variable 'i'
tslib.c:154: warning: unused variable 'fd'
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01)
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index 59011b0..7cc23e6 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -151,10 +151,6 @@ TslibDisable (KdPointerInfo *pi)
static Status
TslibInit (KdPointerInfo *pi)
{
- int fd = 0, i = 0;
- DIR *inputdir = NULL;
- struct dirent *inputent = NULL;
- struct tsdev *tsDev = NULL;
struct TslibPrivate *private = NULL;
if (!pi || !pi->dixdev)
commit e644e322c78d83e445daa64dc3f2f596b2b64016
Author: Keith Packard <keithp at keithp.com>
Date: Wed Oct 21 16:46:55 2009 +0900
Fix 'distcheck' to use host xkb files but install to build dir
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23)
diff --git a/Makefile.am b/Makefile.am
index cb98d2c..a5e0730 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,11 @@ endif
EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
+DISTCHECK_CONFIGURE_FLAGS=\
+ --with-xkb-path=$(XKB_BASE_DIRECTORY) \
+ --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
+ --with-xkb-output='$${datadir}/X11/xkb/compiled'
+
DISTCLEANFILES = doltcompile doltlibtool
MAINTAINERCLEANFILES=ChangeLog
diff --git a/configure.ac b/configure.ac
index 2770115..628f410 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1091,11 +1091,16 @@ AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
-AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
+AC_ARG_WITH(xkb-bin-directory,
+ AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]),
+ [XKB_BIN_DIRECTORY="$withval"],
+ [XKB_BIN_DIRECTORY="$bindir"])
+
+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
dnl Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
-if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
+if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
fi
More information about the xorg-commit
mailing list