X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=886d3c8fe7bcb6e4dba90d13561b918a8eaffd26;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=fa85195b52afb71e707516441a2c2da33d4452ce;hpb=7287a259c5436b8f3f384c0d0bd7641a2f2601e9;p=lyx.git diff --git a/src/BufferView.h b/src/BufferView.h index fa85195b52..886d3c8fe7 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -15,6 +15,8 @@ #ifndef BUFFER_VIEW_H #define BUFFER_VIEW_H +#include "DocumentClassPtr.h" +#include "TexRow.h" #include "update_flags.h" #include "support/strfwd.h" @@ -31,6 +33,7 @@ class Buffer; class Change; class CoordCache; class Cursor; +class CursorSlice; class DispatchResult; class DocIterator; class DocumentClass; @@ -38,9 +41,12 @@ class FuncRequest; class FuncStatus; class Intl; class Inset; +class Length; class ParIterator; class ParagraphMetrics; class Point; +class Row; +class TexRow; class Text; class TextMetrics; @@ -53,15 +59,15 @@ enum CursorStatus { /// Scrollbar Parameters. struct ScrollbarParameters { + // These parameters are normalized against the screen geometry and pixel + // coordinates. Position 0 corresponds to the top the the screen. ScrollbarParameters() - : min(0), max(0), position(0), single_step(1), page_step(1) + : min(0), max(0), single_step(1), page_step(1) {} /// Minimum scrollbar position in pixels. int min; /// Maximum scrollbar position in pixels. int max; - /// Current position in the document in pixels. - int position; /// Line-scroll amount in pixels. int single_step; /// Page-scroll amount in pixels. @@ -100,23 +106,46 @@ public: /// left margin int leftMargin() const; + /// return the on-screen size of this length + /* + * This is a wrapper around Length::inPixels that uses the + * bufferview width as width and the EM value of the default + * document font. + */ + int inPixels(Length const & len) const; + /// \return true if the BufferView is at the top of the document. bool isTopScreen() const; /// \return true if the BufferView is at the bottom of the document. bool isBottomScreen() const; - /// perform pending metrics updates. - /** \c Update::FitCursor means first to do a FitCursor, and to + /// Add \p flags to current update flags and trigger an update. + /* If this method is invoked several times before the update + * actually takes place, the effect is cumulative. + * \c Update::FitCursor means first to do a FitCursor, and to * force an update if screen position changes. * \c Update::Force means to force an update in any case. - * \retval true if a screen redraw is needed */ void processUpdateFlags(Update::flags flags); - /// move the screen to fit the cursor. + /// return true if one shall move the screen to fit the cursor. /// Only to be called with good y coordinates (after a bv::metrics) - bool fitCursor(); + bool needsFitCursor() const; + + // Returns the amount of horizontal scrolling applied to the + // top-level row where the cursor lies + int horizScrollOffset() const; + // Returns the amount of horizontal scrolling applied to the + // row of text starting at (pit, pos) + int horizScrollOffset(Text const * text, + pit_type pit, pos_type pos) const; + + // Returns true if the row of text starting at (pit, pos) was scrolled + // at the last draw event. + bool hadHorizScrollOffset(Text const * text, + pit_type pit, pos_type pos) const; + /// reset the scrollbar to reflect current view position. void updateScrollbar(); /// return the Scrollbar Parameters. @@ -144,7 +173,9 @@ public: void gotoLabel(docstring const & label); /// set the cursor based on the given TeX source row. - void setCursorFromRow(int row); + bool setCursorFromRow(int row); + /// set the cursor based on the given start and end TextEntries. + bool setCursorFromEntries(TexRow::TextEntry start, TexRow::TextEntry end); /// set cursor to the given inset. Return true if found. bool setCursorFromInset(Inset const *); @@ -153,11 +184,11 @@ public: void recenter(); /// Ensure that the BufferView cursor is visible. /// This method will automatically scroll and update the BufferView - /// if needed. - void showCursor(); + /// (metrics+drawing) if needed. + void showCursor(); /// Ensure the passed cursor \p dit is visible. /// This method will automatically scroll and update the BufferView - /// if needed. + /// (metrics+drawing) if needed. /// \param recenter Whether the cursor should be centered on screen void showCursor(DocIterator const & dit, bool recenter, bool update); @@ -166,8 +197,6 @@ public: /// Scroll to the cursor. /// \param recenter Whether the cursor should be centered on screen bool scrollToCursor(DocIterator const & dit, bool recenter); - /// LFUN_SCROLL Helper. - void lfunScroll(FuncRequest const & cmd); /// scroll down document by the given number of pixels. int scrollDown(int pixels); /// scroll up document by the given number of pixels. @@ -194,7 +223,7 @@ public: void resetInlineCompletionPos(); /// set the inline completion postfix and its position in the buffer. /// Updates the updateFlags in \c cur. - void setInlineCompletion(Cursor & cur, DocIterator const & pos, + void setInlineCompletion(Cursor const & cur, DocIterator const & pos, docstring const & completion, size_t uniqueChars = 0); /// translate and insert a character, using the correct keymap. @@ -229,8 +258,10 @@ public: /// access to full cursor. Cursor const & cursor() const; /// sets cursor. - /// This will also open all relevant collapsable insets. + /// This will also open all relevant collapsible insets. void setCursor(DocIterator const &); + /// set the selection up to dit. + void setCursorSelectionTo(DocIterator const & dit); /// Check deleteEmptyParagraphMechanism and update metrics if needed. /// \retval true if an update was needed. bool checkDepm(Cursor & cur, Cursor & old); @@ -253,6 +284,10 @@ public: /// update the internal \c ViewMetricsInfo. void updateMetrics(); + // this is the "nodraw" drawing stage: only set the positions of the + // insets in metrics cache. + void updatePosCache(); + /// TextMetrics const & textMetrics(Text const * t) const; TextMetrics & textMetrics(Text const * t); @@ -268,14 +303,15 @@ public: Point getPos(DocIterator const & dit) const; /// is the paragraph of the cursor visible ? bool paragraphVisible(DocIterator const & dit) const; - /// is the cursor currently visible in the view - bool cursorInView(Point const & p, int h) const; - /// get the position and height of the cursor - void cursorPosAndHeight(Point & p, int & h) const; - + /// is the caret currently visible in the view + bool caretInView() const; + /// set the ascent and descent of the caret + void setCaretAscentDescent(int asc, int des); + /// get the position and height of the caret + void caretPosAndHeight(Point & p, int & h) const; /// - void draw(frontend::Painter & pain); + void draw(frontend::Painter & pain, bool paint_caret); /// get this view's keyboard map handler. Intl & getIntl(); @@ -318,6 +354,8 @@ public: void clearLastInset(Inset * inset) const; /// Is the mouse hovering a clickable inset or element? bool clickableInset() const; + /// + void makeDocumentClass(); private: /// noncopyable @@ -329,12 +367,21 @@ private: /// Update current paragraph metrics. /// \return true if no further update is needed. bool singleParUpdate(); + /// do the work for the public updateMetrics() + void updateMetrics(Update::flags & update_flags); + + // Set the row on which the cursor lives. + void setCurrentRowSlice(CursorSlice const & rowSlice); + + // Check whether the row where the cursor lives needs to be scrolled. + // Update the drawing strategy if needed. + void checkCursorScrollOffset(); /// The minimal size of the document that is visible. Used /// when it is allowed to scroll below the document. int minVisiblePart(); - /// Search recursively for the the innermost inset that covers (x, y) position. + /// Search recursively for the innermost inset that covers (x, y) position. /// \retval 0 if no inset is found. Inset const * getCoveringInset( Text const & text, //< The Text where we start searching. @@ -347,7 +394,7 @@ private: void updateHoveredInset() const; /// - void updateDocumentClass(DocumentClass const * const olddc); + void updateDocumentClass(DocumentClassConstPtr olddc); /// int width_; ///