fix cursor positioning using the mouse

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 389ce3dc201f33e6b348c10e8d6f71689434c6fd..34f93337891f9851ef2ed385b9fc0977e621b927 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -24,6 +24,7 @@
 #include "math_defs.h"
 
 class MathInset;
+class MathAtom;
 class MathArrayInset;
 class MathFuncInset;
 class MathMatrixInset;
@@ -65,10 +66,6 @@ public:
        ///
        explicit MathCursor(InsetFormulaBase *);
        ///
-       ~MathCursor();
-       ///
-       void insert(char, MathTextCodes t = LM_TC_MIN);
-       ///
        void insert(MathInset *);
        ///
        void insert(MathArray const &);
@@ -77,9 +74,9 @@ public:
        ///
        void backspace();
        ///
-       void home();
+       void home(bool sel = false);
        ///
-       void end();
+       void end(bool sel = false);
        ///
        bool right(bool sel = false);
        ///
@@ -140,8 +137,6 @@ public:
        bool toggleLimits();
        ///
        // Macro mode methods
-       void macroModeOpen();
-       ///
        void macroModeClose();
        ///
        bool inMacroMode() const;
@@ -168,8 +163,6 @@ public:
        ///
        void handleFont(MathTextCodes t);
        ///
-       void handleAccent(string const & name);
-       ///
        void handleDelim(latexkeys const * l, latexkeys const * r);
        ///
        void handleNest(MathInset * p);
@@ -212,13 +205,19 @@ public:
        MathArray & array() const;
        ///
        MathXArray & xarray() const;
+       ///
+       MathAtom const * prevAtom() const;
+       ///
+       MathAtom * prevAtom();
+       ///
+       MathAtom const * nextAtom() const;
+       ///
+       MathAtom * nextAtom();
 
        /// returns the selection
        void getSelection(MathCursorPos &, MathCursorPos &) const;
        /// returns the normalized anchor of the selection
        MathCursorPos normalAnchor() const;
-       /// returns the normalized anchor of the selection
-       bool openable(MathInset *, bool selection, bool useupdown) const;
 
        /// path of positions the cursor had to go if it were leving each inset
        std::vector<MathCursorPos> Cursor_;
@@ -254,8 +253,16 @@ public:
        MathSpaceInset * prevSpaceInset() const;
 private:
        ///
-       int & pos();
+       string macroName() const;
        ///
+       void insert(char, MathTextCodes t = LM_TC_MIN);
+       /// can we enter the inset? 
+       bool openable(MathInset *, bool selection) const;
+       /// can the setPos routine enter that inset?
+       MathInset * positionable(MathAtom *, int x, int y) const;
+       /// write access to cursor cell position
+       int & pos();
+       /// write access to cursor cell index
        int & idx();
        /// x-offset of current cell relative to par xo
        int cellXOffset() const;
@@ -272,8 +279,6 @@ private:
        InsetFormulaBase * const formula_;
        ///
        MathTextCodes lastcode_;
-       ///
-       MathFuncInset * imacro_;
        // Selection stuff
        /// do we currently select
        bool selection_;