The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 9d8e51eb43cca743245898c31c6133a8daf37fc6..df6efba2dbcfbb2af76576f1600cbae6d22c492e 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -38,6 +38,7 @@
 using std::string;
 using std::auto_ptr;
 using std::istringstream;
+using std::max;
 using std::ostream;
 using std::ostringstream;
 
@@ -45,22 +46,27 @@ using std::ostringstream;
 void InsetCharStyle::init()
 {
        setInsetName("CharStyle");
-       setStatus(Inlined);
+       setInlined();
        setDrawFrame(false);
        has_label_ = true;
 }
 
 
+InsetCharStyle::InsetCharStyle(BufferParams const & bp, string const s)
+       : InsetCollapsable(bp)
+{
+       params_.type = s;
+       setUndefined();
+       init();
+}
+
+
 InsetCharStyle::InsetCharStyle(BufferParams const & bp,
                                CharStyles::iterator cs)
        : InsetCollapsable(bp)
 {
        params_.type = cs->name;
-       params_.latextype = cs->latextype;
-       params_.latexname = cs->latexname;
-       params_.latexparam = cs->latexparam;
-       params_.font = cs->font;
-       params_.labelfont = cs->labelfont;
+       setDefined(cs);
        init();
 }
 
@@ -78,6 +84,33 @@ auto_ptr<InsetBase> InsetCharStyle::doClone() const
 }
 
 
+bool InsetCharStyle::undefined() const
+{
+       return params_.latexname.empty();
+}
+
+
+void InsetCharStyle::setUndefined()
+{
+       params_.latextype.clear();
+       params_.latexname.clear();
+       params_.latexparam.clear();
+       params_.font = LyXFont(LyXFont::ALL_INHERIT);
+       params_.labelfont = LyXFont(LyXFont::ALL_INHERIT);
+       params_.labelfont.setColor(LColor::error);
+}
+
+
+void InsetCharStyle::setDefined(CharStyles::iterator cs)
+{
+       params_.latextype = cs->latextype;
+       params_.latexname = cs->latexname;
+       params_.latexparam = cs->latexparam;
+       params_.font = cs->font;
+       params_.labelfont = cs->labelfont;
+}
+
+
 string const InsetCharStyle::editMessage() const
 {
        return _("Opened CharStyle Inset");
@@ -94,7 +127,7 @@ void InsetCharStyle::write(Buffer const & buf, ostream & os) const
 void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
 {
        InsetCollapsable::read(buf, lex);
-       setStatus(Inlined);
+       setInlined();
 }
 
 
@@ -102,8 +135,30 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        LyXFont tmpfont = mi.base.font;
        getDrawFont(mi.base.font);
+       mi.base.font.reduce(LyXFont(LyXFont::ALL_SANE));
+       mi.base.font.realize(tmpfont);
+       mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
        InsetText::metrics(mi, dim);
        mi.base.font = tmpfont;
+       if (has_label_) {
+               // consider width of the inset label
+               LyXFont font(params_.labelfont);
+               font.realize(LyXFont(LyXFont::ALL_SANE));
+               font.decSize();
+               font.decSize();
+               int w = 0;
+               int a = 0;
+               int d = 0;
+               string s(params_.type);
+               if (undefined())
+                       s = _("Undef: ") + s;
+               font_metrics::rectText(s, font, w, a, d);
+               dim.wid = max(dim.wid, w);
+       }
+       dim.asc += TEXT_TO_INSET_OFFSET;
+       dim.des += TEXT_TO_INSET_OFFSET;
+       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+       mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
        dim_ = dim;
        if (has_label_)
                dim_.des += ascent();
@@ -116,6 +171,8 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 
        LyXFont tmpfont = pi.base.font;
        getDrawFont(pi.base.font);
+       // I don't understand why the above .reduce and .realize aren't
+       //needed, or even wanted, here. It just works. -- MV 10.04.2005
        InsetText::draw(pi, x, y);
        pi.base.font = tmpfont;
 
@@ -124,9 +181,9 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
                desc -= ascent();
 
        pi.pain.line(x, y + desc - 4, x, y + desc, params_.labelfont.color());
-       pi.pain.line(x, y + desc, x + dim_.wid - 2, y + desc,
+       pi.pain.line(x, y + desc, x + dim_.wid - 3, y + desc,
                params_.labelfont.color());
-       pi.pain.line(x + dim_.wid - 2, y + desc, x + dim_.wid - 2, y + desc - 4,
+       pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
                params_.labelfont.color());
 
        // the name of the charstyle. Can be toggled.
@@ -138,9 +195,12 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
                int w = 0;
                int a = 0;
                int d = 0;
-               font_metrics::rectText(params_.type, font, w, a, d);
+               string s(params_.type);
+               if (undefined())
+                       s = _("Undef: ") + s;
+               font_metrics::rectText(s, font, w, a, d);
                pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
-                       params_.type, font, LColor::none, LColor::none);
+                       s, font, LColor::none, LColor::none);
        }
 
        // a visual clue when the cursor is inside the inset
