svn merge ^/branches/released .

13 files changed, 385 insertions, 342 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 41acdbe4e..d02f4a0a1 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.9.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2011-2-24"

+AC_INIT([xorg-server], 1.10.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

+RELEASE_DATE="2011-2-25"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -2173,6 +2173,8 @@ AC_SUBST([libdir])
 AC_SUBST([exec_prefix])

 AC_SUBST([prefix])

 

+AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep])

+

 AC_OUTPUT([

 Makefile

 glx/Makefile

@@ -2246,6 +2248,7 @@ hw/xfree86/utils/gtf/Makefile
 hw/dmx/config/Makefile

 hw/dmx/config/man/Makefile

 hw/dmx/doc/Makefile

+hw/dmx/doc/doxygen.conf

 hw/dmx/examples/Makefile

 hw/dmx/input/Makefile

 hw/dmx/glxProxy/Makefile

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 1bf73b992..1c2cc9807 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -1233,6 +1233,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
 {

     int i;

     ValuatorClassPtr valc;

+    union align_u { ValuatorClassRec valc; double d; } *align;

 

     if (!dev)

         return FALSE;

@@ -1245,12 +1246,13 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
         numAxes = MAX_VALUATORS;

     }

 

-    valc = (ValuatorClassPtr)calloc(1, sizeof(ValuatorClassRec) +

-				    numAxes * sizeof(AxisInfo) +

-				    numAxes * sizeof(double));

-    if (!valc)

+    align = (union align_u *) calloc(1, sizeof(union align_u) +

+				     numAxes * sizeof(double) +

+				     numAxes * sizeof(AxisInfo));

+    if (!align)

 	return FALSE;

 

+    valc = &align->valc;

     valc->sourceid = dev->id;

     valc->motion = NULL;

     valc->first_motion = 0;

@@ -1259,8 +1261,8 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
     valc->numMotionEvents = numMotionEvents;

     valc->motionHintWindow = NullWindow;

     valc->numAxes = numAxes;

-    valc->axes = (AxisInfoPtr)(valc + 1);

-    valc->axisVal = (double *)(valc->axes + numAxes);

+    valc->axisVal = (double *)(align + 1);

+    valc->axes = (AxisInfoPtr)(valc->axisVal + numAxes);

 

     if (mode & OutOfProximity)

         InitProximityClassDeviceStruct(dev);

diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 4bbc8bf88..2c5350bd9 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -1,265 +1,280 @@
-#  Copyright 2005 Red Hat, Inc.
-#
-#  Permission to use, copy, modify, distribute, and sell this software
-#  and its documentation for any purpose is hereby granted without
-#  fee, provided that the above copyright notice appear in all copies
-#  and that both that copyright notice and this permission notice
-#  appear in supporting documentation, and that the name of Red Hat
-#  not be used in advertising or publicity pertaining to distribution
-#  of the software without specific, written prior permission.  Red
-#  Hat makes no representations about the suitability of this software
-#  for any purpose.  It is provided "as is" without express or implied
-#  warranty.
-#
-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-#  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-doc_sources = dmx.xml scaled.xml
-
-# Developer's documentation is not installed
-if ENABLE_DEVEL_DOCS
-include $(top_srcdir)/doc/xml/xmlrules-noinst.in
-
-if HAVE_DOXYGEN
-
-DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
-
-all-local: html/annotated.html
-
-dist-local: html/annotated.html
-
-html/annotated.html: $(DOXYGEN_SRC)
-	$(DOXYGEN) $(srcdir)/doxygen.conf
-
-maintainer-clean-local:
-	rm -rf html/
-endif
-endif ENABLE_DEVEL_DOCS
-
-EXTRA_DIST = \
-	$(XML_FILES) \
-	DMXSpec.txt \
-	DMXSpec-v1.txt \
-	dmx.txt \
-	doxygen.conf \
-	doxygen.css \
-	doxygen.foot \
-	doxygen.head \
-	scaled.txt \
-	html/annotated.html \
-	html/ChkNotMaskEv_8c.html \
-	html/ChkNotMaskEv_8h.html \
-	html/ChkNotMaskEv_8h_source.html \
-	html/classes.html \
-	html/dmx_8h.html \
-	html/dmx_8h_source.html \
-	html/dmxarg_8c.html \
-	html/dmxarg_8h.html \
-	html/dmxarg_8h_source.html \
-	html/dmxbackend_8c.html \
-	html/dmxbackend_8h.html \
-	html/dmxbackend_8h_source.html \
-	html/dmxcb_8c.html \
-	html/dmxcb_8h.html \
-	html/dmxcb_8h_source.html \
-	html/dmxclient_8h.html \
-	html/dmxclient_8h_source.html \
-	html/dmxcmap_8c.html \
-	html/dmxcmap_8h.html \
-	html/dmxcmap_8h_source.html \
-	html/dmxcommon_8c.html \
-	html/dmxcommon_8h.html \
-	html/dmxcommon_8h_source.html \
-	html/dmxcompat_8c.html \
-	html/dmxcompat_8h.html \
-	html/dmxcompat_8h_source.html \
-	html/dmxconfig_8c.html \
-	html/dmxconfig_8h.html \
-	html/dmxconfig_8h_source.html \
-	html/dmxconsole_8c.html \
-	html/dmxconsole_8h.html \
-	html/dmxconsole_8h_source.html \
-	html/dmxcursor_8c.html \
-	html/dmxcursor_8h.html \
-	html/dmxcursor_8h_source.html \
-	html/dmxdetach_8c.html \
-	html/dmxdpms_8c.html \
-	html/dmxdpms_8h.html \
-	html/dmxdpms_8h_source.html \
-	html/dmxdummy_8c.html \
-	html/dmxdummy_8h.html \
-	html/dmxdummy_8h_source.html \
-	html/dmxevents_8c.html \
-	html/dmxevents_8h.html \
-	html/dmxevents_8h_source.html \
-	html/dmxextension_8c.html \
-	html/dmxextension_8h.html \
-	html/dmxextension_8h_source.html \
-	html/dmxfont_8c.html \
-	html/dmxfont_8h.html \
-	html/dmxfont_8h_source.html \
-	html/dmxgc_8c.html \
-	html/dmxgc_8h.html \
-	html/dmxgc_8h_source.html \
-	html/dmxgcops_8c.html \
-	html/dmxgcops_8h.html \
-	html/dmxgcops_8h_source.html \
-	html/dmx__glxvisuals_8h_source.html \
-	html/dmxinit_8c.html \
-	html/dmxinit_8h.html \
-	html/dmxinit_8h_source.html \
-	html/dmxinput_8c.html \
-	html/dmxinput_8h.html \
-	html/dmxinput_8h_source.html \
-	html/dmxinputinit_8c.html \
-	html/dmxinputinit_8h.html \
-	html/dmxinputinit_8h_source.html \
-	html/dmxlog_8c.html \
-	html/dmxlog_8h.html \
-	html/dmxlog_8h_source.html \
-	html/dmxmap_8c.html \
-	html/dmxmap_8h.html \
-	html/dmxmap_8h_source.html \
-	html/dmxmotion_8c.html \
-	html/dmxmotion_8h.html \
-	html/dmxmotion_8h_source.html \
-	html/dmxparse_8c.html \
-	html/dmxparse_8h.html \
-	html/dmxparse_8h_source.html \
-	html/dmxpict_8c.html \
-	html/dmxpict_8h.html \
-	html/dmxpict_8h_source.html \
-	html/dmxpixmap_8c.html \
-	html/dmxpixmap_8h.html \
-	html/dmxpixmap_8h_source.html \
-	html/dmxprint_8c.html \
-	html/dmxprint_8h.html \
-	html/dmxprint_8h_source.html \
-	html/dmxprop_8c.html \
-	html/dmxprop_8h.html \
-	html/dmxprop_8h_source.html \
-	html/dmxscrinit_8c.html \
-	html/dmxscrinit_8h.html \
-	html/dmxscrinit_8h_source.html \
-	html/dmxshadow_8c.html \
-	html/dmxshadow_8h.html \
-	html/dmxshadow_8h_source.html \
-	html/dmxsigio_8c.html \
-	html/dmxsigio_8h.html \
-	html/dmxsigio_8h_source.html \
-	html/dmxstat_8c.html \
-	html/dmxstat_8h.html \
-	html/dmxstat_8h_source.html \
-	html/dmxsync_8c.html \
-	html/dmxsync_8h.html \
-	html/dmxsync_8h_source.html \
-	html/dmxvisual_8c.html \
-	html/dmxvisual_8h.html \
-	html/dmxvisual_8h_source.html \
-	html/dmxwindow_8c.html \
-	html/dmxwindow_8h.html \
-	html/dmxwindow_8h_source.html \
-	html/dmxxinput_8c.html \
-	html/doxygen.css \
-	html/doxygen.png \
-	html/files.html \
-	html/ftv2blank.png \
-	html/ftv2doc.png \
-	html/ftv2folderclosed.png \
-	html/ftv2folderopen.png \
-	html/ftv2lastnode.png \
-	html/ftv2link.png \
-	html/ftv2mlastnode.png \
-	html/ftv2mnode.png \
-	html/ftv2node.png \
-	html/ftv2plastnode.png \
-	html/ftv2pnode.png \
-	html/ftv2vertline.png \
-	html/functions.html \
-	html/functions_vars.html \
-	html/globals_defs.html \
-	html/globals_enum.html \
-	html/globals_eval.html \
-	html/globals_func.html \
-	html/globals.html \
-	html/globals_type.html \
-	html/globals_vars.html \
-	html/index.html \
-	html/lnx-keyboard_8c.html \
-	html/lnx-keyboard_8h.html \
-	html/lnx-keyboard_8h_source.html \
-	html/lnx-ms_8c.html \
-	html/lnx-ms_8h.html \
-	html/lnx-ms_8h_source.html \
-	html/lnx-ps2_8c.html \
-	html/lnx-ps2_8h.html \
-	html/lnx-ps2_8h_source.html \
-	html/main.html \
-	html/struct__dmxArg.html \
-	html/struct__dmxColormapPriv.html \
-	html/structDMXConfigCmdStruct.html \
-	html/struct__DMXConfigComment.html \
-	html/struct__DMXConfigDisplay.html \
-	html/struct__DMXConfigEntry.html \
-	html/struct__DMXConfigFullDim.html \
-	html/structDMXConfigListStruct.html \
-	html/struct__DMXConfigNumber.html \
-	html/struct__DMXConfigOption.html \
-	html/struct__DMXConfigPair.html \
-	html/struct__DMXConfigParam.html \
-	html/struct__DMXConfigPartDim.html \
-	html/struct__DMXConfigString.html \
-	html/struct__DMXConfigSub.html \
-	html/struct__DMXConfigToken.html \
-	html/struct__DMXConfigVirtual.html \
-	html/struct__DMXConfigWall.html \
-	html/struct__dmxCursorPriv.html \
-	html/structDMXDesktopAttributesRec.html \
-	html/struct__DMXEventMap.html \
-	html/struct__dmxFontPriv.html \
-	html/struct__dmxGCPriv.html \
-	html/structdmxGlxVisualPrivate.html \
-	html/struct__dmxGlyphPriv.html \
-	html/structDMXInputAttributesRec.html \
-	html/struct__DMXInputInfo.html \
-	html/struct__DMXLocalInitInfo.html \
-	html/struct__DMXLocalInputInfo.html \
-	html/struct__dmxPictPriv.html \
-	html/struct__dmxPixPriv.html \
-	html/structDMXScreenAttributesRec.html \
-	html/struct__DMXScreenInfo.html \
-	html/struct__DMXStatAvg.html \
-	html/struct__DMXStatInfo.html \
-	html/structDMXWindowAttributesRec.html \
-	html/struct__dmxWinPriv.html \
-	html/struct__myPrivate.html \
-	html/tree.html \
-	html/usb-common_8c.html \
-	html/usb-common_8h.html \
-	html/usb-common_8h_source.html \
-	html/usb-keyboard_8c.html \
-	html/usb-keyboard_8h.html \
-	html/usb-keyboard_8h_source.html \
-	html/usb-mouse_8c.html \
-	html/usb-mouse_8h.html \
-	html/usb-mouse_8h_source.html \
-	html/usb-other_8c.html \
-	html/usb-other_8h.html \
-	html/usb-other_8h_source.html \
-	html/usb-private_8h.html \
-	html/usb-private_8h_source.html
-
-$(builddir)/doxygen.head:
-	$(LN_S) $(srcdir)/doxygen.head $@
-
-$(builddir)/doxygen.foot:
-	$(LN_S) $(srcdir)/doxygen.foot $@
-
-$(builddir)doxygen.css:
-	$(LN_S) $(srcdir)/doxygen.css $@
-
+#  Copyright 2005 Red Hat, Inc.

+#

+#  Permission to use, copy, modify, distribute, and sell this software

+#  and its documentation for any purpose is hereby granted without

+#  fee, provided that the above copyright notice appear in all copies

+#  and that both that copyright notice and this permission notice

+#  appear in supporting documentation, and that the name of Red Hat

+#  not be used in advertising or publicity pertaining to distribution

+#  of the software without specific, written prior permission.  Red

+#  Hat makes no representations about the suitability of this software

+#  for any purpose.  It is provided "as is" without express or implied

+#  warranty.

+#

+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

+#  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

+#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+doc_sources = dmx.xml scaled.xml

+

+# Developer's documentation is not installed

+if ENABLE_DEVEL_DOCS

+include $(top_srcdir)/doc/xml/xmlrules-noinst.in

+endif ENABLE_DEVEL_DOCS

+

+DOXYGEN_HEAD=\

+	html/annotated.html

+

+DOXYGEN_REST= \

+	dmx.txt \

+	scaled.txt \

+	html/ChkNotMaskEv_8c.html \

+	html/ChkNotMaskEv_8h.html \

+	html/ChkNotMaskEv_8h_source.html \

+	html/classes.html \

+	html/dmx_8h.html \

+	html/dmx_8h_source.html \

+	html/dmxarg_8c.html \

+	html/dmxarg_8h.html \

+	html/dmxarg_8h_source.html \

+	html/dmxbackend_8c.html \

+	html/dmxbackend_8h.html \

+	html/dmxbackend_8h_source.html \

+	html/dmxcb_8c.html \

+	html/dmxcb_8h.html \

+	html/dmxcb_8h_source.html \

+	html/dmxclient_8h.html \

+	html/dmxclient_8h_source.html \

+	html/dmxcmap_8c.html \

+	html/dmxcmap_8h.html \

+	html/dmxcmap_8h_source.html \

+	html/dmxcommon_8c.html \

+	html/dmxcommon_8h.html \

+	html/dmxcommon_8h_source.html \

+	html/dmxcompat_8c.html \

+	html/dmxcompat_8h.html \

+	html/dmxcompat_8h_source.html \

+	html/dmxconfig_8c.html \

+	html/dmxconfig_8h.html \

+	html/dmxconfig_8h_source.html \

+	html/dmxconsole_8c.html \

+	html/dmxconsole_8h.html \

+	html/dmxconsole_8h_source.html \

+	html/dmxcursor_8c.html \

+	html/dmxcursor_8h.html \

+	html/dmxcursor_8h_source.html \

+	html/dmxdetach_8c.html \

+	html/dmxdpms_8c.html \

+	html/dmxdpms_8h.html \

+	html/dmxdpms_8h_source.html \

+	html/dmxdummy_8c.html \

+	html/dmxdummy_8h.html \

+	html/dmxdummy_8h_source.html \

+	html/dmxevents_8c.html \

+	html/dmxevents_8h.html \

+	html/dmxevents_8h_source.html \

+	html/dmxextension_8c.html \

+	html/dmxextension_8h.html \

+	html/dmxextension_8h_source.html \

+	html/dmxfont_8c.html \

+	html/dmxfont_8h.html \

+	html/dmxfont_8h_source.html \

+	html/dmxgc_8c.html \

+	html/dmxgc_8h.html \

+	html/dmxgc_8h_source.html \

+	html/dmxgcops_8c.html \

+	html/dmxgcops_8h.html \

+	html/dmxgcops_8h_source.html \

+	html/dmx__glxvisuals_8h_source.html \

+	html/dmxinit_8c.html \

+	html/dmxinit_8h.html \

+	html/dmxinit_8h_source.html \

+	html/dmxinput_8c.html \

+	html/dmxinput_8h.html \

+	html/dmxinput_8h_source.html \

+	html/dmxinputinit_8c.html \

+	html/dmxinputinit_8h.html \

+	html/dmxinputinit_8h_source.html \

+	html/dmxlog_8c.html \

+	html/dmxlog_8h.html \

+	html/dmxlog_8h_source.html \

+	html/dmxmap_8c.html \

+	html/dmxmap_8h.html \

+	html/dmxmap_8h_source.html \

+	html/dmxmotion_8c.html \

+	html/dmxmotion_8h.html \

+	html/dmxmotion_8h_source.html \

+	html/dmxparse_8c.html \

+	html/dmxparse_8h.html \

+	html/dmxparse_8h_source.html \

+	html/dmxpict_8c.html \

+	html/dmxpict_8h.html \

+	html/dmxpict_8h_source.html \

+	html/dmxpixmap_8c.html \

+	html/dmxpixmap_8h.html \

+	html/dmxpixmap_8h_source.html \

+	html/dmxprint_8c.html \

+	html/dmxprint_8h.html \

+	html/dmxprint_8h_source.html \

+	html/dmxprop_8c.html \

+	html/dmxprop_8h.html \

+	html/dmxprop_8h_source.html \

+	html/dmxscrinit_8c.html \

+	html/dmxscrinit_8h.html \

+	html/dmxscrinit_8h_source.html \

+	html/dmxshadow_8c.html \

+	html/dmxshadow_8h.html \

+	html/dmxshadow_8h_source.html \

+	html/dmxsigio_8c.html \

+	html/dmxsigio_8h.html \

+	html/dmxsigio_8h_source.html \

+	html/dmxstat_8c.html \

+	html/dmxstat_8h.html \

+	html/dmxstat_8h_source.html \

+	html/dmxsync_8c.html \

+	html/dmxsync_8h.html \

+	html/dmxsync_8h_source.html \

+	html/dmxvisual_8c.html \

+	html/dmxvisual_8h.html \

+	html/dmxvisual_8h_source.html \

+	html/dmxwindow_8c.html \

+	html/dmxwindow_8h.html \

+	html/dmxwindow_8h_source.html \

+	html/dmxxinput_8c.html \

+	html/doxygen.css \

+	html/doxygen.png \

+	html/files.html \

+	html/ftv2blank.png \

+	html/ftv2doc.png \

+	html/ftv2folderclosed.png \

+	html/ftv2folderopen.png \

+	html/ftv2lastnode.png \

+	html/ftv2link.png \

+	html/ftv2mlastnode.png \

+	html/ftv2mnode.png \

+	html/ftv2node.png \

+	html/ftv2plastnode.png \

+	html/ftv2pnode.png \

+	html/ftv2vertline.png \

+	html/functions.html \

+	html/functions_vars.html \

+	html/globals_defs.html \

+	html/globals_enum.html \

+	html/globals_eval.html \

+	html/globals_func.html \

+	html/globals.html \

+	html/globals_type.html \

+	html/globals_vars.html \

+	html/index.html \

+	html/lnx-keyboard_8c.html \

+	html/lnx-keyboard_8h.html \

+	html/lnx-keyboard_8h_source.html \

+	html/lnx-ms_8c.html \

+	html/lnx-ms_8h.html \

+	html/lnx-ms_8h_source.html \

+	html/lnx-ps2_8c.html \

+	html/lnx-ps2_8h.html \

+	html/lnx-ps2_8h_source.html \

+	html/main.html \

+	html/struct__dmxArg.html \

+	html/struct__dmxColormapPriv.html \

+	html/structDMXConfigCmdStruct.html \

+	html/struct__DMXConfigComment.html \

+	html/struct__DMXConfigDisplay.html \

+	html/struct__DMXConfigEntry.html \

+	html/struct__DMXConfigFullDim.html \

+	html/structDMXConfigListStruct.html \

+	html/struct__DMXConfigNumber.html \

+	html/struct__DMXConfigOption.html \

+	html/struct__DMXConfigPair.html \

+	html/struct__DMXConfigParam.html \

+	html/struct__DMXConfigPartDim.html \

+	html/struct__DMXConfigString.html \

+	html/struct__DMXConfigSub.html \

+	html/struct__DMXConfigToken.html \

+	html/struct__DMXConfigVirtual.html \

+	html/struct__DMXConfigWall.html \

+	html/struct__dmxCursorPriv.html \

+	html/structDMXDesktopAttributesRec.html \

+	html/struct__DMXEventMap.html \

+	html/struct__dmxFontPriv.html \

+	html/struct__dmxGCPriv.html \

+	html/structdmxGlxVisualPrivate.html \

+	html/struct__dmxGlyphPriv.html \

+	html/structDMXInputAttributesRec.html \

+	html/struct__DMXInputInfo.html \

+	html/struct__DMXLocalInitInfo.html \

+	html/struct__DMXLocalInputInfo.html \

+	html/struct__dmxPictPriv.html \

+	html/struct__dmxPixPriv.html \

+	html/structDMXScreenAttributesRec.html \

+	html/struct__DMXScreenInfo.html \

+	html/struct__DMXStatAvg.html \

+	html/struct__DMXStatInfo.html \

+	html/structDMXWindowAttributesRec.html \

+	html/struct__dmxWinPriv.html \

+	html/struct__myPrivate.html \

+	html/tree.html \

+	html/usb-common_8c.html \

+	html/usb-common_8h.html \

+	html/usb-common_8h_source.html \

+	html/usb-keyboard_8c.html \

+	html/usb-keyboard_8h.html \

+	html/usb-keyboard_8h_source.html \

+	html/usb-mouse_8c.html \

+	html/usb-mouse_8h.html \

+	html/usb-mouse_8h_source.html \

+	html/usb-other_8c.html \

+	html/usb-other_8h.html \

+	html/usb-other_8h_source.html \

+	html/usb-private_8h.html \

+	html/usb-private_8h_source.html

+

+DOXYGEN_FILES=$(DOXYGEN_HEAD) $(DOXYGEN_REST)

+

+EXTRA_DIST = \

+	$(XML_FILES) \

+	DMXSpec.txt \

+	DMXSpec-v1.txt \

+	doxygen.conf \

+	doxygen.css \

+	doxygen.foot \

+	doxygen.head \

+	$(DOXYGEN_FILES)

+

+if ENABLE_DEVEL_DOCS

+if HAVE_DOXYGEN

+

+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf

+

+all-local: $(DOXYGEN_FILES)

+

+dist-local: $(DOXYGEN_FILES)

+

+$(DOXYGEN_HEAD): $(DOXYGEN_SRC)

+	$(DOXYGEN) doxygen.conf

+

+$(DOXYGEN_REST): $(DOXYGEN_HEAD)

+

+maintainer-clean-local:

+	rm -rf html/ scaled.txt dmx.txt

+

+distclean-local:

+	rm -rf html/ scaled.txt dmx.txt

+

+endif HAVE_DOXYGEN

+endif ENABLE_DEVEL_DOCS

+

+$(builddir)/doxygen.head:

+	$(LN_S) $(srcdir)/doxygen.head $@

+

+$(builddir)/doxygen.foot:

+	$(LN_S) $(srcdir)/doxygen.foot $@

+

+$(builddir)doxygen.css:

+	$(LN_S) $(srcdir)/doxygen.css $@

+

diff --git a/xorg-server/hw/dmx/doc/doxygen.conf b/xorg-server/hw/dmx/doc/doxygen.conf.in
index f7a541f90..f886a436f 100644
--- a/xorg-server/hw/dmx/doc/doxygen.conf
+++ b/xorg-server/hw/dmx/doc/doxygen.conf.in
@@ -344,9 +344,9 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = .. \
-                         ../input \
-                         ../config
+INPUT                  = @srcdir@/.. \
+                         @srcdir@/../input \
+                         @srcdir@/../config
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -367,9 +367,9 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../config/parser.c \
-                         ../config/parser.h \
-                         ../config/scanner.c
+EXCLUDE                = @srcdir@/../config/parser.c \
+                         @srcdir@/../config/parser.h \
+                         @srcdir@/../config/scanner.c
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
 # that are symbolic links (a Unix filesystem feature) are excluded from the input.
@@ -510,20 +510,20 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = doxygen.head
+HTML_HEADER            = @srcdir@/doxygen.head
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = doxygen.foot
+HTML_FOOTER            = @srcdir@/doxygen.foot
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet
 
-HTML_STYLESHEET        = doxygen.css
+HTML_STYLESHEET        = @srcdir@/doxygen.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
diff --git a/xorg-server/hw/xfree86/loader/Makefile.am b/xorg-server/hw/xfree86/loader/Makefile.am
index acacda650..8045885b1 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.am
+++ b/xorg-server/hw/xfree86/loader/Makefile.am
@@ -26,4 +26,5 @@ CLEANFILES = sdksyms.c sdksyms.dep
 sdksyms.dep sdksyms.c: sdksyms.sh

 	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)

 

-sinclude sdksyms.dep

+SDKSYMS_DEP = sdksyms.dep

+include $(SDKSYMS_DEP)

diff --git a/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am
index dae58bf89..94ebbb828 100644
--- a/xorg-server/hw/xwin/glx/Makefile.am
+++ b/xorg-server/hw/xwin/glx/Makefile.am
@@ -45,10 +45,10 @@ wgl.tm:
 	wget http://www.opengl.org/registry/api/wgl.tm

 

 generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/gl.spec --typemap=$(srcdir)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

+	$(srcdir)/gen_gl_wrappers.py --spec=`test -e gl.spec || echo $(srcdir)/`gl.spec --typemap=`test -e gl.tm || echo $(srcdir)/`gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

 

 generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/wglext.spec --typemap=$(srcdir)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

+	$(srcdir)/gen_gl_wrappers.py --spec=`test -e wglext.spec || echo $(srcdir)/`wglext.spec --typemap=`test -e wgl.tm || echo $(srcdir)/`wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

 

 wglext.h:

 	wget http://www.opengl.org/registry/api/wglext.h

diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 00634858d..fc01ea82e 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -60,6 +60,7 @@
   caps:super		=	+capslock(super)

   caps:hyper		=	+capslock(hyper)

   caps:none		=	+capslock(none)

+  caps:ctrl_modifier	=	+capslock(ctrl_modifier)

   ctrl:nocaps		=	+ctrl(nocaps)

   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)

   ctrl:swapcaps		=	+ctrl(swapcaps)

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index d6061b0ec..37e7a56d4 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1394,14 +1394,14 @@
         </variant>

         <variant>

           <configItem>

