The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 59e8f57aa69dc7aeaee13715a0b423c238e7b859..7d41b6df86586c56f04a01fe4834c29f5024a004 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -21,16 +21,18 @@
 #include "Floating.h"
 #include "FloatList.h"
 #include "funcrequest.h"
+#include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
+#include "pariterator.h"
 
-#include "support/std_sstream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
+#include <sstream>
 
 using std::string;
 using std::endl;
@@ -42,10 +44,6 @@ using std::ostringstream;
 
 namespace {
 
-// this should not be hardcoded, but be part of the definition
-// of the float (JMarc)
-string const caplayout("Caption");
-
 string floatname(string const & type, BufferParams const & bp)
 {
        FloatList const & floats = bp.getLyXTextClass().floats();
@@ -68,9 +66,6 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
        params_.type = type;
        params_.width = LyXLength(50, LyXLength::PCW);
        setInsetName(type);
-       LyXTextClass const & tclass = bp.getLyXTextClass();
-       if (tclass.hasLayout(caplayout))
-               paragraphs().begin()->layout(tclass[caplayout]);
 }
 
 
@@ -80,7 +75,7 @@ InsetWrap::~InsetWrap()
 }
 
 
-void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
@@ -88,7 +83,6 @@ void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                InsetWrapMailer::string2params(cmd.argument, params);
                params_.placement = params.placement;
                params_.width     = params.width;
-               cur.bv().update();
                break;
        }
 
@@ -96,13 +90,37 @@ void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                InsetWrapMailer(*this).updateDialog(&cur.bv());
                break;
 
+       case LFUN_MOUSE_RELEASE: {
+               if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
+                       InsetWrapMailer(*this).showDialog(&cur.bv());
+                       break;
+               }
+               InsetCollapsable::doDispatch(cur, cmd);
+               break;
+       }
+
        default:
-               InsetCollapsable::priv_dispatch(cur, cmd);
+               InsetCollapsable::doDispatch(cur, cmd);
                break;
        }
 }
 
 
+bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       switch (cmd.action) {
+       case LFUN_INSET_MODIFY:
+       case LFUN_INSET_DIALOG_UPDATE:
+               flag.enabled(true);
+               return true;
+
+       default:
+               return InsetCollapsable::getStatus(cur, cmd, flag);
+       }
+}
+
+
 void InsetWrapParams::write(ostream & os) const
 {
        os << "Wrap " << type << '\n';
@@ -116,29 +134,25 @@ void InsetWrapParams::write(ostream & os) const
 
 void InsetWrapParams::read(LyXLex & lex)
 {
-       if (lex.isOK()) {
-               lex.next();
-               string token = lex.getString();
-               if (token == "placement") {
-                       lex.next();
-                       placement = lex.getString();
-               } else {
-                       // take countermeasures
-                       lex.pushToken(token);
-               }
+       string token;
+       lex >> token;
+       if (token == "placement")
+               lex >> placement;
+       else {
+               // take countermeasures
+               lex.pushToken(token);
        }
-       if (lex.isOK()) {
+       if (!lex)
+               return;
+       lex >> token;
+       if (token == "width") {
                lex.next();
-               string token = lex.getString();
-               if (token == "width") {
-                       lex.next();
-                       width = LyXLength(lex.getString());
-               } else {
-                       lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
-                              << endl;
-                       // take countermeasures
-                       lex.pushToken(token);
-               }
+               width = LyXLength(lex.getString());
+       } else {
+               lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
+                       << endl;
+               // take countermeasures
+               lex.pushToken(token);
        }
 }
 
@@ -164,7 +178,7 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-auto_ptr<InsetBase> InsetWrap::clone() const
+auto_ptr<InsetBase> InsetWrap::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetWrap(*this));
 }
@@ -199,7 +213,7 @@ int InsetWrap::docbook(Buffer const & buf, ostream & os,
 }
 
 
-bool InsetWrap::insetAllowed(InsetOld::Code code) const
+bool InsetWrap::insetAllowed(InsetBase::Code code) const
 {
        switch(code) {
        case FLOAT_CODE:
@@ -222,18 +236,18 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 
 void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
 {
-       // Now find the caption in the float...
-       ParagraphList::const_iterator tmp = paragraphs().begin();
-       ParagraphList::const_iterator end = paragraphs().end();
+       ParConstIterator pit = par_const_iterator_begin(*this);
+       ParConstIterator end = par_const_iterator_end(*this);
 
-       for (; tmp != end; ++tmp) {
-               if (tmp->layout()->name() == caplayout) {
-                       string const name = floatname(params_.type, buf.params());
+       // Find a caption layout in one of the (child inset's) pars
+       for (; pit != end; ++pit) {
+               if (pit->layout()->labeltype == LABEL_SENSITIVE) {
+                       string const type = params_.type;
                        string const str =
-                               tostr(toclist[name].size() + 1)
-                               + ". " + tmp->asString(buf, false);
-                       lyx::toc::TocItem const item(tmp->id(), 0 , str);
-                       toclist[name].push_back(item);
+                               convert<string>(toclist[type].size() + 1)
+                               + ". " + pit->asString(buf, false);
+                       lyx::toc::TocItem const item(pit->id(), 0 , str);
+                       toclist[type].push_back(item);
                }
        }
 }
@@ -274,6 +288,8 @@ void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params)
        if (!lex || id != "Wrap")
                return print_mailer_error("InsetBoxMailer", in, 2, "Wrap");
 
+       // We have to read the type here!
+       lex >> params.type;
        params.read(lex);
 }