@@ -149,9 +209,9 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
                y -= ascent();
                pi.pain.line(x, y + 4, x, y, params_.labelfont.color());
                pi.pain.line(x + 4, y, x, y, params_.labelfont.color());
-               pi.pain.line(x + dim_.wid - 2, y + 4, x + dim_.wid - 2, y,
+               pi.pain.line(x + dim_.wid - 3, y + 4, x + dim_.wid - 3, y,
                        params_.labelfont.color());
-               pi.pain.line(x + dim_.wid - 6, y, x + dim_.wid - 2, y,
+               pi.pain.line(x + dim_.wid - 7, y, x + dim_.wid - 3, y,
                        params_.labelfont.color());
        }
 }
@@ -163,19 +223,19 @@ void InsetCharStyle::getDrawFont(LyXFont & font) const
 }
 
 
-void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetCharStyle::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       setStatus(Inlined);
+       setInlined();
        switch (cmd.action) {
                case LFUN_MOUSE_PRESS:
                        if (cmd.button() == mouse_button::button3)
                                has_label_ = !has_label_;
                        else
-                               InsetText::priv_dispatch(cur, cmd);
+                               InsetText::doDispatch(cur, cmd);
                        break;
 
                default:
-                       InsetCollapsable::priv_dispatch(cur, cmd);
+                       InsetCollapsable::doDispatch(cur, cmd);
                        break;
        }
 }
@@ -201,12 +261,15 @@ bool InsetCharStyle::getStatus(LCursor & cur, FuncRequest const & cmd,
 int InsetCharStyle::latex(Buffer const & buf, ostream & os,
                     OutputParams const & runparams) const
 {
-       os << "\\" << params_.latexname;
-       if (!params_.latexparam.empty())
-               os << params_.latexparam;
-       os << "{";
+       if (!undefined()) {
+               os << "\\" << params_.latexname;
+               if (!params_.latexparam.empty())
+                       os << params_.latexparam;
+               os << "{";
+       }
        int i = InsetText::latex(buf, os, runparams);
-       os << "}";
+       if (!undefined())
+               os << "}";
        return i;
 }
 
@@ -214,9 +277,11 @@ int InsetCharStyle::latex(Buffer const & buf, ostream & os,
 int InsetCharStyle::linuxdoc(Buffer const & buf, ostream & os,
                             OutputParams const & runparams) const
 {
-       sgml::openTag(os, params_.latexname, params_.latexparam);
+       if (!undefined())
+               sgml::openTag(os, params_.latexname, params_.latexparam);
        int i = InsetText::linuxdoc(buf, os, runparams);
-       sgml::closeTag(os, params_.latexname);
+       if (!undefined())
+               sgml::closeTag(os, params_.latexname);
        return i;
 }
 
@@ -227,15 +292,19 @@ int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
        ParagraphList::const_iterator par = paragraphs().begin();
         ParagraphList::const_iterator end = paragraphs().end();
 
-       sgml::openTag(os, params_.latexname, par->getID(buf, runparams) + params_.latexparam);
+       if (!undefined())
+               sgml::openTag(os, params_.latexname,
+                       par->getID(buf, runparams) + params_.latexparam);
 
         for (; par != end; ++par) {
                par->simpleDocBookOnePar(buf, os, runparams,
-                                        outerFont(par - paragraphs().begin(),
+                                outerFont(par - paragraphs().begin(),
                                                   paragraphs()));
         }
 
-       sgml::closeTag(os, params_.latexname);
+       if (!undefined())
+               sgml::closeTag(os, params_.latexname);
+
        return 0;
 }
 
@@ -247,9 +316,18 @@ int InsetCharStyle::plaintext(Buffer const & buf, ostream & os,
 }
 
 
+int InsetCharStyle::textString(Buffer const & buf, ostream & os,
+                      OutputParams const & op) const
+{
+       return plaintext(buf, os, op);
+}
+
+
 void InsetCharStyle::validate(LaTeXFeatures & features) const
 {
+       // Force inclusion of preamble snippet in layout file
        features.require(params_.type);
+       InsetText::validate(features);
 }