-            <name>olpc-fa</name>

+            <name>fa-olpc</name>

             <_description>OLPC Dari</_description>

             <!-- No ISO code in ISO639-2, only draft ISO693-3 -->

           </configItem>

         </variant>

         <variant>

           <configItem>

-            <name>olpc-uz</name>

+            <name>uz-olpc</name>

             <_description>OLPC Southern Uzbek</_description>

             <languageList><iso639Id>uzb</iso639Id></languageList>

           </configItem>

@@ -5295,6 +5295,12 @@
           <_description>Caps Lock is disabled</_description>

         </configItem>

       </option>

+      <option>

+        <configItem>

+          <name>caps:ctrl_modifier</name>

+          <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>

+        </configItem>

+      </option>

     </group>

     <group allowMultipleSelection="false">

       <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->

diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index 90bfe127d..691b0a07c 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -275,7 +275,7 @@ xkb_symbols "olpc-ps" {
 };

 

 partial alphanumeric_keys 

-xkb_symbols "olpc-fa" {

+xkb_symbols "fa-olpc" {

 

    name[Group1]= "Afghanistan - OLPC Dari";

 

@@ -336,7 +336,7 @@ xkb_symbols "olpc-fa" {
 };

 

 partial alphanumeric_keys 

-xkb_symbols "olpc-uz" {

+xkb_symbols "uz-olpc" {

 

    name[Group1]= "Afghanistan - OLPC Southern Uzbek";

 

diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 288a1d293..6daf5c1ed 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -60,3 +60,15 @@ partial hidden modifier_keys
 xkb_symbols "numlock" {

     key <CAPS> {        [       Num_Lock  ]       };

 };

+

+// This changes the modifier behavior of the <CAPS> key.

+// The keysym will be reset to Caps_Lock

+partial hidden modifier_keys

+xkb_symbols "ctrl_modifier" {

+    replace key <CAPS> {

+        type[Group1] = "ONE_LEVEL",

+        symbols[Group1] = [ Caps_Lock ],

+        actions[Group1] = [ SetMods(modifiers=Control) ]    

+    };

+    modifier_map Control { <CAPS> };

+};

diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et
index 6f71b2f97..e1530c2ad 100644
--- a/xorg-server/xkeyboard-config/symbols/et
+++ b/xorg-server/xkeyboard-config/symbols/et
@@ -31,18 +31,18 @@ xkb_symbols "olpc" {
 

     key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q

     key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w

-    key <AD03>	{ [        e,           E          ]	}; // e

+    key <AD03>	{ [        0x0100FE69,  0x0100FE70 ]	}; // dead e

     key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r

     key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t

     key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y

-    key <AD07>	{ [        u,           U          ]	}; // u

-    key <AD08>	{ [        i,           I          ]	}; // i

-    key <AD09>	{ [        o,           O          ]	}; // o

+    key <AD07>	{ [        0x0100FE75,  0x0100FE76 ]	}; // dead u

+    key <AD08>	{ [        0x0100FE71,  0x0100FE72 ]	}; // dead i

+    key <AD09>	{ [        0x0100FE73,  0x0100FE74 ]	}; // dead o

     key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p

     key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [

     key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]

 

-    key <AC01>	{ [        a,           A          ]	}; // a

+    key <AC01>	{ [        0x0100FE67,  0x0100FE68 ]	}; // dead a

     key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s

     key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d

     key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f

@@ -57,7 +57,7 @@ xkb_symbols "olpc" {
 

     key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z

     key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x

-    key <AB03>  { [        0x01001278,  VoidSymbol ]    }; // c

+    key <AB03>  { [        0x01001278,  0x0100FE78 ]    }; // c

     key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v

     key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b

     key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n

@@ -65,7 +65,7 @@ xkb_symbols "olpc" {
 

     key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <

     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >

-    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?

+    key <AB10>  { [        0x01001367,  question   ]    }; // ?

 

     key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl

 

diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn
index 44e5e4e67..462a953e8 100644
--- a/xorg-server/xkeyboard-config/symbols/mn
+++ b/xorg-server/xkeyboard-config/symbols/mn
@@ -74,6 +74,8 @@ xkb_symbols "olpc" {
 

   include "mn(basic)"

 

+  key <AE07> { [ 7,                 semicolon,          ampersand       ] };

+

   key <BKSL> { [ backslash,         bar,     		exclam          ] };

 

   include "group(olpc)"

diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index 635fa348a..9cb14c873 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -65,56 +65,57 @@ xkb_symbols "basic" {
 };

 

 partial alphanumeric_keys

-xkb_symbols "olpc" {

 

+xkb_symbols "olpc" {

 // Contact: Walter Bender <walter@laptop.org>

 

   include "np"

-      key <TLDE> { [      grave,     asciitilde 	]	};

-      key <AE01> { [      0x1000967	 		]	}; // Nepali digit one

-      key <AE02> { [      0x1000968			]	}; // Nepali digit two

-      key <AE03> { [      0x1000969 	 		]	}; // Nepali digit three

-      key <AE04> { [      0x100096A  	 		]	}; // Nepali digit four

-      key <AE05> { [      0x100096B  	 		]	}; // Nepali digit five

-      key <AE06> { [      0x100096C,  sterling 	 	]	}; // Nepali digit six

-      key <AE07> { [      0x100096D,  eurosign 	 	]	}; // Nepali digit seven

-      key <AE08> { [      0x100096e  	 		]	}; // Nepali digit eight

-      key <AE09> { [      0x100096F	 		]	}; // Nepali digit nine

-      key <AE10> { [      0x1000966			]	}; // Nepali digit zero

-      key <AE12> { [      0x1000950,  0x1000903 	]	}; // OM, SIGN VISARGA

-

-      key <AD01> { [      0x100091C,  0x100091D 	]	}; // JA, JHA

-      key <AD02> { [      0x1000917,  0x1000918       	]	}; // GA, GHA

-      key <AD03> { [      0x100092F,  0x100091E 	]	}; // YA, YNA

-      key <AD04> { [      0x1000938,  0x1000936       	]	}; // SA, SHA

-      key <AD05> { [      0x100090F,  0x1000910		]	}; // E, AI

-      key <AD06> { [      0x100091B,  0x100091A         ]       }; // CHHA, CHA

-      key <AD07> { [      0x100092A,  0x100092B 	]	}; // PA, PHA

-      key <AD08> { [      0x1000947,  0x1000948       	]	}; // VOWEL SIGN E, VOWEL SIGN AI

-      key <AD09> { [      0x100094B,  0x100093E		]	}; // VOWEL SIGN O, VOWEL SIGN AA

-      key <AD10> { [      0x1000924,  0x1000925       	]	}; // TA, THA

-      key <AD11> { [      0x1000909,  0x100090A 	]	}; // HRSHWA U, DIRGHA UU

-      key <AD12> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN HRSHWA I, VOWEL SIGN DIRGHA II

-

-      key <AC01> { [      0x100092E,  0x1000902         ]       }; // MA, SIGN ANUSVARA

-      key <AC02> { [      0x1000907,  0x1000908		]	}; // HRSHWA I, DIRGHA II

-      key <AC03> { [      0x1000928,  0x1000923         ]       }; // NA, NNA

-      key <AC04> { [      0x100094D,  0x1000921		]       }; // VIRAMA (HALANTA?), DDA

-      key <AC05> { [      0x100091F,  0x1000920       	]	}; // TTA, TTHA

-      key <AC06> { [      0x1000926,  0x1000927       	]	}; // DA, DHA

-      key <AC07> { [      0x100093E,  0x1000901       	]	}; // SIGN AA, SIGN CANDRABINDU

-      key <AC08> { [      0x1000930,  0x1000943       	]	}; // RA, VOWEL SIGN VOCALIC R

-      key <AC09> { [      0x1000915,  0x1000916 	]	}; // KA, KHA

-

-      key <AB01> { [      0x1000937,  0x100090B		]	}; // SSA, VOCALIC R (RRI)

-      key <AB02> { [      0x100092C,  0x100092D		]       }; // BA, BHA

-      key <AB03> { [      0x1000941,  0x1000942       	]	}; // VOWEL SIGN HRSHWA U, VOWEL SIGN DIRGHA U (UU)

-      key <AB04> { [      0x1000939,  0x1000922 	]	}; // HA, DDHA

-      key <AB05> { [      0x1000913,  0x1000914		]	}; // O, AU

-      key <AB06> { [      0x1000905,  0x1000906		]	}; // A, AA

-      key <AB07> { [      0x1000932,  0x1000919 	]	}; // LA, NGA

-      key <AB08> { [      comma,  0x1000935		]       }; // VA

-      key <AB09> { [      0x1000964,  0x1000965		]       }; // PURNA VIRAM, DIRGHA VIRAM

+      key <TLDE> { [      0x100091E,  0x1000965 	]	}; // NYA; double danda

+      key <AE01> { [      0x1000967,  0x10FFFFD	]	}; // Nepali digit one; U091C+U094D+U091E

+      key <AE02> { [      0x1000968,  0x1000908		]	}; // Nepali digit two;      key <AE03> { [      0x1000969,  0x1000918 	]	}; // Nepali digit three;

+      key <AE04> { [      0x100096A,  0x10FFFFC  	]	}; // Nepali digit four; U0926+U094D+U0927

+      key <AE05> { [      0x100096B,  0x100091B  	]	}; // Nepali digit five

+      key <AE06> { [      0x100096C,  0x100091F  	]	}; // Nepali digit six

+      key <AE07> { [      0x100096D,  0x1000920  	]	}; // Nepali digit seven

+      key <AE08> { [      0x100096e,  0x1000921  	]	}; // Nepali digit eight

+      key <AE09> { [      0x100096F,  0x1000922	 	]	}; // Nepali digit nine

+      key <AE10> { [      0x1000966,  0x1000923		]	}; // Nepali digit zero

+      key <AE11> { [      0x1000914,  0x1000913         ]       }; // O, AU

+      key <AE12> { [      0x100200C,  0x1000902 	]       }; // ZERO-WIDTH-NON-JOINER (ZWNJ); SIGN ANUSVARA

+      key <BKSL> { [      0x100094D,  0x100200D 	]	}; // SIGN VIRAMA; ZERO-WIDTH-JOINER (ZWJ)

+      key <AD01> { [      0x10FFFFB,  0x10FFFFA 	]	}; // U0924+U094D+U0930; U0924+U094D+U0924

+      key <AD02> { [      0x1000927,  0x10FFFF9   	]	}; // DHA; U0921+U094D+U0922

+      key <AD03> { [      0x100092D,  0x1000910 	]	}; // BHA, AI

+      key <AD04> { [      0x100091A,  0x10FFFF8       ]	}; // CA; U0926+U094D+U0935

+      key <AD05> { [      0x1000924,  0x10FFFF7		]	}; // TA; U091F+U094D+U091F

+      key <AD06> { [      0x1000925,  0x10FFFF6   ]       }; // THA; U0920+U094D+U0920

+      key <AD07> { [      0x1000917,  0x100090A 	]	}; // GA, UU

+      key <AD08> { [      0x1000937,  0x10FFFF5    	]	}; // SSA; U0915+U094D+U0937

+      key <AD09> { [      0x100092F,  0x1000907 	]	}; // YA, I

+      key <AD10> { [      0x1000909,  0x100090F 	]	}; // U, E

+      key <AD11> { [      0x10FFFF4,  0x1000943 	]	}; // U0928+U094D+ZWJ; VOWEL SIGN VOCALIC R

+      key <AD12> { [      0x1000947,  0x1000948 	]	}; // SIGN E; SIGN AI

+      key <AC01> { [      0x100092C,  0x1000906         ]       }; // BA, AA

+      key <AC02> { [      0x1000915,  0x10FFFF3	]	}; // KA; U0919+U094D+U0915

+      key <AC03> { [      0x100092E,  0x10FFFF2      ]       }; // MA; U0919+U094D+U0917

+      key <AC04> { [      0x100093E,  0x1000901		]       }; // CANDRABINDU, VOWEL SIGN AA

+      key <AC05> { [      0x1000928,  0x10FFFF1      	]	}; // NA; U0926+U094D+U0926

+      key <AC06> { [      0x100091C,  0x100091D       	]	}; // JA, JHA

+      key <AC07> { [      0x1000935,  0x100094B       	]	}; // VA, VOWEL SIGN O

+      key <AC08> { [      0x100092A,  0x100092B       	]	}; // PA, PHA

+      key <AC09> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN I, VOWEL SIGN II

+      key <AC10> { [      0x1000938,  0x10FFFF0 	]	}; // SA; U091F+U094D+U0920

+      key <AC11> { [      0x1000941,  0x1000942 	]	}; // VOWEL SIGN U, VOWEL SIGN UU

+      key <AB01> { [      0x1000936,  0x10FFFEF	]	}; // SHA; U0915+U094D+U0915

+      key <AB02> { [      0x1000939,  0x10FFFEE	]       }; // HA; U0939+U094D+U092F

+      key <AB03> { [      0x1000905, 0x100090B         	]	}; // A; U0909+U090B

+      key <AB04> { [      0x1000916,  0x1000950 	]	}; // KHA, OM

+      key <AB05> { [      0x1000926,  0x100094C		]	}; // DA, VOWEL SIGN AU

+      key <AB06> { [      0x1000932,  0x10FFFED	]	}; // LA; U0926+U094D+U092F

+      key <AB07> { [      0x1000903,  0x10FFFEC 	]	}; // SIGN VISARGA; U0921+U094D+U0921

+      key <AB08> { [      0x100093D,  0x1000919		]       }; // SIGN AVAGRHA; NGA

+      key <AB09> { [      0x1000964,  0x10FFFEB	]       }; // DANDA; U0936+U094D+U0930

+      key <AB10> { [      0x1000930,  0x10FFFEA   		]       }; // RA; U0930+U0941

 

       include "group(olpc)"

 };