svn merge ^/branches/released .

4 files changed, 132 insertions, 166 deletions

diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index a64798608..d29ee4d91 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -97,16 +97,6 @@ typedef struct _LFclosure {
 

 /* 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;

@@ -117,24 +107,12 @@ typedef struct _PTclosure {
     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;

@@ -144,8 +122,6 @@ typedef struct _ITclosure {
     int			xorg;

     int			yorg;

     CARD8		reqType;

-    ImageTextPtr	imageText;

-    int			itemSize;

     XID			did;

 } ITclosureRec;

 #endif				/* CLOSESTR_H */

diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h
index f1fc8ebef..385c7969c 100644
--- a/xorg-server/include/colormapst.h
+++ b/xorg-server/include/colormapst.h
@@ -1,134 +1,132 @@
-/*
-
-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 CMAPSTRUCT_H
-#define CMAPSTRUCT_H 1
-
-#include <X11/Xarch.h>
-
-#include "colormap.h"
-#include "screenint.h"
-#include "privates.h"
-
-/* Shared color -- the color is used by AllocColorPlanes */
-typedef struct
-{
-    unsigned short color;
-    short  refcnt;
-} SHAREDCOLOR;
-
-/* LOCO -- a local color for a PseudoColor cell. DirectColor maps always
- * use the first value (called red) in the structure.  What channel they
- * are really talking about depends on which map they are in. */
-typedef struct
-{
-    unsigned short	red, green, blue;
-} LOCO;
-
-/* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.
- * DirectColor maps always use the first value (called red) in the structure.
- * What channel they are really talking about depends on which map they
- * are in. */
-typedef struct 
-{
-    SHAREDCOLOR *red, *green, *blue;
-} SHCO;
-
-
-/* color map entry */
-typedef struct _CMEntry
-{
-    union
-    {
-	LOCO	local;
-	SHCO	shco;
-    } co;
-    short	refcnt;
-    Bool	fShared;
-} Entry;
-
-/*
- * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
- * only needs one cell table, we arbitrarily pick red.  We keep track
- * of that table with freeRed, numPixelsRed, and clientPixelsRed
- *
- * The padN variables are unfortunate ABI BC. See fdo bug #6924.
- */
-
-typedef struct _ColormapRec
-{
-    VisualPtr	pVisual;
-    short	class;		/* PseudoColor or DirectColor */
-#if defined(_XSERVER64)
-    short	pad0;
-    XID		pad1;
-#endif
-    XID		mid;		/* client's name for colormap */
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
-    XID		pad2;
-#endif
-    ScreenPtr	pScreen;	/* screen map is associated with */
-    short	flags;		/* 1 = IsDefault
-				 * 2 = AllAllocated */
-    int		freeRed;
-    int		freeGreen;
-    int		freeBlue;
-    int		*numPixelsRed;	
-    int		*numPixelsGreen;	
-    int		*numPixelsBlue;	
-    Pixel	**clientPixelsRed;
-    Pixel	**clientPixelsGreen;
-    Pixel	**clientPixelsBlue;
-    Entry	*red;
-    Entry 	*green;
-    Entry	*blue;
-    pointer	devPriv;
-    PrivateRec	*devPrivates;	/* dynamic devPrivates added after devPriv
-				   already existed - must keep devPriv */
-} ColormapRec;
-	      
-#endif /* COLORMAP_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 CMAPSTRUCT_H

+#define CMAPSTRUCT_H 1

+

+#include <X11/Xarch.h>

+

+#include "colormap.h"

+#include "screenint.h"

+#include "privates.h"

+

+/* Shared color -- the color is used by AllocColorPlanes */

+typedef struct

+{

+    unsigned short color;

+    short  refcnt;

+} SHAREDCOLOR;

+

+/* LOCO -- a local color for a PseudoColor cell. DirectColor maps always

+ * use the first value (called red) in the structure.  What channel they

+ * are really talking about depends on which map they are in. */

+typedef struct

+{

+    unsigned short	red, green, blue;

+} LOCO;

+

+/* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.

+ * DirectColor maps always use the first value (called red) in the structure.

+ * What channel they are really talking about depends on which map they

+ * are in. */

+typedef struct 

+{

+    SHAREDCOLOR *red, *green, *blue;

+} SHCO;

+

+

+/* color map entry */

+typedef struct _CMEntry

+{

+    union

+    {

+	LOCO	local;

+	SHCO	shco;

+    } co;

+    short	refcnt;

+    Bool	fShared;

+} Entry;

+

+/*

+ * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor

+ * only needs one cell table, we arbitrarily pick red.  We keep track

+ * of that table with freeRed, numPixelsRed, and clientPixelsRed

+ *

+ * The padN variables are unfortunate ABI BC. See fdo bug #6924.

+ */

+

+typedef struct _ColormapRec

+{

+    VisualPtr	pVisual;

+    short	class;		/* PseudoColor or DirectColor */

+#if defined(_XSERVER64)

+    short	pad0;

+    XID		pad1;

+#endif

+    XID		mid;		/* client's name for colormap */

+#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)

+    XID		pad2;

+#endif

+    ScreenPtr	pScreen;	/* screen map is associated with */

+    short	flags;		/* 1 = IsDefault

+				 * 2 = AllAllocated */

+    int		freeRed;

+    int		freeGreen;

+    int		freeBlue;

+    int		*numPixelsRed;	

+    int		*numPixelsGreen;	

+    int		*numPixelsBlue;	

+    Pixel	**clientPixelsRed;

+    Pixel	**clientPixelsGreen;

+    Pixel	**clientPixelsBlue;

+    Entry	*red;

+    Entry 	*green;

+    Entry	*blue;

+    PrivateRec	*devPrivates;

+} ColormapRec;

+	      

+#endif /* COLORMAP_H */

diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h
index 428c40441..89a74d8ba 100644
--- a/xorg-server/include/gc.h
+++ b/xorg-server/include/gc.h
@@ -122,10 +122,6 @@ extern _X_EXPORT int FreeGC(
     pointer /*pGC*/,

     XID /*gid*/);

 

-extern _X_EXPORT GCPtr CreateScratchGC(

-    ScreenPtr /*pScreen*/,

-    unsigned /*depth*/);

-

 extern _X_EXPORT void FreeGCperDepth(

     int /*screenNum*/);

 

diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h
index c2f057a4a..5a34f0b70 100644
--- a/xorg-server/include/gcstruct.h
+++ b/xorg-server/include/gcstruct.h
@@ -95,7 +95,6 @@ typedef struct _GCFuncs {
     void	(* CopyClip)(

 		GCPtr /*pgcDst*/,

 		GCPtr /*pgcSrc*/);

-    DevUnion	devPrivate;

 } GCFuncs;

 

 /*

@@ -264,8 +263,6 @@ typedef struct _GCOps {
 		int /*h*/,

 		int /*x*/,

 		int /*y*/);

-

-    DevUnion	devPrivate;

 } GCOps;

 

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

@@ -306,7 +303,6 @@ typedef struct _GC {
     DDXPointRec		patOrg;		/* origin for (tile, stipple) */

     struct _Font	*font;

     DDXPointRec		clipOrg;

-    DDXPointRec		lastWinOrg;	/* position of window last validated */

     pointer		clientClip;

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

     unsigned long       serialNumber;