X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbase.C;h=29d5448f96ffbc88e8ea3e83aa342e2528f643d4;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=45d957ab341b722761174af89453a56ea94509d0;hpb=991b0ec589f718420f98f2722936386520658e82;p=lyx.git

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 45d957ab34..29d5448f96 100644
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -13,32 +13,42 @@
 #include "insetbase.h"
 
 #include "buffer.h"
+#include "coordcache.h"
 #include "BufferView.h"
 #include "LColor.h"
 #include "cursor.h"
 #include "debug.h"
 #include "dimension.h"
 #include "dispatchresult.h"
+#include "funcrequest.h"
+#include "FuncStatus.h"
 #include "gettext.h"
 #include "lyxtext.h"
 #include "metricsinfo.h"
 
 #include "frontends/Painter.h"
 
+#include <boost/current_function.hpp>
+
 #include <map>
+#include <typeinfo>
+
 
-namespace {
+namespace lyx {
 
-struct InsetName {
+class InsetName {
+public:
 	InsetName(std::string const & n, InsetBase::Code c)
 		: name(n), code(c) {}
 	std::string name;
 	InsetBase::Code code;
 };
 
+
 typedef std::map<std::string, InsetBase::Code> TranslatorMap;
 
-TranslatorMap const build_translator()
+
+static TranslatorMap const build_translator()
 {
 	InsetName const insetnames[] = {
 		InsetName("toc", InsetBase::TOC_CODE),
@@ -53,6 +63,7 @@ TranslatorMap const build_translator()
 		InsetName("accent", InsetBase::ACCENT_CODE),
 		InsetName("math", InsetBase::MATH_CODE),
 		InsetName("index", InsetBase::INDEX_CODE),
+		InsetName("nomenclature", InsetBase::NOMENCL_CODE),
 		InsetName("include", InsetBase::INCLUDE_CODE),
 		InsetName("graphics", InsetBase::GRAPHICS_CODE),
 		InsetName("bibitem", InsetBase::BIBITEM_CODE),
@@ -68,10 +79,10 @@ TranslatorMap const build_translator()
 		InsetName("external", InsetBase::EXTERNAL_CODE),
 		InsetName("caption", InsetBase::CAPTION_CODE),
 		InsetName("mathmacro", InsetBase::MATHMACRO_CODE),
-		InsetName("error", InsetBase::ERROR_CODE),
 		InsetName("cite", InsetBase::CITE_CODE),
 		InsetName("float_list", InsetBase::FLOAT_LIST_CODE),
 		InsetName("index_print", InsetBase::INDEX_PRINT_CODE),
+		InsetName("nomencl_print", InsetBase::NOMENCL_PRINT_CODE),
 		InsetName("optarg", InsetBase::OPTARG_CODE),
 		InsetName("environment", InsetBase::ENVIRONMENT_CODE),
 		InsetName("hfill", InsetBase::HFILL_CODE),
@@ -81,8 +92,7 @@ TranslatorMap const build_translator()
 		InsetName("box", InsetBase::BOX_CODE),
 		InsetName("charstyle", InsetBase::CHARSTYLE_CODE),
 		InsetName("vspace", InsetBase::VSPACE_CODE),
-		InsetName("mathgrid", InsetBase::MATHGRID_CODE),
-		InsetName("mathhull", InsetBase::MATHHULL_CODE)
+		InsetName("mathmacroarg", InsetBase::MATHMACROARG_CODE),
 	};
 
 	std::size_t const insetnames_size =
@@ -97,7 +107,13 @@ TranslatorMap const build_translator()
 	return data;
 }
 
-} // namespace anon
+
+std::auto_ptr<InsetBase> InsetBase::clone() const
+{
+	std::auto_ptr<InsetBase> b = doClone();
+	BOOST_ASSERT(typeid(*b) == typeid(*this));
+	return b;
+}
 
 
 InsetBase::Code InsetBase::translate(std::string const & name)
@@ -111,32 +127,63 @@ InsetBase::Code InsetBase::translate(std::string const & name)
 
 void InsetBase::dispatch(LCursor & cur, FuncRequest & cmd)
 {
-	priv_dispatch(cur, cmd);
+	cur.updateFlags(Update::Force | Update::FitCursor);
+	cur.dispatched();
+	doDispatch(cur, cmd);
 }
 
 
-void InsetBase::priv_dispatch(LCursor & cur, FuncRequest &)
+void InsetBase::doDispatch(LCursor & cur, FuncRequest &)
 {
 	cur.noUpdate();
 	cur.undispatched();
 }
 
 
-bool InsetBase::getStatus(LCursor &, FuncRequest const &, FuncStatus &) const
+bool InsetBase::getStatus(LCursor &, FuncRequest const & cmd,
+	FuncStatus & flag) const
 {
-	return false;
+	// LFUN_INSET_APPLY is sent from the dialogs when the data should
+	// be applied. This is either changed to LFUN_INSET_MODIFY (if the
+	// dialog belongs to us) or LFUN_INSET_INSERT (if the dialog does
+	// not belong to us, i. e. the dialog was open, and the user moved
+	// the cursor in our inset) in LyXFunc::getStatus().
+	// Dialogs::checkStatus() ensures that the dialog is deactivated if
+	// LFUN_INSET_APPLY is disabled.
+
+	switch (cmd.action) {
+	case LFUN_INSET_MODIFY:
+		// Allow modification of our data.
+		// This needs to be handled in the doDispatch method of our
+		// instantiatable children.
+		flag.enabled(true);
+		return true;
+
+	case LFUN_INSET_INSERT:
+		// Don't allow insertion of new insets.
+		// Every inset that wants to allow new insets from open
+		// dialogs needs to override this.
+		flag.enabled(false);
+		return true;
+
+	default:
+		return false;
+	}
 }
 
 
 void InsetBase::edit(LCursor &, bool)
 {
-	lyxerr << "InsetBase: edit left/right" << std::endl;
+	lyxerr[Debug::INSETS] << BOOST_CURRENT_FUNCTION
+			      << ": edit left/right" << std::endl;
 }
 
 
 InsetBase * InsetBase::editXY(LCursor &, int x, int y)
 {
-	lyxerr << "InsetBase: editXY x:" << x << " y: " << y << std::endl;
+	lyxerr[Debug::INSETS] << BOOST_CURRENT_FUNCTION
+			      << ": x=" << x << " y= " << y
+			      << std::endl;
 	return this;
 }
 
@@ -144,9 +191,11 @@ InsetBase * InsetBase::editXY(LCursor &, int x, int y)
 InsetBase::idx_type InsetBase::index(row_type row, col_type col) const
 {
 	if (row != 0)
-		lyxerr << "illegal row: " << row << std::endl;
+		lyxerr << BOOST_CURRENT_FUNCTION
+		       << ": illegal row: " << row << std::endl;
 	if (col != 0)
-		lyxerr << "illegal col: " << col << std::endl;
+		lyxerr << BOOST_CURRENT_FUNCTION
+		       << ": illegal col: " << col << std::endl;
 	return 0;
 }
 
@@ -163,28 +212,15 @@ bool InsetBase::idxUpDown(LCursor &, bool) const
 }
 
 
-bool InsetBase::idxUpDown2(LCursor &, bool) const
-{
-	return false;
-}
-
-
 int InsetBase::plaintext(Buffer const &,
-	std::ostream &, OutputParams const &) const
-{
-	return 0;
-}
-
-
-int InsetBase::linuxdoc(Buffer const &,
-	std::ostream &, OutputParams const &) const
+	odocstream &, OutputParams const &) const
 {
 	return 0;
 }
 
 
 int InsetBase::docbook(Buffer const &,
-	std::ostream &, OutputParams const &) const
+	odocstream &, OutputParams const &) const
 {
 	return 0;
 }
@@ -208,71 +244,70 @@ bool InsetBase::autoDelete() const
 }
 
 
-std::string const InsetBase::editMessage() const
+docstring const InsetBase::editMessage() const
 {
 	return _("Opened inset");
 }
 
 
-std::string const & InsetBase::getInsetName() const
+docstring const & InsetBase::getInsetName() const
 {
-	static std::string const name = "unknown";
+	static docstring const name = from_ascii("unknown");
 	return name;
 }
 
 
-void InsetBase::markErased()
-{}
-
-
-void InsetBase::getCursorPos(CursorSlice const &, int & x, int & y) const
+void InsetBase::cursorPos(BufferView const & /*bv*/, CursorSlice const &,
+		bool, int & x, int & y) const
 {
-	lyxerr << "InsetBase::getCursorPos called directly" << std::endl;
+	lyxerr << "InsetBase::cursorPos called directly" << std::endl;
 	x = 100;
 	y = 100;
 }
 
 
-void InsetBase::metricsMarkers(Dimension & dim, int) const
+void InsetBase::metricsMarkers(Dimension & dim, int framesize) const
 {
-	dim.wid += 2;
-	dim.asc += 1;
+	dim.wid += 2 * framesize;
+	dim.asc += framesize;
 }
 
 
-void InsetBase::metricsMarkers2(Dimension & dim, int) const
+void InsetBase::metricsMarkers2(Dimension & dim, int framesize) const
 {
-	dim.wid += 2;
-	dim.asc += 1;
-	dim.des += 1;
+	dim.wid += 2 * framesize;
+	dim.asc += framesize;
+	dim.des += framesize;
 }
 
 
 void InsetBase::drawMarkers(PainterInfo & pi, int x, int y) const
 {
-	if (!editing(pi.base.bv))
-		return;
+	LColor::color pen_color = editing(pi.base.bv)?
+		LColor::mathframe : LColor::background;
+
 	int const t = x + width() - 1;
 	int const d = y + descent();
-	pi.pain.line(x, d - 3, x, d, LColor::mathframe);
-	pi.pain.line(t, d - 3, t, d, LColor::mathframe);
-	pi.pain.line(x, d, x + 3, d, LColor::mathframe);
-	pi.pain.line(t - 3, d, t, d, LColor::mathframe);
+	pi.pain.line(x, d - 3, x, d, pen_color);
+	pi.pain.line(t, d - 3, t, d, pen_color);
+	pi.pain.line(x, d, x + 3, d, pen_color);
+	pi.pain.line(t - 3, d, t, d, pen_color);
 	setPosCache(pi, x, y);
 }
 
 
 void InsetBase::drawMarkers2(PainterInfo & pi, int x, int y) const
 {
-	if (!editing(pi.base.bv))
-		return;
+	LColor::color pen_color = editing(pi.base.bv)?
+		LColor::mathframe : LColor::background;
+
 	drawMarkers(pi, x, y);
 	int const t = x + width() - 1;
 	int const a = y - ascent();
-	pi.pain.line(x, a + 3, x, a, LColor::mathframe);
-	pi.pain.line(t, a + 3, t, a, LColor::mathframe);
-	pi.pain.line(x, a, x + 3, a, LColor::mathframe);
-	pi.pain.line(t - 3, a, t, a, LColor::mathframe);
+	pi.pain.line(x, a + 3, x, a, pen_color);
+	pi.pain.line(t, a + 3, t, a, pen_color);
+	pi.pain.line(x, a, x + 3, a, pen_color);
+	pi.pain.line(t - 3, a, t, a, pen_color);
 	setPosCache(pi, x, y);
 }
 
