Fix math cursor positioning bug

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

diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/math_xyarrowinset.C
index 73f14eac5f6816c1ca3dd81220ad08021dfb608f..5ff8ef3437a01c0ccad5c65393a5aa6d06e3d9a1 100644 (file)
--- a/src/mathed/math_xyarrowinset.C
+++ b/src/mathed/math_xyarrowinset.C
@@ -1,37 +1,46 @@
-#include <config.h>
+/**
+ * \file math_xyarrowinset.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_xyarrowinset.h"
-#include "math_xymatrixinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
 #include "debug.h"
 
 
+using std::max;
+
+
 MathXYArrowInset::MathXYArrowInset()
        : MathNestInset(2)
 {}
 
 
-MathInset * MathXYArrowInset::clone() const
+std::auto_ptr<InsetBase> MathXYArrowInset::clone() const
 {
-       return new MathXYArrowInset(*this);
+       return std::auto_ptr<InsetBase>(new MathXYArrowInset(*this));
 }
 
 
 MathXYMatrixInset const * MathXYArrowInset::targetMatrix() const
 {
-       return mi_.inset ? mi_.inset->asXYMatrixInset() : 0;
+       return target_;
 }
 
 
-MathXArray const & MathXYArrowInset::targetCell() const
+MathArray const & MathXYArrowInset::targetCell() const
 {
+#if 0
        MathXYMatrixInset const * p = targetMatrix();
        int x = 0;
        int y = 0;
@@ -44,69 +53,87 @@ MathXArray const & MathXYArrowInset::targetCell() const
                        case 'd': ++y; break;
                }
        }
-       //lyxerr << "target: x: " << x << " y: " << y << "\n";
-       int n = mi_.idx + p->ncols() * y + x;
-       if (n < 0 || n >= int(p->nargs())) {
-               lyxerr << "source: n: " << mi_.idx << "\n";
-               lyxerr << "target: n: " << n << " out of range\n";
+       //lyxerr << "target: x: " << x << " y: " << y << endl;
+       MathInset::idx_type n = mi_.idx + p->ncols() * y + x;
+       if (n >= p->nargs()) {
+               lyxerr << "source: n: " << mi_.idx << "\n"
+                      << "target: n: " << n << " out of range" << endl;
                n = 0;
        }
-  return p->xcell(n);
+       return p->cell(n);
+#else
+       static MathArray dummy;
+       return dummy;
+#endif
 }
 
 
-MathXArray const & MathXYArrowInset::sourceCell() const
+MathArray const & MathXYArrowInset::sourceCell() const
 {
-  return targetMatrix()->xcell(mi_.idx);
+#if 0
+       return targetMatrix()->cell(mi_.idx);
+#else
+       static MathArray dummy;
+       return dummy;
+#endif
 }
 
 
-void MathXYArrowInset::metrics(MathMetricsInfo const & mi) const
+void MathXYArrowInset::metrics(MetricsInfo & mi) const
 {
-       mi_ = mi;
        MathNestInset::metrics(mi);
+       mi_   = mi;
+       FontSetChanger dummy(mi.base, "textrm");
+#if 0
+       target_ = mi.inset ? mi.inset->asXYMatrixInset() : 0;
 
        if (editing()) {
-               int w    = mathed_string_width(LM_TC_TEXTRM, mi_, "target: ");
-               width_   = w + std::max(xcell(0).width(), xcell(1).width());
-               ascent_  = xcell(0).ascent();
-               descent_ = xcell(0).descent() + xcell(1).height() + 10;
+               int w    = mathed_string_width(mi.base.font, "target: ");
+               width_   = w + max(cell(0).width(), cell(1).width());
+               ascent_  = cell(0).ascent();
+               descent_ = cell(0).descent() + cell(1).height() + 10;
        } else {
                width_   = 0;
                ascent_  = 0;
                descent_ = 0;
-               //mathed_string_dim(LM_TC_TEXTRM, mi_, "X", ascent_, descent_, width_);
+               //mathed_string_dim(font_, "X", ascent_, descent_, width_);
        }
+#endif
 }
 
 
-void MathXYArrowInset::draw(Painter & pain, int x, int y) const
+void MathXYArrowInset::draw(PainterInfo & pi, int x, int y) const
 {
        metrics(mi_);
+       FontSetChanger dummy(pi.base, "textrm");
 
        if (editing()) {
 
+#if 0
+
                int lasc;
                int ldes;
                int lwid;
-               mathed_string_dim(LM_TC_TEXTRM, mi_, "target: ", lasc, ldes, lwid);
+               mathed_string_dim(pi.base.font, "target: ", lasc, ldes, lwid);
 
-               xcell(0).draw(pain, x + lwid, y);
-               drawStr(pain, LM_TC_TEXTRM, mi_, x + 3, y, "target");
-               y += std::max(xcell(0).descent(), ldes) + 5;
+               cell(0).draw(pi, x + lwid, y);
+               drawStr(pi, pi.base.font, x + 3, y, "target");
+               y += max(cell(0).descent(), ldes) + 5;
 
-               y += std::max(xcell(1).ascent(), lasc) + 5;
-               xcell(1).draw(pain, x + lwid, y);
-               drawStr(pain, LM_TC_TEXTRM, mi_, x + 3, y, "label");
+               y += max(cell(1).ascent(), lasc) + 5;
+               cell(1).draw(pi, x + lwid, y);
+               drawStr(pi, pi.base.font, x + 3, y, "label");
+
+#endif
 
        } else {
 
-               //drawStr(pain, LM_TC_TEXTRM, mi_, x, y, "X");
-               MathXArray const & s = sourceCell();
-               MathXArray const & t = targetCell();
-               pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
-               xcell(1).draw(pain, (s.xm() + t.xm())/2, (s.ym() + t.ym())/2);
-               
+               drawStr(pi, font_, x, y, "X");
+               MathArray const & s = sourceCell();
+               MathArray const & t = targetCell();
+               pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
+               cell(1).draw(pi, (s.xm() + t.xm())/2, (s.ym() + t.ym())/2);
+
        }
 }
 
@@ -115,9 +142,9 @@ void MathXYArrowInset::write(WriteStream & os) const
 {
        os << "\\ar";
        if (cell(0).size())
-               os << "[" << cell(0) << "]";
+               os << '[' << cell(0) << ']';
        if (cell(1).size())
-               os << (up_ ? "^" : "_") << "{" << cell(1) << "}";
+               os << (up_ ? '^' : '_') << '{' << cell(1) << '}';
        os << " ";
 }
 
@@ -126,5 +153,5 @@ void MathXYArrowInset::normalize(NormalStream & os) const
 {
        os << "[xyarrow ";
        MathNestInset::normalize(os);
-       os << "]";
+       os << ']';
 }