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, 197 insertions, 214 deletions

diff --git a/xorg-server/dbe/dbestruct.h b/xorg-server/dbe/dbestruct.h
index 089719ba7..9ea9eb695 100644
--- a/xorg-server/dbe/dbestruct.h
+++ b/xorg-server/dbe/dbestruct.h
@@ -1,214 +1,197 @@
-/******************************************************************************

- * 

- * Copyright (c) 1994, 1995  Hewlett-Packard Company

- *

- * Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sublicense, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard

- * Company 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 Hewlett-Packard Company.

- * 

- *     Header file for DIX-related DBE

- *

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

-

-#ifndef DBE_STRUCT_H

-#define DBE_STRUCT_H

-

-

-/* INCLUDES */

-

-#define NEED_DBE_PROTOCOL

-#include <X11/extensions/dbeproto.h>

-#include "windowstr.h"

-#include "privates.h"

-

-typedef struct

-{

-    VisualID    visual;    /* one visual ID that supports double-buffering */

-    int         depth;     /* depth of visual in bits                      */

-    int         perflevel; /* performance level of visual                  */

-}

-XdbeVisualInfo;

-

-typedef struct

-{

-    int                 count;          /* number of items in visual_depth   */

-    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */

-}

-XdbeScreenVisualInfo;

-

-/* DEFINES */

-

-#define DBE_SCREEN_PRIV(pScreen) ((DbeScreenPrivPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, dbeScreenPrivKey))

-

-#define DBE_SCREEN_PRIV_FROM_DRAWABLE(pDrawable) \

-    DBE_SCREEN_PRIV((pDrawable)->pScreen)

-

-#define DBE_SCREEN_PRIV_FROM_WINDOW_PRIV(pDbeWindowPriv) \

-    DBE_SCREEN_PRIV((pDbeWindowPriv)->pWindow->drawable.pScreen)

-

-#define DBE_SCREEN_PRIV_FROM_WINDOW(pWindow) \

-    DBE_SCREEN_PRIV((pWindow)->drawable.pScreen)

-

-#define DBE_SCREEN_PRIV_FROM_PIXMAP(pPixmap) \

-    DBE_SCREEN_PRIV((pPixmap)->drawable.pScreen)

-

-#define DBE_SCREEN_PRIV_FROM_GC(pGC)\

-    DBE_SCREEN_PRIV((pGC)->pScreen)

-

-#define DBE_WINDOW_PRIV(pWin) ((DbeWindowPrivPtr) \

-    dixLookupPrivate(&(pWin)->devPrivates, dbeWindowPrivKey))

-

-/* Initial size of the buffer ID array in the window priv. */

-#define DBE_INIT_MAX_IDS	2

-

-/* Reallocation increment for the buffer ID array. */

-#define DBE_INCR_MAX_IDS	4

-

-/* Marker for free elements in the buffer ID array. */

-#define DBE_FREE_ID_ELEMENT	0

-

-extern _X_EXPORT void DbeExtensionInit (void);

-

-/* TYPEDEFS */

-

-/* Record used to pass swap information between DIX and DDX swapping

- * procedures.

- */

-typedef struct _DbeSwapInfoRec

-{

-    WindowPtr		pWindow;

-    unsigned char	swapAction;

-

-} DbeSwapInfoRec, *DbeSwapInfoPtr;

-

-/*

- ******************************************************************************

- ** Per-window data

- ******************************************************************************

- */

-

-typedef struct _DbeWindowPrivRec

-{

-    /* A pointer to the window with which the DBE window private (buffer) is

-     * associated.

-     */

-    WindowPtr		pWindow;

-

-    /* Last known swap action for this buffer.  Legal values for this field

-     * are XdbeUndefined, XdbeBackground, XdbeUntouched, and XdbeCopied.

-     */

-    unsigned char	swapAction;

-

-    /* Last known buffer size.

-     */

-    unsigned short	width, height;

-

-    /* Coordinates used for static gravity when the window is positioned.

-     */

-    short		x, y;

-

-    /* Number of XIDs associated with this buffer.

-     */

-    int			nBufferIDs;

-

-    /* Capacity of the current buffer ID array, IDs. */

-    int			maxAvailableIDs;

-

-    /* Pointer to the array of buffer IDs.  This initially points to initIDs.

-     * When the static limit of the initIDs array is reached, the array is

-     * reallocated and this pointer is set to the new array instead of initIDs.

-     */

-    XID			*IDs;

-

-    /* Initial array of buffer IDs.  We are defining the XID array within the

-     * window priv to optimize for data locality.  In most cases, only one

-     * buffer will be associated with a window.  Having the array declared

-     * here can prevent us from accessing the data in another memory page,

-     * possibly resulting in a page swap and loss of performance.  Initially we

-     * will use this array to store buffer IDs.  For situations where we have

-     * more IDs than can fit in this static array, we will allocate a larger

-     * array to use, possibly suffering a performance loss. 

-     */

-    XID			initIDs[DBE_INIT_MAX_IDS];

-

-    /* Device-specific private information.

-     */

-    PrivateRec		*devPrivates;

-

-} DbeWindowPrivRec, *DbeWindowPrivPtr;

