projects/dwt-linux: dwt/browser/Mozilla.d comparison

comparison dwt/browser/Mozilla.d @ 305:c7c696cdfec2

Mozilla module progress; fixes to other browser modules; update XPCOM interfaces

author	John Reimer<terminal.node@gmail.com>
date	Sat, 16 Aug 2008 22:53:35 -0700
parents	16ba3d9cb209
children	8235a17d9255

comparison

equal deleted inserted replaced

-:16ba3d9cb209
+:c7c696cdfec2
 static final String PREFERENCE_PROXYHOST_SSL = "network.proxy.ssl"; //$NON-NLS-1$
 static final String PREFERENCE_PROXYPORT_SSL = "network.proxy.ssl_port"; //$NON-NLS-1$
 static final String PREFERENCE_PROXYTYPE = "network.proxy.type"; //$NON-NLS-1$
 static final String PROFILE_AFTER_CHANGE = "profile-after-change"; //$NON-NLS-1$
 static final String PROFILE_BEFORE_CHANGE = "profile-before-change"; //$NON-NLS-1$
-static final String PROFILE_DIR = SEPARATOR_OS + "eclipse" ~ SEPARATOR_OS; //$NON-NLS-1$
+static final String PROFILE_DIR = SEPARATOR_OS ~ "eclipse" ~ SEPARATOR_OS; //$NON-NLS-1$
 static final String PROFILE_DO_CHANGE = "profile-do-change"; //$NON-NLS-1$
 static final String PROPERTY_PROXYPORT = "network.proxy_port"; //$NON-NLS-1$
 static final String PROPERTY_PROXYHOST = "network.proxy_host"; //$NON-NLS-1$
 static final String SEPARATOR_LOCALE = "-"; //$NON-NLS-1$
 static final String SHUTDOWN_PERSIST = "shutdown-persist"; //$NON-NLS-1$
 * so just bind to it instead of trying to initialize a new one.
 */
 Initialized = true;
 }
 String mozillaPath = System.getProperty (XULRUNNER_PATH);
-/+ if (mozillaPath is null) {
+if (mozillaPath is null) {
+// we don't have to load an initial library in DWT, so set to "true"
+initLoaded = true;
+/+
+if (mozillaPath is null) {
 try {
 String libName = mozDelegate.getSWTInitLibraryName ();
 Library.loadLibrary (libName);
 initLoaded = true;
 } catch (UnsatisfiedLinkError e) {
 * If this library failed to load then do not attempt to detect a
 * xulrunner to use.  The Browser may still be usable if MOZILLA_FIVE_HOME
 * points at a GRE.
 */
 }
-} else { +/
++/
+} else {
 mozillaPath ~= SEPARATOR_OS ~ mozDelegate.getLibraryName ();
 IsXULRunner = true;
-// }
+}
 if (initLoaded) {
 /* attempt to discover a XULRunner to use as the GRE */
 GREVersionRange range;
 //byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
-int /*long*/ lower = C.malloc (bytes.length);
+//int /*long*/ lower = C.malloc (bytes.length);
-C.memmove (lower, bytes, bytes.length);
+//C.memmove (lower, bytes, bytes.length);
-range.lower = lower;
+range.lower = GRERANGE_LOWER;
 range.lowerInclusive = LowerRangeInclusive;
-bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);
+//bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);
-int /*long*/ upper = C.malloc (bytes.length);
+//int /*long*/ upper = C.malloc (bytes.length);
-C.memmove (upper, bytes, bytes.length);
+//C.memmove (upper, bytes, bytes.length);
-range.upper = upper;
+range.upper = GRERANGE_UPPER;
 range.upperInclusive = UpperRangeInclusive;
-int length = XPCOMInit.PATH_MAX;
+//int length = XPCOMInit.PATH_MAX;
-int /*long*/ greBuffer = C.malloc (length);
+//int /*long*/ greBuffer = C.malloc (length);
-int /*long*/ propertiesPtr = C.malloc (2 * C.PTR_SIZEOF);
+char[] greBuffer = new char[XPCOMInit.PATH_MAX];
-int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length);
+//int /*long*/ propertiesPtr = C.malloc (2 * C.PTR_SIZEOF);
+int rc = XPCOMInit.GRE_GetGREPathWithProperties (&range, 1, null, 0, greBuffer.ptr, greBuffer.length);
 /*
 * A XULRunner was not found that supports wrapping of XPCOM handles as JavaXPCOM objects.
 * Drop the lower version bound and try to detect an earlier XULRunner installation.
 */
 if (rc !is XPCOM.NS_OK) {
-C.free (lower);
+//C.free (lower);
-bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
+//bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
-lower = C.malloc (bytes.length);
+//lower = C.malloc (bytes.length);
-C.memmove (lower, bytes, bytes.length);
+//C.memmove (lower, bytes, bytes.length);
-range.lower = lower;
+range.lower = GRERANGE_LOWER_FALLBACK;
-rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length);
+rc = XPCOMInit.GRE_GetGREPathWithProperties (&range, 1, null, 0, greBuffer.ptr, greBuffer.length);
 }
