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 19f2b20a12a9816d6d87be33f8a0f516566af2f5..a3f37890eaba315270a4c4b8a578c12a972787c5 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -5,47 +5,59 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #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 std::ostream;
+#include <sstream>
+
+
+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(0, InsetText::LOCKED);
-       setFrameColor(0, LColor::captionframe);
+       setDrawFrame(true);
+       setFrameColor(LColor::captionframe);
 }
 
 
-void InsetCaption::write(Buffer const * buf, ostream & os) const
+void InsetCaption::write(Buffer const & buf, ostream & os) const
 {
        os << "Caption\n";
-       writeParagraphData(buf, os);
+       text_.write(buf, os);
 }
 
 
-
-void InsetCaption::read(Buffer const * buf, LyXLex & lex)
+void InsetCaption::read(Buffer const & buf, LyXLex & lex)
 {
 #if 0
        // We will enably this check again when the compability
@@ -66,8 +78,7 @@ string const InsetCaption::editMessage() const
 }
 
 
-void InsetCaption::draw(BufferView * bv, LyXFont const & f,
-                       int baseline, float & x) const
+void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 {
        // We must draw the label, we should get the label string
        // from the enclosing float inset.
@@ -77,36 +88,41 @@ void InsetCaption::draw(BufferView * bv, LyXFont const & f,
 
        // See if we can find the name of the float this caption
        // belongs to.
-       Inset * i1 = owner();
-       Inset * 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
-               lyx::Assert(0);
+               BOOST_ASSERT(false);
 
        FloatList const & floats =
-               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 = "#";
 
        // Generate the label
        string const label = bformat("%1$s %2$s:", _(fl), num);
-       Painter & pain = bv->painter();
-       int const w = font_metrics::width(label, f);
-       pain.text(int(x), baseline, label, f);
-       x += w;
-
-       InsetText::draw(bv, f, baseline, x);
+       int const w = font_metrics::width(label, pi.base.font);
+       pi.pain.text(x, y, label, pi.base.font);
+       InsetText::draw(pi, x + w, y);
 }
 
 
-int InsetCaption::latex(Buffer const * buf, ostream & os, LatexRunParams const & runparams,
-                       bool fragile, bool free_spc) const
+int InsetCaption::latex(Buffer const & buf, ostream & os,
+                       OutputParams const & runparams) const
 {
        // This is a bit too simplistic to take advantage of
        // caption options we must add more later. (Lgb)
@@ -114,25 +130,32 @@ int InsetCaption::latex(Buffer const * buf, ostream & os, LatexRunParams const &
        // \caption{...}, later we will make it take advantage
        // of the one of the caption packages. (Lgb)
        ostringstream ost;
-       int const l = InsetText::latex(buf, ost, runparams, fragile, free_spc);
+       int const l = InsetText::latex(buf, ost, runparams);
        os << "\\caption{" << ost.str() << "}\n";
        return l + 1;
 }
 
 
-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));
+}