-

-

-/*

- ******************************************************************************

- ** Per-screen data

- ******************************************************************************

- */

-

-typedef struct _DbeScreenPrivRec

-{

-    /* Wrapped functions

-     * It is the responsibilty of the DDX layer to wrap PositionWindow().

-     * DbeExtensionInit wraps DestroyWindow().

-     */

-    PositionWindowProcPtr PositionWindow;

-    DestroyWindowProcPtr  DestroyWindow;

-

-    /* Per-screen DIX routines */

-    Bool	(*SetupBackgroundPainter)(

-		WindowPtr /*pWin*/,

-		GCPtr /*pGC*/

-);

-

-    /* Per-screen DDX routines */

-    Bool	(*GetVisualInfo)(

-		ScreenPtr /*pScreen*/,

-		XdbeScreenVisualInfo * /*pVisInfo*/

-);

-    int		(*AllocBackBufferName)(

-		WindowPtr /*pWin*/,

-		XID /*bufId*/,

-		int /*swapAction*/

-);

-    int		(*SwapBuffers)(

-		ClientPtr /*client*/,

-		int * /*pNumWindows*/,

-		DbeSwapInfoPtr /*swapInfo*/

-);

-    void	(*BeginIdiom)(

-		ClientPtr /*client*/

-);

-    void	(*EndIdiom)(

-		ClientPtr /*client*/

-);

-    void	(*WinPrivDelete)(

-		DbeWindowPrivPtr /*pDbeWindowPriv*/,

-		XID /*bufId*/

-);

-    void	(*ResetProc)(

-		ScreenPtr /*pScreen*/

-);

-

-} DbeScreenPrivRec, *DbeScreenPrivPtr;

-

-#endif /* DBE_STRUCT_H */

