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, 292 insertions, 322 deletions

diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h
index 5a34f0b70..7621ceb11 100644
--- a/xorg-server/include/gcstruct.h
+++ b/xorg-server/include/gcstruct.h
@@ -1,322 +1,292 @@
-/***********************************************************

-

-Copyright 1987, 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.

-

-

-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 GCSTRUCT_H

-#define GCSTRUCT_H

-

-#include "gc.h"

-

-#include "regionstr.h"

-#include "region.h"

-#include "pixmap.h"

-#include "screenint.h"

-#include "privates.h"

-#include <X11/Xprotostr.h>

-

-#define GCAllBits ((1 << (GCLastBit + 1)) - 1)

-

-/*

- * functions which modify the state of the GC

- */

-

-typedef struct _GCFuncs {

-    void	(* ValidateGC)(

-		GCPtr /*pGC*/,

-		unsigned long /*stateChanges*/,

-		DrawablePtr /*pDrawable*/);

-

-    void	(* ChangeGC)(

-		GCPtr /*pGC*/,

-		unsigned long /*mask*/);

-

-    void	(* CopyGC)(

-		GCPtr /*pGCSrc*/,

-		unsigned long /*mask*/,

-		GCPtr /*pGCDst*/);

-

-    void	(* DestroyGC)(

-		GCPtr /*pGC*/);

-

-    void	(* ChangeClip)(

-		GCPtr /*pGC*/,

-		int /*type*/,

-		pointer /*pvalue*/,

-		int /*nrects*/);

-

-    void	(* DestroyClip)(

-		GCPtr /*pGC*/);

-

-    void	(* CopyClip)(

-		GCPtr /*pgcDst*/,

-		GCPtr /*pgcSrc*/);

-} GCFuncs;

-

-/*

- * graphics operations invoked through a GC

- */

-

-typedef struct _GCOps {

-    void	(* FillSpans)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*nInit*/,

-		DDXPointPtr /*pptInit*/,

-		int * /*pwidthInit*/,

-		int /*fSorted*/);

-

-    void	(* SetSpans)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		char * /*psrc*/,

-		DDXPointPtr /*ppt*/,

-		int * /*pwidth*/,

-		int /*nspans*/,

-		int /*fSorted*/);

-

-    void	(* PutImage)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*depth*/,

-		int /*x*/,

-		int /*y*/,

-		int /*w*/,

-		int /*h*/,

-		int /*leftPad*/,

-		int /*format*/,

-		char * /*pBits*/);

-

-    RegionPtr	(* CopyArea)(

-		DrawablePtr /*pSrc*/,

-		DrawablePtr /*pDst*/,

-		GCPtr /*pGC*/,

-		int /*srcx*/,

-		int /*srcy*/,

-		int /*w*/,

-		int /*h*/,

-		int /*dstx*/,

-		int /*dsty*/);

-

-    RegionPtr	(* CopyPlane)(

-		DrawablePtr /*pSrcDrawable*/,

-		DrawablePtr /*pDstDrawable*/,

-		GCPtr /*pGC*/,

-		int /*srcx*/,

-		int /*srcy*/,

-		int /*width*/,

-		int /*height*/,

-		int /*dstx*/,

-		int /*dsty*/,

-		unsigned long /*bitPlane*/);

-    void	(* PolyPoint)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*mode*/,

-		int /*npt*/,

-		DDXPointPtr /*pptInit*/);

-

-    void	(* Polylines)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*mode*/,

-		int /*npt*/,

-		DDXPointPtr /*pptInit*/);

-

-    void	(* PolySegment)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*nseg*/,

-		xSegment * /*pSegs*/);

-

-    void	(* PolyRectangle)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*nrects*/,

-		xRectangle * /*pRects*/);

-

-    void	(* PolyArc)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*narcs*/,

-		xArc * /*parcs*/);

-

-    void	(* FillPolygon)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*shape*/,

-		int /*mode*/,

-		int /*count*/,

-		DDXPointPtr /*pPts*/);

-

-    void	(* PolyFillRect)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*nrectFill*/,

-		xRectangle * /*prectInit*/);

-

-    void	(* PolyFillArc)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*narcs*/,

-		xArc * /*parcs*/);

-

-    int		(* PolyText8)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*x*/,

-		int /*y*/,

-		int /*count*/,

-		char * /*chars*/);

-

-    int		(* PolyText16)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*x*/,

