X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=719a2cbd4f8138e49259badd6abd6ac065cb22ce;hb=badbd3dcc344f125e301a795c33d2c67cde8d97e;hp=a3efffed1a657fdffba47ecc8854322248b4d4ed;hpb=4c7fdddd74ffdcc011102059c4448f98778f87b2;p=lyx.git diff --git a/src/Cursor.h b/src/Cursor.h index a3efffed1a..719a2cbd4f 100644 --- a/src/Cursor.h +++ b/src/Cursor.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -17,6 +17,8 @@ #include "Font.h" #include "Undo.h" +#include "mathed/MathParser_flags.h" + #include @@ -34,19 +36,18 @@ class Encoding; /// The cursor class describes the position of a cursor within a document. - -// The public inheritance should go in favour of a suitable data member -// (or maybe private inheritance) at some point of time. class Cursor : public DocIterator { public: /// create the cursor of a BufferView explicit Cursor(BufferView & bv); + /// returns true if we made a decision + bool getStatus(FuncRequest const & cmd, FuncStatus & flag) const; /// 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) @@ -61,6 +62,8 @@ public: void leaveInset(Inset const & inset); /// sets cursor part void setCursor(DocIterator const & it); + /// sets the cursor to the normalized selection anchor + void setCursorToAnchor(); /// void setCurrentFont(); @@ -78,6 +81,10 @@ public: /// do we have a multiline selection? bool selIsMultiLine() const { return selection_ && selBegin().pit() != selEnd().pit(); } + /// + void setWordSelection(bool set) { word_selection_ = set; } + /// + bool wordSelection() { return word_selection_; } /// did we place the anchor? bool mark() const { return mark_; } /// did we place the anchor? @@ -191,20 +198,22 @@ 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 BufferView & bv() const; - /// access to owning Buffer - Buffer & buffer() const; /// get some interesting description of top position void info(odocstream & os) const; /// are we in math mode (2), text mode (1) or unsure (0)? int currentMode(); - /// reset cursor bottom to the beginning of the given inset + /// reset cursor bottom to the beginning of the top inset // (sort of 'chroot' environment...) - void reset(Inset &); + void reset(); /// for spellchecking void replaceWord(std::string const & replacestring); /** @@ -219,8 +228,14 @@ public: void undispatched(); /// the event was already dispatched void dispatched(); - /// Set which update should be done - void updateFlags(Update::flags f); + /// Set which screen update should be done + void screenUpdateFlags(Update::flags f); + /// Forces an updateBuffer() call + void forceBufferUpdate(); + /// Removes any pending updateBuffer() call + void clearBufferUpdate(); + /// Do we need to call updateBuffer()? + bool needBufferUpdate() const; /** * don't call update() when done * @@ -229,9 +244,9 @@ public: * not need to be re-drawn and all entries in the coord cache stay * valid (and there are no other things to put in the coord cache). * This is a fairly rare event as well and only some optimization. - * Not using noUpdate() should never be wrong. + * Not using noScreenUpdate() should never be wrong. */ - void noUpdate(); + void noScreenUpdate(); /// fix cursor in circumstances that should never happen. /// \retval true if a fix occured. bool fixIfBroken(); @@ -277,18 +292,20 @@ public: void checkBufferStructure(); public: - /// - BufferView * bv_; //private: - /// the anchor position - DocIterator anchor_; /// - DispatchResult disp_; + DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; } /// - DocIterator const & beforeDispatchCursor() { return beforeDispatchCursor_; } - + void saveBeforeDispatchPosXY(); + private: + /// + BufferView * bv_; + /// the anchor position + DocIterator anchor_; + /// + mutable DispatchResult disp_; /** * The target x position of the cursor. This is used for when * we have text like : @@ -308,6 +325,8 @@ private: bool selection_; /// are we on the way to get one? bool mark_; + /// are we in word-selection mode? This is set when double clicking. + bool word_selection_; /// 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 @@ -315,6 +334,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: @@ -357,6 +380,8 @@ public: /// move the cursor up by sending an internal LFUN_DOWN, /// return true if fullscreen update is needed bool down(); + /// whether the cursor is either at the first or last row + bool atFirstOrLastRow(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 @@ -371,7 +396,8 @@ public: /// void niceInsert(MathAtom const & at); /// - void niceInsert(docstring const & str); + void niceInsert(docstring const & str, Parse::flags f = Parse::NORMAL, + bool enter = true); /// in pixels from top of screen void setScreenPos(int x, int y); @@ -428,11 +454,12 @@ 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 + * Notifies all insets which appear in old, but not in cur. And then + * notify all insets which appear in cur, but not in old. + * 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); +bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur); } // namespace lyx