svn merge ^/branches/released .

5 files changed, 84 insertions, 147 deletions

diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 6bba40aef..de78b7e24 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -576,35 +576,4 @@ extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);

 extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);

 

-

-/*

- * These are deprecated compatibility functions and will be removed soon!

- * Please use the noted replacements instead.

- */

-/* replaced by dixLookupWindow */

-extern _X_EXPORT WindowPtr SecurityLookupWindow(

-    XID id,

-    ClientPtr client,

-    Mask access_mode);

-/* replaced by dixLookupWindow */

-extern _X_EXPORT WindowPtr LookupWindow(

-    XID id,

-    ClientPtr client);

-

-/* replaced by dixLookupDrawable */

-extern _X_EXPORT pointer SecurityLookupDrawable(

-    XID id,

-    ClientPtr client,

-    Mask access_mode);

-

-/* replaced by dixLookupDrawable */

-extern _X_EXPORT pointer LookupDrawable(

-    XID id,

-    ClientPtr client);

-

-/* replaced by dixLookupClient */

-extern _X_EXPORT ClientPtr LookupClient(

-    XID id,

-    ClientPtr client);

-

 #endif /* DIX_H */

diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 4c474464f..044a5740b 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -96,10 +96,8 @@ OF THIS SOFTWARE.
 #define EXTENSION_EVENT_BASE 64

 #define EXTENSION_BASE 128

 

-typedef unsigned long PIXEL;

 typedef unsigned long ATOM;

 

-

 #ifndef TRUE

 #define TRUE 1

 #define FALSE 0

diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 8002b170a..47dce91e1 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -1,84 +1,83 @@
-/***********************************************************
-
-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 PIXMAPSTRUCT_H
-#define PIXMAPSTRUCT_H
-#include "pixmap.h"
-#include "screenint.h"
-#include "regionstr.h"
-#include "privates.h"
-
-typedef struct _Drawable {
-    unsigned char	type;	/* DRAWABLE_<type> */
-    unsigned char	class;	/* specific to type */
-    unsigned char	depth;
-    unsigned char	bitsPerPixel;
-    XID			id;	/* resource id */
-    short		x;	/* window: screen absolute, pixmap: 0 */
-    short		y;	/* window: screen absolute, pixmap: 0 */
-    unsigned short	width;
-    unsigned short	height;
-    ScreenPtr		pScreen;
-    unsigned long	serialNumber;
-} DrawableRec;
-
-/*
- * PIXMAP -- device dependent 
- */
-
-typedef struct _Pixmap {
-    DrawableRec		drawable;
-    PrivateRec		*devPrivates;
-    int			refcnt;
-    int			devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */
-    DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */
-    short		screen_x;
-    short		screen_y;
-    unsigned		usage_hint; /* see CREATE_PIXMAP_USAGE_* */
-} PixmapRec;
-
-#endif /* PIXMAPSTRUCT_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 PIXMAPSTRUCT_H

+#define PIXMAPSTRUCT_H

+#include "pixmap.h"

+#include "screenint.h"

+#include "regionstr.h"

+#include "privates.h"

+

+typedef struct _Drawable {

+    unsigned char	type;	/* DRAWABLE_<type> */

+    unsigned char	class;	/* specific to type */

+    unsigned char	depth;

+    unsigned char	bitsPerPixel;

+    XID			id;	/* resource id */

+    short		x;	/* window: screen absolute, pixmap: 0 */

+    short		y;	/* window: screen absolute, pixmap: 0 */

+    unsigned short	width;

+    unsigned short	height;

+    ScreenPtr		pScreen;

+    unsigned long	serialNumber;

+} DrawableRec;

+

+/*

+ * PIXMAP -- device dependent 

+ */

+

+typedef struct _Pixmap {

+    DrawableRec		drawable;

+    PrivateRec		*devPrivates;

+    int			refcnt;

+    int			devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */

+    DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */

+    short		screen_x;

+    short		screen_y;

+} PixmapRec;

+

+#endif /* PIXMAPSTRUCT_H */

diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 82068fe0e..95e34a9b8 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -251,34 +251,5 @@ extern _X_EXPORT unsigned int GetXIDList(
 extern _X_EXPORT RESTYPE lastResourceType;

 extern _X_EXPORT RESTYPE TypeMask;

 

-/*

- * These are deprecated compatibility functions and will be removed soon!

- * Please use the noted replacements instead.

- */

-

-/* replaced by dixLookupResourceByType */

-extern _X_EXPORT pointer SecurityLookupIDByType(

-    ClientPtr client,

-    XID id,

-    RESTYPE rtype,

-    Mask access_mode) _X_DEPRECATED;

-

-/* replaced by dixLookupResourceByClass */

-extern _X_EXPORT pointer SecurityLookupIDByClass(

-    ClientPtr client,

-    XID id,

-    RESTYPE classes,

-    Mask access_mode) _X_DEPRECATED;

-

-/* replaced by dixLookupResourceByType */

-extern _X_EXPORT pointer LookupIDByType(

-    XID id,

-    RESTYPE rtype) _X_DEPRECATED;

-

-/* replaced by dixLookupResourceByClass */

-extern _X_EXPORT pointer LookupIDByClass(

-    XID id,

-    RESTYPE classes) _X_DEPRECATED;

-

 #endif /* RESOURCE_H */

 

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index a373acd27..28dd2c011 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -208,7 +208,7 @@ typedef    PixmapPtr (* CreatePixmapProcPtr)(
 	int /*width*/,

 	int /*height*/,

 	int /*depth*/,

-	unsigned /*usage_hint*/);

+	unsigned /*class*/);

 

 typedef    Bool (* DestroyPixmapProcPtr)(

 	PixmapPtr /*pPixmap*/);