The speed patch: redraw only rows that have changed

[lyx.git] / src / insets / insetbase.C

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index d08c3459c2c11e4165817ad87543157a0c0f76a3..0736f60fc4d276a2d8e1e0cc14d8a4338d328ff1 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -13,24 +13,31 @@
 #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 {
 
-struct InsetName {
+class InsetName {
+public:
        InsetName(std::string const & n, InsetBase::Code c)
                : name(n), code(c) {}
        std::string name;
@@ -84,8 +91,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 =
@@ -103,6 +109,22 @@ TranslatorMap const build_translator()
 } // namespace anon
 
 
+InsetBase::InsetBase()
+{}
+
+
+InsetBase::InsetBase(InsetBase const &)
+{}
+
+
+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)
 {
        static TranslatorMap const translator = build_translator();
@@ -114,32 +136,63 @@ InsetBase::Code InsetBase::translate(std::string const & name)
 
 void InsetBase::dispatch(LCursor & cur, FuncRequest & cmd)
 {
-       priv_dispatch(cur, cmd);
+       cur.needsUpdate();
+       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;
 }
 
@@ -147,9 +200,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;
 }
 
@@ -166,12 +221,6 @@ bool InsetBase::idxUpDown(LCursor &, bool) const
 }
 
 
-bool InsetBase::idxUpDown2(LCursor &, bool) const
-{
-       return false;
-}
-
-
 int InsetBase::plaintext(Buffer const &,
        std::ostream &, OutputParams const &) const
 {
@@ -224,30 +273,30 @@ std::string const & InsetBase::getInsetName() const
 }
 
 
-void InsetBase::markErased()
+void InsetBase::markErased(bool)
 {}
 
 
-void InsetBase::getCursorPos(CursorSlice const &, int & x, int & y) const
+void InsetBase::cursorPos(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;
 }
 
 
@@ -286,14 +335,27 @@ bool InsetBase::editing(BufferView * bv) const
 }
 
 
+int InsetBase::xo() const
+{
+       return theCoords.getInsets().x(this);
+}
+
+
+int InsetBase::yo() const
+{
+       return theCoords.getInsets().y(this);
+}
+
+
 bool InsetBase::covers(int x, int y) const
 {
-       //lyxerr << "InsetBase::covers, x: " << x << " y: " << y 
+       //lyxerr << "InsetBase::covers, x: " << x << " y: " << y
        //      << " xo: " << xo() << " yo: " << yo()
        //      << " x1: " << xo() << " x2: " << xo() + width()
        //      << " y1: " << yo() - ascent() << " y2: " << yo() + descent()
        //      << std::endl;
-       return x >= xo()
+       return theCoords.getInsets().has(this)
+                       && x >= xo()
                        && x <= xo() + width()
                        && y >= yo() - ascent()
                        && y <= yo() + descent();