compilation fix

[lyx.git] / src / cursor.h

diff --git a/src/cursor.h b/src/cursor.h
index c8a63b7de48a1cb1be4a4bdfaa47ec5d2704b049..332bf219fbdc603efb3716f369cb1776a46b833f 100644 (file)
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -18,9 +18,12 @@
 #include <iosfwd>
 #include <vector>
 
+class Buffer;
 class BufferView;
 class FuncStatus;
 class FuncRequest;
+class Point;
+class LyXFont;
 
 // these should go
 class MathUnknownInset;
@@ -37,10 +40,9 @@ public:
        explicit LCursor(BufferView & bv);
 
        /// dispatch from innermost inset upwards
-       DispatchResult dispatch(FuncRequest const & cmd);
-       /// are we willing to handle this event?
-       bool getStatus(FuncRequest const & cmd, FuncStatus & flag);
-
+       void dispatch(FuncRequest const & cmd);
+       /// get the resut of the last dispatch
+       DispatchResult result() const;
        /// add a new cursor slice
        void push(InsetBase & inset);
        /// add a new cursor slice, place cursor on left end
@@ -52,7 +54,7 @@ public:
        /// pop one slice off the cursor stack and go right
        bool popRight();
        /// sets cursor part
-       void setCursor(DocIterator const & it, bool sel);
+       void setCursor(DocIterator const & it);
 
        //
        // selection
@@ -72,36 +74,15 @@ public:
        ///
        void clearSelection();
        /// access start of selection
-       CursorSlice const & selBegin() const;
+       CursorSlice selBegin() const;
        /// access end of selection
-       CursorSlice const & selEnd() const;
+       CursorSlice selEnd() const;
        /// access start of selection
        DocIterator selectionBegin() const;
        /// access start of selection
        DocIterator selectionEnd() const;
        ///
-       std::string grabSelection();
-       ///
-       void eraseSelection();
-       ///
-       std::string grabAndEraseSelection();
-       // other selection methods
-       ///
-       void selCopy();
-       ///
-       void selCut();
-       ///
-       void selDel();
-       /// pastes n-th element of cut buffer
-       void selPaste(size_t n);
-       ///
        void selHandle(bool selecting);
-       /// start selection
-       void selStart();
-       /// clear selection
-       void selClear();
-       /// clears or deletes selection depending on lyxrc setting
-       void selClearOrDel();
        //
        std::string selectionAsString(bool label) const;
        ///
@@ -119,8 +100,6 @@ public:
        bool & macromode() { return macromode_; }
        /// returns x,y position
        void getPos(int & x, int & y) const;
-       /// returns cursor dimension
-       void getDim(int & asc, int & desc) const;
 
        //
        // common part
@@ -137,23 +116,25 @@ public:
        /// insert a string
        void insert(std::string const & str);
 
+       /// in pixels from left of screen
+       int targetX() const;
        /// write acess to target x position of cursor
        int & x_target();
        /// return target x position of cursor
        int x_target() const;
+       /// set targetX in current position
+       void setTargetX();
        /// clear target x position of cursor
        void clearTargetX();
 
-       /// access to selection anchor
-       CursorSlice & anchor();
-       /// access to selection anchor
-       CursorSlice const & anchor() const;
-       /// cache the absolute coordinate from the top inset
-       void updatePos();
+       /// access to normalized selection anchor
+       CursorSlice anchor() const;
        /// sets anchor to cursor position
        void resetAnchor();
        /// access to owning BufferView
        BufferView & bv() const;
+       /// access to owning Buffer
+       Buffer & buffer() const;
        /// get some interesting description of top position
        void info(std::ostream & os) const;
        /// are we in math mode (2), text mode (1) or unsure (0)?
@@ -163,14 +144,16 @@ public:
        void reset(InsetBase &);
        /// for spellchecking
        void replaceWord(std::string const & replacestring);
-       /// update our view
-       void update();
        /// the event was not (yet) dispatched
        void undispatched();
        /// the event was already dispatched
        void dispatched();
+       /// call update() when done
+       void needsUpdate();
        /// don't call update() when done
        void noUpdate();
+       /// fix cursor in circumstances that should never happen
+       void fixIfBroken();
 
        /// output
        friend std::ostream & operator<<(std::ostream & os, LCursor const & cur);
@@ -185,9 +168,8 @@ public:
        ///
        DispatchResult disp_;
 
+
 private:
-       ///
-       int cached_y_;
        /**
         * The target x position of the cursor. This is used for when
         * we have text like :
@@ -206,6 +188,8 @@ private:
        /// are we on the way to get one?
        bool mark_;
 
+private:
+
        //
        // math specific stuff that could be promoted to "global" later
        //
@@ -247,10 +231,6 @@ public:
 
        /// in pixels from top of screen
        void setScreenPos(int x, int y);
-       /// in pixels from left of screen
-       int targetX() const;
-       /// adjust anchor position after deletions/insertions
-       void adjust(pos_type from, int diff);
        /// current offset in the top cell
        /// interpret name a name of a macro
        void macroModeClose();
@@ -270,9 +250,6 @@ public:
        /// mark current cursor trace for redraw
        void touch();
 
-       /// returns the normalized anchor of the selection
-       CursorSlice normalAnchor();
-
        /// hack for reveal codes
        void markInsert();
        void markErase();
@@ -299,12 +276,9 @@ public:
        bool openable(MathAtom const &) const;
        ///
        Encoding const * getEncoding() const;
-
-private:
-       /// moves position closest to (x, y) in current cell
-       void bruteFind2(int x, int y);
-       /// moves position closest to (x, y) in given box
-       bool bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh);
+       /// font at cursor position
+       LyXFont getFont() const;
 };
 
+
 #endif // LYXCURSOR_H