6638701 move headers for Sun extension protocols to open-src/proto
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Fri, 07 Dec 2007 13:42:18 -0800
changeset 258 959991251e79
parent 257 258e599d0802
child 259 bd9c33ee0a70
6638701 move headers for Sun extension protocols to open-src/proto
open-src/proto/Makefile
open-src/proto/sun-ext-protos/Makefile
open-src/proto/sun-ext-protos/docs/sun-sme.txt
open-src/proto/sun-ext-protos/include/allplanes.h
open-src/proto/sun-ext-protos/include/allplanesstr.h
open-src/proto/sun-ext-protos/include/dgast.h
open-src/proto/sun-ext-protos/include/fbpm.h
open-src/proto/sun-ext-protos/include/fbpmstr.h
open-src/proto/sun-ext-protos/include/interactive.h
open-src/proto/sun-ext-protos/include/interactiveCommon.h
open-src/proto/sun-ext-protos/include/sme.h
open-src/proto/sun-ext-protos/include/transovl.h
open-src/proto/sun-ext-protos/include/transovlstr.h
open-src/xserver/xorg/sun-src/include/X11/extensions/interactive.h
open-src/xserver/xorg/sun-src/include/X11/extensions/interactiveCommon.h
packages/SUNWxwinc/prototype
--- a/open-src/proto/Makefile	Mon Dec 03 13:59:43 2007 -0800
+++ b/open-src/proto/Makefile	Fri Dec 07 13:42:18 2007 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.7	07/11/20
+# @(#)Makefile	1.8	07/12/07
 #
 ###############################################################################
 
@@ -38,7 +38,7 @@
 	randrproto recordproto renderproto resourceproto scrnsaverproto \
 	trapproto videoproto xcmiscproto xextproto xf86bigfontproto \
 	xf86dgaproto xf86miscproto xf86vidmodeproto xineramaproto \