+/******************************************************************************
+ * 
+ * Copyright (c) 1994, 1995  Hewlett-Packard Company
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
+ * Company 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 Hewlett-Packard Company.
+ * 
+ *     Header file for DIX-related DBE
+ *
+ *****************************************************************************/
+
+#ifndef DBE_STRUCT_H
+#define DBE_STRUCT_H
+
+/* INCLUDES */
+
+#define NEED_DBE_PROTOCOL
+#include <X11/extensions/dbeproto.h>
+#include "windowstr.h"
+#include "privates.h"
+
+typedef struct {
+    VisualID visual;            /* one visual ID that supports double-buffering */
+    int depth;                  /* depth of visual in bits                      */
+    int perflevel;              /* performance level of visual                  */
+} XdbeVisualInfo;
+
+typedef struct {
+    int count;                  /* number of items in visual_depth   */
+    XdbeVisualInfo *visinfo;    /* list of visuals & depths for scrn */
+} XdbeScreenVisualInfo;
+
+/* DEFINES */
+
+#define DBE_SCREEN_PRIV(pScreen) ((DbeScreenPrivPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, dbeScreenPrivKey))
+
+#define DBE_SCREEN_PRIV_FROM_DRAWABLE(pDrawable) \
+    DBE_SCREEN_PRIV((pDrawable)->pScreen)
+
+#define DBE_SCREEN_PRIV_FROM_WINDOW_PRIV(pDbeWindowPriv) \
+    DBE_SCREEN_PRIV((pDbeWindowPriv)->pWindow->drawable.pScreen)
+
+#define DBE_SCREEN_PRIV_FROM_WINDOW(pWindow) \
+    DBE_SCREEN_PRIV((pWindow)->drawable.pScreen)
+
+#define DBE_SCREEN_PRIV_FROM_PIXMAP(pPixmap) \
+    DBE_SCREEN_PRIV((pPixmap)->drawable.pScreen)
+
+#define DBE_SCREEN_PRIV_FROM_GC(pGC)\
+    DBE_SCREEN_PRIV((pGC)->pScreen)
+
+#define DBE_WINDOW_PRIV(pWin) ((DbeWindowPrivPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, dbeWindowPrivKey))
+
+/* Initial size of the buffer ID array in the window priv. */
+#define DBE_INIT_MAX_IDS	2
+
+/* Reallocation increment for the buffer ID array. */
+#define DBE_INCR_MAX_IDS	4
+
+/* Marker for free elements in the buffer ID array. */
+#define DBE_FREE_ID_ELEMENT	0
+
+extern _X_EXPORT void DbeExtensionInit(void);
+
+/* TYPEDEFS */
+
+/* Record used to pass swap information between DIX and DDX swapping
+ * procedures.
+ */
+typedef struct _DbeSwapInfoRec {
+    WindowPtr pWindow;
+    unsigned char swapAction;
+
+} DbeSwapInfoRec, *DbeSwapInfoPtr;
+
+/*
+ ******************************************************************************
+ ** Per-window data
+ ******************************************************************************
+ */
+
+typedef struct _DbeWindowPrivRec {
+    /* A pointer to the window with which the DBE window private (buffer) is
+     * associated.
+     */
+    WindowPtr pWindow;
+
+    /* Last known swap action for this buffer.  Legal values for this field
+     * are XdbeUndefined, XdbeBackground, XdbeUntouched, and XdbeCopied.
+     */
+    unsigned char swapAction;
+
+    /* Last known buffer size.
+     */
+    unsigned short width, height;
+
+    /* Coordinates used for static gravity when the window is positioned.
+     */
+    short x, y;
+
+    /* Number of XIDs associated with this buffer.
+     */
+    int nBufferIDs;
+
+    /* Capacity of the current buffer ID array, IDs. */
+    int maxAvailableIDs;
+
+    /* Pointer to the array of buffer IDs.  This initially points to initIDs.
+     * When the static limit of the initIDs array is reached, the array is
+     * reallocated and this pointer is set to the new array instead of initIDs.
+     */
+    XID *IDs;
+
+    /* Initial array of buffer IDs.  We are defining the XID array within the
+     * window priv to optimize for data locality.  In most cases, only one
+     * buffer will be associated with a window.  Having the array declared
+     * here can prevent us from accessing the data in another memory page,
+     * possibly resulting in a page swap and loss of performance.  Initially we
+     * will use this array to store buffer IDs.  For situations where we have
+     * more IDs than can fit in this static array, we will allocate a larger
+     * array to use, possibly suffering a performance loss. 
+     */
+    XID initIDs[DBE_INIT_MAX_IDS];
+
+    /* Device-specific private information.
+     */
+    PrivateRec *devPrivates;
+
+} DbeWindowPrivRec, *DbeWindowPrivPtr;
+
+/*
+ ******************************************************************************
+ ** Per-screen data
+ ******************************************************************************
+ */
+
+typedef struct _DbeScreenPrivRec {
+    /* Wrapped functions
+     * It is the responsibilty of the DDX layer to wrap PositionWindow().
+     * DbeExtensionInit wraps DestroyWindow().
+     */
+    PositionWindowProcPtr PositionWindow;
+    DestroyWindowProcPtr DestroyWindow;
+
+    /* Per-screen DIX routines */
+    Bool (*SetupBackgroundPainter) (WindowPtr /*pWin */ ,
+                                    GCPtr       /*pGC */
+        );
+
+    /* Per-screen DDX routines */
+    Bool (*GetVisualInfo) (ScreenPtr /*pScreen */ ,
+                           XdbeScreenVisualInfo *       /*pVisInfo */
+        );
+    int (*AllocBackBufferName) (WindowPtr /*pWin */ ,
+                                XID /*bufId */ ,
+                                int     /*swapAction */
+        );
+    int (*SwapBuffers) (ClientPtr /*client */ ,
+                        int * /*pNumWindows */ ,
+                        DbeSwapInfoPtr  /*swapInfo */
+        );
+    void (*BeginIdiom) (ClientPtr       /*client */
+        );
+    void (*EndIdiom) (ClientPtr /*client */
+        );
+    void (*WinPrivDelete) (DbeWindowPrivPtr /*pDbeWindowPriv */ ,
+                           XID  /*bufId */
+        );
+    void (*ResetProc) (ScreenPtr        /*pScreen */
+        );
+
+} DbeScreenPrivRec, *DbeScreenPrivPtr;
+
+#endif                          /* DBE_STRUCT_H */