The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 3bd8cd50265fbec65dc6cada7f90b31d661db364..a3f37890eaba315270a4c4b8a578c12a972787c5 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -11,33 +11,41 @@
 #include <config.h>
 
 #include "insetcaption.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
-#include "BufferView.h"
+#include "insetfloat.h"
+#include "insetwrap.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "insets/insetfloat.h"
-#include "insets/insetwrap.h"
-#include "debug.h"
 #include "gettext.h"
-#include "Lsstream.h"
+#include "LColor.h"
 #include "metricsinfo.h"
+#include "paragraph.h"
+
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
 #include "support/lstrings.h"
-#include "support/LAssert.h"
-#include "support/BoostFormat.h"
 
-using namespace lyx::support;
+#include <sstream>
 
-using std::ostream;
+
+using lyx::support::bformat;
+
+using std::auto_ptr;
 using std::endl;
+using std::string;
+using std::ostream;
+using std::ostringstream;
 
 
 InsetCaption::InsetCaption(BufferParams const & bp)
        : InsetText(bp)
 {
        setAutoBreakRows(true);
-       setDrawFrame(InsetText::LOCKED);
+       setDrawFrame(true);
        setFrameColor(LColor::captionframe);
 }
 
@@ -45,7 +53,7 @@ InsetCaption::InsetCaption(BufferParams const & bp)
 void InsetCaption::write(Buffer const & buf, ostream & os) const
 {
        os << "Caption\n";
-       writeParagraphData(buf, os);
+       text_.write(buf, os);
 }
 
 
@@ -80,19 +88,27 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 
        // See if we can find the name of the float this caption
        // belongs to.
-       InsetOld * i1 = owner();
-       InsetOld * i2 = i1 ? i1->owner() : 0;
+#if 0
+       InsetBase * i1 = owner();
+       InsetBase * i2 = i1 ? i1->owner() : 0;
        string type;
        if (i2->lyxCode() == FLOAT_CODE)
+#ifdef WITH_WARNINGS
+#warning Now, what happens for i2 == 0?
+#endif
                type = static_cast<InsetFloat *>(i2)->params().type;
        else if (i2->lyxCode() == WRAP_CODE)
                type = static_cast<InsetWrap *>(i2)->params().type;
        else
-               Assert(0);
+               BOOST_ASSERT(false);
 
        FloatList const & floats =
-               pi.base.bv->buffer()->params.getLyXTextClass().floats();
+               pi.base.bv->buffer()->params().getLyXTextClass().floats();
        string const fl = i2 ? floats.getType(type).name() : N_("Float");
+#else
+       string type = "float";
+       string const fl = N_("Float");
+#endif
 
        // Discover the number...
        string const num = "#";
@@ -106,7 +122,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 
 
 int InsetCaption::latex(Buffer const & buf, ostream & os,
-                       LatexRunParams const & runparams) const
+                       OutputParams const & runparams) const
 {
        // This is a bit too simplistic to take advantage of
        // caption options we must add more later. (Lgb)
@@ -120,19 +136,26 @@ int InsetCaption::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetCaption::ascii(Buffer const & /*buf*/,
-                       ostream & /*os*/, int /*linelen*/) const
+int InsetCaption::plaintext(Buffer const & /*buf*/,ostream & /*os*/,
+                       OutputParams const & /*runparams*/) const
 {
-       // FIX: Implement me!
+       // FIXME: Implement me!
        return 0;
 }
 
 
-int InsetCaption::docbook(Buffer const & buf, ostream & os, bool mixcont) const
+int InsetCaption::docbook(Buffer const & buf, ostream & os,
+                         OutputParams const & runparams) const
 {
        int ret;
        os << "<title>";
-       ret = InsetText::docbook(buf, os, mixcont);
+       ret = InsetText::docbook(buf, os, runparams);
        os << "</title>\n";
        return ret;
 }
+
+
+auto_ptr<InsetBase> InsetCaption::doClone() const
+{
+       return auto_ptr<InsetBase>(new InsetCaption(*this));
+}