From cf9eee7ecd3da200576f0ac80f92a819b4ac2ade Mon Sep 17 00:00:00 2001
From: "idk%eng.sun.com" <idk%eng.sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 25 Jan 2000 23:28:17 +0000
Subject: [PATCH] Fixed problem with awt on Solaris. Start using XmNvisual,
 XmNcolormap, XmNdepth values from awt for shell createing

git-svn-id: svn://10.0.0.236/trunk@58646 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/java/plugins/src/PlugletViewMotif.cpp | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/mozilla/java/plugins/src/PlugletViewMotif.cpp b/mozilla/java/plugins/src/PlugletViewMotif.cpp
index 04ce94c3fa7..637fdd63222 100644
--- a/mozilla/java/plugins/src/PlugletViewMotif.cpp
+++ b/mozilla/java/plugins/src/PlugletViewMotif.cpp
@@ -48,6 +48,20 @@ PlugletViewMotif::PlugletViewMotif() {
     frame = NULL;
     WindowID = 0;
 }
+
+#ifdef SOLARIS    //following futures are not available under Linux Blackdown JDK
+extern "C" void getAwtData(int          *awt_depth,
+                Colormap     *awt_cmap,
+                Visual       **awt_visual,
+                int          *awt_num_colors,
+                void         *pReserved);
+
+static int awt_depth;
+static Colormap awt_cmap;
+static Visual * awt_visual;
+static int awt_num_colors;
+#endif 
+
 void PlugletViewMotif::Initialize() {
     PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
 	   ("PlugletViewMotif.Initialize\n"));
@@ -63,6 +77,9 @@ void PlugletViewMotif::Initialize() {
         clazz = NULL;
         return;
     }
+#ifdef SOLARIS 
+  getAwtData(&awt_depth, &awt_cmap, &awt_visual, &awt_num_colors, NULL);
+#endif
 }
 
 #define AWT_LOCK()      (env)->MonitorEnter(awt_lock)
@@ -130,6 +147,11 @@ PRBool PlugletViewMotif::SetWindow(nsPluginWindow* win) {
     XtSetArg(args[argc], XmNx, 0); argc++;
     XtSetArg(args[argc], XmNy, 0); argc++;
     XtSetArg(args[argc],XmNmappedWhenManaged,False); argc++;
+#ifdef SOLARIS
+    XtSetArg(args[argc], XmNvisual, awt_visual); argc++;
+    XtSetArg(args[argc], XmNdepth, awt_depth); argc++;
+    XtSetArg(args[argc], XmNcolormap, awt_cmap); argc++;
+#endif 
     Widget w = XtAppCreateShell("AWTapp", "XApplication", 
                                 vendorShellWidgetClass,
                                 awt_display,