svn merge ^/branches/released .

3 files changed, 159 insertions, 158 deletions

diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index 2cd67b1d3..a64798608 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -1,156 +1,151 @@
-/*
-
-Copyright 1991, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-#ifndef CLOSESTR_H
-#define CLOSESTR_H
-
-#include <X11/Xproto.h>
-#include "closure.h"
-#include "dix.h"
-#include "misc.h"
-#include "gcstruct.h"
-
-/* closure structures */
-
-/* OpenFont */
-
-typedef struct _OFclosure {
-    ClientPtr   client;
-    short       current_fpe;
-    short       num_fpes;
-    FontPathElementPtr *fpe_list;
-    Mask        flags;
-    Bool        slept;
-
-/* XXX -- get these from request buffer instead? */
-    char       *origFontName;
-    int		origFontNameLen;
-    XID         fontid;
-    char       *fontname;
-    int         fnamelen;
-    FontPtr	non_cachable_font;
-}           OFclosureRec;
-
-/* ListFontsWithInfo */
-
-#define XLFDMAXFONTNAMELEN	256
-typedef struct _LFWIstate {
-    char	pattern[XLFDMAXFONTNAMELEN];
-    int		patlen;
-    int		current_fpe;
-    int		max_names;
-    Bool	list_started;
-    pointer	private;
-} LFWIstateRec, *LFWIstatePtr;
-
-typedef struct _LFWIclosure {
-    ClientPtr		client;
-    int			num_fpes;
-    FontPathElementPtr	*fpe_list;
-    xListFontsWithInfoReply *reply;
-    int			length;
-    LFWIstateRec	current;
-    LFWIstateRec	saved;
-    int			savedNumFonts;
-    Bool		haveSaved;
-    Bool		slept;
-    char		*savedName;
-} LFWIclosureRec;
-
-/* ListFonts */
-
-typedef struct _LFclosure {
-    ClientPtr   client;
-    int         num_fpes;
-    FontPathElementPtr *fpe_list;
-    FontNamesPtr names;
-    LFWIstateRec current;
-    LFWIstateRec saved;
-    Bool        haveSaved;
-    Bool        slept;
-    char	*savedName;
-    int		savedNameLen;
-}	LFclosureRec;
-
-/* PolyText */
-
-typedef
-    int			(* PolyTextPtr)(
-			DrawablePtr /* pDraw */,
-			GCPtr /* pGC */,
-			int /* x */,
-			int /* y */,
-			int /* count */,
-			void * /* chars or shorts */
-			);
-
-typedef struct _PTclosure {
-    ClientPtr		client;
-    DrawablePtr		pDraw;
-    GC			*pGC;
-    unsigned char	*pElt;
-    unsigned char	*endReq;
-    unsigned char	*data;
-    int			xorg;
-    int			yorg;
-    CARD8		reqType;
-    PolyTextPtr		polyText;
-    int			itemSize;
-    XID			did;
-    int			err;
-    Bool		slept;
-} PTclosureRec;
-
-/* ImageText */
-
-typedef
-    void		(* ImageTextPtr)(
-			DrawablePtr /* pDraw */,
-			GCPtr /* pGC */,
-			int /* x */,
-			int /* y */,
-			int /* count */,
-			void * /* chars or shorts */
-			);
-
-typedef struct _ITclosure {
-    ClientPtr		client;
-    DrawablePtr		pDraw;
-    GC			*pGC;
-    BYTE		nChars;
-    unsigned char	*data;
-    int			xorg;
-    int			yorg;
-    CARD8		reqType;
-    ImageTextPtr	imageText;
-    int			itemSize;
-    XID			did;
-    Bool		slept;
-} ITclosureRec;
-#endif				/* CLOSESTR_H */
+/*

+

+Copyright 1991, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+*/

+

+

+#ifndef CLOSESTR_H

+#define CLOSESTR_H

+

+#include <X11/Xproto.h>

+#include "closure.h"

+#include "dix.h"

+#include "misc.h"

+#include "gcstruct.h"

+

+/* closure structures */

+

+/* OpenFont */

+