-	lg3dproto
+	lg3dproto sun-ext-protos
 
 OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/Makefile	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# 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, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# 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
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+# ident "@(#)Makefile 1.1     07/12/04 SMI"
+#
+# Definitions of Solaris-specific X Server extensions
+
+# No upstream sources for these files, since they're Solaris-specific
+SOURCE_TARBALL_NAME=NONE
+
+### Include common rulesets
+PWD:sh=pwd
+TOP=$(PWD)/../..
+include $(TOP)/common/Makefile.inc
+
+DESTDIR=$(PROTODIR)
+INSTDIR=$(DESTDIR)$(X11_INCLUDES_DIR)/X11/extensions
+
+install_gen::
+	mkdir -p $(INSTDIR)
+	cp -pf include/*h $(INSTDIR)/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/docs/sun-sme.txt	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,158 @@
+# Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# 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, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# 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
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# Originally submitted as PSARC/1994/377
+
+The purpose of this document is to fast track the implementation of a
+shared memory based transport mechanism for the OpenWindows server
+and clients. This document briefly describes some of the design
+and implementation features of this mechanism. Section 3, entitled
+"User Interface for SUN_SME", describes the user visible interface. 
+We are requesting that the interface in Section 3 be declared a Public
+interface.  The components that have been affected by SUN_SME are Xsun 
+and libX11. 
+
+It should be noted that SUN_SME is targeted at improving benchmark 
+performance. The current implementation uses SYSV shared memory and 
+thus has a limit of 6 shared memory connections.  Once the limit is 
+exceeded the implementation silently falls back to a pipe connection.
+The plan is to eventually remove this limitation by using SunOS native
+shared memory mechanisms.
+
+1. What is 'SHARED_MEMORY_EXTENSION'(SUN_SME) ?
+
+	SUN_SME is an extension to the OpenWindows server with the purpose 
+	allowing clients to send requests to the server via shared memory.
+	SUN_SME is intended to be another form of local transport mechanism
+	like Unix sockets and the pipes mechanisms. The SUN_SME extension
+	will be versioned so that changes can be made in a compatible manner
+	if they become necessary. 
+
+2. How and where 'SUN_SME' gets used ?
+
+    	In order for a client to communicate via shared memory with the
+	server it should have its display environment variable set to 
+ 	:x.y (where x is the display number and y is the screen 
+ 	number) and the environment variable XSUNTRANSPORT set to
+ 	"shmem" before it is started. If the display variable is set
+ 	to :x.y and XSUNTRANSPORT set to "shmem", local clients query 
+ 	the X server for the SUN_SME Extension and if it is supported 
+ 	the connection is set up.
+
+	It should be noted that shared memory will be used for sending
+	requests from client to server only. Replies/events and all
+	other communication initiated by the X server will use the
+	default IPC mechanism which is pipes in OW 3.4. Also, one shared
+	memory segment will be set up per display connection. 
+
+3. User Interface for SUN_SME
+
+	The user interface for SUN_SME will be documented in the man 
+        pages and other appropriate documentation.  Following, are the 
+        visible changes that have been introduced by SUN_SME :
+	
+ 		- If the value of DISPLAY has any form other than 
+ 		  :x[.y], the transport is determined directly from 
+ 		  its value (using the standard, pre-existent X rules).  
+ 		  Otherwise, the value of XSUNTRANSPORT becomes relevant.  
+ 		  If unset, a suitable (but otherwise unspecified) local 
+ 		  transport is used; otherwise, the transport named by 
+ 		  its value is used, if available.  In the case of shared 
+ 		  memory, XSUNTRANSPORT must be set to "shmem".
+
+		- The size of the shared memory segment between the
+		  client and server will be user configurable by setting
+		  the environment variable XSUNSMESIZE. The default value
+		  for XSUNSMESIZE will be 64K.
+
+		- The xdpyinfo client will return SUN_SME in the list
+		  of supported extensions.  Similarly the XQueryExtension()
+		  and XListExtensions() routines in Xlib and the corresponding
+		  QueryExtension and ListExtensions X protocol requests will
+		  indicate the existence of the SUN_SME extension.  However,
+		  this information is not particularly useful to users or
+		  application developers, since the extension interfaces
+		  are intended to be Consolidation Private.
+
+4. Implementation Features
+
+This section is for information purposes only, since the extension
+interfaces are Consolidation Private.  The affected components are
+libX11 and Xsun.
+
+Currently clients communicate with the server via pipes and sockets
+(TCP and UDP). Our goal is to provide a shared memory communication
+mechanism between the client and the server. Communicating via 
+shared memory has been measured to be more efficient than sockets/pipes.
+The current SUN_SME implementation uses SYSV shared memory.  The
+final implementation will use SunOS shared memory.
+
+Some characteristics of this mechanism are :
+
+	- Shared memory will be only be used for client requests. 
+	Replies from the server will be sent via pipes.
+
+	- The size of the shared memory segment will be set to 64K by
+	default. This size will be use configurable via the XSUNSMESIZE
+ 	environment variable.
+
+	- Variable size buffers are allocated out of the shared memory 
+	segment in a ring-like fashion. The buffers in the shared memory 
+	segment are indexed with the index containing the address 
+	and size of the buffers. The client updates the head pointer 
+	every time a request buffer is inserted and the server 
+	updates the tail pointer every time a request buffer is processed. 
+
+	- Requests sent by the client are packetized and sent in a 
+	buffer instead of sending one request per buffer using the
+	same algorithm used by pipe and socket connections. The client 
+	sends a byte through the pipe to the server indicating
+	that a request buffer has been sent. This way the server 
+	has something to poll on and the traditional select mechanism
+	can be retained.
+
+ 	- Suitable locking mechanisms will be used to insure consistency
+ 	of shared memory between client and server under the PSO memory
+ 	model when/if it becomes possible for user processes to run under
+ 	PSO.
+
+	- If the client runs out of request buffers it gets blocked and 
+	waits for a special reply denoted by SMEREPLY. 
+
+	- Large requests (for e.g. XPutImage) are split into multiple
+	requests. 
+
+	- In the event that the maximum allowable shared memory has
+	been allocated and a client attempts to initiate a shared
+	memory connection, the transport mechanism will default
+	to pipes. 
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/allplanes.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,57 @@
+/* Copyright 1990 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */ 
+
+#pragma ident   "@(#)allplanes.h	35.3	07/12/04 SMI"
+
+/* @(#)allplanes.h	35.3 07/12/04 INCLUDE_XEXT SMI */
+
+#ifndef _ALLPLANES_H_
+#define _ALLPLANES_H_
+
+#define X_AllPlanesQueryVersion			0
+#define X_AllPlanesPolyPoint			1
+#define X_AllPlanesPolyLine			2
+#define X_AllPlanesPolySegment			3
+#define X_AllPlanesPolyRectangle		4
+#define X_AllPlanesPolyFillRectangle		5
+
+#define AllPlanesNumberEvents			0
+
+#ifndef _ALLPLANES_SERVER_
+
+extern Bool XAllPlanesQueryExtension();
+extern Status XAllPlanesQueryVersion();
+extern void XAllPlanesDrawPoints();
+extern void XAllPlanesDrawLines();
+extern void XAllPlanesDrawSegments();
+extern void XAllPlanesDrawRectangles();
+extern void XAllPlanesFillRectangles();
+
+#endif /* _ALLPLANES_SERVER_ */
+
+#endif /* _ALLPLANES_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/allplanesstr.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,89 @@
+/* Copyright 1990 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#pragma ident "@(#)allplanesstr.h	35.3 07/12/04 INCLUDE_EXT SMI"
+
+#ifndef _ALLPLANESSTR_H_
+#define _ALLPLANESSTR_H_
+
+#include "allplanes.h"
+
+#define ALLPLANESNAME "SUN_ALLPLANES"
+#define ALLPLANES_MAJOR_VERSION	1	/* current version numbers */
+#define ALLPLANES_MINOR_VERSION	0
+
+typedef struct {
+    CARD8       reqType;		/* always AllPlanesReqCode */
+    CARD8       allplanesReqType;	/* always X_AllPlanesQueryVersion */
+    CARD16	length B16;
+} xAllPlanesQueryVersionReq;
+#define sz_xAllPlanesQueryVersionReq	4
+
+typedef struct {
+    BYTE        type;			/* X_Reply */
+    CARD8       unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xAllPlanesQueryVersionReply;
+#define sz_xAllPlanesQueryVersionReply	32
+
+typedef struct {
+    CARD8       reqType;		/* always AllPlanesReqCode */
+    CARD8       allplanesReqType;	/* always X_AllPlanesPolySegment */
+    CARD16	length B16;
+    Drawable	drawable B32;
+} xAllPlanesPolySegmentReq;
+#define sz_xAllPlanesPolySegmentReq 8
+
+typedef xAllPlanesPolySegmentReq xAllPlanesPolyRectangleReq;
+#define sz_xAllPlanesPolyRectangleReq 8
+
+typedef xAllPlanesPolySegmentReq xAllPlanesPolyFillRectangleReq;
+#define sz_xAllPlanesPolyFillRectangleReq 8
+
+typedef struct {
+    CARD8       reqType;		/* always AllPlanesReqCode */
+    CARD8       allplanesReqType;	/* always X_AllPlanesPolyPoint */
+    CARD16	length B16;
+    Drawable	drawable B32;
+    BYTE	coordMode;
+    CARD8	pad0;
+    CARD16	pad1 B16;
+} xAllPlanesPolyPointReq;
+#define sz_xAllPlanesPolyPointReq 12
+
+typedef xAllPlanesPolyPointReq xAllPlanesPolyLineReq;
+#define sz_xAllPlanesPolyLineReq 12
+#endif /* _ALLPLANESSTR_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/dgast.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,165 @@
+/* Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */ 
+
+#pragma ident	"@(#)dgast.h	1.6	07/12/04 SMI"
+
+/*
+ *-----------------------------------------------------------------------
+ * SUN_DGA private extension minor op codes
+ *-----------------------------------------------------------------------
+ */
+
+#ifndef _SUN_DGA_H
+#define _SUN_DGA_H
+
+#define SUN_DGA_MAJOR_VERSION	3	/* current version numbers */
+#define SUN_DGA_MINOR_VERSION	2
+
+/* protocol requests in Protocol Version 1 - OpenWindows 2.0 FCS */
+#define  X_WxGrab 		1
+#define  X_WxUnGrab 		2
+#define  X_WxGrabColormap 	3
+#define  X_WxUnGrabColormap 	4
+
+/* additional protocol requests in Protocol Version 2 - OpenWindows 3.0 Beta */
+#define  X_WxGrabWids 		5	
+#define  X_WxGrabBuffers 	6	
+#define  X_WxUnGrabBuffers  	7	
+#define  X_WxGrabFCS		8
+#define  X_WxGrabZbuf		9
+#define  X_WxGrabStereo	       10	
+#define  X_WxGrab_New 	       11
+#define  X_WxUnGrab_New	       12
+
+/* additional protocol requests in Protocol Version 3 - OpenWindows 3.0 FCS */
+#define  X_WxGrabColormapNew   13
+#define  X_WxUnGrabColormapNew 14
+#define  X_WxGrabRetained      15
+#define  X_WxUnGrabRetained    16
+#define  X_WxGetRetainedPath   17
+#define  X_DgaQueryVersion     18
+
+/* additional protocol requests in Protocol Version 3 - OpenWindows 3.0 FCS */
+
+#define  X_WxGrabPixmap        19
+#define  X_WxUnGrabPixmap      20
+
+/* additional protocol requests in Protocol Version 3.2 */
+
+#define  X_WxGrabDrawable      21
+#define  X_WxUnGrabDrawable    22
+
+/* additional protocol requests in Protocol Version 3.6 */
+
+#define  X_WxGrabABuffers      23
+#define  X_WxUnGrabABuffers    24
+
+#ifdef PANORAMIX
+#define X_DgaXineramaInfo 25
+#endif
+
+/*
+** Types of grabbable drawables
+*/
+
+#define DGA_PROTO_WINDOW  0
+#define DGA_PROTO_PIXMAP  1
+#define DGA_PROTO_OVERLAY 2
+
+#define DGA_TOKEN_NULL    0
+
+/* Ancillary Buffers request structure */
+
+ typedef struct {
+    CARD8 reqType;
+    BYTE pad;
+    CARD16 length B16;
+    CARD32 id B32;  /* a Window, Drawable, Font, GContext, Pixmap, etc. */
+    CARD32 type;
+    CARD32 buffer_site;
+    } xDgaGrabABuffersReq;
+#define sz_xDgaGrabABuffersReq    (sizeof(xDgaGrabABuffersReq))
+
+/*
+** OWGX request structure
+*/
+
+ typedef struct {
+    CARD8 reqType;
+    BYTE pad;
+    CARD16 length B16;
+    CARD32 id B32;  /* a Window, Drawable, Font, GContext, Pixmap, etc. */
+    CARD32 number_objects B32;
+    } xOWGXReq;
+#define sz_xOWGXReq    12
+
+
+/*
+** OWGX shared retained path reply structure
+*/
+
+ typedef struct {
+    BYTE type;			/* X_Reply */
+    CARD8 pad;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD8  path[200];
+    } xOWGXRtndPathReply;
+#define sz_xOWGXRtndPathReply 208
+
+
+/*
+ * DgaQueryVersion request and reply structures
+ */
+
+typedef struct {
+    CARD8       reqType;		/* always SUN_DGA major opcode */
+    CARD8       dgaReqType;		/* always X_DgaQueryVersion */
+    CARD16	length B16;
+} xDgaQueryVersionReq;
+#define sz_xDgaQueryVersionReq	4
+
+typedef struct {
+    BYTE        type;			/* X_Reply */
+    CARD8       unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xDgaQueryVersionReply;
+#define sz_xDgaQueryVersionReply	32
+
+
+
+#endif /* _SUN_DGA_H */
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/fbpm.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+ * All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#pragma ident   "@(#)fbpm.h	1.10	06/08/09 SMI"
+
+#define FBPMModeOn	0
+#define FBPMModeStandby	1
+#define FBPMModeSuspend	2
+#define FBPMModeOff	3
+
+#define DDXStatError 0
+#define DDXStatFbOk  1
+#define DDXStatMonOk 2
+#define DDXStatOk	(DDXStatFbOk | DDXStatMonOk)
+
+#ifndef DPMS_SERVER
+
+Bool FBPMQueryExtension(
+#if NeedFunctionPrototypes
+Display *, 
+int *, 
+int *
+#endif
+);
+Status FBPMGetVersion(
+#if NeedFunctionPrototypes
+Display *, 
+int *, 
+int *
+#endif
+);
+Bool FBPMCapable(
+#if NeedFunctionPrototypes
+Display *
+#endif
+);
+Bool FBPMEnable(
+#if NeedFunctionPrototypes
+Display *, 
+int
+#endif
+);
+Status FBPMDisable(
+#if NeedFunctionPrototypes
+Display *
+#endif
+);
+Status FBPMForceLevel(
+#if NeedFunctionPrototypes
+Display *, 
+CARD16
+#endif
+);
+Status FBPMInfo(
+#if NeedFunctionPrototypes
+Display *, 
+CARD16 *, 
+BOOL *
+#endif
+);
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/fbpmstr.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,143 @@
+/* Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#pragma ident   "@(#)fbpmstr.h	1.4	07/12/04 SMI"
+
+
+#define X_FBPMGetVersion	0
+#define X_FBPMCapable		1
+#define X_FBPMEnable		4
+#define X_FBPMDisable		5
+#define X_FBPMForceLevel	6
+#define X_FBPMInfo       	7
+
+#define FBPMNumberEvents	0
+
+#define FBPMNumberErrors	0
+
+#define FBPMMajorVersion	1
+#define FBPMMinorVersion	1
+
+#define FBPMExtensionName	"FBPM"
+
+typedef struct {
+    CARD8	reqType;	/* always FBPMCode */
+    CARD8	fbpmReqType;	/* always X_FBPMGetVersion */
+    CARD16	length B16;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+} xFBPMGetVersionReq;
+#define sz_xFBPMGetVersionReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xFBPMGetVersionReply;
+#define sz_xFBPMGetVersionReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always FBPMCode */
+    CARD8	fbpmReqType;	/* always X_FBPMCapable */
+    CARD16	length B16;
+} xFBPMCapableReq;
+#define sz_xFBPMCapableReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    BOOL	capable;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xFBPMCapableReply;
+#define sz_xFBPMCapableReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always FBPMCode */
+    CARD8	fbpmReqType;	/* always X_FBPMEnable */
+    CARD16	length B16;
+    CARD16      level B16;      /* power level requested */
+    CARD16      pad0 B16;
+
+} xFBPMEnableReq;
+#define sz_xFBPMEnableReq 8
+
+typedef struct {
+    CARD8	reqType;	/* always FBPMCode */
+    CARD8	fbpmReqType;	/* always X_FBPMDisable */
+    CARD16	length B16;
+} xFBPMDisableReq;
+#define sz_xFBPMDisableReq 4
+
+typedef struct {
+    CARD8	reqType;	/* always FBPMCode */
+    CARD8	fbpmReqType;	/* always X_FBPMInfo */
+    CARD16	length B16;
+} xFBPMInfoReq;
+#define sz_xFBPMInfoReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16      power_level B16;
+    BOOL        state;
+    CARD8       pad1;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xFBPMInfoReply;
+#define sz_xFBPMInfoReply 32
+
+typedef struct {
+    CARD8       reqType;        /* always FBPMCode */
+    CARD8       fbpmReqType;    /* always X_FBPMForceLevel */
+    CARD16      length B16;
+    CARD16      level B16;      /* power level requested */
+    CARD16      pad0 B16;
+} xFBPMForceLevelReq;
+#define sz_xFBPMForceLevelReq 8
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/interactive.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,114 @@
+/*
+ * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ * 
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+/************************************************************
+	Protocol defs for XIA extension
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#ifndef _INTERACTIVE_H
+#define _INTERACTIVE_H
+
+#pragma ident	"@(#)interactive.h	35.3	05/08/31 SMI"
+
+#include <X11/Xproto.h>
+
+#include "interactiveCommon.h"
+
+#define X_IAQueryVersion                0
+#define X_IASetProcessInfo              1
+#define X_IAGetProcessInfo              2
+
+#define IANumberEvents                  0
+#define IANumberErrors                  0
+
+typedef int ConnectionPidRec;
+typedef int * ConnectionPidPtr;
+
+#define IANAME "SolarisIA"
+
+#define IA_MAJOR_VERSION	1	/* current version numbers */
+#define IA_MINOR_VERSION	1
+
+typedef struct _IAQueryVersion {
+    CARD8	reqType;		/* always IAReqCode */
+    CARD8	IAReqType;		/* always X_IAQueryVersion */
+    CARD16	length B16;
+} xIAQueryVersionReq;
+#define sz_xIAQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad;			/* padding */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of IA protocol */
+    CARD16	minorVersion B16;	/* minor version of IA protocol */
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xIAQueryVersionReply;
+#define sz_xIAQueryVersionReply	32
+
+typedef struct _IASetProcessInfo {
+    CARD8	reqType;		/* Always IAReqCode */
+    CARD8	connectionAttrType;	/* What attribute */
+    CARD16	length B16;		/* Request length */
+    CARD32	flags B32;		/* Request flags */
+    CARD32	uid B32;		/* requestor's uid */
+} xIASetProcessInfoReq;
+#define sz_xIASetProcessInfoReq	12	
+
+typedef struct _IAGetProcessInfo {
+    CARD8	reqType;		/* Always IAReqCode */
+    CARD8	connectionAttrType;	/* What attribute */
+    CARD16	length;			/* Request length */
+    CARD32	flags B32;		/* Request flags */
+} xIAGetProcessInfoReq;
+#define sz_xIAGetProcessInfoReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad;			/* padding */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	count B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xIAGetProcessInfoReply;
+
+#define sz_xIAGetProcessInfo 32
+
+#endif 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/interactiveCommon.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,40 @@
+/*
+ * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ * 
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#ifndef _INTERACTIVECOMMON_H
+#define _INTERACTIVECOMMON_H
+
+#pragma ident	"@(#)interactiveCommon.h	35.3	05/08/31 SMI"
+
+
+#define INTERACTIVE_INFO		0x1
+#define INTERACTIVE_SETTING		0x2
+
+
+#endif	/* _INTERACTIVECOMMON_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/sme.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,130 @@
+/* Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#pragma ident	"@(#)sme.h	1.6	07/12/04 SMI"
+
+/************************************************************
+Copyright 1989 by The Massachusetts Institute of Technology
+ 
+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 MIT not be used in
+advertising or publicity pertaining to distribution of the
+software without specific prior written permission.
+M.I.T. makes no representation about the suitability of
+this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+ 
+MIT DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
+NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
+ABLE  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 _SME_H_
+#define _SME_H_
+
+#include <X11/Xmd.h>
+#include <thread.h>
+#include <synch.h>
+
+typedef struct _xSMEReq {
+    CARD8 reqType;
+    CARD8 subReqType;
+    CARD16 length B16;
+    CARD32 xsunsmesize B32;
+} xSMEReq;
+
+#define sz_xSMEReq  8
+#define SMENAME "SUN_SME"
+#define SMEFILE "/tmp/.X11-sme"
+
+typedef struct _xSmeConnInitReply {
+    BYTE type;              /* X_Reply */
+    BYTE status;
+    CARD16 sequenceNumber B16;  /* of last request received by server */
+    CARD32 length B32;
+    CARD32 client_index B32;   	/* client index to be used in opening sme*/
+    CARD32 pad1 B32;		/* Pad to standard reply size */
+    CARD32 pad2 B32;
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+} xSmeConnInitReply;
+
+/* "Sme2" in hex */
+#define SME_MAGIC2	0x53686d32
+/* "Sme3" in hex */
+#define SME_MAGIC3	0x53686d33
+/* "Sme4" in hex */
+#define SME_MAGIC4	0x53686d34
+
+/*
+ * Add a few more fields to shared memory data structures for
+ * debugging.
+ */
+
+#define INIT_SME_CONN	1
+#define START_SME_CONN	2
+
+#define SMECONNQSIZE	512		/* Total number of allocation
+					 * chunks that can be queued in
+					 * the fifo. */
+/*
+ * Shared memory structure
+ */
+typedef struct _smeRegion {
+	INT32	smeMagic;
+	INT32	smeHeapSize;		/* Total number of bytes in heap */
+	INT32	smeBufferSize;          /* Allocation chunk within heap */
+	volatile INT32	smeClientBufferBlocked;
+	mutex_t	smeBufferMutex;
+	cond_t	smeBufferCV;
+	volatile INT32	smeIn;
+	volatile INT32	smeOut;
+	volatile INT32	smeHeadptr;	/* Relative ptr to first free byte in
+					 * the heap.  Only the client updates 
+					 * this. */
+	volatile INT32	smeTailptr;	/* Relative ptr to the last free byte
+					 * in the heap.  Only the server 
+					 * updates this. */
+	struct smeQueueEntry {
+		volatile INT32	bufp;
+		volatile INT32	msgSize;
+		} smeQueue[SMECONNQSIZE];
+} smeRegion;
+
+#endif /* _SME_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/transovl.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,169 @@
+/* Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#pragma ident	"@(#)transovl.h	35.3	07/12/04 INCLUDE_EXT SMI"
+
+#ifndef _TRANSOVL_H_
+#define _TRANSOVL_H_
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#ifndef _TRANSOVL_SERVER_
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#endif /* _TRANSOVL_SERVER_ */
+
+#define X_OvlQueryVersion			0
+#define X_OvlGetPartners			1
+#define X_OvlGetSharedPixels			2
+#define X_OvlGetSharedColors			3
+#define X_OvlCreateWindow			4
+#define X_OvlIsOverlayWindow			5
+#define X_OvlSetWindowTransparent		6
+#define X_OvlSetPaintType			7
+#define X_OvlCopyPaintType			8
+#define X_OvlCopyAreaAndPaintType		9
+#define X_OvlReadScreen				10
+
+#define OvlNumberEvents				0
+
+typedef enum {
+    XSolarisOvlPaintTransparent,
+    XSolarisOvlPaintOpaque
+} XSolarisOvlPaintType;
+
+typedef enum {
+    XSolarisOvlSuccess,
+    XSolarisOvlQualifiedSuccess,
+    XSolarisOvlCriteriaFailure,
+    XSolarisOvlFailure
+} XSolarisOvlSelectStatus;
+
+typedef enum {
+    XSolarisOvlSelectBestOverlay,
+    XSolarisOvlSelectBestUnderlay
+} XSolarisOvlSelectType;
+
+typedef struct {
+    unsigned long	hardCriteriaMask;
+    unsigned long	softCriteriaMask;
+    int			c_class;
+    unsigned int	depth;
+    unsigned int	minColors;
+    unsigned int	minRed;
+    unsigned int	minGreen;
+    unsigned int	minBlue;
+    unsigned int	minBitsPerRGB;
+    unsigned int	minBuffers;
+} XSolarisOvlVisualCriteria;
+
+typedef struct {
+    XSolarisOvlVisualCriteria	overlayCriteria;
+    XSolarisOvlVisualCriteria	underlayCriteria;
+} XSolarisOvlPairCriteria;
+
+#define XSolarisOvlVisualClass		(1L<<0)
+#define XSolarisOvlDepth		(1L<<1)
+#define XSolarisOvlMinColors		(1L<<2)
+#define XSolarisOvlMinRed		(1L<<3)
+#define XSolarisOvlMinGreen		(1L<<4)
+#define XSolarisOvlMinBlue		(1L<<5)
+#define XSolarisOvlMinBitsPerRGB	(1L<<6)
+#define XSolarisOvlMinBuffers		(1L<<7)
+#define XSolarisOvlUnsharedPixels	(1L<<8)
+#define XSolarisOvlUnsharedColors	(1L<<9)
+#define XSolarisOvlPreferredPartner	(1L<<10)
+
+#define XSolarisOvlCopyOpaque		(1L<<0)
+#define XSolarisOvlCopyTransparent	(1L<<1)
+#define XSolarisOvlCopyAll		(XSolarisOvlCopyOpaque|XSolarisOvlCopyTransparent)
+
+#ifndef _TRANSOVL_SERVER_
+
+#if defined(__STDC__) || defined(__cplusplus)
+extern Bool XSolarisOvlQueryExtension(Display *, int *, int *);
+
+extern Status XSolarisOvlQueryVersion(Display *, int *, int *);
+
+extern Window XSolarisOvlCreateWindow(Display *, Window, int, int, 
+		unsigned int, unsigned int, unsigned int, int, 
+		unsigned int, Visual *, unsigned long, XSetWindowAttributes *);
+
+extern Bool XSolarisOvlIsOverlayWindow(Display *, Window);
+
+extern void XSolarisOvlSetWindowTransparent(Display *, Window);
+
+extern Status XSolarisOvlSetPaintType(Display *, GC, XSolarisOvlPaintType);
+
+extern XSolarisOvlPaintType XSolarisOvlGetPaintType(Display *, GC);
+
+extern Status XSolarisOvlCopyPaintType(Display *, Drawable, Drawable, GC, 
+		int, int, unsigned int, unsigned int, int, int, 
+		unsigned long, unsigned long);
+
+extern Status XSolarisOvlCopyAreaAndPaintType(Display *, 
+		Drawable, Drawable, Drawable, Drawable,
+		GC, GC, int, int, int, int, 
+		unsigned int, unsigned int, int, int, int, int, 
+		unsigned long, unsigned long);
+
+extern XImage *XReadScreen(Display *, Window, int, int, unsigned int, unsigned int, Bool);
+
+extern XSolarisOvlSelectStatus XSolarisOvlSelectPartner(Display *, int, VisualID, 
+		XSolarisOvlSelectType, int, XSolarisOvlVisualCriteria *, XVisualInfo *, 
+		unsigned long *);
+
+extern XSolarisOvlSelectStatus XSolarisOvlSelectPair(Display *, int, int, 
+		XSolarisOvlPairCriteria *, XVisualInfo *, XVisualInfo *, 
+		unsigned long *, unsigned long *);
+#else
+extern Bool XSolarisOvlQueryExtension();
+extern Status XSolarisOvlQueryVersion();
+extern Window XSolarisOvlCreateWindow();
+extern Bool XSolarisOvlIsOverlayWindow();
+extern void XSolarisOvlSetWindowTransparent();
+extern Status XSolarisOvlSetPaintType();
+extern XSolarisOvlPaintType XSolarisOvlGetPaintType();
+extern Status XSolarisOvlCopyPaintType();
+extern Status XSolarisOvlCopyAreaAndPaintType();
+extern XImage *XReadScreen();
+extern XSolarisOvlSelectStatus XSolarisOvlSelectPartner();
+extern XSolarisOvlSelectStatus XSolarisOvlSelectPair();
+#endif
+
+#endif /* _TRANSOVL_SERVER_ */
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* _TRANSOVL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/sun-ext-protos/include/transovlstr.h	Fri Dec 07 13:42:18 2007 -0800
@@ -0,0 +1,329 @@
+/* Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */ 
+
+#pragma ident	"@(#)transovlstr.h	35.4	07/12/04 INCLUDE_EXT SMI"
+
+#ifndef _TRANSOVLSTR_H_
+#define _TRANSOVLSTR_H_
+
+#include "transovl.h"
+
+/*
+   B U G : 4173223
+
+   These items should be 32 bit type.
+
+   We must redefine the following types in terms 
+   of Xmd.h's types, which may include bit fields.  
+   All of these are #undef'd at the end of this file,
+   restoring the definitions in X.h.  
+ */
+
+#define Window CARD32
+#define Drawable CARD32
+#define Font CARD32
+#define Pixmap CARD32
+#define Cursor CARD32
+#define Colormap CARD32
+#define GContext CARD32
+#define Atom CARD32
+#define VisualID CARD32
+#define Time CARD32
+#define KeyCode CARD8
+#define KeySym CARD32
+
+
+#define OVLNAME "SUN_OVL"
+#define OVL_MAJOR_VERSION	1	/* current version numbers */
+#define OVL_MINOR_VERSION	0
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlQueryVersion */
+    CARD16	length B16;
+} xOvlQueryVersionReq;
+#define sz_xOvlQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xOvlQueryVersionReply;
+#define sz_xOvlQueryVersionReply	32
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlGetPartners */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xOvlGetPartnersReq;
+#define sz_xOvlGetPartnersReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	restricted;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	numPairs B16;
+    CARD16	pad0 B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xOvlGetPartnersReply;
+#define sz_xOvlGetPartnersReply	32
+
+typedef struct {
+    VisualID	overlayVid;
+    VisualID	underlayVid;
+} XOvlVidPair;
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlGetSharedPixels */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xOvlGetSharedPixelsReq;
+#define sz_xOvlGetSharedPixelsReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	numPGInfos B16;
+    CARD16	pad0 B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xOvlGetSharedPixelsReply;
+#define sz_xOvlGetSharedPixelsReply	32
+
+typedef struct {
+    VisualID	vid;
+    CARD32	ovplanes;
+    CARD32	unplanes;
+} XOvlPGInfo;
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlGetSharedColors */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xOvlGetSharedColorsReq;
+#define sz_xOvlGetSharedColorsReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	numClutInfos B16;
+    CARD16	pad0 B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xOvlGetSharedColorsReply;
+#define sz_xOvlGetSharedColorsReply	32
+
+typedef struct {
+    VisualID	vid;
+    CARD32	pool;
+    INT32	count;
+} XOvlClutInfo;
+
+#define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\
+		     CWBorderPixel|CWBitGravity|CWWinGravity|\
+		     CWBackingStore|CWBackingPlanes|CWBackingPixel|\
+		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\
+		     CWDontPropagate|CWColormap|CWCursor)
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlCreateWindow */
+    CARD16	length B16;
+    Window	wid B32;
+    Window	parent B32;
+    INT16	x B16;
+    INT16	y B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD16	borderWidth B16;
+    INT16	depth B16;
+    CARD32	class B32;
+    VisualID	visual B32;
+    CARD32	mask B32;
+} xOvlCreateWindowReq;
+#define sz_xOvlCreateWindowReq	36
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlIsOverlayWindow */
+    CARD16	length B16;
+    Window	wid B32;
+} xOvlIsOverlayWindowReq;
+#define sz_xOvlIsOverlayWindowReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	isoverlay;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xOvlIsOverlayWindowReply;
+#define sz_xOvlIsOverlayWindowReply	32
+
+typedef struct {
+    CARD8		reqType;	/* always OvlReqCode */
+    CARD8		ovlReqType;	/* always X_OvlSetWindowTransparent */
+    CARD16		length B16;
+    Window		wid B32;
+} xOvlSetWindowTransparentReq;
+#define sz_xOvlSetWindowTransparentReq	8
+
+typedef struct {
+    CARD8		reqType;	/* always OvlReqCode */
+    CARD8		ovlReqType;	/* always X_OvlSetPaintType */
+    CARD16		length B16;
+    GContext		gc B32;
+    XSolarisOvlPaintType paintType B32;
+} xOvlSetPaintTypeReq;
+#define sz_xOvlSetPaintTypeReq	12
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlCopyPaintType */
+    CARD16	length B16;
+    Drawable	srcDrawable B32;
+    Drawable	dstDrawable B32;
+    GContext	gc B32;
+    INT16	srcX B16;
+    INT16	srcY B16;
+    INT16	destX B16;
+    INT16	destY B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD32      action_mask B32;
+    CARD32      bitPlane B32;
+} xOvlCopyPaintTypeReq;
+#define sz_xOvlCopyPaintTypeReq	36
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlCopyAreaAndPaintType */
+    CARD16	length B16;
+    Drawable	colorSrc B32;
+    Drawable	paintTypeSrc B32;
+    Drawable	colorDst B32;
+    Drawable	paintTypeDst B32;
+    GContext	colorGC B32;
+    GContext	paintTypeGC B32;
+    INT16	colorSrcX B16;
+    INT16	colorSrcY B16;
+    INT16	paintTypeSrcX B16;
+    INT16	paintTypeSrcY B16;
+    INT16	colorDstX B16;
+    INT16	colorDstY B16;
+    INT16	paintTypeDstX B16;
+    INT16	paintTypeDstY B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD32      action_mask B32;
+    CARD32      bitPlane B32;
+} xOvlCopyAreaAndPaintTypeReq;
+#define sz_xOvlCopyAreaAndPaintTypeReq	56
+
+#define READSCREEN_BLUEMASK	0x00ff0000
+#define READSCREEN_GREENMASK	0x0000ff00
+#define READSCREEN_REDMASK	0x000000ff
+
+typedef struct {
+    CARD8	reqType;		/* always OvlReqCode */
+    CARD8	ovlReqType;		/* always X_OvlReadScreen */
+    CARD16	length B16;
+    Window	window B32;
+    INT16	x B16;
+    INT16	y B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    BOOL	includeCursor;
+    CARD8	pad[3];
+} xOvlReadScreenReq;
+#define sz_xOvlReadScreenReq	20
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xOvlReadScreenReply;
+#define sz_xOvlReadScreenReply 32
+
+
+/*
+   B U G : 4173223
+ */
+/* restore these definitions back to the typedefs in X.h */
+#undef Window
+#undef Drawable
+#undef Font
+#undef Pixmap
+#undef Cursor
+#undef Colormap
+#undef GContext
+#undef Atom
+#undef VisualID
+#undef Time
+#undef KeyCode
+#undef KeySym
+
+#endif /* _TRANSOVLSTR_H_ */
--- a/open-src/xserver/xorg/sun-src/include/X11/extensions/interactive.h	Mon Dec 03 13:59:43 2007 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
- * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
- *
- * 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, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * 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
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
- * 
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
- */
-
-/************************************************************
-	Protocol defs for XIA extension
-********************************************************/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _INTERACTIVE_H
-#define _INTERACTIVE_H
-
-#pragma ident	"@(#)interactive.h	35.3	05/08/31 SMI"
-
-#include <X11/Xproto.h>
-
-#include "interactiveCommon.h"
-
-#define X_IAQueryVersion                0
-#define X_IASetProcessInfo              1
-#define X_IAGetProcessInfo              2
-
-#define IANumberEvents                  0
-#define IANumberErrors                  0
-
-typedef int ConnectionPidRec;
-typedef int * ConnectionPidPtr;
-
-#define IANAME "SolarisIA"
-
-#define IA_MAJOR_VERSION	1	/* current version numbers */
-#define IA_MINOR_VERSION	1
-
-typedef struct _IAQueryVersion {
-    CARD8	reqType;		/* always IAReqCode */
-    CARD8	IAReqType;		/* always X_IAQueryVersion */
-    CARD16	length B16;
-} xIAQueryVersionReq;
-#define sz_xIAQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	pad;			/* padding */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of IA protocol */
-    CARD16	minorVersion B16;	/* minor version of IA protocol */
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xIAQueryVersionReply;
-#define sz_xIAQueryVersionReply	32
-
-typedef struct _IASetProcessInfo {
-    CARD8	reqType;		/* Always IAReqCode */
-    CARD8	connectionAttrType;	/* What attribute */
-    CARD16	length B16;		/* Request length */
-    CARD32	flags B32;		/* Request flags */
-    CARD32	uid B32;		/* requestor's uid */
-} xIASetProcessInfoReq;
-#define sz_xIASetProcessInfoReq	12	
-
-typedef struct _IAGetProcessInfo {
-    CARD8	reqType;		/* Always IAReqCode */
-    CARD8	connectionAttrType;	/* What attribute */
-    CARD16	length;			/* Request length */
-    CARD32	flags B32;		/* Request flags */
-} xIAGetProcessInfoReq;
-#define sz_xIAGetProcessInfoReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	pad;			/* padding */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	count B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xIAGetProcessInfoReply;
-
-#define sz_xIAGetProcessInfo 32
-
-#endif 
--- a/open-src/xserver/xorg/sun-src/include/X11/extensions/interactiveCommon.h	Mon Dec 03 13:59:43 2007 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
- *
- * 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, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * 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
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
- * 
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
- */
-
-#ifndef _INTERACTIVECOMMON_H
-#define _INTERACTIVECOMMON_H
-
-#pragma ident	"@(#)interactiveCommon.h	35.3	05/08/31 SMI"
-
-
-#define INTERACTIVE_INFO		0x1
-#define INTERACTIVE_SETTING		0x2
-
-
-#endif	/* _INTERACTIVECOMMON_H */
--- a/packages/SUNWxwinc/prototype	Mon Dec 03 13:59:43 2007 -0800
+++ b/packages/SUNWxwinc/prototype	Fri Dec 07 13:42:18 2007 -0800
@@ -27,7 +27,7 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype	35.73	07/08/29 SMI"
+# ident	"@(#)prototype	35.74	07/12/07 SMI"
 #
 #  X Window System include files
 
