X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.h;h=54ee58bec7f553e06ea28ea003eaf37bd17b6ad8;hb=65ec1c0437fd53ac6cff0b329f1563d91e481b6e;hp=1b0388a3410f686149380e50aa563f90339aef53;hpb=cb8bb668e768b6e13863a0988779070297e33e6d;p=lyx.git diff --git a/src/insets/insettext.h b/src/insets/insettext.h index 1b0388a341..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; @@ -95,11 +96,11 @@ public: /// int width(BufferView *, LyXFont const & f) const; /// - int textWidth(BufferView *) const; + int textWidth(BufferView *, bool fordraw = false) const; /// 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); /// @@ -140,7 +141,7 @@ public: /// int linuxdoc(Buffer const *, std::ostream &) const { return 0; } /// - int docBook(Buffer const *, std::ostream &) const ; + int docbook(Buffer const *, std::ostream &) const ; /// void validate(LaTeXFeatures & features) const; /// @@ -152,7 +153,7 @@ public: /// void toggleInsetCursor(BufferView *); /// - void showInsetCursor(BufferView *, bool show=true); + void showInsetCursor(BufferView *, bool show = true); /// void hideInsetCursor(BufferView *); /// @@ -176,12 +177,14 @@ public: /// void writeParagraphData(Buffer const *, std::ostream &) const; /// - void setParagraphData(Paragraph *); + void setParagraphData(Paragraph *, bool same_id = false); /// void setText(string const &); /// void setAutoBreakRows(bool); /// + bool getAutoBreakRows() const { return autoBreakRows; } + /// void setDrawFrame(BufferView *, DrawFrame); /// void setFrameColor(BufferView *, LColor::color); @@ -199,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; /// @@ -219,21 +222,30 @@ public: /// Paragraph * firstParagraph() const; /// + Paragraph * getFirstParagraph(int) const; + /// LyXCursor const & cursor(BufferView *) const; /// Paragraph * paragraph() const; /// void paragraph(Paragraph *); /// - string selectNextWord(BufferView *, float & value) const; + bool allowSpellcheck() { return true; } + /// + 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 &); + /// // // Public structures and variables /// @@ -243,6 +255,8 @@ protected: /// void updateLocal(BufferView *, int what, bool mark_dirty) const; /// + void lockInset(BufferView *, UpdatableInset *); + /// mutable int drawTextXOffset; /// mutable int drawTextYOffset; @@ -254,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; /// @@ -289,16 +306,11 @@ private: UpdatableInset::RESULT moveDown(BufferView *); /// void setCharFont(Buffer const *, int pos, LyXFont const & font); -#if 0 - ///What's that ??? Not used, not implemented! - /// - string const getText(int); -#endif /// bool checkAndActivateInset(BufferView * bv, bool behind); /// bool checkAndActivateInset(BufferView * bv, int x = 0, int y = 0, - int button = 0); + int button = 0); /// void removeNewlines(); /// @@ -306,7 +318,7 @@ private: /// int cy(BufferView *) const; /// - Paragraph::size_type cpos(BufferView *) const; + lyx::pos_type cpos(BufferView *) const; /// Paragraph * cpar(BufferView *) const; /// @@ -318,10 +330,15 @@ private: /// void clearFrame(Painter &, bool cleared) const; /// - void clearInset(Painter &, int baseline, bool & cleared) const; + 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 */ /// @@ -335,15 +352,11 @@ private: /// mutable int insetWidth; /// - mutable int last_width; - /// - mutable int last_height; - /// mutable int top_y; /// Paragraph * inset_par; /// - Paragraph::size_type inset_pos; + lyx::pos_type inset_pos; /// bool inset_boundary; /// @@ -351,7 +364,7 @@ private: /// mutable int inset_y; /// - mutable unsigned int old_max_width; + mutable int old_max_width; /// bool no_selection; /// @@ -371,22 +384,43 @@ private: /// mutable boost::shared_ptr cached_text; /// - mutable struct save_state { + struct save_state { Paragraph * lpar; Paragraph * selstartpar; Paragraph * selendpar; - Paragraph::size_type pos; - Paragraph::size_type selstartpos; - Paragraph::size_type selendpos; + lyx::pos_type pos; + lyx::pos_type selstartpos; + lyx::pos_type selendpos; bool boundary; bool selstartboundary; bool selendboundary; bool selection; bool mark_set; - } sstate; + bool refresh; + }; + /// + 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! mutable LyXText * lt; + /// + // to remember old painted frame dimensions to clear it on the right spot! + /// + mutable int frame_x; + mutable int frame_y; + mutable int frame_w; + mutable int frame_h; + /// + bool in_update; /* as update is not reentrant! */ + 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