X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.h;h=da632bf1a3df9e428baf6d185160fe941273f1bb;hb=55ef7b50b54939f66b37a71e21c235afca03265e;hp=93b167efec7666c454c4dcb4775e84a5e2e315f1;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 93b167efec..da632bf1a3 100644
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -4,9 +4,11 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
+ * \author Alfredo Braunstein
+ * \author Tommaso Cucinotta
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,58 +16,118 @@
 #ifndef LYXFIND_H
 #define LYXFIND_H
 
-#include "support/types.h"
+#include "support/strfwd.h"
 
-class BufferView;
-class LyXText;
+// FIXME
+#include "support/docstring.h"
 
 namespace lyx {
-namespace find {
-
-enum SearchResult {
-	//
-	SR_NOT_FOUND = 0,
-	//
-	SR_FOUND,
-	//
-	SR_FOUND_NOUPDATE
-};
 
 
-int replace(BufferView * bv,
-	       std::string const &, std::string const &,
-	       bool, bool = true, bool = false,
-	       bool = false, bool = false);
 
-/**
- * This function is called as a general interface to find some
- * text from the actual cursor position in whatever direction
- * we want to go. This does also update the screen.
+class Buffer;
+class BufferView;
+class DocIterator;
+class FuncRequest;
+class Text;
+
+/** Encode the parameters needed to find \c search as a string
+ *  that can be dispatched to the LyX core in a FuncRequest wrapper.
  */
-bool find(BufferView *,
-	     std::string const & searchstr, bool forward,
-	     bool casesens = true, bool matchwrd = false);
+docstring const find2string(docstring const & search,
+			      bool casesensitive,
+			      bool matchword,
+			      bool forward);
 
-/**
- * This function does search from the cursor position inside the
- * passed LyXText parameter and regards this LyXText as the root
- * LyXText. It will NOT update any screen stuff. It will however
- * set the cursor to the new position inside LyXText, before
- * returning to the calling function.
+/** Encode the parameters needed to replace \c search with \c replace
+ *  as a string that can be dispatched to the LyX core in a FuncRequest
+ *  wrapper.
+ */
+docstring const replace2string(docstring const & replace,
+				 docstring const & search,
+				 bool casesensitive,
+				 bool matchword,
+				 bool all,
+				 bool forward);
+
+/** Parse the string encoding of the find request that is found in
+ *  \c ev.argument and act on it.
+ * The string is encoded by \c find2string.
+ * \return true if the string was found.
  */
+bool lyxfind(BufferView * bv, FuncRequest const & ev);
 
-SearchResult find(BufferView *, LyXText * text,
-		     std::string const & searchstr, bool forward,
-		     bool casesens = true, bool matchwrd = false);
+/** Parse the string encoding of the replace request that is found in
+ *  \c ev.argument and act on it.
+ * The string is encoded by \c replace2string.
+ * \return whether we did anything
+ */
+bool lyxreplace(BufferView * bv, 
+		FuncRequest const &, bool has_deleted = false);
 
 /// find the next change in the buffer
 bool findNextChange(BufferView * bv);
 
-SearchResult findNextChange(BufferView * bv, LyXText * text, lyx::pos_type & length);
+/// find the previous change in the buffer
+bool findPreviousChange(BufferView * bv);
+
+/// find the change in the buffer
+/// \param next true to find the next change, otherwise the previous
+bool findChange(BufferView * bv, bool next);
+
+class FindAndReplaceOptions {
+public:
+	typedef enum {
+		S_BUFFER,
+		S_DOCUMENT,
+		S_OPEN_BUFFERS,
+		S_ALL_MANUALS
+	} SearchScope;
+	FindAndReplaceOptions(
+		docstring const & find_buf_name,
+		bool casesensitive,
+		bool matchword,
+		bool forward,
+		bool expandmacros,
+		bool ignoreformat,
+		docstring const & repl_buf_name,
+		bool keep_case,
+		SearchScope scope = S_BUFFER
+	);
+	FindAndReplaceOptions() {  }
+	docstring find_buf_name;
+	bool casesensitive;
+	bool matchword;
+	bool forward;
+	bool expandmacros;
+	bool ignoreformat;
+	/// This is docstring() if no replace was requested
+	docstring repl_buf_name;
+	bool keep_case;
+	SearchScope scope;
+};
+
+/// Write a FindAdvOptions instance to a stringstream
+std::ostringstream & operator<<(std::ostringstream & os, lyx::FindAndReplaceOptions const & opt);
+
+/// Read a FindAdvOptions instance from a stringstream
+std::istringstream & operator>>(std::istringstream & is, lyx::FindAndReplaceOptions & opt);
 
-SearchResult nextChange(BufferView * bv, LyXText * text, lyx::pos_type & length);
+/// Perform a FindAdv operation.
+bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt);
+	
+/** Computes the simple-text or LaTeX export (depending on opt) of buf starting
+ ** from cur and ending len positions after cur, if len is positive, or at the
+ ** paragraph or innermost inset end if len is -1.
+ **
+ ** This is useful for computing opt.search from the SearchAdvDialog controller (ControlSearchAdv).
+ ** Ideally, this should not be needed, and the opt.search field should become a Text const &.
+ **/
+docstring stringifyFromForSearch(
+	FindAndReplaceOptions const & opt,
+	DocIterator const & cur,
+	int len = -1);
 
-} // namespace find
 } // namespace lyx
 
 #endif // LYXFIND_H