X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.h;h=54ee58bec7f553e06ea28ea003eaf37bd17b6ad8;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=0a7a0f99ddc0f77bdb4db23662e44f219717bff6;hpb=8a3b0939d5fdf0f561e608af9c706b22303e04a9;p=lyx.git diff --git a/src/insets/insettext.h b/src/insets/insettext.h index 0a7a0f99dd..54ee58bec7 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -24,6 +24,7 @@ #include "LColor.h" #include "paragraph.h" #include "lyxcursor.h" + #include class Painter; @@ -99,7 +100,7 @@ public: /// void draw(BufferView *, LyXFont const &, int , float &, bool) const; /// - void update(BufferView *, LyXFont const &, bool =false); + void update(BufferView *, LyXFont const &, bool = false); /// void setUpdateStatus(BufferView *, int what) const; /// @@ -122,7 +123,7 @@ public: /// bool updateInsetInInset(BufferView *, Inset *); /// - void insetButtonRelease(BufferView *, int, int, int); + bool insetButtonRelease(BufferView *, int, int, int); /// void insetButtonPress(BufferView *, int, int, int); /// @@ -152,7 +153,7 @@ public: /// void toggleInsetCursor(BufferView *); /// - void showInsetCursor(BufferView *, bool show=true); + void showInsetCursor(BufferView *, bool show = true); /// void hideInsetCursor(BufferView *); /// @@ -201,19 +202,19 @@ public: /// bool nodraw() const; /// - int scroll(bool recursive=true) const; + int scroll(bool recursive = true) const; /// - void scroll(BufferView *bv, float sx) const { + void scroll(BufferView * bv, float sx) const { UpdatableInset::scroll(bv, sx); } /// - void scroll(BufferView *bv, int offset) const { + void scroll(BufferView * bv, int offset) const { UpdatableInset::scroll(bv, offset); } /// - void selectAll(BufferView *bv); + void selectAll(BufferView * bv); /// - void clearSelection(BufferView *bv); + void clearSelection(BufferView * bv); /// Paragraph * getParFromID(int id) const; /// @@ -230,14 +231,18 @@ public: void paragraph(Paragraph *); /// bool allowSpellcheck() { return true; } - string const selectNextWordToSpellcheck(BufferView *, float & value) const; + /// + string const selectNextWordToSpellcheck(BufferView *, + float & value) const; void selectSelectedWord(BufferView *); + /// void toggleSelection(BufferView *, bool kill_selection); /// bool searchForward(BufferView *, string const &, - bool const & = true, bool const & = false); + bool = true, bool = false); + /// bool searchBackward(BufferView *, string const &, - bool const & = true, bool const & = false); + bool = true, bool = false); /// bool checkInsertChar(LyXFont &); /// @@ -250,6 +255,8 @@ protected: /// void updateLocal(BufferView *, int what, bool mark_dirty) const; /// + void lockInset(BufferView *, UpdatableInset *); + /// mutable int drawTextXOffset; /// mutable int drawTextYOffset; @@ -261,14 +268,17 @@ protected: LColor::color frame_color; private: + /// struct InnerCache { + /// InnerCache(boost::shared_ptr); - + /// boost::shared_ptr text; + /// bool remove; }; /// - typedef std::map Cache; + typedef std::map Cache; /// typedef Cache::value_type value_type; /// @@ -323,9 +333,12 @@ private: void clearInset(BufferView *, int baseline, bool & cleared) const; /// void saveLyXTextState(LyXText *) const; + /// void restoreLyXTextState(BufferView *, LyXText *) const; /// void reinitLyXText() const; + /// + void collapseParagraphs(BufferParams const & bparams) const; /* Private structures and variables */ /// @@ -339,10 +352,6 @@ private: /// mutable int insetWidth; /// - mutable int last_width; - /// - mutable int last_height; - /// mutable int top_y; /// Paragraph * inset_par; @@ -375,7 +384,7 @@ private: /// mutable boost::shared_ptr cached_text; /// - mutable struct save_state { + struct save_state { Paragraph * lpar; Paragraph * selstartpar; Paragraph * selendpar; @@ -388,7 +397,10 @@ private: bool selection; bool mark_set; bool refresh; - } sstate; + }; + /// + mutable save_state sstate; + /// // this is needed globally so we know that we're using it actually and // so the LyXText-Cache is not erased until used! @@ -405,5 +417,10 @@ private: mutable BufferView * do_resize; mutable bool do_reinit; mutable bool in_insetAllowed; + /// + // these are used to check for mouse movement in Motion selection code + /// + int mouse_x; + int mouse_y; }; #endif