Fix event loop to no longer eat CPU

[lyx.git] / src / mathed / math_fontinset.C

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index c07d9e09d3c1319f3b67e500193cdcbe1fafe84a..ee440305b9785a6575717b6250650b2e229aaadb 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -1,90 +1,96 @@
-#include <config.h>
+/**
+ * \file math_fontinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_fontinset.h"
-#include "debug.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "math_parser.h"
 #include "LaTeXFeatures.h"
-#include "textpainter.h"
+#include "support/std_ostream.h"
 
+using std::string;
+using std::auto_ptr;
 
 
+MathFontInset::MathFontInset(latexkeys const * key)
+       : MathNestInset(1), key_(key)
+{}
 
-MathFontInset::MathFontInset(string const & name)
-       : MathNestInset(1), name_(name)
-{
-       lock(true);
-}
 
-
-MathInset * MathFontInset::clone() const
+auto_ptr<InsetBase> MathFontInset::doClone() const
 {
-       return new MathFontInset(*this);
+       return auto_ptr<InsetBase>(new MathFontInset(*this));
 }
 
 
-void MathFontInset::metrics(MathMetricsInfo & mi) const
+MathInset::mode_type MathFontInset::currentMode() const
 {
-       MathFontSetChanger dummy(mi.base, name_.c_str());
-       xcell(0).metrics(mi);
-       width_   = xcell(0).width();
-       ascent_  = xcell(0).ascent();
-       descent_ = xcell(0).descent();
+       if (key_->extra == "mathmode")
+               return MATH_MODE;
+       if (key_->extra == "textmode")
+               return TEXT_MODE;
+       return UNDECIDED_MODE;
 }
 
 
-void MathFontInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathFontInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       //lyxerr << "MathFontInset::draw\n";
-       MathNestInset::draw(pi, x, y);
-       MathFontSetChanger dummy(pi.base, name_.c_str());
-       xcell(0).draw(pi, x, y);
+       FontSetChanger dummy(mi.base, key_->name.c_str());
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathFontInset::metricsT(TextMetricsInfo const & mi) const
+void MathFontInset::draw(PainterInfo & pi, int x, int y) const
 {
-       xcell(0).metricsT(mi);
-       width_   = xcell(0).width();
-       ascent_  = xcell(0).ascent();
-       descent_ = xcell(0).descent();
+       FontSetChanger dummy(pi.base, key_->name.c_str());
+       cell(0).draw(pi, x + 1, y);
+       drawMarkers(pi, x, y);
+       setPosCache(pi, x, y);
 }
 
 
-void MathFontInset::drawT(TextPainter & pain, int x, int y) const
+void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension &) const
 {
-       //lyxerr << "drawing font code: " << code_ << '\n';
-       xcell(0).drawT(pain, x, y);
+       cell(0).metricsT(mi, dim_);
 }
 
 
-void MathFontInset::write(WriteStream & os) const
+void MathFontInset::drawT(TextPainter & pain, int x, int y) const
 {
-       os << '\\' << name_ << '{' << cell(0) << '}';
+       cell(0).drawT(pain, x, y);
 }
 
 
-void MathFontInset::normalize(NormalStream & os) const
+string MathFontInset::name() const
 {
-       os << "[font_ " << name_ << " " << cell(0) << "]";
+       return key_->name;
 }
 
 
 void MathFontInset::validate(LaTeXFeatures & features) const
 {
+       MathNestInset::validate(features);
        // Make sure amssymb is put in preamble if Blackboard Bold or
        // Fraktur used:
-       if (name_ == "mathfrak" || name_ == "mathbb")
+       if (key_->name == "mathfrak" || key_->name == "mathbb")
                features.require("amssymb");
+       if (key_->name == "text")
+               features.require("amsmath");
 }
 
 
 void MathFontInset::infoize(std::ostream & os) const
 {
-       os << "Font: " << name_;
+       os << "Font: " << key_->name;
 }