@@ -290,12 +290,6 @@
 f none openwin/share/include/X11/extensions/XKMformat.h 0644 root bin
 f none openwin/share/include/X11/extensions/Xevie.h 0644 root bin
 f none openwin/share/include/X11/extensions/XRes.h 0444 root bin
-f none openwin/share/include/X11/extensions/allplanes.h 0644 root bin
-f none openwin/share/include/X11/extensions/allplanesstr.h 0644 root bin
-f none openwin/share/include/X11/extensions/transovl.h 0644 root bin
-f none openwin/share/include/X11/extensions/transovlstr.h 0644 root bin
-f none openwin/share/include/X11/extensions/fbpm.h 0644 root bin
-f none openwin/share/include/X11/extensions/fbpmstr.h 0644 root bin
 f none openwin/share/include/X11/extensions/xinerama.h 0644 root bin
 f none openwin/share/include/X11/extensions/Xtsol.h 0644 root bin
 f none openwin/share/include/X11/extensions/Xtsolproto.h 0644 root bin
@@ -424,6 +418,20 @@
 f none X11/include/X11/extensions/xtestext1.h 	0444 root bin
 f none X11/include/X11/extensions/xteststr.h 	0444 root bin
 
+# extension headers from open-src/proto/sun-ext-protos
+f none X11/include/X11/extensions/allplanes.h	0444 root bin
+f none X11/include/X11/extensions/allplanesstr.h 0444 root bin
+f none X11/include/X11/extensions/transovl.h 	0444 root bin
+f none X11/include/X11/extensions/transovlstr.h	0444 root bin
+f none X11/include/X11/extensions/fbpm.h	0444 root bin
+f none X11/include/X11/extensions/fbpmstr.h	0444 root bin
+s none openwin/share/include/X11/extensions/allplanes.h=../../../../../X11/include/X11/extensions/allplanes.h
+s none openwin/share/include/X11/extensions/allplanesstr.h=../../../../../X11/include/X11/extensions/allplanesstr.h
+s none openwin/share/include/X11/extensions/transovl.h=../../../../../X11/include/X11/extensions/transovl.h
+s none openwin/share/include/X11/extensions/transovlstr.h=../../../../../X11/include/X11/extensions/transovlstr.h
+s none openwin/share/include/X11/extensions/fbpm.h=../../../../../X11/include/X11/extensions/fbpm.h
+s none openwin/share/include/X11/extensions/fbpmstr.h=../../../../../X11/include/X11/extensions/fbpmstr.h
+
 # open-src/lib/libXcomposite
 s none openwin/share/include/X11/extensions/Xcomposite.h=../../../../../X11/include/X11/extensions/Xcomposite.h
 f none X11/include/X11/extensions/Xcomposite.h 0444 root bin