X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=19eeca964b32db2670bdab9110d066eddafe85e7;hb=2f71fca7df3c7149542cadf577395ecedf82bbf5;hp=c33478d523356f1ce029e343097223f192a9ec31;hpb=880b6c4d6ebd6f8e36b340a3efa3cb13108cc478;p=lyx.git diff --git a/src/Cursor.h b/src/Cursor.h index c33478d523..19eeca964b 100644 --- a/src/Cursor.h +++ b/src/Cursor.h @@ -14,8 +14,9 @@ #include "DispatchResult.h" #include "DocIterator.h" +#include "Font.h" +#include "Undo.h" -#include #include @@ -25,7 +26,6 @@ class Buffer; class BufferView; class FuncStatus; class FuncRequest; -class Font; class Row; // these should go @@ -48,19 +48,22 @@ public: DispatchResult result() const; /// add a new cursor slice void push(Inset & inset); - /// add a new cursor slice, place cursor on left end - void pushLeft(Inset & inset); + /// add a new cursor slice, place cursor at front (move backwards) + void pushBackward(Inset & inset); /// pop one level off the cursor void pop(); - /// pop one slice off the cursor stack and go left - bool popLeft(); - /// pop one slice off the cursor stack and go right - bool popRight(); + /// pop one slice off the cursor stack and go backwards + bool popBackward(); + /// pop one slice off the cursor stack and go forward + bool popForward(); /// make sure we are outside of given inset void leaveInset(Inset const & inset); /// sets cursor part void setCursor(DocIterator const & it); + /// + void setCurrentFont(); + // // selection // @@ -68,6 +71,12 @@ public: bool selection() const { return selection_; } /// selection active? bool & selection() { return selection_; } + /// do we have a multicell selection? + bool selIsMultiCell() const + { return selection_ && selBegin().idx() != selEnd().idx(); } + /// do we have a multiline selection? + bool selIsMultiLine() const + { return selection_ && selBegin().pit() != selEnd().pit(); } /// did we place the anchor? bool mark() const { return mark_; } /// did we place the anchor? @@ -86,12 +95,12 @@ public: DocIterator selectionBegin() const; /// access start of selection DocIterator selectionEnd() const; - /// + /// FIXME: document this bool selHandle(bool selecting); - // + /// docstring selectionAsString(bool label) const; /// - docstring currentState(); + docstring currentState() const; /// auto-correct mode bool autocorrect() const { return autocorrect_; } @@ -103,16 +112,54 @@ public: bool & macromode() { return macromode_; } /// returns x,y position void getPos(int & x, int & y) const; + /// return logical positions between which the cursor is situated + /** + * If the cursor is at the edge of a row, the position which is "over the + * edge" will be returned as -1. + */ + void getSurroundingPos(pos_type & left_pos, pos_type & right_pos); /// the row in the paragraph we're in Row const & textRow() const; // // common part // - /// move one step to the left - bool posLeft(); - /// move one step to the right - bool posRight(); + /// move one step backwards + bool posBackward(); + /// move one step forward + bool posForward(); + /// move visually one step to the right + /** + * @note: This method may move into an inset unless skip_inset == true. + * @note: This method may move into a new paragraph. + * @note: This method may move out of the current slice. + * @return: true if moved, false if not moved + */ + bool posVisRight(bool skip_inset = false); + /// move visually one step to the left + /** + * @note: This method may move into an inset unless skip_inset == true. + * @note: This method may move into a new paragraph. + * @note: This method may move out of the current slice. + * @return: true if moved, false if not moved + */ + bool posVisLeft(bool skip_inset = false); + /// move visually to next/previous row + /** + * Assuming we were to keep moving left (right) from the current cursor + * position, place the cursor at the rightmost (leftmost) edge of the + * new row to which we would move according to visual-mode cursor movement. + * This could be either the next or the previous row, depending on the + * direction in which we're moving, and whether we're in an LTR or RTL + * paragraph. + * @note: The new position may even be in a new paragraph. + * @note: This method will not move out of the current slice. + * @return: false if not moved (no more rows to move to in given direction) + * @return: true if moved + */ + bool posVisToNewRow(bool movingLeft); + /// move to right or left extremity of the current row + void posVisToRowExtremity(bool left); /// insert an inset void insert(Inset *); @@ -179,11 +226,49 @@ public: * Not using noUpdate() should never be wrong. */ void noUpdate(); - /// fix cursor in circumstances that should never happen - void fixIfBroken(); + /// fix cursor in circumstances that should never happen. + /// \retval true if a fix occured. + bool fixIfBroken(); /// output friend std::ostream & operator<<(std::ostream & os, Cursor const & cur); + friend LyXErr & operator<<(LyXErr & os, Cursor const & cur); + + /// + bool textUndo(); + /// + bool textRedo(); + + /// makes sure the next operation will be stored + void finishUndo() const; + + /// open a new group of undo operations. Groups can be nested. + void beginUndoGroup() const; + + /// end the current undo group + void endUndoGroup() const; + + /// The general case: prepare undo for an arbitrary range. + void recordUndo(UndoKind kind, pit_type from, pit_type to) const; + + /// Convenience: prepare undo for the range between 'from' and cursor. + void recordUndo(UndoKind kind, pit_type from) const; + + /// Convenience: prepare undo for the single paragraph or cell + /// containing the cursor + void recordUndo(UndoKind kind = ATOMIC_UNDO) const; + + /// Convenience: prepare undo for the inset containing the cursor + void recordUndoInset(UndoKind kind = ATOMIC_UNDO) const; + + /// Convenience: prepare undo for the whole buffer + void recordUndoFullDocument() const; + + /// Convenience: prepare undo for the selected paragraphs or cells + void recordUndoSelection() const; + + /// + void checkBufferStructure(); public: /// @@ -194,6 +279,8 @@ public: /// DispatchResult disp_; + /// + DocIterator const & beforeDispatchCursor() { return beforeDispatchCursor_; } private: /** @@ -220,13 +307,16 @@ private: // of a big inset spanning a whole row and computing coordinates for // displaying the cursor. bool logicalpos_; - /// x position before dispatch started - int beforeDispX_; - /// y position before dispatch started - int beforeDispY_; /// position before dispatch started - size_t beforeDispDepth_; - + DocIterator beforeDispatchCursor_; + +// FIXME: make them private. +public: + /// the current font settings + Font current_font; + /// the current font + Font real_current_font; + private: // @@ -256,12 +346,17 @@ public: /// return false for empty math insets bool backspace(); /// move the cursor up by sending an internal LFUN_UP + /// return true if fullscreen update is needed bool up(); - /// move the cursor up by sending an internal LFUN_DOWN + /// move the cursor up by sending an internal LFUN_DOWN, + /// return true if fullscreen update is needed bool down(); - /// move up/down in a text inset, called for LFUN_UP/DOWN - bool upDownInText(bool up); + /// move up/down in a text inset, called for LFUN_UP/DOWN, + /// return true if successful, updateNeeded set to true if fullscreen + /// update is needed, otherwise it's not touched + bool upDownInText(bool up, bool & updateNeeded); /// move up/down in math or any non text inset, call for LFUN_UP/DOWN + /// return true if successful bool upDownInMath(bool up); /// void plainErase(); @@ -283,14 +378,17 @@ public: bool inMacroMode() const; /// get access to the macro we are currently typing InsetMathUnknown * activeMacro(); + /// get access to the macro we are currently typing + InsetMathUnknown const * activeMacro() const; /// replace selected stuff with at, placing the former // selection in given cell of atom void handleNest(MathAtom const & at, int cell = 0); /// - bool isInside(Inset const *); + bool isInside(Inset const *) const; /// make sure cursor position is valid + /// FIXME: It does a subset of fixIfBroken. Maybe merge them? void normalize(); /// mark current cursor trace for redraw void touch(); @@ -308,7 +406,7 @@ public: /// display an error message void errorMessage(docstring const & msg) const; /// - docstring getPossibleLabel(); + docstring getPossibleLabel() const; /// the name of the macro we are currently inputting docstring macroName(); @@ -323,6 +421,13 @@ public: }; +/** + * Notifies all insets which appear in old, but not in cur. Make + * Sure that the cursor old is valid, i.e. all inset pointers + * point to valid insets! Use Cursor::fixIfBroken if necessary. + */ +bool notifyCursorLeaves(Cursor const & old, Cursor & cur); + } // namespace lyx