-		int /*y*/,

-		int /*count*/,

-		unsigned short * /*chars*/);

-

-    void	(* ImageText8)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*x*/,

-		int /*y*/,

-		int /*count*/,

-		char * /*chars*/);

-

-    void	(* ImageText16)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*x*/,

-		int /*y*/,

-		int /*count*/,

-		unsigned short * /*chars*/);

-

-    void	(* ImageGlyphBlt)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*x*/,

-		int /*y*/,

-		unsigned int /*nglyph*/,

-		CharInfoPtr * /*ppci*/,

-		pointer /*pglyphBase*/);

-

-    void	(* PolyGlyphBlt)(

-		DrawablePtr /*pDrawable*/,

-		GCPtr /*pGC*/,

-		int /*x*/,

-		int /*y*/,

-		unsigned int /*nglyph*/,

-		CharInfoPtr * /*ppci*/,

-		pointer /*pglyphBase*/);

-

-    void	(* PushPixels)(

-		GCPtr /*pGC*/,

-		PixmapPtr /*pBitMap*/,

-		DrawablePtr /*pDst*/,

-		int /*w*/,

-		int /*h*/,

-		int /*x*/,

-		int /*y*/);

-} GCOps;

-

-/* there is padding in the bit fields because the Sun compiler doesn't

- * force alignment to 32-bit boundaries.  losers.

- */

-typedef struct _GC {

-    ScreenPtr		pScreen;		

-    unsigned char	depth;    

-    unsigned char	alu;

-    unsigned short	lineWidth;          

-    unsigned short	dashOffset;

-    unsigned short	numInDashList;

-    unsigned char	*dash;

-    unsigned int	lineStyle : 2;

-    unsigned int	capStyle : 2;

-    unsigned int	joinStyle : 2;

-    unsigned int	fillStyle : 2;

-    unsigned int	fillRule : 1;

-    unsigned int 	arcMode : 1;

-    unsigned int	subWindowMode : 1;

-    unsigned int	graphicsExposures : 1;

-    unsigned int	clientClipType : 2; /* CT_<kind> */

-    unsigned int	miTranslate:1; /* should mi things translate? */

-    unsigned int	tileIsPixel:1; /* tile is solid pixel */

-    unsigned int	fExpose:1;     /* Call exposure handling */

-    unsigned int	freeCompClip:1;  /* Free composite clip */

-    unsigned int	scratch_inuse:1; /* is this GC in a pool for reuse? */

-    unsigned int	unused:13; /* see comment above */

-    unsigned long	planemask;

-    unsigned long	fgPixel;

-    unsigned long	bgPixel;

-    /*

-     * alas -- both tile and stipple must be here as they

-     * are independently specifiable

-     */

-    PixUnion		tile;

-    PixmapPtr		stipple;

-    DDXPointRec		patOrg;		/* origin for (tile, stipple) */

-    struct _Font	*font;

-    DDXPointRec		clipOrg;

-    pointer		clientClip;

-    unsigned long	stateChanges;	/* masked with GC_<kind> */

-    unsigned long       serialNumber;

-    GCFuncs		*funcs;

-    GCOps		*ops;

-    PrivateRec		*devPrivates;

-    /*

-     * The following were moved here from private storage to allow device-

-     * independent access to them from screen wrappers.

-     * --- 1997.11.03  Marc Aurele La France (tsi@xfree86.org)

-     */

-    PixmapPtr		pRotatedPixmap; /* tile/stipple rotated for alignment */

-    RegionPtr		pCompositeClip;

-    /* fExpose & freeCompClip defined above */

-} GC;

-

-#endif /* GCSTRUCT_H */

