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

comparison dwt/browser/Mozilla.d @ 341:942da4b6558a

Ongoing fixup for compile

author	John Reimer <terminal.node@gmail.com>
date	Sun, 26 Oct 2008 21:19:51 -0700
parents	3f4a5c7d138f
children	96243e3ebcf0

comparison

equal deleted inserted replaced

-:3f4a5c7d138f
+:942da4b6558a
 //import java.util.Enumeration;
 //import java.util.Locale;
 //import java.util.Vector;
 import tango.text.locale.Core;  // Necessary for Region/Culture/Locale code
+import tango.text.convert.Format;
+import tango.io.Console;
+import tango.sys.Environment;
 import dwt.internal.c.gtk;
 import dwt.DWT;
 import dwt.DWTError;
 import dwt.graphics.Device;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
+import dwt.browser.Browser;
+import dwt.browser.WebBrowser;
 import dwt.browser.MozillaDelegate;
 import dwt.browser.AppFileLocProvider;
 import dwt.browser.WindowCreator2;
+import dwt.browser.PromptService2Factory;
+import dwt.browser.HelperAppLauncherDialogFactory;
+import dwt.browser.DownloadFactory;
+import dwt.browser.DownloadFactory_1_8;
+import dwt.browser.FilePickerFactory;
+import dwt.browser.FilePickerFactory_1_8;
 import dwt.internal.Compatibility;
 import dwt.internal.LONG;
 import dwt.internal.Library;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMInit;
+import XPCOMInit = dwt.internal.mozilla.XPCOMInit;
 import dwt.internal.mozilla.Common;
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsIAppShell;
 import dwt.internal.mozilla.nsIBaseWindow;
 import dwt.internal.mozilla.nsICategoryManager;
 import dwt.internal.mozilla.nsIComponentManager;
 import dwt.internal.mozilla.nsIComponentRegistrar;
 import dwt.internal.mozilla.nsIContextMenuListener;
 import dwt.internal.mozilla.nsICookie;
 import dwt.internal.mozilla.nsICookieManager;
 import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsIDOMNode;
 import dwt.internal.mozilla.nsIDOMEvent;
 import dwt.internal.mozilla.nsIDOMEventListener;
 import dwt.internal.mozilla.nsIDOMEventTarget;
 import dwt.internal.mozilla.nsIDOMKeyEvent;
 import dwt.internal.mozilla.nsIDOMMouseEvent;
 import dwt.internal.mozilla.nsIDOMSerializer;
 import dwt.internal.mozilla.nsIDOMSerializer_1_7;
 import dwt.internal.mozilla.nsIDOMWindow;
 import dwt.internal.mozilla.nsIDOMWindowCollection;
+import dwt.internal.mozilla.nsIDOMDocument;
 import dwt.internal.mozilla.nsIDirectoryService;
 import dwt.internal.mozilla.nsIDocShell;
 //import dwt.internal.mozilla.nsIDocShell_1_8;
 //import dwt.internal.mozilla.nsIDocShell_1_9;
 import dwt.internal.mozilla.nsIEmbeddingSiteWindow;
 import dwt.internal.mozilla.nsIFile;
+import dwt.internal.mozilla.nsIFactory;
 import dwt.internal.mozilla.nsIIOService;
 import dwt.internal.mozilla.nsIInterfaceRequestor;
 import dwt.internal.mozilla.nsIJSContextStack;
 import dwt.internal.mozilla.nsILocalFile;
 import dwt.internal.mozilla.nsIObserverService;
 import dwt.internal.mozilla.nsIPrefService;
 import dwt.internal.mozilla.nsIProperties;
 import dwt.internal.mozilla.nsIRequest;
 import dwt.internal.mozilla.nsIServiceManager;
 import dwt.internal.mozilla.nsISimpleEnumerator;
+import dwt.internal.mozilla.nsIStreamListener;
 import dwt.internal.mozilla.nsISupports;
 //import dwt.internal.mozilla.nsISupportsWeakReference;
 import dwt.internal.mozilla.nsITooltipListener;
 import dwt.internal.mozilla.nsIURI;
 import dwt.internal.mozilla.nsIURIContentListener;
 import dwt.internal.mozilla.nsIWebNavigation;
 import dwt.internal.mozilla.nsIWebNavigationInfo;
 import dwt.internal.mozilla.nsIWebProgress;
 import dwt.internal.mozilla.nsIWebProgressListener;
 import dwt.internal.mozilla.nsIWindowWatcher;
+import dwt.internal.mozilla.nsIWindowCreator;
+import dwt.internal.mozilla.nsStringAPI;
 import dwt.layout.FillLayout;
 import dwt.widgets.Composite;
 import dwt.widgets.Display;
 import dwt.widgets.Event;
 import dwt.widgets.Label;
 import dwt.widgets.Listener;
 import dwt.widgets.Menu;
 import dwt.widgets.Shell;
-import dwt.browser.WebBrowser;
+import dwt.widgets.Control;
 class Mozilla : WebBrowser,
 nsIWeakReference,
 nsIWebProgressListener,
 nsIWebBrowserChrome,
-nsIWebBrowserFocus,
+nsIWebBrowserChromeFocus,
 nsIEmbeddingSiteWindow,
 nsIInterfaceRequestor,
 nsISupportsWeakReference,
 nsIContextMenuListener,
 nsIURIContentListener,
 rc = enumerator.HasMoreElements (&moreElements);
 if (rc !is XPCOM.NS_OK) error (rc);
 while (moreElements !is 0) {
 //result[0] = 0;
 nsICookie cookie;
-rc = enumerator.GetNext (cast(nsISupports)cookie);
+rc = enumerator.GetNext (cast(nsISupports*)&cookie);
 if (rc !is XPCOM.NS_OK) error (rc);
 //nsICookie cookie = new nsICookie (result[0]);
 PRUint64 expires;
 rc = cookie.GetExpires (&expires);
 if (expires is 0) {
 */
 Initialized = true;
 }
 String mozillaPath = System.getProperty (XULRUNNER_PATH);
 if (mozillaPath is null) {
-// we don't have to load an initial library in DWT, so set to "true"
+// we don't need to load an initial library in DWT, so set to "true"
 initLoaded = true;
 /+
 if (mozillaPath is null) {
 try {
 String libName = mozDelegate.getSWTInitLibraryName ();
 IsXULRunner = true;
 }
 if (initLoaded) {
 /* attempt to discover a XULRunner to use as the GRE */
-GREVersionRange range;
+XPCOMInit.GREVersionRange range;
 //byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
 //int /*long*/ lower = C.malloc (bytes.length);
 //C.memmove (lower, bytes, bytes.length);
-range.lower = GRERANGE_LOWER;
+range.lower = GRERANGE_LOWER.ptr;
 range.lowerInclusive = LowerRangeInclusive;
 //bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);
 //int /*long*/ upper = C.malloc (bytes.length);
 //C.memmove (upper, bytes, bytes.length);
-range.upper = GRERANGE_UPPER;
+range.upper = GRERANGE_UPPER.ptr;
 range.upperInclusive = UpperRangeInclusive;
 //int length = XPCOMInit.PATH_MAX;
 //int /*long*/ greBuffer = C.malloc (length);
 char[] greBuffer = new char[XPCOMInit.PATH_MAX];
 if (rc !is XPCOM.NS_OK) {
 //C.free (lower);
 //bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
 //lower = C.malloc (bytes.length);
 //C.memmove (lower, bytes, bytes.length);
-range.lower = GRERANGE_LOWER_FALLBACK;
+range.lower = GRERANGE_LOWER_FALLBACK.ptr;
 rc = XPCOMInit.GRE_GetGREPathWithProperties (&range, 1, null, 0, greBuffer.ptr, greBuffer.length);
 }
 //C.free (lower);
 //C.free (upper);
 if (IsXULRunner) {
 // byte[] path = MozillaDelegate.wcsToMbcs (null, mozillaPath, true);
 rc = XPCOMInit.XPCOMGlueStartup (mozillaPath.ptr);
 if (rc !is XPCOM.NS_OK) {
 IsXULRunner = false;    /* failed */
-mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
+//mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
-//mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
+mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
-if (Device.DEBUG) Stdout ("cannot use detected XULRunner: ") (mozillaPath).newline; //$NON-NLS-1$
+if (Device.DEBUG) Cerr ("cannot use detected XULRunner: ") (mozillaPath).newline; //$NON-NLS-1$
 } else {
 XPCOMInitWasGlued = true;
 }
 }
 }
 //C.free (greBuffer);
 }
 if (IsXULRunner) {
-if (Device.DEBUG) Stdout ("XULRunner path: ") (mozillaPath).newline; //$NON-NLS-1$
+if (Device.DEBUG) Cerr ("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);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
-+/          // No need for double layer initialization in DWT; glue is initialized -JJR
++/          // No need for double layer initialization in DWT; XPCOMInit was glued
+// At this stage we know that XULRunner is available, but we don't know
+// TODO: determine if
 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[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
+mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (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) ?
 " [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 */
-auto mozFiveHome = tango.sys.Environment.get(XPCOM.MOZILLA_FIVE_HOME);
+auto mozFiveHome = Environment.get(XPCOM.MOZILLA_FIVE_HOME);
 if (mozFiveHome !is null) {
 //int length = C.strlen (ptr);
 //byte[] buffer = new byte[length];
 //C.memmove (buffer, ptr, length);
 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) Stdout ("Mozilla path: ") (mozillaPath).newline; //$NON-NLS-1$
+if (Device.DEBUG) Cerr ("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 (!Initialized) {
-nsILocalFile file;
+nsILocalFile localFile;
-scope auto pathString = new nsEmbedString (mozillaPath);
+scope auto pathString = new nsEmbedString (mozillaPath.toString16());
 nsresult rc = XPCOM.NS_NewLocalFile (cast(nsAString*)pathString, 1, &localFile);
 //pathString.dispose ();
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 rc = LocationProvider.QueryInterface( &nsIDirectoryServiceProvider.IID, cast(void**)&directoryServiceProvider);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose();
 error(rc);
 }
-rc = XPCOM.NS_InitXPCOM2 (null, cast(IFile*)&localFile, &directoryServiceProvider);
+rc = XPCOM.NS_InitXPCOM2 (null, cast(nsIFile)localFile, directoryServiceProvider);
 localFile.Release ();
 LocationProvider.Release();
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 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$
 //nsIComponentManager componentManager = new nsIComponentManager (result[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.ptr, 0, &nsIAppShell.IID, cast(void**)&AppShell);
+rc = componentManager.CreateInstance (&XPCOM.NS_APPSHELL_CID, null, &nsIAppShell.IID, cast(void**)&AppShell);
 if (rc !is XPCOM.NS_ERROR_NO_INTERFACE) {
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 browser.dispose ();
 error (XPCOM.NS_NOINTERFACE);
 }
 //AppShell = new nsIAppShell (result[0]);
-rc = AppShell.Create (0, null);
+rc = AppShell.Create (null, null);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 rc = AppShell.Spinup ();
 error (XPCOM.NS_NOINTERFACE);
 }
 //nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
 //result[0] = 0;
-rc = windowWatcher.SetWindowCreator (&WindowCreator);
+rc = windowWatcher.SetWindowCreator (cast(nsIWindowCreator)WindowCreator);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 windowWatcher.Release ();
 //result[0] = 0;
 //buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_DO_CHANGE, true);
 //length = STARTUP.length ();
 //char[] chars = new char [length + 1];
 //STARTUP.getChars (0, length, chars, 0);
-wchar[] chars = Utf.toString16(STARTUP).toString16z;
+wchar* chars = STARTUP.toString16().toString16z();
 rc = observerService.NotifyObservers (null, PROFILE_DO_CHANGE.ptr, chars);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 //buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_AFTER_CHANGE, true);
-rc = observerService.NotifyObservers (null, PROFILE_AFTER_CHANGE.ptr, chars.ptr);
+rc = observerService.NotifyObservers (null, PROFILE_AFTER_CHANGE.ptr, chars);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 observerService.Release ();
 * and charset.  The fix for this is to set mozilla's locale and charset
 * preference values according to the user's current locale and charset.
 */
 //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
 nsIPrefService prefService;
-rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID, &nsIPrefService.IID, cast(void**)&prefService);
+rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID.ptr, &nsIPrefService.IID, cast(void**)&prefService);
 serviceManager.Release ();
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 //int span = newLocales.length ();
 //char[] charBuffer = new char[span + 1];
 //newLocales.getChars (0, span, charBuffer, 0);
 if (localizedString is null) {
 //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID.ptr, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 if (localizedString is null) {
 error (XPCOM.NS_NOINTERFACE);
 }
 //localizedString = new nsIPrefLocalizedString (result[0]);
 //result[0] = 0;
 }
-localizedString.SetDataWithLength (newLocales.length, Utf.toString16(newLocales).toString16z);
+localizedString.SetDataWithLength (newLocales.length, newLocales.toString16().toString16z());
-rc = prefBranch.SetComplexValue (PREFERENCES_LANGUAGES.ptr, nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
+rc = prefBranch.SetComplexValue (PREFERENCE_LANGUAGES.ptr, &nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
 }
 if (localizedString !is null) {
 localizedString.Release ();
 localizedString = null;
 }
 /* get Mozilla's current charset preference value */
 String prefCharset = null;
 //buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_CHARSET, true);
-rc = prefBranch.GetComplexValue (PREFERENCE_CHARSET.ptr, nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+rc = prefBranch.GetComplexValue (PREFERENCE_CHARSET.ptr, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
 /*
 * Feature of Debian.  For some reason attempting to query for the current charset
 * preference fails on Debian.  The workaround for this is to assume a value of
 * "ISO-8859-1" since this is typically the default value when mozilla is used
 * without a profile.
 //int length = newCharset.length ();
 //char[] charBuffer = new char[length + 1];
 //newCharset.getChars (0, length, charBuffer, 0);
 if (localizedString is null) {
 //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID.ptr, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 if (localizedString is null) {
 error (XPCOM.NS_NOINTERFACE);
 }
 //localizedString = new nsIPrefLocalizedString (result[0]);
 //result[0] = 0;
 }
-localizedString.SetDataWithLength (newCharset.length, Utf.toString16(newCharset).toString16z);
+localizedString.SetDataWithLength (newCharset.length, newCharset.toString16().toString16z());
 rc = prefBranch.SetComplexValue (PREFERENCE_CHARSET.ptr, &nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
 }
 if (localizedString !is null) localizedString.Release ();
 /*
 }
 }
 if (proxyHost !is null) {
 //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID.ptr, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
 if (rc !is XPCOM.NS_OK) error (rc);
 if (localizedString is null) error (XPCOM.NS_NOINTERFACE);
 //localizedString = new nsIPrefLocalizedString (result[0]);
 //result[0] = 0;
 //int length = proxyHost.length ();
 //char[] charBuffer = new char[length + 1];
 //proxyHost.getChars (0, length, charBuffer, 0);
-rc = localizedString.SetDataWithLength (proxyHost.length, Utf.toString16(proxyHost).toString16z);
+rc = localizedString.SetDataWithLength (proxyHost.length, proxyHost.toString16().toString16z());
 if (rc !is XPCOM.NS_OK) error (rc);
 //buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_FTP, true);
 rc = prefBranch.SetComplexValue (PREFERENCE_PROXYHOST_FTP.ptr, &nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
 if (rc !is XPCOM.NS_OK) error (rc);
 //buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_HTTP, true);
 //result[0] = 0;
 //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PROMPTSERVICE_CONTRACTID, true);
 String aClassName = "Prompt Service";
 //byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "Prompt Service", true); //$NON-NLS-1$
-rc = componentRegistrar.RegisterFactory (XPCOM.NS_PROMPTSERVICE_CID, aClassName.ptr, XPCOM.NS_PROMPTSERVICE_CONTRACTID, cast(nsIFactory)factory);
+rc = componentRegistrar.RegisterFactory (&XPCOM.NS_PROMPTSERVICE_CID, aClassName.ptr, XPCOM.NS_PROMPTSERVICE_CONTRACTID.ptr, cast(nsIFactory)factory);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 HelperAppLauncherDialogFactory dialogFactory = new HelperAppLauncherDialogFactory ();
 dialogFactory.AddRef ();
 //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID, true);
 aClassName = "Helper App Launcher Dialog";
 //aClassName = MozillaDelegate.wcsToMbcs (null, "Helper App Launcher Dialog", true); //$NON-NLS-1$
-rc = componentRegistrar.RegisterFactory (XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CID, aClassName.ptr, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID, cast(nsIFactory)dialogFactory);
+rc = componentRegistrar.RegisterFactory (&XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CID, aClassName.ptr, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID.ptr, cast(nsIFactory)dialogFactory);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 dialogFactory.Release ();
 DownloadFactory downloadFactory = new DownloadFactory ();
 downloadFactory.AddRef ();
 //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOWNLOAD_CONTRACTID, true);
 aClassName = "Download";
 //aClassName = MozillaDelegate.wcsToMbcs (null, "Download", true); //$NON-NLS-1$
-rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_DOWNLOAD_CONTRACTID, cast(nsIFactory)downloadFactory);
+rc = componentRegistrar.RegisterFactory (&XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_DOWNLOAD_CONTRACTID.ptr, cast(nsIFactory)downloadFactory);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 downloadFactory.Release ();
 FilePickerFactory pickerFactory = IsXULRunner ? new FilePickerFactory_1_8 () : new FilePickerFactory ();
 pickerFactory.AddRef ();
 //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_FILEPICKER_CONTRACTID, true);
 aClassName = "FilePicker";
 //aClassName = MozillaDelegate.wcsToMbcs (null, "FilePicker", true); //$NON-NLS-1$
-rc = componentRegistrar.RegisterFactory (XPCOM.NS_FILEPICKER_CID, aClassName.ptr, XPCOM.NS_FILEPICKER_CONTRACTID, cast(nsIFactory)pickerFactory);
+rc = componentRegistrar.RegisterFactory (&XPCOM.NS_FILEPICKER_CID, aClassName.ptr, XPCOM.NS_FILEPICKER_CONTRACTID.ptr, cast(nsIFactory)pickerFactory);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 pickerFactory.Release ();
 Initialized = true;
 }
 if (display.getData (DISPOSE_LISTENER_HOOKED) is null) {
-display.setData (DISPOSE_LISTENER_HOOKED, DISPOSE_LISTENER_HOOKED);
+display.setData (DISPOSE_LISTENER_HOOKED, stringcast(DISPOSE_LISTENER_HOOKED));
 display.addListener (DWT.Dispose, new class() Listener {
 public void handleEvent (Event event) {
 if (BrowserCount > 0) return; /* another display is still active */
-		nsIServiceManager serviceManager;
+nsIServiceManager serviceManager;
 //int /*long*/[] result = new int /*long*/[1];
 int rc = XPCOM.NS_GetServiceManager (&serviceManager);
 if (rc !is XPCOM.NS_OK) error (rc);
 if (serviceManager is null) error (XPCOM.NS_NOINTERFACE);
 //nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
 //result[0] = 0;
 //byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
-		nsIObserverService observerService;
+nsIObserverService observerService;
-rc = serviceManager.GetServiceByContractID (XPCOM.NS_OBSERVER_CONTRACTID, &nsIObserverService.IID, cast(void**)&observerService);
+rc = serviceManager.GetServiceByContractID (XPCOM.NS_OBSERVER_CONTRACTID.ptr, &nsIObserverService.IID, cast(void**)&observerService);
 if (rc !is XPCOM.NS_OK) error (rc);
 if (observerService is null) error (XPCOM.NS_NOINTERFACE);
 //nsIObserverService observerService = new nsIObserverService (result[0]);
 //result[0] = 0;
 //buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_BEFORE_CHANGE, true);
 //int length = SHUTDOWN_PERSIST.length ();
 //char[] chars = new char [length + 1];
 //SHUTDOWN_PERSIST.getChars (0, length, chars, 0);
-rc = observerService.NotifyObservers (null, PROFILE_BEFORE_CHANGE.ptr, Utf.toString16(SHUTDOWN_PERSIST).toString16z);
+rc = observerService.NotifyObservers (null, PROFILE_BEFORE_CHANGE.ptr, SHUTDOWN_PERSIST.toString16().toString16z());
 if (rc !is XPCOM.NS_OK) error (rc);
 observerService.Release ();
 if (LocationProvider !is null) {
 String prefsLocation = LocationProvider.profilePath ~ AppFileLocProvider.PREFERENCES_FILE;
-scope auto pathString = new nsEmbedString (prefsLocation);
+scope auto pathString = new nsEmbedString (prefsLocation.toString16());
 nsILocalFile localFile;
 rc = XPCOM.NS_NewLocalFile (cast(nsAString*)pathString, 1, &localFile);
 if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
 if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
 //pathString.dispose ();
 //nsILocalFile localFile = new nsILocalFile (result [0]);
 //result[0] = 0;
 nsIFile prefFile;
-rc = localFile.QueryInterface (&nsIFile.IID, &prefFile);
+rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&prefFile);
 if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
 if (prefFile is null) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
 localFile.Release ();
 //nsIFile prefFile = new nsIFile (result[0]);
 //result[0] = 0;
 nsIPrefService prefService;
 //buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
-rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID, &nsIPrefService.IID, &prefService);
+rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID.ptr, &nsIPrefService.IID, cast(void**)&prefService);
 if (rc !is XPCOM.NS_OK) error (rc);
 if (prefService is null) error (XPCOM.NS_NOINTERFACE);
 //nsIPrefService prefService = new nsIPrefService (result[0]);
 //result[0] = 0;
 prefFile.Release ();
 }
 serviceManager.Release ();
 if (XPCOMWasGlued) {
-XPCOM.XPCOMGlueShutdown ();
+// TODO: is there a difference between two startup methhods? Glue functions are same.
+XPCOMInit.XPCOMGlueShutdown ();
 XPCOMWasGlued = false;
 }
 if (XPCOMInitWasGlued) {
 XPCOMInit.XPCOMGlueShutdown ();
 XPCOMInitWasGlued = false;
 browser.dispose ();
 error (rc);
 }
 nsIBaseWindow baseWindow;
-rc = webBrowser.QueryInterface (nsIBaseWindow.IID, cast(void**)&baseWindow);
+rc = webBrowser.QueryInterface (&nsIBaseWindow.IID, cast(void**)&baseWindow);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 if (baseWindow is null) {
 rect.height = 1;
 }
 embedHandle = mozDelegate.getHandle ();
-rc = baseWindow.InitWindow (embedHandle, 0, 0, 0, rect.width, rect.height);
+rc = baseWindow.InitWindow (cast(void*)embedHandle, null, 0, 0, rect.width, rect.height);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (XPCOM.NS_ERROR_FAILURE);
 }
 rc = baseWindow.Create ();
 // nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]);
 DownloadFactory_1_8 downloadFactory_1_8 = new DownloadFactory_1_8 ();
 downloadFactory_1_8.AddRef ();
 // byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_TRANSFER_CONTRACTID, true);
-// byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "Transfer", true); //$NON-NLS-1$
+String aClassName = "Transfer"; //$NON-NLS-1$
-rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_TRANSFER_CONTRACTID, cast(nsIFactory)downloadFactory_1_8);
+rc = componentRegistrar.RegisterFactory (&XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_TRANSFER_CONTRACTID.ptr, cast(nsIFactory)downloadFactory_1_8);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 downloadFactory_1_8.Release ();
 error (XPCOM.NS_ERROR_NO_INTERFACE);
 }
 //nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
 //char[] uri = new char[ABOUT_BLANK.length () + 1];
 //ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-rc = webNavigation.LoadURI (Utf.toString16(ABOUT_BLANK).toString16z, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+rc = webNavigation.LoadURI (ABOUT_BLANK.toString16().toString16z(), nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
 webNavigation.Release ();
 }
 }
 //result[0] = 0;
 interfaceRequestor.Release ();
 }
 componentManager.Release ();
+/*
+// REMOVE: not necessary
 nsIWeakReference weakReference;
 rc = this.QueryInterface(&nsIWeakReference.IID, cast(void**)&weakReference);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose();
 error(rc);
 }
 if (weakReference is null) {
 browser.dispose();
 error(XPCOM.NS_ERROR_NO_INTERFACE);
 }
+*/
-// TODO: Find appropriate place to "Release" weakReference -JJR
+rc = webBrowser.AddWebBrowserListener (cast(nsIWeakReference)this, &nsIWebProgressListener.IID);
-rc = webBrowser.AddWebBrowserListener (weakReference, &nsIWebProgressListener.IID);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose ();
 error (rc);
 }
 // TODO: Find appropriate place to "Release" uriContentListener -JJR
