merge CursorItem and MathPos

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 91ab25e4703af870bc4336e3233cfdd18f6812e7..59d6a18e630bc7757d873f43586f1f11e69d4323 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -1,26 +1,24 @@
 // -*- C++ -*-
 /**
- *  File:        math_cursor.h
- *  Purpose:     Declaration of interaction classes for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *  Created:     January 1996
- *  Description: MathCursor control all user interaction
+ * \file math_cursor.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: Xlib, XForms
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, Alejandro Aguilar Sierra
- *
- *   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_CURSOR
 #define MATH_CURSOR
 
-
 #include "math_inset.h"
+#include "math_data.h"
 #include "math_iterator.h"
-#include "LString.h"
+
+#include <string>
+
 
 class InsetFormulaBase;
 class BufferView;
@@ -32,7 +30,7 @@ class MathUnknownInset;
 [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 MathCursorPos, each of which is made
+World. It contains a stack of CursorSlice, 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.
 
@@ -63,7 +61,9 @@ public:
        ///
        void insert(MathArray const &);
        ///
-       void paste(string const & data);
+       void insert2(std::string const &);
+       ///
+       void paste(std::string const & data);
        /// return false for empty math insets
        bool erase();
        /// return false for empty math insets
@@ -95,7 +95,7 @@ public:
        ///
        void niceInsert(MathAtom const &);
        ///
-       void niceInsert(string const &);
+       void niceInsert(std::string const &);
 
        /// in pixels from top of screen
        void setPos(int x, int y);
@@ -104,7 +104,7 @@ public:
        /// in pixels from left of screen
        int targetX() const;
        /// current inset
-       MathInset * par() const;
+       MathInset * inset() const;
        /// return the next enclosing grid inset and the cursor's index in it
        MathGridInset * enclosingGrid(idx_type & idx) const;
        /// go up to enclosing grid
@@ -150,7 +150,7 @@ public:
        ///
        void selDel();
        /// pastes n-th element of cut buffer
-       void selPaste(int n);
+       void selPaste(size_t n);
        ///
        void selHandle(bool);
        ///
@@ -161,10 +161,11 @@ public:
        void selClearOrDel();
        /// draws light-blue selection background
        void drawSelection(PainterInfo & pi) const;
-       ///
-       void handleNest(MathAtom const & at);
+       /// replace selected stuff with at, placing the former
+       // selection in given cell of atom
+       void handleNest(MathAtom const & at, int cell = 0);
        /// remove this as soon as LyXFunc::getStatus is "localized"
-       string getLastCode() const { return "mathnormal"; }
+       std::string getLastCode() const { return "mathnormal"; }
        ///
        bool isInside(MathInset const *) const;
        ///
@@ -206,21 +207,18 @@ public:
        MathAtom & nextAtom();
 
        /// returns the selection
-       void getSelection(MathCursorPos &, MathCursorPos &) const;
+       void getSelection(CursorSlice &, CursorSlice &) const;
        /// returns the normalized anchor of the selection
-       MathCursorPos normalAnchor() const;
+       CursorSlice normalAnchor() const;
 
        /// reference to the last item of the path, i.e. "The Cursor"
-       MathCursorPos & cursor();
+       CursorSlice & cursor();
        /// reference to the last item of the path, i.e. "The Cursor"
-       MathCursorPos const & cursor() const;
+       CursorSlice const & cursor() const;
        /// how deep are we nested?
        unsigned depth() const;
-
-       /// local dispatcher
-       dispatch_result dispatch(FuncRequest const & cmd);
        /// describe the situation
-       string info() const;
+       std::string info() const;
        /// dump selection information for debugging
        void seldump(char const * str) const;
        /// dump selection information for debugging
@@ -228,13 +226,13 @@ public:
        /// moves on
        void setSelection(MathIterator const & where, size_type n);
        /// grab selection marked by anchor and current cursor
-       string grabSelection() const;
+       std::string grabSelection() const;
        /// guess what
-       string grabAndEraseSelection();
+       std::string grabAndEraseSelection();
        ///
        void insert(char c);
        ///
-       void insert(string const & str);
+       void insert(std::string const & str);
        /// lock/unlock inset
        void insetToggle();
 
@@ -244,8 +242,10 @@ public:
        /// injects content of a cell into parent
        void pullArg();
        /// split font inset etc
-       void handleFont(string const & font);
-
+       void handleFont(std::string const & font);
+       ///
+       DispatchResult
+       dispatch(FuncRequest const & cmd);
 private:
        /// moves cursor index one cell to the left
        bool idxLeft();
@@ -270,7 +270,7 @@ private:
        void eraseSelection();
 
        /// the name of the macro we are currently inputting
-       string macroName() const;
+       std::string macroName() const;
        /// where in the curent cell does the macro name start?
        difference_type macroNamePos() const;
        /// can we enter the inset?