Check for toolkit nsITypeAheadFind.

2005-05-28  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:

	Check for toolkit nsITypeAheadFind.

	* embed/Makefile.am:
	* embed/ephy-embed-factory.c: (ephy_embed_factory_new_object):
	* embed/ephy-embed-find.c: (ephy_embed_find_set_embed),
	(ephy_embed_find_set_properties), (ephy_embed_find_find),
	(ephy_embed_find_find_again), (ephy_embed_find_get_type):
	* embed/ephy-embed-find.h:
	* embed/ephy-embed.c:
	* embed/ephy-embed.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/EphyFind.cpp:
	* embed/mozilla/EphyFind.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/mozilla-embed-find.cpp:
	* embed/mozilla/mozilla-embed-find.h:
	* embed/mozilla/mozilla-embed.cpp:
	* src/bookmarks/ephy-bookmarks-import.c:
	(gul_general_read_line_from_file):
	* src/ephy-find-toolbar.c: (get_find), (set_controls),
	(tab_content_changed_cb), (entry_changed_cb),
	(ephy_find_toolbar_init), (ephy_find_toolbar_finalize),
	(ephy_find_toolbar_class_init), (ephy_find_toolbar_new),
	(ephy_find_toolbar_get_text), (ephy_find_toolbar_set_embed),
	(ephy_find_toolbar_find_next), (ephy_find_toolbar_find_previous):
	* src/ephy-find-toolbar.h:
	* src/ephy-window.c: (ephy_window_set_active_tab),
	(ephy_window_init), (ephy_window_get_find_toolbar),
	(ephy_window_notebook_switch_page_cb):
	* src/ephy-window.h:
	* src/window-commands.c: (window_cmd_edit_find_next),
	(window_cmd_edit_find_prev):

	Implement typeaheadfind for the find toolbar.

1 files changed, 188 insertions, 0 deletions

diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp
new file mode 100644
index 000000000..ace176b23
--- /dev/null
+++ b/embed/mozilla/EphyFind.cpp
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (C) 2005 Christian Persch
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
+ */
+
+#include "mozilla-config.h"
+
+#include "config.h"
+
+#include "EphyFind.h"
+
+#include "ephy-debug.h"
+
+#undef MOZILLA_INTERNAL_API
+#include <nsEmbedString.h>
+#define MOZILLA_INTERNAL_API 1
+
+#include <gtkmozembed.h>
+#include <gtkmozembed_internal.h>
+#include <nsCOMPtr.h>
+#include <nsIServiceManager.h>
+#include <nsIInterfaceRequestorUtils.h>
+#include <nsIDOMWindow.h>
+#include <nsIWebBrowser.h>
+
+#ifdef HAVE_TYPEAHEADFIND
+#include <nsIDocShell.h>
+#include <nsITypeAheadFind.h>
+#else
+#include <nsIWebBrowserFind.h>
+#include <nsMemory.h>
+#endif
+
+#include <glib.h>
+
+#ifdef HAVE_TYPEAHEADFIND
+#define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
+#endif /* HAVE_TYPEAHEADFIND */
+
+EphyFind::EphyFind ()
+: mCurrentEmbed(nsnull)
+{
+  LOG ("EphyFind ctor [%p]", this);
+}
+
+EphyFind::~EphyFind ()
+{
+  LOG ("EphyFind dtor [%p]", this);
+}
+
+nsresult
+EphyFind::SetEmbed (EphyEmbed *aEmbed)
+{
+  nsresult rv = NS_OK;
+  if (aEmbed == mCurrentEmbed) return rv;
+
+  mCurrentEmbed = nsnull;
+
+  rv = NS_ERROR_FAILURE;
+  nsCOMPtr<nsIWebBrowser> webBrowser;
+  gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (aEmbed),
+				   getter_AddRefs (webBrowser));
+  NS_ENSURE_TRUE (webBrowser, rv);
+
+#ifdef HAVE_TYPEAHEADFIND
+  nsCOMPtr<nsIDocShell> docShell (do_GetInterface (webBrowser, &rv));
+  NS_ENSURE_SUCCESS (rv, rv);
+
+  if (!mFinder) {
+    mFinder = do_CreateInstance (NS_TYPEAHEADFIND_CONTRACTID, &rv);
+    NS_ENSURE_SUCCESS (rv, rv);
+
+    rv = mFinder->Init (docShell);
+    mFinder->SetFocusLinks (PR_TRUE);
+  } else {
+    rv = mFinder->SetDocShell (docShell);
+  }
+  NS_ENSURE_SUCCESS (rv, rv);
+#else
+  PRUnichar *string = nsnull;
+  if (mFinder) {
+    mFinder->GetSearchString (&string);
+  }
+
+  mFinder = do_GetInterface (webBrowser, &rv);
+  NS_ENSURE_SUCCESS (rv, rv);
+
+  mFinder->SetWrapFind (PR_TRUE);
+
+  if (string) {
+    mFinder->SetSearchString (string);
+    nsMemory::Free (string);    
+  }
+#endif /* HAVE_TYPEAHEADFIND */
+
+  mCurrentEmbed = aEmbed;
+
+  return rv;
+}
+
+void
+EphyFind::SetFindProperties (const char *aSearchString,
+			     PRBool aCaseSensitive)
+{
+  if (!mFinder) return;
+
+#ifdef HAVE_TYPEAHEADFIND
+  mFinder->SetCaseSensitive (aCaseSensitive);
+  /* search string is set on ::Find */
+#else 
+  mFinder->SetMatchCase (aCaseSensitive);
+  
+  nsEmbedString uSearchString;
+  NS_CStringToUTF16 (nsEmbedCString (aSearchString ? aSearchString : ""),
+		     NS_CSTRING_ENCODING_UTF8, uSearchString);
+  
+  mFinder->SetSearchString (uSearchString.get ());
+#endif /* TYPEAHEADFIND */
+}
+
+PRBool
+EphyFind::Find (const char *aSearchString,
+                PRBool aLinksOnly)
+{
+  if (!mFinder) return PR_FALSE;
+
+  nsEmbedString uSearchString;
+  NS_CStringToUTF16 (nsEmbedCString (aSearchString ? aSearchString : ""),
+  		     NS_CSTRING_ENCODING_UTF8, uSearchString);
+
+#ifdef HAVE_TYPEAHEADFIND
+  nsresult rv;
+  PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
+  rv = mFinder->Find (uSearchString, aLinksOnly, &found);
+
+  return NS_SUCCEEDED (rv) && found != nsITypeAheadFind::FIND_NOTFOUND;
+#else
+  mFinder->SetSearchString (uSearchString.get ());
+  mFinder->SetFindBackwards (PR_FALSE);
+
+  nsresult rv;
+  PRBool didFind = PR_FALSE;
+  rv = mFinder->FindNext (&didFind);
+        
+  return NS_SUCCEEDED (rv) && didFind;
+#endif /* HAVE_TYPEAHEADFIND */
+}
+
+PRBool
+EphyFind::FindAgain (PRBool aForward)
+{
+  if (!mFinder) return PR_FALSE;
+
+#ifdef HAVE_TYPEAHEADFIND
+  nsresult rv;
+  PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
+  if (aForward) {
+    rv = mFinder->FindNext (&found);
+  } else {
+    rv = mFinder->FindPrevious (&found);
+  }
+
+  return NS_SUCCEEDED (rv) && found != nsITypeAheadFind::FIND_NOTFOUND;
+#else
+  mFinder->SetFindBackwards (!aForward);
+        
+  nsresult rv;
+  PRBool didFind = PR_FALSE;
+  rv = mFinder->FindNext (&didFind);
+        
+  return NS_SUCCEEDED (rv) && didFind;
+#endif /* HAVE_TYPEAHEADFIND */
+}