swallow <Return> events in mathed. Should mimic 1.3.x behaviour.

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

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 77ce4d5e56d122eb7c3974fc12988af320f4c663..7bb9f08f22e95e9e42625d971e7f2316dfa12a31 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -41,7 +41,9 @@ public:
        /// get cursor position
        void getCursorPos(CursorSlice const & cur, int & x, int & y) const;
        ///
-       void edit(LCursor & cur, int, int);
+       void edit(LCursor & cur, bool left);
+       ///
+       InsetBase * editXY(LCursor & cur, int x, int y);
 
        /// order of movement through the cells when pressing the left key
        bool idxLeft(LCursor &) const;
@@ -58,11 +60,6 @@ public:
        /// target pos when we enter the inset from the right by pressing "Left"
        bool idxLast(LCursor &) const;
 
-       /// where should we go if we press home?
-       bool idxHome(LCursor &) const;
-       /// where should we go if we press end?
-       bool idxEnd(LCursor &) const;
-
        /// number of cells currently governed by us
        idx_type nargs() const;
        /// access to the lock
@@ -70,7 +67,7 @@ public:
        /// access to the lock
        void lock(bool);
        /// get notification when the cursor leaves this inset
-       void notifyCursorLeaves(idx_type);
+       void notifyCursorLeaves(LCursor & cur);
 
        /// direct access to the cell
        MathArray & cell(idx_type);
@@ -96,15 +93,37 @@ public:
        void write(WriteStream & os) const;
        /// writes [, name(), and args in []
        void normalize(NormalStream & os) const;
+       ///
+       int latex(Buffer const &, std::ostream & os,
+                       OutputParams const & runparams) const;
+
 protected:
        ///
-       DispatchResult priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+       void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+       /// do we want to handle this event?
+       bool getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & status) const;
        ///
        void handleFont(LCursor & cur,
                std::string const & arg, std::string const & font);
        ///
        void handleFont2(LCursor & cur, std::string const & arg);
 
+       ///
+       bool interpret(LCursor & cur, char c);
+       ///
+       bool script(LCursor & cur, bool);
+
+
+private:
+       /// lfun handler
+       void lfunMousePress(LCursor &, FuncRequest &);
+       ///
+       void lfunMouseRelease(LCursor &, FuncRequest &);
+       ///
+       void lfunMouseMotion(LCursor &, FuncRequest &);
+
+protected:
        /// we store the cells in a vector
        typedef std::vector<MathArray> cells_type;
        /// thusly: