Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 183 insertions, 184 deletions

diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h
index 7ed29cfba..9333041fb 100644
--- a/xorg-server/include/dixfont.h
+++ b/xorg-server/include/dixfont.h
@@ -1,184 +1,183 @@
-/***********************************************************

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for any purpose and without fee is hereby granted,

-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 Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

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

-

-******************************************************************/

-

-#ifndef DIXFONT_H

-#define DIXFONT_H 1

-

-#include "dix.h"

-#include <X11/fonts/font.h>

-#include "closure.h"

-#include <X11/fonts/fontstruct.h>

-

-#define NullDIXFontProp ((DIXFontPropPtr)0)

-

-typedef struct _DIXFontProp *DIXFontPropPtr;

-

-extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname*/);

-

-extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe*/);

-

-extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe*/);

-

-extern _X_EXPORT void FontWakeup(pointer /*data*/,

-		       int /*count*/,

-		       pointer /*LastSelectMask*/);

-

-extern _X_EXPORT int OpenFont(ClientPtr /*client*/,

-		    XID /*fid*/,

-		    Mask /*flags*/,

-		    unsigned /*lenfname*/,

-		    char * /*pfontname*/);

-

-extern _X_EXPORT int CloseFont(pointer /*pfont*/,

-		     XID /*fid*/);

-

-typedef struct _xQueryFontReply *xQueryFontReplyPtr;

-

-extern _X_EXPORT void QueryFont(FontPtr /*pFont*/,

-		      xQueryFontReplyPtr /*pReply*/,

-		      int /*nProtoCCIStructs*/);

-

-extern _X_EXPORT int ListFonts(ClientPtr /*client*/,

-		     unsigned char * /*pattern*/,

-		     unsigned int /*length*/,

-		     unsigned int /*max_names*/);

-

-extern _X_EXPORT int

-doListFontsWithInfo(ClientPtr /*client*/,

-		    LFWIclosurePtr /*c*/);

-

-extern _X_EXPORT int doPolyText(ClientPtr /*client*/,

-		      PTclosurePtr /*c*/

-);

-

-extern _X_EXPORT int PolyText(ClientPtr /*client*/,

-		    DrawablePtr /*pDraw*/,

-		    GCPtr /*pGC*/,

-		    unsigned char * /*pElt*/,

-		    unsigned char * /*endReq*/,

-		    int /*xorg*/,

-		    int /*yorg*/,

-		    int /*reqType*/,

-		    XID /*did*/);

-

-extern _X_EXPORT int doImageText(ClientPtr /*client*/,

-		       ITclosurePtr /*c*/);

-

-extern _X_EXPORT int ImageText(ClientPtr /*client*/,

-		     DrawablePtr /*pDraw*/,

-		     GCPtr /*pGC*/,

-		     int /*nChars*/,

-		     unsigned char * /*data*/,

-		     int /*xorg*/,

-		     int /*yorg*/,

-		     int /*reqType*/,

-		     XID /*did*/);

-

-extern _X_EXPORT int SetFontPath(ClientPtr /*client*/,

-		       int /*npaths*/,

-		       unsigned char * /*paths*/);

-

-extern _X_EXPORT int SetDefaultFontPath(char * /*path*/);

-

-extern _X_EXPORT int GetFontPath(ClientPtr client,

-		       int *count,

-		       int *length,

-		       unsigned char **result);

-

-extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client*/);

-

-/* Quartz support on Mac OS X pulls in the QuickDraw

-   framework whose InitFonts function conflicts here. */

-#ifdef __APPLE__

-#define InitFonts Darwin_X_InitFonts

-#endif

-extern _X_EXPORT void InitFonts(void);

-

-extern _X_EXPORT void FreeFonts(void);

-

-extern _X_EXPORT FontPtr find_old_font(XID /*id*/);

-

