X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=c2c7a5d87361b688b7c0c454f395188c036e15a8;hb=b6846bdace3bb9e8619faeea2a0921d7664c3a61;hp=b34c6762236c4aef3e1de0fa36a9c9483be9590c;hpb=a1e991a82ea76d66aaca4e781df920d20bed59b0;p=lyx.git diff --git a/src/Cursor.h b/src/Cursor.h index b34c676223..c2c7a5d873 100644 --- a/src/Cursor.h +++ b/src/Cursor.h @@ -50,7 +50,7 @@ public: /// dispatch from innermost inset upwards void dispatch(FuncRequest const & cmd); /// get the resut of the last dispatch - DispatchResult result() const; + DispatchResult const & result() const; /// add a new cursor slice void push(Inset & inset); /// add a new cursor slice, place cursor at front (move backwards) @@ -201,7 +201,11 @@ public: int textTargetOffset() const; /// access to normalized selection anchor - CursorSlice anchor() const; + CursorSlice normalAnchor() const; + // FIXME: this can't be a const & and a const function because + // LFUN_TAB_* wants to move the real anchor. + /// access to real selection anchor + DocIterator & realAnchor(); /// sets anchor to cursor position void resetAnchor(); /// access to owning BufferView @@ -285,18 +289,20 @@ public: void checkBufferStructure(); public: +//private: + + /// + DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; } + /// + void saveBeforeDispatchPosXY(); + +private: /// BufferView * bv_; -//private: /// the anchor position DocIterator anchor_; - /// mutable DispatchResult disp_; - /// - DocIterator const & beforeDispatchCursor() { return beforeDispatchCursor_; } - -private: /** * The target x position of the cursor. This is used for when * we have text like : @@ -325,6 +331,10 @@ private: bool logicalpos_; /// position before dispatch started DocIterator beforeDispatchCursor_; + /// cursor screen coordinates before dispatch started + int beforeDispatchPosX_; + int beforeDispatchPosY_; + // FIXME: make them private. public: