diff options
author | Marco Pesenti Gritti <marco@gnome.org> | 2004-06-13 04:25:09 +0800 |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-13 04:25:09 +0800 |
commit | b59ab61dde301128d88778045f502cc30008bf8f (patch) | |
tree | 57dd181d409b16ca5abe7d2bddac9c3c54219e95 /embed/mozilla | |
parent | decb30ea6768b634476d351f3d5f5e73e4308326 (diff) | |
download | gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.tar gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.tar.gz gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.tar.bz2 gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.tar.lz gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.tar.xz gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.tar.zst gsoc2013-epiphany-b59ab61dde301128d88778045f502cc30008bf8f.zip |
Add a way to open new windows passing features and uri. Something like js
2004-06-12 Marco Pesenti Gritti <marco@gnome.org>
* embed/ephy-embed-single.c: (ephy_embed_single_open_window):
* embed/ephy-embed-single.h:
* embed/ephy-embed.h:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/EventContext.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
Add a way to open new windows passing features and uri.
Something like js window.open. It's necessary for popup
blocker.
Diffstat (limited to 'embed/mozilla')
-rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 9 | ||||
-rw-r--r-- | embed/mozilla/EphyBrowser.h | 1 | ||||
-rw-r--r-- | embed/mozilla/EventContext.cpp | 2 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 23 |
4 files changed, 33 insertions, 2 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 066532790..2ca36a9bb 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -548,6 +548,15 @@ nsresult EphyBrowser::GetPageDescriptor(nsISupports **aPageDescriptor) return NS_OK; } +nsresult EphyBrowser::GetDOMWindow (nsIDOMWindow **aDOMWindow) +{ + NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); + + NS_IF_ADDREF (*aDOMWindow = mDOMWindow); + + return NS_OK; +} + nsresult EphyBrowser::GetDocumentUrl (nsACString &url) { nsresult rv; diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index d8a6300bb..f2f034dd1 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -111,6 +111,7 @@ public: nsresult GetTargetDocument (nsIDOMDocument **aDOMDocument); nsresult GetDocumentUrl (nsACString &url); nsresult GetTargetDocumentUrl (nsACString &url); + nsresult GetDOMWindow (nsIDOMWindow **window); nsresult GetHasModifiedForms (PRBool *modified); diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp index 5b815a756..656def8c8 100644 --- a/embed/mozilla/EventContext.cpp +++ b/embed/mozilla/EventContext.cpp @@ -177,8 +177,6 @@ nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget, { nsresult rv; - const PRUnichar bgLiteral[] = {'b', 'a', 'c', 'k', 'g', 'r', 'o', 'u', - 'n', 'd', '\0'}; const PRUnichar hrefLiteral[] = {'h', 'r', 'e', 'f', '\0'}; const PRUnichar typeLiteral[] = {'t', 'y', 'p', 'e', '\0'}; const PRUnichar xlinknsLiteral[] = {'h', 't', 't', 'p', ':', '/', '/','w', diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 522767150..bf74c9305 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -40,6 +40,7 @@ #include "ephy-embed-prefs.h" #include "MozRegisterComponents.h" #include "EphySingle.h" +#include "EphyBrowser.h" #include "EphyUtils.h" #include <glib/gi18n.h> @@ -50,6 +51,7 @@ #include <nsEmbedString.h> #include <nsIPrefService.h> #include <nsIServiceManager.h> +#include <nsIWindowWatcher.h> #include <nsIIOService.h> #include <nsISupportsPrimitives.h> #include <nsICookieManager.h> @@ -838,6 +840,27 @@ impl_permission_manager_list (EphyPermissionManager *manager, return list; } +void +mozilla_embed_single_open_window (EphyEmbedSingle *single, + EphyEmbed *parent, + const char *address, + const char *features) +{ + nsCOMPtr<nsIDOMWindow> domWindow; + if (parent) + { + EphyBrowser *browser; + + browser = (EphyBrowser *) _mozilla_embed_get_ephy_browser (MOZILLA_EMBED(parent)); + g_return_if_fail (browser != NULL); + + browser->GetDOMWindow (getter_AddRefs (domWindow)); + } + + nsCOMPtr<nsIWindowWatcher> wWatch(do_GetService ("@mozilla.org/embedcomp/window-watcher;1")); + wWatch->OpenWindow (domWindow, address, "", features, nsnull, nsnull); +} + static void mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass) { |