-C.free (lower);
+//C.free (lower);
-C.free (upper);
+//C.free (upper);
-C.free (propertiesPtr);
+//C.free (propertiesPtr);
 if (rc is XPCOM.NS_OK) {
 /* indicates that a XULRunner was found */
-length = C.strlen (greBuffer);
+//length = C.strlen (greBuffer);
-bytes = new byte[length];
+//bytes = new byte[length];
-C.memmove (bytes, greBuffer, length);
+//C.memmove (bytes, greBuffer, length);
-mozillaPath = new String (MozillaDelegate.mbcsToWcs (null, bytes));
+//mozillaPath = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-IsXULRunner = mozillaPath.length () > 0;
+mozillaPath = greBuffer;
+IsXULRunner = mozillaPath.length > 0;
 /*
 * Test whether the detected XULRunner can be used as the GRE before loading swt's
 * XULRunner library.  If it cannot be used then fall back to attempting to use
 * the GRE pointed to by MOZILLA_FIVE_HOME.
 *
 * One case where this will fail is attempting to use a 64-bit xulrunner while swt
 * is running in 32-bit mode, or vice versa.
 */
 if (IsXULRunner) {
-byte[] path = MozillaDelegate.wcsToMbcs (null, mozillaPath, true);
+// byte[] path = MozillaDelegate.wcsToMbcs (null, mozillaPath, true);
-rc = XPCOMInit.XPCOMGlueStartup (path);
+rc = XPCOMInit.XPCOMGlueStartup (mozillaPath.ptr);
 if (rc !is XPCOM.NS_OK) {
 IsXULRunner = false;    /* failed */
-mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
+mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
-if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + mozillaPath); //$NON-NLS-1$
+//mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
+if (Device.DEBUG) Stdout ("cannot use detected XULRunner: ") (mozillaPath).newline; //$NON-NLS-1$
 } else {
 XPCOMInitWasGlued = true;
 }
 }
 }