-nsIUriContentListener uriContentListener;
+nsIURIContentListener uriContentListener;
-this.QueryInterface(&nsIUriContentListener.IID, cast(void**)&uriContentListener);
+this.QueryInterface(&nsIURIContentListener.IID, cast(void**)&uriContentListener);
 if (rc !is XPCOM.NS_OK) {
 browser.dispose();
 error(rc);
 }
 if (uriContentListener is null) {
 mozDelegate.init ();
 listener = new class () Listener {
 public void handleEvent (Event event) {
+Control control = cast(Control)this.outer.browser;
 switch (event.type) {
 case DWT.Dispose: {
 /* make this handler run after other dispose listeners */
 if (ignoreDispose) {
 ignoreDispose = false;
 case DWT.Resize: onResize (); break;
 case DWT.FocusIn: Activate (); break;
 case DWT.Activate: Activate (); break;
 case DWT.Deactivate: {
 Display display = event.display;
-if (this.browser is display.getFocusControl ()) Deactivate ();
+if (control is display.getFocusControl ()) Deactivate ();
 break;
 }
 case DWT.Show: {
 /*
 * Feature in GTK Mozilla.  Mozilla does not show up when
 //nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
 //char[] arg = url.toCharArray ();
 //char[] c = new char[arg.length+1];
 //System.arraycopy (arg, 0, c, 0, arg.length);
-rc = webNavigation.LoadURI (Utf.toString16(url).toString16z, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+rc = webNavigation.LoadURI (url.toString16().toString16z(), nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
 webNavigation.Release ();
 return rc is XPCOM.NS_OK;
 }
 static Browser findBrowser (void* handle) {
 public String getText () {
 if (awaitingNavigate) return ""; //$NON-NLS-1$
 //int /*long*/[] result = new int /*long*/[1];
-nsIDOMWIndow window;
+nsIDOMWindow window;
 int rc = webBrowser.GetContentDOMWindow (&window);
 if (rc !is XPCOM.NS_OK) error (rc);
 if (window is null) error (XPCOM.NS_NOINTERFACE);
 //nsIDOMWindow window = new nsIDOMWindow (result[0]);
 //nsIComponentManager componentManager = new nsIComponentManager (result[0]);
 //result[0] = 0;
 //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOMSERIALIZER_CONTRACTID, true);
 String chars = null;
 nsIDOMSerializer_1_7 serializer_1_7;
-rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID, null, &nsIDOMSerializer_1_7.IID, cast(void**)&serializer_1_7);
+rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID.ptr, null, &nsIDOMSerializer_1_7.IID, cast(void**)&serializer_1_7);
 if (rc is XPCOM.NS_OK) {    /* mozilla >= 1.7 */
 if (serializer_1_7 is null) error (XPCOM.NS_NOINTERFACE);
 //nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
 //result[0] = 0;
 //int length = XPCOM.nsEmbedString_Length (string);
 //int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
 //chars = new char[length];
 //XPCOM.memmove (chars, buffer, length * 2);
 //XPCOM.nsEmbedString_delete (string);
-chars = string.toString;
+chars = string.toString();
 } else {    /* mozilla < 1.7 */
 nsIDOMSerializer serializer;
-rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID, null, &nsIDOMSerializer.IID, cast(void**)&serializer);
+rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID.ptr, null, &nsIDOMSerializer.IID, cast(void**)&serializer);
 if (rc !is XPCOM.NS_OK) error (rc);
 if (serializer is null) error (XPCOM.NS_NOINTERFACE);
 // TODO: Lookup SerializeToString contract. Find out if the string must provide it's own memory to the method. -JJR
 PRUnichar* string;
 //nsIDOMSerializer serializer = new nsIDOMSerializer (result[0]);
 serializer.Release ();
 //int length = XPCOM.strlen_PRUnichar (string);
 //chars = new char[length];
 //XPCOM.memmove (chars, result[0], length * 2);
-chars = Utf.toString(string.fromString16z);
+chars = Utf.toString(fromString16z(string));
 }
 componentManager.Release ();
 document.Release ();
 return chars.dup;
 //int length = XPCOM.nsEmbedCString_Length (aSpec);
 //int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
 location = aSpec.toString;
 //XPCOM.memmove (dest, buffer, length);
 //XPCOM.nsEmbedCString_delete (aSpec);
-uri.Release ();
+aCurrentURI.Release ();
 }
 if (location is null) return ""; //$NON-NLS-1$
 /*
 * If the URI indicates that the page is being rendered from memory
 webNavigation.Release ();
 return aCanGoForward !is 0;
 }
 static String error (int code) {
-throw new DWTError ("XPCOM error " ~ code); //$NON-NLS-1$
+throw new DWTError ("XPCOM error " ~ Integer.toString(code)); //$NON-NLS-1$
 }
 void onDispose (Display display) {
-int rc = webBrowser.RemoveWebBrowserListener (weakReference, &nsIWebProgressListener.IID);
+int rc = webBrowser.RemoveWebBrowserListener (cast(nsIWeakReference)this, &nsIWebProgressListener.IID);
 if (rc !is XPCOM.NS_OK) error (rc);
-rc = webBrowser.SetParentURIContentListener (0);
+rc = webBrowser.SetParentURIContentListener (null);
 if (rc !is XPCOM.NS_OK) error (rc);
 unhookDOMListeners ();
 if (listener !is null) {
 int[] folderEvents = [
 }
 return QueryInterface (riid, ppvObject);
 }
 nsresult GetWeakReference (void** ppvObject) {
-*ppvObject = cast(void*)weakReference;
+*ppvObject = cast(void*)cast(nsIWeakReference)this;
 //XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
 AddRef ();
 return XPCOM.NS_OK;
 }
 domWindow.Release ();
 }
 return XPCOM.NS_OK;
 }
-nsresult OnProgressChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRint32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) {
+nsresult OnProgressChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) {
 if (awaitingNavigate || super.progressListeners.length is 0) return XPCOM.NS_OK;
 ProgressEvent event = new ProgressEvent (browser);
 event.display = browser.getDisplay ();
 event.widget = browser;
 event.current = aCurTotalProgress;
 locationListeners[i].changed (event);
 }
 return XPCOM.NS_OK;
 }
-int OnStatusChange (nsIWebProgress aWebProgress, nsIRequest aRequest, nsresult aStatus, PRUnichar* aMessage) {
+nsresult OnStatusChange (nsIWebProgress aWebProgress, nsIRequest aRequest, nsresult aStatus, PRUnichar* aMessage) {
 if (awaitingNavigate || statusTextListeners.length is 0) return XPCOM.NS_OK;
 StatusTextEvent event = new StatusTextEvent (browser);
 event.display = browser.getDisplay ();
 event.widget = browser;
 //int length = XPCOM.strlen_PRUnichar (aMessage);
 statusTextListeners[i].changed (event);
 }
 return XPCOM.NS_OK;
 }
-int OnSecurityChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRUint32 state) {
+nsresult OnSecurityChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRUint32 state) {
 return XPCOM.NS_OK;
 }
 /* nsIWebBrowserChrome */
-nsresult SetStatus (PRUint32 statusType, PRUinchar* status) {
+nsresult SetStatus (PRUint32 statusType, PRUnichar* status) {
 if (awaitingNavigate || statusTextListeners.length is 0) return XPCOM.NS_OK;
 StatusTextEvent event = new StatusTextEvent (browser);
 event.display = browser.getDisplay ();
 event.widget = browser;
 //int length = XPCOM.strlen_PRUnichar (status);
 browser.getShell ().setSize (cx, cy);
 }
 return XPCOM.NS_OK;
 }
-int GetDimensions (PRUint32 flags, PRInt32* x, PRInt32* y, PRInt32* cx, PRInt32* cy) {
+nsresult GetDimensions (PRUint32 flags, PRInt32* x, PRInt32* y, PRInt32* cx, PRInt32* cy) {
 if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) !is 0) {
 Point location = browser.getShell ().getLocation ();
 if (x !is null) *x = location.x; /* PRInt32 */
 if (y !is null) *y = location.y; /* PRInt32 */
 }

Mercurial > projects > dwt-linux

comparison dwt/browser/Mozilla.d @ 341:942da4b6558a