+/***********************************************************
+
+Copyright 1987, 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.
+
+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 GCSTRUCT_H
+#define GCSTRUCT_H
+
+#include "gc.h"
+
+#include "regionstr.h"
+#include "region.h"
+#include "pixmap.h"
+#include "screenint.h"
+#include "privates.h"
+#include <X11/Xprotostr.h>
+
+#define GCAllBits ((1 << (GCLastBit + 1)) - 1)
+
+/*
+ * functions which modify the state of the GC
+ */
+
+typedef struct _GCFuncs {
+    void (*ValidateGC) (GCPtr /*pGC */ ,
+                        unsigned long /*stateChanges */ ,
+                        DrawablePtr /*pDrawable */ );
+
+    void (*ChangeGC) (GCPtr /*pGC */ ,
+                      unsigned long /*mask */ );
+
+    void (*CopyGC) (GCPtr /*pGCSrc */ ,
+                    unsigned long /*mask */ ,
+                    GCPtr /*pGCDst */ );
+
+    void (*DestroyGC) (GCPtr /*pGC */ );
+
+    void (*ChangeClip) (GCPtr /*pGC */ ,
+                        int /*type */ ,
+                        pointer /*pvalue */ ,
+                        int /*nrects */ );
+
+    void (*DestroyClip) (GCPtr /*pGC */ );
+
+    void (*CopyClip) (GCPtr /*pgcDst */ ,
+                      GCPtr /*pgcSrc */ );
+} GCFuncs;
+
+/*
+ * graphics operations invoked through a GC
+ */
+
+typedef struct _GCOps {
+    void (*FillSpans) (DrawablePtr /*pDrawable */ ,
+                       GCPtr /*pGC */ ,
+                       int /*nInit */ ,
+                       DDXPointPtr /*pptInit */ ,
+                       int * /*pwidthInit */ ,
+                       int /*fSorted */ );
+
+    void (*SetSpans) (DrawablePtr /*pDrawable */ ,
+                      GCPtr /*pGC */ ,
+                      char * /*psrc */ ,
+                      DDXPointPtr /*ppt */ ,
+                      int * /*pwidth */ ,
+                      int /*nspans */ ,
+                      int /*fSorted */ );
+
+    void (*PutImage) (DrawablePtr /*pDrawable */ ,
+                      GCPtr /*pGC */ ,
+                      int /*depth */ ,
+                      int /*x */ ,
+                      int /*y */ ,
+                      int /*w */ ,
+                      int /*h */ ,
+                      int /*leftPad */ ,
+                      int /*format */ ,
+                      char * /*pBits */ );
+
+    RegionPtr (*CopyArea) (DrawablePtr /*pSrc */ ,
+                           DrawablePtr /*pDst */ ,
+                           GCPtr /*pGC */ ,
+                           int /*srcx */ ,
+                           int /*srcy */ ,
+                           int /*w */ ,
+                           int /*h */ ,
+                           int /*dstx */ ,
+                           int /*dsty */ );
+
+    RegionPtr (*CopyPlane) (DrawablePtr /*pSrcDrawable */ ,
+                            DrawablePtr /*pDstDrawable */ ,
+                            GCPtr /*pGC */ ,
+                            int /*srcx */ ,
+                            int /*srcy */ ,
+                            int /*width */ ,
+                            int /*height */ ,
+                            int /*dstx */ ,
+                            int /*dsty */ ,
+                            unsigned long /*bitPlane */ );
+    void (*PolyPoint) (DrawablePtr /*pDrawable */ ,
+                       GCPtr /*pGC */ ,
+                       int /*mode */ ,
+                       int /*npt */ ,
+                       DDXPointPtr /*pptInit */ );
+
+    void (*Polylines) (DrawablePtr /*pDrawable */ ,
+                       GCPtr /*pGC */ ,
+                       int /*mode */ ,
+                       int /*npt */ ,
+                       DDXPointPtr /*pptInit */ );
+
+    void (*PolySegment) (DrawablePtr /*pDrawable */ ,
+                         GCPtr /*pGC */ ,
+                         int /*nseg */ ,
+                         xSegment * /*pSegs */ );
+
+    void (*PolyRectangle) (DrawablePtr /*pDrawable */ ,
+                           GCPtr /*pGC */ ,
+                           int /*nrects */ ,
+                           xRectangle * /*pRects */ );
+
+    void (*PolyArc) (DrawablePtr /*pDrawable */ ,
+                     GCPtr /*pGC */ ,
+                     int /*narcs */ ,
+                     xArc * /*parcs */ );
+
+    void (*FillPolygon) (DrawablePtr /*pDrawable */ ,
+                         GCPtr /*pGC */ ,
+                         int /*shape */ ,
+                         int /*mode */ ,
+                         int /*count */ ,
+                         DDXPointPtr /*pPts */ );
+
+    void (*PolyFillRect) (DrawablePtr /*pDrawable */ ,
+                          GCPtr /*pGC */ ,
+                          int /*nrectFill */ ,
+                          xRectangle * /*prectInit */ );
+
+    void (*PolyFillArc) (DrawablePtr /*pDrawable */ ,
+                         GCPtr /*pGC */ ,
+                         int /*narcs */ ,
+                         xArc * /*parcs */ );
+
+    int (*PolyText8) (DrawablePtr /*pDrawable */ ,
+                      GCPtr /*pGC */ ,
+                      int /*x */ ,
+                      int /*y */ ,
+                      int /*count */ ,
+                      char * /*chars */ );
+
+    int (*PolyText16) (DrawablePtr /*pDrawable */ ,
+                       GCPtr /*pGC */ ,
+                       int /*x */ ,
+                       int /*y */ ,
+                       int /*count */ ,
+                       unsigned short * /*chars */ );
+
+    void (*ImageText8) (DrawablePtr /*pDrawable */ ,
+                        GCPtr /*pGC */ ,
+                        int /*x */ ,
+                        int /*y */ ,
+                        int /*count */ ,
+                        char * /*chars */ );
+
+    void (*ImageText16) (DrawablePtr /*pDrawable */ ,
+                         GCPtr /*pGC */ ,
+                         int /*x */ ,
+                         int /*y */ ,
+                         int /*count */ ,
+                         unsigned short * /*chars */ );
+
+    void (*ImageGlyphBlt) (DrawablePtr /*pDrawable */ ,
+                           GCPtr /*pGC */ ,
+                           int /*x */ ,
+                           int /*y */ ,
+                           unsigned int /*nglyph */ ,
+                           CharInfoPtr * /*ppci */ ,
+                           pointer /*pglyphBase */ );
+
+    void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ ,
+                          GCPtr /*pGC */ ,
+                          int /*x */ ,
+                          int /*y */ ,
+                          unsigned int /*nglyph */ ,
+                          CharInfoPtr * /*ppci */ ,
+                          pointer /*pglyphBase */ );
+
+    void (*PushPixels) (GCPtr /*pGC */ ,
+                        PixmapPtr /*pBitMap */ ,
+                        DrawablePtr /*pDst */ ,
+                        int /*w */ ,
+                        int /*h */ ,
+                        int /*x */ ,
+                        int /*y */ );
+} GCOps;
+
+/* there is padding in the bit fields because the Sun compiler doesn't
+ * force alignment to 32-bit boundaries.  losers.
+ */
+typedef struct _GC {
+    ScreenPtr pScreen;
+    unsigned char depth;
+    unsigned char alu;
+    unsigned short lineWidth;
+    unsigned short dashOffset;
+    unsigned short numInDashList;
+    unsigned char *dash;
+    unsigned int lineStyle:2;
+    unsigned int capStyle:2;
+    unsigned int joinStyle:2;
+    unsigned int fillStyle:2;
+    unsigned int fillRule:1;
+    unsigned int arcMode:1;
+    unsigned int subWindowMode:1;
+    unsigned int graphicsExposures:1;
+    unsigned int clientClipType:2;      /* CT_<kind> */
+    unsigned int miTranslate:1; /* should mi things translate? */
+    unsigned int tileIsPixel:1; /* tile is solid pixel */
+    unsigned int fExpose:1;     /* Call exposure handling */
+    unsigned int freeCompClip:1;        /* Free composite clip */
+    unsigned int scratch_inuse:1;       /* is this GC in a pool for reuse? */
+    unsigned int unused:13;     /* see comment above */
+    unsigned long planemask;
+    unsigned long fgPixel;
+    unsigned long bgPixel;
+    /*
+     * alas -- both tile and stipple must be here as they
+     * are independently specifiable
+     */
+    PixUnion tile;
+    PixmapPtr stipple;
+    DDXPointRec patOrg;         /* origin for (tile, stipple) */
+    struct _Font *font;
+    DDXPointRec clipOrg;
+    pointer clientClip;
+    unsigned long stateChanges; /* masked with GC_<kind> */
+    unsigned long serialNumber;
+    GCFuncs *funcs;
+    GCOps *ops;
+    PrivateRec *devPrivates;
+    /*
+     * The following were moved here from private storage to allow device-
+     * independent access to them from screen wrappers.
+     * --- 1997.11.03  Marc Aurele La France (tsi@xfree86.org)
+     */
+    PixmapPtr pRotatedPixmap;   /* tile/stipple rotated for alignment */
+    RegionPtr pCompositeClip;
+    /* fExpose & freeCompClip defined above */
+} GC;
+
+#endif                          /* GCSTRUCT_H */