cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / cursor.h

diff --git a/src/cursor.h b/src/cursor.h
index 773513a16192c9e8abe466e7b5c3d18ab49aaaa8..e934700244e060bdbe3c7b9b197cb0e8d39cfa9d 100644 (file)
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -26,7 +26,7 @@ class Point;
 class LyXFont;
 
 // these should go
-class MathUnknownInset;
+class InsetMathUnknown;
 class Encoding;
 
 
@@ -86,9 +86,7 @@ public:
        ///
        void selHandle(bool selecting);
        //
-       std::string selectionAsString(bool label) const;
-       ///
-       void paste(std::string const & data);
+       lyx::docstring selectionAsString(bool label) const;
        ///
        std::string currentState();
 
@@ -114,7 +112,7 @@ public:
        /// insert an inset
        void insert(InsetBase *);
        /// insert a single char
-       void insert(char c);
+       void insert(lyx::char_type c);
        /// insert a string
        void insert(std::string const & str);
 
@@ -206,6 +204,11 @@ private:
        bool selection_;
        /// are we on the way to get one?
        bool mark_;
+       /// If true, we are behind the previous char, otherwise we are in front
+       // of the next char. This only make a difference when we are in front
+       // of a big inset spanning a whole row and computing coordinates for
+       // displaying the cursor.
+       bool logicalpos_;
 
 private:
 
@@ -251,12 +254,14 @@ public:
        /// in pixels from top of screen
        void setScreenPos(int x, int y);
        /// current offset in the top cell
-       /// interpret name a name of a macro
-       void macroModeClose();
+
+       /// interpret name a name of a macro. Returns true if
+       /// something got inserted.
+       bool macroModeClose();
        /// are we currently typing the name of a macro?
        bool inMacroMode() const;
        /// get access to the macro we are currently typing
-       MathUnknownInset * activeMacro();
+       InsetMathUnknown * activeMacro();
 
        /// replace selected stuff with at, placing the former
        // selection in given cell of atom
@@ -278,9 +283,9 @@ public:
        void handleFont(std::string const & font);
 
        /// display a message
-       void message(std::string const & msg) const;
+       void message(lyx::docstring const & msg) const;
        /// display an error message
-       void errorMessage(std::string const & msg) const;
+       void errorMessage(lyx::docstring const & msg) const;
        ///
        std::string getPossibleLabel();