-extern _X_EXPORT void GetGlyphs(FontPtr     /*font*/,

-		      unsigned long /*count*/,

-		      unsigned char * /*chars*/,

-		      FontEncoding /*fontEncoding*/,

-		      unsigned long * /*glyphcount*/,

-		      CharInfoPtr * /*glyphs*/);

-

-extern _X_EXPORT void QueryGlyphExtents(FontPtr     /*pFont*/,

-			      CharInfoPtr * /*charinfo*/,

-			      unsigned long /*count*/,

-			      ExtentInfoPtr /*info*/);

-

-extern _X_EXPORT Bool QueryTextExtents(FontPtr     /*pFont*/,

-			     unsigned long /*count*/,

-			     unsigned char * /*chars*/,

-			     ExtentInfoPtr /*info*/);

-

-extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str*/);

-

-extern _X_EXPORT void InitGlyphCaching(void);

-

-extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);

-

-extern _X_EXPORT void register_fpe_functions(void);

-

-/*

- * libXfont stubs.

- */

-extern _X_EXPORT int client_auth_generation(ClientPtr client);

-

-extern _X_EXPORT void DeleteFontClientID(Font id);

-

-extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num);

-

-extern _X_EXPORT int GetDefaultPointSize(void);

-

-extern _X_EXPORT Font GetNewFontClientID(void);

-

-extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe,

-				      BlockHandlerProcPtr block_handler);

-

-extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func,

-					  InitFpeFunc init_func,

-					  FreeFpeFunc free_func,

-					  ResetFpeFunc reset_func,

-					  OpenFontFunc open_func,

-					  CloseFontFunc close_func,

-					  ListFontsFunc list_func,

-					  StartLfwiFunc start_lfwi_func,

-					  NextLfwiFunc next_lfwi_func,

-					  WakeupFpeFunc wakeup_func,

-					  ClientDiedFunc client_died,

-					  LoadGlyphsFunc load_glyphs,

-					  StartLaFunc start_list_alias_func,

-					  NextLaFunc next_list_alias_func,

-					  SetPathFunc set_path_func);

-

-extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe,

-					 BlockHandlerProcPtr blockHandler,

-					 Bool all);

-

-extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id);

-

-#endif				/* DIXFONT_H */

