aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/EphyBrowser.cpp27
-rw-r--r--embed/mozilla/EphyBrowser.h7
-rw-r--r--embed/mozilla/Makefile.am2
-rw-r--r--embed/mozilla/mozilla-embed.cpp97
4 files changed, 124 insertions, 9 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 1972f8fbb..52b83cb44 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -351,6 +351,9 @@ nsresult EphyBrowser::Init (GtkMozEmbed *mozembed)
getter_AddRefs(mWebBrowser));
NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ mWebBrowserFocus = do_QueryInterface (mWebBrowser);
+ NS_ENSURE_TRUE (mWebBrowserFocus, NS_ERROR_FAILURE);
+
mWebBrowser->GetContentDOMWindow (getter_AddRefs (mDOMWindow));
NS_ENSURE_TRUE (mDOMWindow, NS_ERROR_FAILURE);
@@ -661,13 +664,9 @@ nsresult EphyBrowser::GetTargetDocument (nsIDOMDocument **aDOMDocument)
}
/* Use the focused document */
- nsCOMPtr<nsIWebBrowserFocus> webBrowserFocus;
- webBrowserFocus = do_QueryInterface (mWebBrowser);
- NS_ENSURE_TRUE (webBrowserFocus, NS_ERROR_FAILURE);
-
nsresult rv;
nsCOMPtr<nsIDOMWindow> DOMWindow;
- rv = webBrowserFocus->GetFocusedWindow (getter_AddRefs(DOMWindow));
+ rv = mWebBrowserFocus->GetFocusedWindow (getter_AddRefs(DOMWindow));
if (NS_SUCCEEDED (rv) && DOMWindow)
{
return DOMWindow->GetDocument (aDOMDocument);
@@ -1131,3 +1130,21 @@ EphyBrowser::ShowCertificate ()
return NS_OK;
#endif
}
+
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+nsresult
+EphyBrowser::FocusActivate ()
+{
+ NS_ENSURE_STATE (mWebBrowserFocus);
+
+ return mWebBrowserFocus->Activate();
+}
+
+nsresult
+EphyBrowser::FocusDeactivate ()
+{
+ NS_ENSURE_STATE (mWebBrowserFocus);
+
+ return mWebBrowserFocus->Deactivate();
+}
+#endif /* GTKMOZEMBED_BROKEN_FOCUS */
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index b61a88ec1..0e693f43d 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -35,6 +35,7 @@
#include <nsIWebNavigation.h>
#include <nsISHistory.h>
#include <nsIWebBrowser.h>
+#include <nsIWebBrowserFocus.h>
#include <nsIDOMDocument.h>
#include <nsIDOMWindow.h>
#include <nsIPrintSettings.h>
@@ -149,10 +150,16 @@ public:
nsresult GetSecurityInfo (PRUint32 *aState, nsACString &aDescription);
nsresult ShowCertificate ();
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+ nsresult FocusActivate ();
+ nsresult FocusDeactivate ();
+#endif
+
nsCOMPtr<nsIWebBrowser> mWebBrowser;
private:
GtkWidget *mEmbed;
+ nsCOMPtr<nsIWebBrowserFocus> mWebBrowserFocus;
nsCOMPtr<nsIDOMDocument> mTargetDocument;
nsCOMPtr<nsIDOMEventTarget> mEventTarget;
nsCOMPtr<nsIDOMWindow> mDOMWindow;
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 029956db0..a704fcd7d 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -42,7 +42,7 @@ INCLUDES = \
if MAINTAINER_MODE
INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(MOZILLA_WARN_CXXFLAGS)
+ -DBONOBO_DISABLE_DEPRECATED $(MOZILLA_WARN_CXXFLAGS)
endif
noinst_LTLIBRARIES = libephymozillaembed.la
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 977d04c50..ff930316f 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -92,12 +92,20 @@ struct MozillaEmbedPrivate
{
EphyBrowser *browser;
MozillaEmbedLoadState load_state;
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+ guint focus_connected : 1;
+#endif /* GTKMOZEMBED_BROKEN_FOCUS */
};
#define WINDOWWATCHER_CONTRACTID "@mozilla.org/embedcomp/window-watcher;1"
static GObjectClass *parent_class = NULL;
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+static guint fiesid = 0;
+static guint foesid = 0;
+#endif /* GTKMOZEMBED_BROKEN_FOCUS */
+
static void
impl_manager_do_command (EphyCommandManager *manager,
const char *command)
@@ -211,20 +219,98 @@ impl_find_set_properties (EphyEmbed *embed,
wrap_around);
}
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+static gboolean
+child_focus_in_event_cb (GtkWidget *child,
+ GdkEventFocus *event,
+ MozillaEmbed *embed)
+{
+ embed->priv->browser->FocusActivate ();
+
+ return FALSE;
+}
+
+static gboolean
+child_focus_out_event_cb (GtkWidget *child,
+ GdkEventFocus *event,
+ MozillaEmbed *embed)
+{
+ embed->priv->browser->FocusDeactivate ();
+
+ return FALSE;
+}
+#endif /* GTKMOZEMBED_BROKEN_FOCUS */
+
static void
mozilla_embed_realize (GtkWidget *widget)
{
MozillaEmbedPrivate *mpriv = MOZILLA_EMBED (widget)->priv;
+ GtkBin *bin = GTK_BIN (widget);
- (* GTK_WIDGET_CLASS(parent_class)->realize) (widget);
+ GTK_WIDGET_CLASS (parent_class)->realize (widget);
+ /* Initialise our helper class */
nsresult rv;
rv = mpriv->browser->Init (GTK_MOZ_EMBED (widget));
-
if (NS_FAILED (rv))
{
- g_warning ("EphyBrowser initialization failed for %p\n", widget);
+ g_warning ("EphyBrowser initialization failed for %p\n", widget);
+ return;
}
+
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+ /* HACK ALERT! This depends highly on undocumented interna of
+ * GtkMozEmbed!
+ *
+ * GtkMozEmbed::realize installs focus-[in|out]-event handlers to
+ * toplevel, and, on the first realize only, to the child.
+ * GtkMozEmbed disconnects its focus-[in|out]-event handler
+ * to the toplevel on unrealize, and leaves the ones to the child
+ * in place. So we don't need to unblock the blocked handlers
+ * and therefore need no ::unrealize handler.
+ */
+
+ GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+ gpointer data = ((GtkMozEmbed *) widget)->data;
+
+ guint n;
+
+ n = g_signal_handlers_block_matched (toplevel,
+ (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+ fiesid, 0, NULL, NULL, data);
+ n += g_signal_handlers_block_matched (toplevel,
+ (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+ foesid, 0, NULL, NULL, data);
+ if (n != 2)
+ {
+ g_warning ("Unexpected number (n=%d) of toplevel focus handlers found!\n", n);
+ }
+
+ if (mpriv->focus_connected) return;
+
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
+ g_return_if_fail (child != NULL);
+
+ n = g_signal_handlers_block_matched (child,
+ (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+ fiesid, 0, NULL, NULL, widget);
+ n += g_signal_handlers_block_matched (child,
+ (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+ foesid, 0, NULL, NULL, widget);
+ if (n != 2)
+ {
+ g_warning ("Unexpected number (n=%d) of child focus handlers found!\n", n);
+ }
+
+ g_signal_connect_object (child, "focus-in-event",
+ G_CALLBACK (child_focus_in_event_cb), widget,
+ G_CONNECT_AFTER);
+ g_signal_connect_object (child, "focus-out-event",
+ G_CALLBACK (child_focus_out_event_cb), widget,
+ G_CONNECT_AFTER);
+
+ mpriv->focus_connected = TRUE;
+#endif /* GTKMOZEMBED_BROKEN_FOCUS */
}
static GObject *
@@ -254,6 +340,11 @@ mozilla_embed_class_init (MozillaEmbedClass *klass)
widget_class->realize = mozilla_embed_realize;
+#ifdef GTKMOZEMBED_BROKEN_FOCUS
+ fiesid = g_signal_lookup ("focus-in-event", GTK_TYPE_WIDGET);
+ foesid = g_signal_lookup ("focus-out-event", GTK_TYPE_WIDGET);
+#endif /* GTKMOZEMBED_BROKEN_FOCUS */
+
g_type_class_add_private (object_class, sizeof(MozillaEmbedPrivate));
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-21 06:45:05 +0800