341N/A###############################################################################
1265N/A# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
341N/A#
341N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
341N/A#
1265N/A
1265N/Adiff --git a/src/Makefile.am b/src/Makefile.am
1370N/Aindex ddad93c..677b0ee 100644
1265N/A--- a/src/Makefile.am
1265N/A+++ b/src/Makefile.am
1370N/A@@ -348,6 +348,9 @@ libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
1064N/A libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
1064N/A libX11_xcb_la_LIBADD = libX11.la
341N/A
341N/A+# SolarisIA extension
341N/A+libX11_la_SOURCES += XInteractive.c
341N/A+
341N/A #
341N/A # Figure out which sub-libraries to link into Xlib
341N/A #
1265N/Adiff --git a/src/OpenDis.c b/src/OpenDis.c
1370N/Aindex a14d13b..ead8703 100644
1265N/A--- a/src/OpenDis.c
1265N/A+++ b/src/OpenDis.c
1265N/A@@ -38,6 +38,12 @@ in this Software without prior written authorization from The Open Group.
341N/A #include "XKBlib.h"
341N/A #endif /* XKB */
341N/A
341N/A+/* begin SUNSOFT_INTERACTIVE */
1064N/A+#include <unistd.h>
341N/A+#include <X11/extensions/interactive.h>
341N/A+#include <X11/extensions/XInteractive.h>
341N/A+/* end SUNSOFT_INTERACTIVE */
341N/A+
1064N/A #if defined(XTHREADS) && defined(SUNSOFT)
1112N/A struct _DisplayPtrLink {
1112N/A Display *dpy;
1370N/A@@ -581,6 +587,21 @@ XOpenDisplay (
341N/A #ifdef XKB
341N/A XkbUseExtension(dpy,NULL,NULL);
341N/A #endif
341N/A+/* begin SUNSOFT_INTERACTIVE */
341N/A+ {
341N/A+
341N/A+ long pid = (long) getpid();
341N/A+ int majorop, first_event, first_error;
341N/A+ int majorv, minorv;
688N/A+
341N/A+ if ( (XQueryExtension(dpy, "SolarisIA",
341N/A+ &majorop, &first_event, &first_error)==True)) {
341N/A+ XSolarisIASetProcessInfo(dpy, (unsigned char *)&pid,
688N/A+ INTERACTIVE_INFO, 1);
341N/A+ }
688N/A+ }
341N/A+/* end SUNSOFT_INTERACTIVE */
341N/A+
341N/A /*
341N/A * and return successfully
341N/A */