+/***********************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL 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.
+
+******************************************************************/
+
+#ifndef DIXFONT_H
+#define DIXFONT_H 1
+
+#include "dix.h"
+#include <X11/fonts/font.h>
+#include "closure.h"
+#include <X11/fonts/fontstruct.h>
+
+#define NullDIXFontProp ((DIXFontPropPtr)0)
+
+typedef struct _DIXFontProp *DIXFontPropPtr;
+
+extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname */ );
+
+extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
+
+extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
+
+extern _X_EXPORT void FontWakeup(pointer /*data */ ,
+                                 int /*count */ ,
+                                 pointer /*LastSelectMask */ );
+
+extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
+                              XID /*fid */ ,
+                              Mask /*flags */ ,
+                              unsigned /*lenfname */ ,
+                              char * /*pfontname */ );
+
+extern _X_EXPORT int CloseFont(pointer /*pfont */ ,
+                               XID /*fid */ );
+
+typedef struct _xQueryFontReply *xQueryFontReplyPtr;
+
+extern _X_EXPORT void QueryFont(FontPtr /*pFont */ ,
+                                xQueryFontReplyPtr /*pReply */ ,
+                                int /*nProtoCCIStructs */ );
+
+extern _X_EXPORT int ListFonts(ClientPtr /*client */ ,
+                               unsigned char * /*pattern */ ,
+                               unsigned int /*length */ ,
+                               unsigned int /*max_names */ );
+
+extern _X_EXPORT int
+ doListFontsWithInfo(ClientPtr /*client */ ,
+                     LFWIclosurePtr /*c */ );
+
+extern _X_EXPORT int doPolyText(ClientPtr /*client */ ,
+                                PTclosurePtr    /*c */
+    );
+
+extern _X_EXPORT int PolyText(ClientPtr /*client */ ,
+                              DrawablePtr /*pDraw */ ,
+                              GCPtr /*pGC */ ,
+                              unsigned char * /*pElt */ ,
+                              unsigned char * /*endReq */ ,
+                              int /*xorg */ ,
+                              int /*yorg */ ,
+                              int /*reqType */ ,
+                              XID /*did */ );
+
+extern _X_EXPORT int doImageText(ClientPtr /*client */ ,
+                                 ITclosurePtr /*c */ );
+
+extern _X_EXPORT int ImageText(ClientPtr /*client */ ,
+                               DrawablePtr /*pDraw */ ,
+                               GCPtr /*pGC */ ,
+                               int /*nChars */ ,
+                               unsigned char * /*data */ ,
+                               int /*xorg */ ,
+                               int /*yorg */ ,
+                               int /*reqType */ ,
+                               XID /*did */ );
+
+extern _X_EXPORT int SetFontPath(ClientPtr /*client */ ,
+                                 int /*npaths */ ,
+                                 unsigned char * /*paths */ );
+
+extern _X_EXPORT int SetDefaultFontPath(char * /*path */ );
+
+extern _X_EXPORT int GetFontPath(ClientPtr client,
+                                 int *count,
+                                 int *length, unsigned char **result);
+
+extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client */ );
+
+/* Quartz support on Mac OS X pulls in the QuickDraw
+   framework whose InitFonts function conflicts here. */
+#ifdef __APPLE__
+#define InitFonts Darwin_X_InitFonts
+#endif
+extern _X_EXPORT void InitFonts(void);
+
+extern _X_EXPORT void FreeFonts(void);
+
+extern _X_EXPORT FontPtr find_old_font(XID /*id */ );
+
+extern _X_EXPORT void GetGlyphs(FontPtr /*font */ ,
+                                unsigned long /*count */ ,
+                                unsigned char * /*chars */ ,
+                                FontEncoding /*fontEncoding */ ,
+                                unsigned long * /*glyphcount */ ,
+                                CharInfoPtr * /*glyphs */ );
+
+extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont */ ,
+                                        CharInfoPtr * /*charinfo */ ,
+                                        unsigned long /*count */ ,
+                                        ExtentInfoPtr /*info */ );
+
+extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont */ ,
+                                       unsigned long /*count */ ,
+                                       unsigned char * /*chars */ ,
+                                       ExtentInfoPtr /*info */ );
+
+extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str */ );
+
+extern _X_EXPORT void InitGlyphCaching(void);
+
+extern _X_EXPORT void SetGlyphCachingMode(int /*newmode */ );
+
+extern _X_EXPORT void register_fpe_functions(void);
+
+/*
+ * libXfont stubs.
+ */
+extern _X_EXPORT int client_auth_generation(ClientPtr client);
+
+extern _X_EXPORT void DeleteFontClientID(Font id);
+
+extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num);
+
+extern _X_EXPORT int GetDefaultPointSize(void);
+
+extern _X_EXPORT Font GetNewFontClientID(void);
+
+extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe,
+                                      BlockHandlerProcPtr block_handler);
+
+extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func,
+                                          InitFpeFunc init_func,
+                                          FreeFpeFunc free_func,
+                                          ResetFpeFunc reset_func,
+                                          OpenFontFunc open_func,
+                                          CloseFontFunc close_func,
+                                          ListFontsFunc list_func,
+                                          StartLfwiFunc start_lfwi_func,
+                                          NextLfwiFunc next_lfwi_func,
+                                          WakeupFpeFunc wakeup_func,
+                                          ClientDiedFunc client_died,
+                                          LoadGlyphsFunc load_glyphs,
+                                          StartLaFunc start_list_alias_func,
+                                          NextLaFunc next_list_alias_func,
+                                          SetPathFunc set_path_func);
+
+extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe,
+                                         BlockHandlerProcPtr blockHandler,
+                                         Bool all);
+
+extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id);
+
+#endif                          /* DIXFONT_H */