+typedef struct _OFclosure {

+    ClientPtr   client;

+    short       current_fpe;

+    short       num_fpes;

+    FontPathElementPtr *fpe_list;

+    Mask        flags;

+

+/* XXX -- get these from request buffer instead? */

+    char       *origFontName;

+    int		origFontNameLen;

+    XID         fontid;

+    char       *fontname;

+    int         fnamelen;

+    FontPtr	non_cachable_font;

+}           OFclosureRec;

+

+/* ListFontsWithInfo */

+

+#define XLFDMAXFONTNAMELEN	256

+typedef struct _LFWIstate {

+    char	pattern[XLFDMAXFONTNAMELEN];

+    int		patlen;

+    int		current_fpe;

+    int		max_names;

+    Bool	list_started;

+    pointer	private;

+} LFWIstateRec, *LFWIstatePtr;

+

+typedef struct _LFWIclosure {

+    ClientPtr		client;

+    int			num_fpes;

+    FontPathElementPtr	*fpe_list;

+    xListFontsWithInfoReply *reply;

+    int			length;

+    LFWIstateRec	current;

+    LFWIstateRec	saved;

+    int			savedNumFonts;

+    Bool		haveSaved;

+    char		*savedName;

+} LFWIclosureRec;

+

+/* ListFonts */

+

+typedef struct _LFclosure {

+    ClientPtr   client;

+    int         num_fpes;

+    FontPathElementPtr *fpe_list;

+    FontNamesPtr names;

+    LFWIstateRec current;

+    LFWIstateRec saved;

+    Bool        haveSaved;

+    char	*savedName;

+    int		savedNameLen;

+}	LFclosureRec;

+

+/* PolyText */

+

+typedef

+    int			(* PolyTextPtr)(

+			DrawablePtr /* pDraw */,

+			GCPtr /* pGC */,

+			int /* x */,

+			int /* y */,

+			int /* count */,

+			void * /* chars or shorts */

+			);

+

+typedef struct _PTclosure {

+    ClientPtr		client;

+    DrawablePtr		pDraw;

+    GC			*pGC;

+    unsigned char	*pElt;

+    unsigned char	*endReq;

+    unsigned char	*data;

+    int			xorg;

+    int			yorg;

+    CARD8		reqType;

+    PolyTextPtr		polyText;

+    int			itemSize;

+    XID			did;

+    int			err;

+} PTclosureRec;

+

+/* ImageText */

+

+typedef

+    void		(* ImageTextPtr)(

+			DrawablePtr /* pDraw */,

+			GCPtr /* pGC */,

+			int /* x */,

+			int /* y */,

+			int /* count */,

+			void * /* chars or shorts */

+			);

+

+typedef struct _ITclosure {

+    ClientPtr		client;

+    DrawablePtr		pDraw;

+    GC			*pGC;

+    BYTE		nChars;

+    unsigned char	*data;

+    int			xorg;

+    int			yorg;

+    CARD8		reqType;

+    ImageTextPtr	imageText;

+    int			itemSize;

+    XID			did;

+} ITclosureRec;

+#endif				/* CLOSESTR_H */

diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 33b94fd3e..1930a308b 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -439,6 +439,12 @@ extern void CreateClassesChangedEvent(EventListPtr event,
                                       DeviceIntPtr master,

                                       DeviceIntPtr slave,

                                       int type);

+extern EventListPtr UpdateFromMaster(

+    EventListPtr events,

+    DeviceIntPtr pDev,

+    int type,

+    int *num_events);

+

 extern _X_EXPORT int GetPointerEvents(

     EventListPtr events,

     DeviceIntPtr pDev,

diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h
index 9b578e467..c2b7b43ec 100644
--- a/xorg-server/include/privates.h
+++ b/xorg-server/include/privates.h
@@ -81,10 +81,10 @@ typedef struct _DevPrivateKeyRec {
  * you can get the address of the extra space and store whatever data you like

  * there.

  *

- * You may call dixRegisterPrivate more than once on the same key, but the

+ * You may call dixRegisterPrivateKey more than once on the same key, but the

  * size and type must match or the server will abort.

  *

- * dixRegisterPrivateIndex returns FALSE if it fails to allocate memory

+ * dixRegisterPrivateKey returns FALSE if it fails to allocate memory

  * during its operation.

  */

 extern _X_EXPORT Bool