@@ -283,12 +318,30 @@ bool InsetBase::editing(BufferView * bv) const
 }
 
 
-bool InsetBase::covers(int x, int y) const
+int InsetBase::xo(BufferView const & bv) const
+{
+	return bv.coordCache().getInsets().x(this);
+}
+
+
+int InsetBase::yo(BufferView const & bv) const
+{
+	return bv.coordCache().getInsets().y(this);
+}
+
+
+bool InsetBase::covers(BufferView const & bv, int x, int y) const
 {
-	return x >= xo()
-			&& x <= xo() + width()
-			&& y >= yo() - ascent()
-			&& y <= yo() + descent();
+	//lyxerr << "InsetBase::covers, x: " << x << " y: " << y
+	//	<< " xo: " << xo(bv) << " yo: " << yo()
+	//	<< " x1: " << xo(bv) << " x2: " << xo() + width()
+	//	<< " y1: " << yo(bv) - ascent() << " y2: " << yo() + descent()
+	//	<< std::endl;
+	return bv.coordCache().getInsets().has(this)
+			&& x >= xo(bv)
+			&& x <= xo(bv) + width()
+			&& y >= yo(bv) - ascent()
+			&& y <= yo(bv) + descent();
 }
 
 
@@ -311,3 +364,6 @@ bool isHighlyEditableInset(InsetBase const * inset)
 {
 	return inset && inset->editable() == InsetBase::HIGHLY_EDITABLE;
 }
+
+
+} // namespace lyx