X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdebug.cpp;h=3a6f9018feb3926549c5af73e125c406b6279d7f;hb=3f59d7e2cc6a3f9a09631c804b49b6d28e05d857;hp=96e324dcccc823a0bf97adf32e8a6e508c55dba6;hpb=0bde349a04ea623b5a37db413eda59c2d28d029c;p=lyx.git

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 96e324dccc..3a6f9018fe 100644
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -5,6 +5,7 @@
  *
  * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
+ * \author Pavel Sanda
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,13 +14,16 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/FileName.h"
+#include "support/ProgressInterface.h"
+#include "support/regex.h"
 
 #include <iostream>
 #include <iomanip>
 
+
 using namespace std;
 using namespace lyx::support;
 
@@ -35,7 +39,7 @@ struct ErrorItem {
 
 
 ErrorItem errorTags[] = {
-	{ Debug::NONE,      "none",      N_("No debugging message")},
+	{ Debug::NONE,      "none",      N_("No debugging messages")},
 	{ Debug::INFO,      "info",      N_("General information")},
 	{ Debug::INIT,      "init",      N_("Program initialisation")},
 	{ Debug::KEY,       "key",       N_("Keyboard events handling")},
@@ -66,6 +70,7 @@ ErrorItem errorTags[] = {
 	{ Debug::RTL,       "rtl",       N_("RTL/Bidi")},
 	{ Debug::LOCALE,    "locale",    N_("Locale/Internationalisation")},
 	{ Debug::SELECTION, "selection", N_("Selection copy/paste mechanism")},
+	{ Debug::FIND,      "find",      N_("Find and replace mechanism")},
 	{ Debug::DEBUG,     "debug",     N_("Developers' general debug messages")},
 	{ Debug::ANY,       "any",       N_("All debugging messages")}
 };
@@ -76,6 +81,40 @@ int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 } // namespace anon
 
 
+int Debug::levelCount()
+{
+	return numErrorTags;
+}
+
+
+Debug::Type Debug::value(int idx)
+{
+	if (idx > 0 && idx < numErrorTags)
+		return errorTags[idx].level;
+	return Debug::NONE;
+}
+
+
+string const Debug::description(Debug::Type val)
+{
+	for (int i = 0 ; i < numErrorTags ; ++i) {
+		if (errorTags[i].level == val)
+			return errorTags[i].desc;
+	}
+	return "unknown level";
+}
+
+
+string const Debug::name(Debug::Type val)
+{
+	for (int i = 0 ; i < numErrorTags ; ++i) {
+		if (errorTags[i].level == val)
+			return errorTags[i].name;
+	}
+	return "unknown level";
+}
+
+
 Debug::Type Debug::value(string const & val)
 {
 	Type l = Debug::NONE;
@@ -106,10 +145,10 @@ Debug::Type Debug::value(string const & val)
 void Debug::showLevel(ostream & os, Debug::Type level)
 {
 	// Show what features are traced
-	for (int i = 0; i != numErrorTags; ++i) {
+	for (int i = 0; i < numErrorTags; ++i) {
 		if (errorTags[i].level != Debug::ANY
-		    && errorTags[i].level != Debug::NONE
-		    && errorTags[i].level & level) {
+		      && errorTags[i].level != Debug::NONE
+		      && errorTags[i].level & level) {
 			// avoid to_utf8(_(...)) re-entrance problem
 			docstring const s = _(errorTags[i].desc);
 			os << to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
@@ -145,46 +184,82 @@ void LyXErr::enable()
 
 bool LyXErr::debugging(Debug::Type t) const
 {
-	return (dt & t);
+	return (dt_ & t);
 }
 
 
 void LyXErr::endl()
 {
-	if (enabled_)
+	if (enabled_) {
 		stream() << std::endl;
+		if (second_enabled_)
+			secondStream() << std::endl;
+	}
+}
+
+
+char const * LyXErr::stripName(char const * n)
+{
+	string const name = n;
+	// find the last occurence of /src/ in name
+	static regex re("[\\/]src[\\/]");
+	string::const_iterator const begin = name.begin();
+	string::const_iterator it = begin;
+	string::const_iterator const end = name.end();
+	smatch results;
+	while (regex_search(it, end, results, re)) {
+		it = results[0].second;
+	}
+	return n + std::distance(begin, it);
+}
+
+
+// It seems not possible to instantiate operator template out of class body
+template<class T>
+LyXErr & toStream(LyXErr & l, T t)	
+{
+	if (l.enabled()){
+		l.stream() << t;
+		if (l.secondEnabled()) {
+			l.secondStream() << t;
+			ProgressInterface::instance()->lyxerrFlush();
+		}
+	}
+	return l;
 }
 
 
 LyXErr & operator<<(LyXErr & l, void const * t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, char const * t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, char t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, int t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned int t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, long t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, double t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, string const & t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, docstring const & t)
-{ if (l.enabled()) l.stream() << to_utf8(t); return l; }
+{ return toStream(l, to_utf8(t)); }
 LyXErr & operator<<(LyXErr & l, FileName const & t)
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, ostream &(*t)(ostream &))
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, ios_base &(*t)(ios_base &))
-{ if (l.enabled()) l.stream() << t; return l; }
+{ return toStream(l, t); }
 
 
 // The global instance
 LyXErr lyxerr;
 
+
+
 } // namespace lyx