split inset -> inset + updatableinset

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

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index e9b578f0b3182956bb8d692ba4a978829aec0ed6..42dad7d97757bdef22a9dc84b87a581e95348b2d 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -1,9 +1,6 @@
 #ifndef MATH_NESTINSET_H
 #define MATH_NESTINSET_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_diminset.h"
 
@@ -22,9 +19,15 @@ public:
 
        /// the size is usuall some sort of convex hull of the cells
        void metrics(MathMetricsInfo const & mi) const;
+       /// add space for markers
+       void metricsMarkers(int frame = 1) const;
+       /// add space for markers
+       void metricsMarkers2(int frame = 1) const;
        /// draw background if locked
        void draw(MathPainterInfo & pi, int x, int y) const;
-       /// draw two angular markers
+       /// draw selection background
+       void drawSelection(MathPainterInfo & pi,
+               idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const;
        void drawMarkers(MathPainterInfo & pi, int x, int y) const;
        /// draw four angular markers
        void drawMarkers2(MathPainterInfo & pi, int x, int y) const;
@@ -32,6 +35,10 @@ public:
        void substitute(MathMacro const & macro);
        /// identifies NestInsets
        MathNestInset * asNestInset() { return this; }
+       /// identifies NestInsets
+       MathNestInset const * asNestInset() const { return this; }
+       /// get cursor position
+       void getPos(idx_type idx, pos_type pos, int & x, int & y) const;
 
        /// order of movement through the cells when pressing the left key
        bool idxLeft(idx_type & idx, pos_type & pos) const;
@@ -60,16 +67,12 @@ public:
        /// access to the lock
        void lock(bool);
        /// get notification when the cursor leaves this inset
-       void notifyCursorLeaves();
+       void notifyCursorLeaves(idx_type);
 
        /// direct access to the cell
        MathArray & cell(idx_type);
        /// direct access to the cell
        MathArray const & cell(idx_type) const;
-       /// direct access to the cell including the drawing cache
-       MathXArray & xcell(idx_type);
-       /// direct access to the cell including the drawing cache
-       MathXArray const & xcell(idx_type) const;
 
        /// can we move into this cell (see macroarg.h)
        bool isActive() const;
@@ -77,11 +80,11 @@ public:
        void validate(LaTeXFeatures & features) const;
 
        /// match in all cells
-       bool match(MathInset *) const;
+       bool match(MathAtom const &) const;
        /// replace in all cells
        void replace(ReplaceData &);
        /// do we contain a given pattern?
-       bool contains(MathArray const &);
+       bool contains(MathArray const &) const;
        /// glue everything to a single cell
        MathArray glue() const;
 
@@ -90,9 +93,18 @@ public:
        /// is the cursor currently somewhere within this inset?
        virtual bool editing() const;
 
+       /// writes \\, name(), and args in braces and '\\lyxlock' if necessary
+       void write(WriteStream & os) const;
+       /// writes [, name(), and args in []
+       void normalize(NormalStream & os) const;
+
+       /// local dispatcher
+       dispatch_result
+               dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+
 protected:
        /// we store the cells in a vector
-       typedef std::vector<MathXArray> cells_type;
+       typedef std::vector<MathArray> cells_type;
        /// thusly:
        cells_type cells_;
        /// if the inset is locked, it can't be entered with the cursor