--- unpacked/xorg-cvs-08.25.05/xc/lib/X11/OpenDis.c	Mon Jun 27 18:13:34 2005
+++ sun-src/xc/lib/X11/OpenDis.c	Wed Aug 31 10:13:48 2005
@@ -24,6 +24,34 @@
 in this Software without prior written authorization from The Open Group.
 
 */
+/*
+ * 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.
+ */
 /* $XFree86: xc/lib/X11/OpenDis.c,v 3.16 2003/07/04 16:24:23 eich Exp $ */
 
 #define NEED_REPLIES
@@ -43,6 +71,11 @@
 #include "XKBlib.h"
 #endif /* XKB */
 
+#ifdef SUNSOFT_INTERACTIVE
+#include <interactive.h>
+#include <XInteractive.h>
+#endif /* SUNSOFT_INTERACTIVE */
+
 #ifdef X_NOT_POSIX
 #define Size_t unsigned int
 #else
@@ -695,6 +728,18 @@
 #ifdef XKB
 	XkbUseExtension(dpy,NULL,NULL);
 #endif
+#ifdef SUNSOFT_INTERACTIVE
+	{
+	    long  pid    = (long) getpid();
+	    int majorop, first_event, first_error;
+	    int majorv, minorv;
+ 
+	    if ((XQueryExtension(dpy, "SolarisIA",
+				  &majorop, &first_event, &first_error)==True))
+		XSolarisIASetProcessInfo(dpy, (unsigned char *)&pid,
+					 INTERACTIVE_INFO, 1); 
+	} 
+#endif /* SUNSOFT_INTERACTIVE */
 /*
  * and return successfully
  */