-C.free (greBuffer);
+//C.free (greBuffer);
 }
 if (IsXULRunner) {
-if (Device.DEBUG) System.out.println ("XULRunner path: " + mozillaPath); //$NON-NLS-1$
+if (Device.DEBUG) Stdout ("XULRunner path: ") (mozillaPath).newline; //$NON-NLS-1$
+/+
 try {
 Library.loadLibrary ("swt-xulrunner"); //$NON-NLS-1$
 } catch (UnsatisfiedLinkError e) {
 DWT.error (DWT.ERROR_NO_HANDLES, e);
 }
 byte[] path = MozillaDelegate.wcsToMbcs (null, mozillaPath, true);
 int rc = XPCOM.XPCOMGlueStartup (path);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
++/          // No need for double layer initialization in DWT; glue is initialized -JJR
 XPCOMWasGlued = true;
 /*
 * Remove the trailing xpcom lib name from mozillaPath because the
 * Mozilla.initialize and NS_InitXPCOM2 invocations require a directory name only.
 */
-mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
+mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
+//mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
 } else {
 if ((style & DWT.MOZILLA) !is 0) {
 browser.dispose ();
-String errorString = (mozillaPath !is null && mozillaPath.length () > 0) ?
+String errorString = (mozillaPath !is null && mozillaPath.length > 0) ?
-" [Failed to use detected XULRunner: " + mozillaPath + "]" :
+" [Failed to use detected XULRunner: " ~ mozillaPath ~ "]" :
 " [Could not detect registered XULRunner to use]";  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 DWT.error (DWT.ERROR_NO_HANDLES, null, errorString);
 }
 /* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
-int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
+auto mozFiveHome = tango.sys.Environment.get(XPCOM.MOZILLA_FIVE_HOME);
-if (ptr !is 0) {
+if (mozFiveHome !is null) {
-int length = C.strlen (ptr);
+//int length = C.strlen (ptr);
-byte[] buffer = new byte[length];
+//byte[] buffer = new byte[length];
-C.memmove (buffer, ptr, length);
+//C.memmove (buffer, ptr, length);
-mozillaPath = new String (MozillaDelegate.mbcsToWcs (null, buffer));
+mozillaPath = mozFiveHome;
 } else {
 browser.dispose ();
 DWT.error (DWT.ERROR_NO_HANDLES, null, " [Unknown Mozilla path (MOZILLA_FIVE_HOME not set)]"); //$NON-NLS-1$
 }
-if (Device.DEBUG) System.out.println ("Mozilla path: " + mozillaPath); //$NON-NLS-1$
+if (Device.DEBUG) Stdout ("Mozilla path: ") (mozillaPath).newline; //$NON-NLS-1$
 /*
 * Note.  Embedding a Mozilla GTK1.2 causes a crash.  The workaround
 * is to check the version of GTK used by Mozilla by looking for
 * the libwidget_gtk.so library used by Mozilla GTK1.2. Mozilla GTK2
 */
 if (Compatibility.fileExists (mozillaPath, "components/libwidget_gtk.so")) { //$NON-NLS-1$
 browser.dispose ();
 DWT.error (DWT.ERROR_NO_HANDLES, null, " [Mozilla GTK2 required (GTK1.2 detected)]"); //$NON-NLS-1$
 }
+/+
 try {
 Library.loadLibrary ("swt-mozilla"); //$NON-NLS-1$
 } catch (UnsatisfiedLinkError e) {
 try {
 /*
 * Print the error from the first failed attempt since at this point it's
 * known that the failure was not due to the libstdc++.so.6 dependency.
 */
 DWT.error (DWT.ERROR_NO_HANDLES, e, " [MOZILLA_FIVE_HOME='" + mozillaPath + "']"); //$NON-NLS-1$ //$NON-NLS-2$
 }
 }
++/
 }
 if (!Initialized) {
-int /*long*/[] retVal = new int /*long*/[1];
+nsILocalFile file;
-nsEmbedString pathString = new nsEmbedString (mozillaPath);
+scope auto pathString = new nsEmbedString (mozillaPath);
-int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, retVal);
+nsresult rc = XPCOM.NS_NewLocalFile (cast(nsAString*)pathString, 1, &localFile);
-pathString.dispose ();
+//pathString.dispose ();
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
-if (retVal[0] is 0) {
+if (localFile is null) {
 browser.dispose ();
 error (XPCOM.NS_ERROR_NULL_POINTER);
 }
 LocationProvider = new AppFileLocProvider (mozillaPath);
 LocationProvider.AddRef ();
-nsIFile localFile = new nsILocalFile (retVal[0]);
+//nsIFile localFile = new nsILocalFile (retVal[0]);
-rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
+nsIDirectoryServiceProvider directoryServiceProvider;
+nsIServiceManager serviceManager;
+rc = LocationProvider.QueryInterface( &nsIDirectoryServiceProvider.IID, cast(void**)&directoryServiceProvider);
+if (rc !is XPCOM.NS_OK) {
+browser.dispose();
+error(rc);
+}
+rc = XPCOM.NS_GetServiceManager(&serviceManager);
+if (rc !is XPCOM.NS_OK) {
+browser.dispose();
+error(rc);
+}
+if (serviceManager is null || directoryServiceProvider is null) {
+browser.dispose;
+error (XPCOM.NS_ERROR_NULL_POINTER);
+}
+rc = XPCOM.NS_InitXPCOM2 (&serviceManager, 0, cast(IFile*)&localFile, &directoryServiceProvider);
 localFile.Release ();
+serviceManager.Release();
+//LocationProvider.Release();
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
-DWT.error (DWT.ERROR_NO_HANDLES, null, " [MOZILLA_FIVE_HOME may not point at an embeddable GRE] [NS_InitEmbedding " + mozillaPath + " error " + rc + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+DWT.error (DWT.ERROR_NO_HANDLES, null, Format(" [MOZILLA_FIVE_HOME may not point at an embeddable GRE] [NS_InitEmbedding {0} error {1} ] ", mozillaPath, rc ) ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 }
 System.setProperty (GRE_INITIALIZED, "true"); //$NON-NLS-1$
 if (IsXULRunner) {
 System.setProperty (XULRUNNER_PATH, mozillaPath);
 }
 }
+/+
 /* If JavaXPCOM is detected then attempt to initialize it with the XULRunner being used */
 if (IsXULRunner) {
 try {
 Class clazz = Class.forName ("org.mozilla.xpcom.Mozilla"); //$NON-NLS-1$
 Method method = clazz.getMethod ("getInstance", new Class[0]); //$NON-NLS-1$
 } catch (IllegalAccessException e) {
 } catch (InvocationTargetException e) {
 } catch (InstantiationException e) {
 }
 }
++/
-int rc = XPCOM.NS_GetComponentManager (result);
+nsIComponentManager componentManager;
+int rc = XPCOM.NS_GetComponentManager (&componentManager);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
-if (result[0] is 0) {
+if (componentManager is null) {
 browser.dispose ();
 error (XPCOM.NS_NOINTERFACE);
 }
-nsIComponentManager componentManager = new nsIComponentManager (result[0]);
+//nsIComponentManager componentManager = new nsIComponentManager (result[0]);
-result[0] = 0;
+//result[0] = 0;
 if (mozDelegate.needsSpinup ()) {
 /* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */
-rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, nsIAppShell.NS_IAPPSHELL_IID, result);
+rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, nsIAppShell.IID, cast(void**)&AppShell);
 if (rc !is XPCOM.NS_ERROR_NO_INTERFACE) {
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
-if (result[0] is 0) {
+if (AppShell is null) {
 browser.dispose ();
 error (XPCOM.NS_NOINTERFACE);
 }
-AppShell = new nsIAppShell (result[0]);
+//AppShell = new nsIAppShell (result[0]);
 rc = AppShell.Create (0, null);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 }
-result[0] = 0;
+//result[0] = 0;
 }
-WindowCreator = new WindowCreator2 ();
+WindowCreator = new WindowCreator2;
 WindowCreator.AddRef ();
-rc = XPCOM.NS_GetServiceManager (result);
+nsIServiceManager serviceManager;
+rc = XPCOM.NS_GetServiceManager (&serviceManager);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
-if (result[0] is 0) {
+if (serviceManager is null) {
 browser.dispose ();
 error (XPCOM.NS_NOINTERFACE);
 }
-nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+//nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-result[0] = 0;
+//result[0] = 0;
-byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
+//byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
-rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
+nsIWindowWatcher windowWatcher;
+rc = serviceManager.GetServiceByContractID (XPCOM.NS_WINDOWWATCHER_CONTRACTID, nsIWindowWatcher.IID, cast(void**)&windowWatcher);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
-if (result[0] is 0) {
+if (windowWatcher is null) {
 browser.dispose ();
 error (XPCOM.NS_NOINTERFACE);
 }
-nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
+//nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
-result[0] = 0;
+//result[0] = 0;
-rc = windowWatcher.SetWindowCreator (WindowCreator.getAddress());
+rc = windowWatcher.SetWindowCreator (&WindowCreator);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 windowWatcher.Release ();

Mercurial > projects > dwt-linux

comparison dwt/browser/Mozilla.d @ 305:c7c696cdfec2