Fix math cursor positioning bug

[lyx.git] / src / mathed / math_data.h

diff --git a/src/mathed/math_data.h b/src/mathed/math_data.h
index 920746412d8b32e32e198a7ec589278b119d8561..1720ba44234e01088b48bdd7b98dd7d9d4ea6470 100644 (file)
--- a/src/mathed/math_data.h
+++ b/src/mathed/math_data.h
@@ -1,16 +1,14 @@
 // -*- C++ -*-
-/*
- *  Purpose:     A general purpose resizable array.
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *  Created:     January 1996
+/**
+ * \file math_data.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: None (almost)
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ * \author Lars Gullik Bjønnes
  *
- *  Copyright: 1996, Alejandro Aguilar Sierra
- *                 1997  The LyX Team!
- *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef MATH_DATA_H
@@ -20,26 +18,16 @@
 #include <vector>
 
 #include "math_atom.h"
+#include "dimension.h"
 
-class MathMacro;
 class LaTeXFeatures;
 class ReplaceData;
+class MetricsInfo;
+class PainterInfo;
+class TextMetricsInfo;
+class TextPainter;
 
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
-/** \class MathArray
-    \brief Low level container for math insets
-
-    \author Alejandro Aguilar Sierra
-    \author André Pönitz
-    \author Lars Gullik Bjønnes
-    \version February 2001
-  */
-
 class MathArray : private std::vector<MathAtom> {
 public:
        /// re-use inhertited stuff
@@ -61,10 +49,10 @@ public:
        ///
        typedef size_type idx_type;
        typedef size_type pos_type;
-       
+
 public:
        ///
-       MathArray() {}
+       MathArray();
        ///
        MathArray(const_iterator from, const_iterator to);
        ///
@@ -89,9 +77,9 @@ public:
        ///
        void dump2() const;
        ///
-       void substitute(MathMacro const & macro);
-       ///
        void replace(ReplaceData &);
+       ///
+       void substitute(MathArray const & m);
 
        /// looks for exact match
        bool match(MathArray const & ar) const;
@@ -110,9 +98,60 @@ public:
        MathAtom & operator[](pos_type);
        /// checked read access
        MathAtom const & operator[](pos_type) const;
+       /// rebuild cached metrics information
+       void metrics(MetricsInfo & mi) const;
+       /// rebuild cached metrics information
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       /// redraw cell using cache metrics information
+       void draw(PainterInfo & pi, int x, int y) const;
+       /// rebuild cached metrics information
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
+       /// redraw cell using cache metrics information
+       void drawT(TextPainter & pi, int x, int y) const;
+       /// mark cell for re-drawing
+       void touch() const;
+
+       /// access to cached x coordinate of last drawing
+       int xo() const;
+       /// access to cached y coordinate of last drawing
+       int yo() const;
+       /// access to cached x coordinate of mid point of last drawing
+       int xm() const { return xo() + dim_.wid / 2; }
+       /// access to cached y coordinate of mid point of last drawing
+       int ym() const { return yo() + (dim_.des - dim_.asc) / 2; }
+       /// write access to coordinate;
+       void setXY(int x, int y) const;
+       /// returns x coordinate of given position in the array
+       int pos2x(size_type pos) const;
+       /// returns position of given x coordinate
+       int pos2x(size_type pos, int glue) const;
+       /// returns position of given x coordinate
+       size_type x2pos(int pos) const;
+       /// returns position of given x coordinate fstarting from a certain pos
+       size_type x2pos(int targetx, int glue) const;
+       /// returns distance of this cell to the point given by x and y
+       // assumes valid position and size cache
+       int dist(int x, int y) const;
+
+       /// ascent of this cell above the baseline
+       int ascent() const { return dim_.asc; }
+       /// descent of this cell below the baseline
+       int descent() const { return dim_.des; }
+       /// height of the cell
+       int height() const { return dim_.asc + dim_.des; }
+       /// width of this cell
+       int width() const { return dim_.wid; }
+       /// dimensions of cell
+       Dimension const & dim() const { return dim_; }
+       /// dimensions of cell
+       void setDim(Dimension const & d) const { dim_ = d; }
+
 private:
        /// is this an exact match at this position?
        bool find1(MathArray const & ar, size_type pos) const;
+
+       /// cached dimensions of cell
+       mutable Dimension dim_;
 };
 
 ///