X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_cursor.h;h=59d6a18e630bc7757d873f43586f1f11e69d4323;hb=a97ed20502fb6a19949cf7ef6fc18a6c6d9e347b;hp=b43e1268c605fa852131318e58b752daa6c5769d;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h index b43e1268c6..59d6a18e63 100644 --- a/src/mathed/math_cursor.h +++ b/src/mathed/math_cursor.h @@ -13,8 +13,8 @@ #ifndef MATH_CURSOR #define MATH_CURSOR - #include "math_inset.h" +#include "math_data.h" #include "math_iterator.h" #include @@ -30,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 CursorPos, 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. @@ -207,19 +207,16 @@ public: MathAtom & nextAtom(); /// returns the selection - void getSelection(CursorPos &, CursorPos &) const; + void getSelection(CursorSlice &, CursorSlice &) const; /// returns the normalized anchor of the selection - CursorPos normalAnchor() const; + CursorSlice normalAnchor() const; /// reference to the last item of the path, i.e. "The Cursor" - CursorPos & cursor(); + CursorSlice & cursor(); /// reference to the last item of the path, i.e. "The Cursor" - CursorPos 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 std::string info() const; /// dump selection information for debugging @@ -246,7 +243,9 @@ public: void pullArg(); /// split font inset etc void handleFont(std::string const & font); - + /// + DispatchResult + dispatch(FuncRequest const & cmd); private: /// moves cursor index one cell to the left bool idxLeft();