try to correct x position where curosr drops of inset.

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index df32032dc9da365d00ad0c311541cee10a959117..74903c75c07121265146adf4814018ab1db2ad6a 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -22,10 +22,11 @@
 #endif
 
 #include "math_inset.h"
-#include "math_pos.h"
+#include "math_iterator.h"
 #include "LString.h"
 
 class InsetFormulaBase;
+class BufferView;
 class MathPainterInfo;
 class MathUnknownInset;
 class Selection;
@@ -35,9 +36,9 @@ class Selection;
 [Have a look at math_inset.h first]
 
 The MathCursor is different from the kind of cursor used in the Outer
-World. It contains a stack of MathCursorPositions, each of which is made
+World. It contains a stack of MathCursorPos, each of which is made
 up of a inset pointer, an index and a position offset, marking a path from
-this formula's mathHullInset to the current position.
+this formula's MathHullInset to the current position.
 
 */
 
@@ -54,8 +55,6 @@ public:
        typedef MathInset::row_type        row_type;
        /// type for column numbers
        typedef MathInset::col_type        col_type;
-       /// how to store a cursor
-       typedef std::vector<MathCursorPos> cursor_type;
 
        ///
        explicit MathCursor(InsetFormulaBase *, bool left);
@@ -100,22 +99,22 @@ public:
        ///
        void niceInsert(MathAtom const &);
 
-       ///
-       void delLine();
        /// in pixels from top of screen
        void setPos(int x, int y);
        /// in pixels from top of screen
-       void getPos(int & x, int & y);
+       void getPos(int & x, int & y) const;
+       /// in pixels from left of screen
+       int targetX() const;
        /// current inset
        MathInset * par() const;
        /// return the next enclosing grid inset and the cursor's index in it
        MathGridInset * enclosingGrid(idx_type & idx) const;
-       /// return the next enclosing hull inset and the cursor's index in it
-       MathHullInset * enclosingHull(idx_type & idx) const;
        /// go up to enclosing grid
        void popToEnclosingGrid();
        /// go up to the hull inset
        void popToEnclosingHull();
+       /// go up to the hull inset
+       void popToHere(MathInset const * p);
        ///
        InsetFormulaBase * formula() const;
        /// current offset in the current cell
@@ -135,11 +134,15 @@ public:
        /// interpret name a name of a macro
        void macroModeClose();
        /// are we currently typing the name of a macro?
-       MathUnknownInset * inMacroMode() const;
+       bool inMacroMode() const;
+       /// get access to the macro we are currently typing
+       MathUnknownInset * activeMacro();
+       /// get access to the macro we are currently typing
+       MathUnknownInset const * activeMacro() const;
        /// are we currently typing '#1' or '#2' or...?
        bool inMacroArgMode() const;
-       /// are we in an mbox?
-       bool inMathMode() const;
+       /// are we in math mode (1), text mode (-1) or unsure?
+       MathInset::mode_type currentMode() const;
 
        // Local selection methods
        ///
@@ -166,30 +169,14 @@ public:
        void drawSelection(MathPainterInfo & pain) const;
        ///
        void handleNest(MathAtom const & at);
-       /// splits cells and shifts right part to the next cell
-       void splitCell();
-       /// splits line and insert new row of cell
-       void breakLine();
-       /// read contents of line into an array
-       void readLine(MathArray & ar) const;
        /// remove this as soon as LyXFunc::getStatus is "localized"
        string getLastCode() const { return "mathnormal"; }
        ///
-       void pullArg(bool goright);
-       ///
        bool isInside(MathInset const *) const;
        ///
        char valign() const;
        ///
        char halign() const;
-       ///
-       col_type hullCol() const;
-       ///
-       row_type hullRow() const;
-       ///
-       col_type gridCol() const;
-       ///
-       row_type gridRow() const;
 
        /// make sure cursor position is valid
        void normalize();
@@ -212,8 +199,6 @@ public:
        ///
        MathArray & array() const;
        ///
-       MathXArray & xarray() const;
-       ///
        bool hasPrevAtom() const;
        ///
        bool hasNextAtom() const;
@@ -239,7 +224,7 @@ public:
        unsigned depth() const;
 
        /// local dispatcher
-       int dispatch(string const & cmd);
+       MathInset::result_type dispatch(FuncRequest const & cmd);
        /// describe the situation
        string info() const;
        /// dump selection information for debugging
@@ -247,7 +232,7 @@ public:
        /// dump selection information for debugging
        void dump(char const * str) const;
        /// moves on
-       void setSelection(cursor_type const & where, size_type n);
+       void setSelection(MathIterator const & where, size_type n);
        ///
        void insert(char c);
        ///
@@ -258,19 +243,19 @@ public:
        /// hack for reveal codes
        void markInsert();
        void markErase();
-       void handleExtern(string const & arg);
+       //void handleExtern(string const & arg);
 
        ///
        friend class Selection;
 
 
 private:
+       /// injects content of a cell into parent
+       void pullArg();
        /// moves cursor index one cell to the left
        bool idxLeft();
        /// moves cursor index one cell to the right
        bool idxRight();
-       /// moves cursor to beginning first cell of current line
-       bool idxLineFirst();
        /// moves cursor to end of last cell of current line
        bool idxLineLast();
        /// moves cursor position one cell to the left
@@ -281,6 +266,8 @@ private:
        bool goUpDown(bool up);
        /// moves position into box
        bool bruteFind(int xo, int yo, int xlow, int xhigh, int ylow, int yhigh);
+       /// are we in a nucleus of a script inset?
+       bool inNucleus() const;
 
 
        /// grab grid marked by anchor and current cursor 
@@ -302,9 +289,9 @@ private:
        idx_type & idx();
 
        /// path of positions the cursor had to go if it were leaving each inset
-       cursor_type Cursor_;
+       MathIterator Cursor_;
        /// path of positions the anchor had to go if it were leaving each inset
-       mutable cursor_type Anchor_;
+       mutable MathIterator Anchor_;
        /// pointer to enclsing LyX inset
        InsetFormulaBase * formula_;
        // Selection stuff
@@ -321,5 +308,6 @@ private:
 };
 
 extern MathCursor * mathcursor;
+void releaseMathCursor(BufferView * bv);
 
 #endif