From eeac7e657d86802e904337ffef1bf5a0341a8cd0 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 3 Jun 2005 13:42:34 +0000 Subject: Don't open search toolbar on / or ' over formfields: 2005-06-03 Christian Persch Don't open search toolbar on / or ' over formfields: * embed/ephy-embed.c: (ephy_embed_base_init): * embed/ephy-embed.h: New signal for searchable key presses. * embed/mozilla/EventContext.cpp: * embed/mozilla/EventContext.h: Add static function to check if a keypress should be forwarded to the search toolbar. * embed/mozilla/mozilla-embed.cpp: Emit the signal here. * lib/ephy-marshal.list: * src/ephy-find-toolbar.c: (tab_search_key_press_cb), (ephy_find_toolbar_set_embed): Use the new signal instead of dom-key-press. --- embed/mozilla/EventContext.cpp | 68 +++++++++++++++++++++++++++++++++++++++++ embed/mozilla/EventContext.h | 2 ++ embed/mozilla/mozilla-embed.cpp | 33 ++++++++++++++++++++ 3 files changed, 103 insertions(+) (limited to 'embed/mozilla') diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp index 6211b36a8..f4b998129 100644 --- a/embed/mozilla/EventContext.cpp +++ b/embed/mozilla/EventContext.cpp @@ -56,6 +56,8 @@ #include #include #include +#include +#include #ifdef ALLOW_PRIVATE_API #include @@ -1003,3 +1005,69 @@ nsresult EventContext::SetURIProperty (nsIDOMNode *node, const char *name, const NS_UTF16ToCString (value, NS_CSTRING_ENCODING_UTF8, cValue); return SetURIProperty (node, name, cValue); } + +/* static */ +PRBool +EventContext::CheckKeyPress (nsIDOMKeyEvent *aEvent) +{ + PRBool retval = PR_FALSE; + + /* check for alt/ctrl */ + PRBool isCtrl = PR_FALSE, isAlt = PR_FALSE; + aEvent->GetCtrlKey (&isCtrl); + aEvent->GetAltKey (&isAlt); + if (isCtrl || isAlt) return retval; + + nsCOMPtr uiEvent (do_QueryInterface (aEvent)); + NS_ENSURE_TRUE (uiEvent, retval); + + /* check for already handled event */ + PRBool isPrevented = PR_FALSE; + uiEvent->GetPreventDefault (&isPrevented); + if (isPrevented) return retval; + + /* check for form controls */ + nsresult rv; + nsCOMPtr target; + rv = aEvent->GetTarget (getter_AddRefs (target)); + NS_ENSURE_SUCCESS (rv, retval); + + nsCOMPtr element (do_QueryInterface (target, &rv)); + NS_ENSURE_SUCCESS (rv, retval); + + PRUint16 type = 0; + element->GetNodeType(&type); + if (nsIDOMNode::ELEMENT_NODE != type) return retval; + + nsEmbedString uTag; + rv = element->GetLocalName(uTag); + NS_ENSURE_SUCCESS (rv, retval); + + nsEmbedCString tag; + NS_UTF16ToCString (uTag, NS_CSTRING_ENCODING_UTF8, tag); + + if (g_ascii_strcasecmp (tag.get(), "input") == 0 || + g_ascii_strcasecmp (tag.get(), "textaread") == 0 || + g_ascii_strcasecmp (tag.get(), "select") == 0 || + g_ascii_strcasecmp (tag.get(), "button") == 0 || + g_ascii_strcasecmp (tag.get(), "isindex") == 0) return retval; + + /* check for design mode */ + nsCOMPtr doc; + rv = element->GetOwnerDocument (getter_AddRefs (doc)); + NS_ENSURE_SUCCESS (rv, retval); + + nsCOMPtr htmlDoc (do_QueryInterface (doc, &rv)); + if (NS_FAILED (rv)) return retval; /* it's okay not to be a HTML document */ + + nsEmbedString uDesign; + rv = htmlDoc->GetDesignMode (uDesign); + NS_ENSURE_SUCCESS (rv, retval); + + nsEmbedCString design; + NS_UTF16ToCString (uDesign, NS_CSTRING_ENCODING_UTF8, design); + + retval = g_ascii_strcasecmp (design.get(), "on") != 0; + + return retval; +} diff --git a/embed/mozilla/EventContext.h b/embed/mozilla/EventContext.h index c982b9722..97e190437 100644 --- a/embed/mozilla/EventContext.h +++ b/embed/mozilla/EventContext.h @@ -55,6 +55,8 @@ public: nsresult GetKeyEventInfo (nsIDOMKeyEvent *event, MozillaEmbedEvent *info); nsresult GetTargetDocument (nsIDOMDocument **domDoc); + static PRBool CheckKeyPress (nsIDOMKeyEvent *aEvent); + private: EphyBrowser *mBrowser; MozillaEmbedEvent *mEmbedEvent; diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 1d87d77ab..e9fc2aab9 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -64,6 +64,9 @@ static gboolean mozilla_embed_dom_mouse_click_cb(GtkMozEmbed *embed, static gboolean mozilla_embed_dom_mouse_down_cb (GtkMozEmbed *embed, gpointer dom_event, MozillaEmbed *membed); +static gboolean mozilla_embed_dom_key_press_cb (GtkMozEmbed *embed, + gpointer dom_event, + MozillaEmbed *membed); static void mozilla_embed_new_window_cb (GtkMozEmbed *embed, GtkMozEmbed **newEmbed, guint chrome_mask, @@ -242,6 +245,9 @@ mozilla_embed_init (MozillaEmbed *embed) g_signal_connect_object (G_OBJECT (embed), "dom_mouse_down", G_CALLBACK (mozilla_embed_dom_mouse_down_cb), embed, (GConnectFlags) 0); + g_signal_connect_object (G_OBJECT (embed), "dom-key-press", + G_CALLBACK (mozilla_embed_dom_key_press_cb), + embed, (GConnectFlags) 0); g_signal_connect_object (G_OBJECT (embed), "new_window", G_CALLBACK (mozilla_embed_new_window_cb), embed, (GConnectFlags) 0); @@ -910,6 +916,33 @@ mozilla_embed_dom_mouse_down_cb (GtkMozEmbed *embed, gpointer dom_event, "ge_dom_mouse_down"); } +static gint +mozilla_embed_dom_key_press_cb (GtkMozEmbed *embed, + gpointer dom_event, + MozillaEmbed *membed) +{ + MozillaEmbedPrivate *mpriv = membed->priv; + gint retval = FALSE; + + if (dom_event == NULL) return FALSE; + + nsCOMPtr ev = static_cast(dom_event); + NS_ENSURE_TRUE (ev, FALSE); + + if (!EventContext::CheckKeyPress (ev)) return FALSE; + + GdkEvent *event = gtk_get_current_event (); + if (event == NULL) return FALSE; /* shouldn't happen! */ + + g_return_val_if_fail (GDK_KEY_PRESS == event->type, FALSE); + + g_signal_emit_by_name (embed, "ge-search-key-press", event, &retval); + + gdk_event_free (event); + + return retval; +} + EphyEmbedChrome _mozilla_embed_translate_chrome (GtkMozEmbedChromeFlags flags) { -- cgit v1.2.3