X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtext.h;h=949566c3e04f633500e58e9d714c3f08be4ba61c;hb=80296aac5015662a4c23ee7a818d5fde34f363bd;hp=e536a1aefb5eda73956050954270930813b9b787;hpb=a6ccea4f21c3da972fb3577ab07404da83f0a223;p=lyx.git diff --git a/src/lyxtext.h b/src/lyxtext.h index e536a1aefb..949566c3e0 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -15,20 +15,23 @@ #define LYXTEXT_H #include "bufferview_funcs.h" +#include "Bidi.h" #include "layout.h" #include "lyxfont.h" +#include "lyxtextclass.h" #include "ParagraphList_fwd.h" #include "RowList_fwd.h" #include "textcursor.h" #include "insets/inset.h" +#include + class Buffer; class BufferParams; class BufferView; class Dimension; -class EnumLColor; -class InsetText; +class LColor_color; class LyXCursor; class MetricsInfo; class Paragraph; @@ -36,7 +39,6 @@ class Row; class Spacing; class UpdatableInset; class VSpace; -class WordLangTuple; /** @@ -49,35 +51,16 @@ class WordLangTuple; // The inheritance from TextCursor should go. It's just there to ease // transition... class LyXText : public TextCursor { + // Public Functions public: /// Constructor - LyXText(BufferView *, InsetText *, bool ininset, - ParagraphList & paragraphs); - - void init(BufferView *); + LyXText(BufferView *, bool ininset); /// - int height; - /// - unsigned int width; - /// the current font settings - LyXFont current_font; - /// the current font - LyXFont real_current_font; - /// our buffer's default layout font - LyXFont defaultfont_; -private: - /// offset of dran area to document start. - int anchor_y_; -public: - /// update all cached row positions - void updateRowPositions(); - /// - InsetText * inset_owner; - /// - UpdatableInset * the_locking_inset; + void init(BufferView *); - /// - int getRealCursorX() const; + + /// update y coordinate cache of all paragraphs + void updateParPositions(); /// LyXFont getFont(ParagraphList::iterator pit, lyx::pos_type pos) const; /// @@ -98,19 +81,17 @@ public: those paragraphs */ ParagraphList::iterator - setLayout(LyXCursor & actual_cursor, - LyXCursor & selection_start, - LyXCursor & selection_end, - string const & layout); + setLayout(ParagraphList::iterator start, + ParagraphList::iterator end, + std::string const & layout); /// - void setLayout(string const & layout); + void setLayout(std::string const & layout); - /** - * Increase or decrease the nesting depth of the selected paragraph(s) - * if test_only, don't change any depths. Returns whether something - * (would have) changed - */ - bool changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only); + /// Increase or decrease the nesting depth of the selected paragraph(s) + void changeDepth(bv_funcs::DEPTH_CHANGE type); + + /// Returns whether something would be changed by changeDepth + bool changeDepthAllowed(bv_funcs::DEPTH_CHANGE type); /// get the depth at current cursor position int getDepth() const; @@ -122,23 +103,19 @@ public: void setFont(LyXFont const &, bool toggleall = false); /// rebreaks all paragaphs between the given pars. - int redoParagraphs(ParagraphList::iterator begin, + void redoParagraphs(ParagraphList::iterator begin, ParagraphList::iterator end); /// rebreaks the given par void redoParagraph(ParagraphList::iterator pit); /// rebreaks the cursor par void redoParagraph(); -private: - /// rebreaks the given par, return max row width - int redoParagraphInternal(ParagraphList::iterator pit); -public: /// void toggleFree(LyXFont const &, bool toggleall = false); /// - string getStringToIndex(); + std::string getStringToIndex(); /** insert a character, moves all the following breaks in the same Paragraph one to the right and make a little rebreak @@ -151,9 +128,11 @@ public: void fullRebreak(); /// compute text metrics void metrics(MetricsInfo & mi, Dimension & dim); + /// draw text (only used for insets) + void draw(PainterInfo & pi, int x, int y) const; - /// - InsetOld::RESULT dispatch(FuncRequest const & cmd); + /// try to handle that request + DispatchResult dispatch(FuncRequest const & cmd); BufferView * bv(); @@ -161,30 +140,20 @@ public: friend class LyXScreen; -public: - /// only the top-level LyXText has this non-zero - BufferView * bv_owner; - -private: - /// returns a pointer to a specified row. - RowList::iterator - getRow(ParagraphList::iterator pit, lyx::pos_type pos) const; -public: - /// returns a pointer cursor row - RowList::iterator getRow(LyXCursor const & cursor) const; + /// returns an iterator pointing to a cursor paragraph + ParagraphList::iterator getPar(LyXCursor const & cursor) const; + /// + ParagraphList::iterator getPar(lyx::paroffset_type par) const; + /// + int parOffset(ParagraphList::iterator pit) const; /// convenience + ParagraphList::iterator cursorPar() const; + /// RowList::iterator cursorRow() const; - /** - * Return the next row, when cursor is at the end of the - * previous row, for insets that take a full row. - * - * FIXME: explain why we need this ? especially for y... - */ - RowList::iterator cursorIRow() const; - /** returns a pointer to the row near the specified y-coordinate - (relative to the whole text). y is set to the real beginning - of this row + /** returns an iterator pointing to the row near the specified + * y-coordinate (relative to the whole text). y is set to the + * real beginning of this row */ RowList::iterator getRowNearY(int y, ParagraphList::iterator & pit) const; @@ -193,7 +162,7 @@ public: x is set to the real beginning of this column */ lyx::pos_type getColumnNearX(ParagraphList::iterator pit, - RowList::iterator rit, int & x, bool & boundary) const; + Row const & row, int & x, bool & boundary) const; /// need the selection cursor: void setSelection(); @@ -213,54 +182,36 @@ public: /// reject selected change void rejectChange(); - /** 'selects" the next word, where the cursor is not in - and returns this word as string. THe cursor will be moved - to the beginning of this word. - With SelectSelectedWord can this be highlighted really - */ - WordLangTuple const selectNextWordToSpellcheck(float & value); /// - void selectSelectedWord(); - /// re-computes the cached coordinates in the cursor - void redoCursor(); + void setCursor(ParagraphList::iterator pit, lyx::pos_type pos); /// returns true if par was empty and was removed - bool setCursor(ParagraphList::iterator pit, - lyx::pos_type pos, - bool setfont = true, - bool boundary = false); + bool setCursor(lyx::paroffset_type par, lyx::pos_type pos, + bool setfont = true, bool boundary = false); /// - void setCursor(LyXCursor &, ParagraphList::iterator pit, - lyx::pos_type pos, - bool boundary = false); + void setCursor(LyXCursor &, lyx::paroffset_type par, + lyx::pos_type pos, bool boundary = false); /// - void setCursorIntern(ParagraphList::iterator pit, - lyx::pos_type pos, - bool setfont = true, - bool boundary = false); + void setCursorIntern(lyx::paroffset_type par, lyx::pos_type pos, + bool setfont = true, bool boundary = false); /// void setCurrentFont(); /// - bool isBoundary(Buffer const &, Paragraph const & par, - lyx::pos_type pos) const; + void recUndo(lyx::paroffset_type first, lyx::paroffset_type last) const; /// - bool isBoundary(Buffer const &, Paragraph const & par, - lyx::pos_type pos, - LyXFont const & font) const; - + void recUndo(lyx::paroffset_type first) const; /// void setCursorFromCoordinates(int x, int y); /// - void setCursorFromCoordinates(LyXCursor &, - int x, int y); + void setCursorFromCoordinates(LyXCursor &, int x, int y); /// void cursorUp(bool selecting = false); /// void cursorDown(bool selecting = false); /// - void cursorLeft(bool internal = true); + bool cursorLeft(bool internal = true); /// - void cursorRight(bool internal = true); + bool cursorRight(bool internal = true); /// void cursorLeftOneWord(); /// @@ -299,8 +250,8 @@ public: /// Change the case of the word at cursor position. void changeCase(TextCase action); - /// - void toggleInset(); + /// returns success + bool toggleInset(); /// void cutSelection(bool doclear = true, bool realcut = true); /// @@ -311,16 +262,12 @@ public: /** the DTP switches for paragraphs. LyX will store the top settings always in the first physical paragraph, the bottom settings in the last. When a paragraph is broken, the top settings rest, the bottom - settings are given to the new one. So I can make shure, they do not - duplicate themself (and you cannnot make dirty things with them! ) + settings are given to the new one. */ - void setParagraph(bool line_top, bool line_bottom, - bool pagebreak_top, bool pagebreak_bottom, - VSpace const & space_top, - VSpace const & space_bottom, + void setParagraph( Spacing const & spacing, LyXAlignment align, - string const & labelwidthstring, + std::string const & labelwidthstring, bool noindent); /* these things are for search and replace */ @@ -334,63 +281,29 @@ public: /** simple replacing. The font of the first selected character is used */ - void replaceSelectionWithString(string const & str); + void replaceSelectionWithString(std::string const & str); /// needed to insert the selection - void insertStringAsLines(string const & str); + void insertStringAsLines(std::string const & str); /// needed to insert the selection - void insertStringAsParagraphs(string const & str); + void insertStringAsParagraphs(std::string const & str); /// Find next inset of some specified type. bool gotoNextInset(std::vector const & codes, - string const & contents = string()); + std::string const & contents = std::string()); /// void gotoInset(std::vector const & codes, bool same_content); /// void gotoInset(InsetOld::Code code, bool same_content); - /// - int workWidth() const; + /// current max text width + int textWidth() const; - /// - void computeBidiTables(ParagraphList::iterator pit, - Buffer const &, RowList::iterator row) const; - /// Maps positions in the visual string to positions in logical string. - lyx::pos_type log2vis(lyx::pos_type pos) const; - /// Maps positions in the logical string to positions in visual string. - lyx::pos_type vis2log(lyx::pos_type pos) const; - /// - lyx::pos_type bidi_level(lyx::pos_type pos) const; - /// - bool bidi_InRange(lyx::pos_type pos) const; -private: - /// - float getCursorX(ParagraphList::iterator pit, - RowList::iterator rit, lyx::pos_type pos, - lyx::pos_type last, bool boundary) const; - /// used in setlayout - void makeFontEntriesLayoutSpecific(BufferParams const &, Paragraph & par); - - /// Calculate and set the height of the row - void setHeightOfRow(ParagraphList::iterator, RowList::iterator rit); - - // fix the cursor `cur' after a characters has been deleted at `where' - // position. Called by deleteEmptyParagraphMechanism - void fixCursorAfterDelete(LyXCursor & cur, LyXCursor const & where); - - /// delete double space (false) or empty paragraphs (true) around old_cursor - bool deleteEmptyParagraphMechanism(LyXCursor const & old_cursor); - -public: - /** Updates all counters starting BEHIND the row. Changed paragraphs - * with a dynamic left margin will be rebroken. */ + /// updates all counters void updateCounters(); - /** - * Returns an inset if inset was hit, or 0 if not. - * If hit, the coordinates are changed relative to the inset. - */ - InsetOld * checkInsetHit(int & x, int & y); + /// Returns an inset if inset was hit, or 0 if not. + InsetOld * checkInsetHit(int x, int y); /// int singleWidth(ParagraphList::iterator pit, lyx::pos_type pos) const; @@ -399,13 +312,7 @@ public: lyx::pos_type pos, char c, LyXFont const & Font) const; /// return the color of the canvas - EnumLColor backgroundColor() const; - - /// - mutable bool bidi_same_direction; - - unsigned char transformChar(unsigned char c, Paragraph const & par, - lyx::pos_type pos) const; + LColor_color backgroundColor() const; /** * Returns the left beginning of the text. @@ -413,100 +320,184 @@ public: * in LaTeX the beginning of the text fits in some cases * (for example sections) exactly the label-width. */ - int leftMargin(ParagraphList::iterator pit, Row const & row) const; + int leftMargin(ParagraphList::iterator pit, lyx::pos_type pos) const; + int leftMargin(ParagraphList::iterator pit) const; /// - int rightMargin(ParagraphList::iterator pit, Buffer const &, Row const & row) const; + int rightMargin(Paragraph const & par) const; /** this calculates the specified parameters. needed when setting * the cursor and when creating a visible row */ - void prepareToPrint(ParagraphList::iterator pit, - RowList::iterator row) const; + void prepareToPrint(ParagraphList::iterator pit, Row & row) const; -private: + // + // special owner functions /// - void setCounter(Buffer const &, ParagraphList::iterator pit); + ParagraphList & paragraphs() const; + + /// return true if this is owned by an inset. + bool isInInset() const; + /// - void deleteWordForward(); + ParagraphList::iterator firstPar() const; /// - void deleteWordBackward(); + ParagraphList::iterator lastPar() const; /// - void deleteLineForward(); - - /* - * some low level functions - */ + ParagraphList::iterator endPar() const; + + /// return first row of text + RowList::iterator firstRow() const; + /// return last row of text + RowList::iterator lastRow() const; + /// return row "behind" last row of text + RowList::iterator endRow() const; + /// return next row crossing paragraph boundaries + void nextRow(ParagraphList::iterator & pit, + RowList::iterator & rit) const; + /// return previous row crossing paragraph boundaries + void previousRow(ParagraphList::iterator & pit, + RowList::iterator & rit) const; + /// is this row the last in the text? + bool isLastRow(ParagraphList::iterator pit, Row const & row) const; + /// is this row the first in the text? + bool isFirstRow(ParagraphList::iterator pit, Row const & row) const; - /// sets row.end to the pos value *after* which a row should break. - /// for example, the pos after which isNewLine(pos) == true - lyx::pos_type rowBreakPoint(ParagraphList::iterator pit, - Row const & row) const; - - /// returns the minimum space a row needs on the screen in pixel - int fill(ParagraphList::iterator pit, - RowList::iterator row, int workwidth) const; + /// + std::string selectionAsString(Buffer const & buffer, bool label) const; + /// + double spacing(Paragraph const &) const; + /// + void cursorLeftOneWord(LyXCursor &); + /// + void cursorRightOneWord(LyXCursor &); - /** - * returns the minimum space a manual label needs on the - * screen in pixels - */ - int labelFill(ParagraphList::iterator pit, Row const & row) const; + /// + DispatchResult moveRight(); + /// + DispatchResult moveLeft(); + /// + DispatchResult moveRightIntern(bool front, + bool activate_inset, bool selecting); + /// + DispatchResult moveLeftIntern(bool front, + bool activate_inset, bool selecting); + /// + DispatchResult moveUp(); + /// + DispatchResult moveDown(); + /// + bool checkAndActivateInset(bool front); - /// FIXME - int labelEnd(ParagraphList::iterator pit, Row const & row) const; + /// + void write(Buffer const & buf, std::ostream & os) const; + /// returns whether we've seen our usual 'end' marker + bool read(Buffer const & buf, LyXLex & lex); /// - mutable std::vector log2vis_list; + int ascent() const; + /// + int descent() const; /// - mutable std::vector vis2log_list; + int cursorX() const; /// - mutable std::vector bidi_levels; + int cursorY() const; /// - mutable lyx::pos_type bidi_start; + int cursorX(LyXCursor const & cursor) const; /// - mutable lyx::pos_type bidi_end; + int cursorY(LyXCursor const & cursor) const; +public: /// - const bool in_inset_; + int height; /// - ParagraphList & paragraphs_; + unsigned int width; + /// + int textwidth_; + /// the current font settings + LyXFont current_font; + /// the current font + LyXFont real_current_font; + /// our buffer's default layout font + LyXFont defaultfont_; + /// + int background_color_; + + /// only the top-level LyXText has this non-zero + BufferView * bv_owner; /// - void charInserted(); -public: - // - // special owner functions + mutable Bidi bidi; + /// + bool in_inset_; /// - ParagraphList & ownerParagraphs() const; + ParagraphList paragraphs_; - /// return true if this is owned by an inset. - bool isInInset() const; + /// absolute document pixel coordinates of this LyXText + mutable int xo_; + mutable int yo_; - /// return first row of text - RowList::iterator firstRow() const; - /// return last row of text - RowList::iterator lastRow() const; - /// return row "behind" last row of text - RowList::iterator endRow() const; - /// return next row crossing paragraph boundaries - void nextRow(ParagraphList::iterator & pit, - RowList::iterator & rit) const; - /// return previous row crossing paragraph boundaries - void previousRow(ParagraphList::iterator & pit, - RowList::iterator & rit) const; + /// our 'outermost' Font + LyXFont font_; - /// - bool noRows() const; private: - /** Cursor related data. - Later this variable has to be removed. There should be now internal - cursor in a text */ + /// return past-the-last paragraph influenced by a layout + /// change on pit + ParagraphList::iterator undoSpan(ParagraphList::iterator pit); + + /// rebreaks the given par + void redoParagraphInternal(ParagraphList::iterator pit); + /// used in setlayout + void makeFontEntriesLayoutSpecific(BufferParams const &, Paragraph & par); + + /// Calculate and set the height of the row + void setHeightOfRow(ParagraphList::iterator, Row & row); + + // fix the cursor `cur' after a characters has been deleted at `where' + // position. Called by deleteEmptyParagraphMechanism + void fixCursorAfterDelete(LyXCursor & cur, LyXCursor const & where); + + /// delete double space (false) or empty paragraphs (true) around old_cursor + bool deleteEmptyParagraphMechanism(LyXCursor const & old_cursor); + /// - ///TextCursor cursor_; + void setCounter(Buffer const &, ParagraphList::iterator pit); + /// + void deleteWordForward(); + /// + void deleteWordBackward(); + /// + void deleteLineForward(); + + /// sets row.end to the pos value *after* which a row should break. + /// for example, the pos after which isNewLine(pos) == true + void rowBreakPoint(ParagraphList::iterator pit, Row & row) const; + + /// sets row.witdh to the minimum space a row needs on the screen in pixel + void fill(ParagraphList::iterator pit, Row & row, int workwidth) const; + + /** + * returns the minimum space a manual label needs on the + * screen in pixels + */ + int labelFill(ParagraphList::iterator pit, Row const & row) const; + + /// FIXME + int labelEnd(ParagraphList::iterator pit) const; + + /// + void charInserted(); + /// set 'number' font property + void number(); + /// is the cursor paragraph right-to-left? + bool rtl() const; }; /// return the default height of a row in pixels, considering font zoom extern int defaultRowHeight(); +/// +std::string expandLabel(LyXTextClass const & textclass, + LyXLayout_ptr const & layout, bool appendix); + #endif // LYXTEXT_H