X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=a79c7bbb62e6b9da5c663fcb7bdfbdc8995362ab;hb=b2475f6625efbaacbd574d5b9a2402b4d20c4047;hp=07d4c0370d8737d65af5c2f7d1b8b565869f296b;hpb=58ab972f714309aa87e7d956ceda00e18337875f;p=lyx.git diff --git a/src/BufferView.h b/src/BufferView.h index 07d4c0370d..a79c7bbb62 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -15,20 +15,11 @@ #ifndef BUFFER_VIEW_H #define BUFFER_VIEW_H -#include "CoordCache.h" -#include "Cursor.h" -#include "MetricsInfo.h" -#include "TextMetrics.h" #include "update_flags.h" +#include "support/strfwd.h" #include "support/types.h" -#include - -#include -#include - - namespace lyx { namespace support { class FileName; } @@ -38,16 +29,20 @@ namespace frontend { class GuiBufferViewDelegate; } class Buffer; class Change; +class CoordCache; +class Cursor; class DocIterator; class FuncRequest; class FuncStatus; class Intl; -class Cursor; -class Text; +class Inset; +class Menu; class ParIterator; class ParagraphMetrics; -class ViewMetricsInfo; - +class Point; +class Text; +class TextMetrics; + enum CursorStatus { CUR_INSIDE, CUR_ABOVE, @@ -57,19 +52,16 @@ enum CursorStatus { /// Scrollbar Parameters. struct ScrollbarParameters { - void reset(int h = 0, int p = 0, int l = 0) - { - height = h; - position = p; - lineScrollHeight = l; - } - - /// Total document height in pixels. - int height; + /// 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 lineScrollHeight; + int single_step; + /// Page-scroll amount in pixels. + int page_step; }; /// Screen view of a Buffer. @@ -84,10 +76,10 @@ struct ScrollbarParameters * \sa Buffer * \sa CoordCache */ -class BufferView : boost::noncopyable { +class BufferView { public: /// - BufferView(Buffer & buffer); + explicit BufferView(Buffer & buffer); /// ~BufferView(); @@ -95,13 +87,22 @@ public: Buffer & buffer(); Buffer const & buffer() const; + /// + void setFullScreen(bool full_screen) { full_screen_ = full_screen; } + + /// right margin + int rightMargin() const; + + /// left margin + int leftMargin() const; + /// perform pending metrics updates. /** \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 */ - bool update(Update::flags flags = Update::FitCursor | Update::Force); + void processUpdateFlags(Update::flags flags); /// move the screen to fit the cursor. /// Only to be called with good y coordinates (after a bv::metrics) @@ -110,6 +111,10 @@ public: void updateScrollbar(); /// return the Scrollbar Parameters. ScrollbarParameters const & scrollbarParameters() const; + /// \return Tool tip for the given position. + docstring toolTip(int x, int y) const; + /// \return the context menu for the given position. + docstring contextMenu(int x, int y) const; /// Save the current position as bookmark. /// if idx == 0, save to temp_bookmark @@ -131,8 +136,16 @@ public: /// set the cursor based on the given TeX source row. void setCursorFromRow(int row); - /// center the document view around the cursor. - void center(); + /// Ensure that the BufferView cursor is visible. + /// This method will automatically scroll and update the BufferView + /// if needed. + void showCursor(); + /// Ensure the passed cursor \p dit is visible. + /// This method will automatically scroll and update the BufferView + /// if needed. + void showCursor(DocIterator const & dit); + /// LFUN_SCROLL Helper. + void lfunScroll(FuncRequest const & cmd); /// scroll down document by the given number of pixels. void scrollDown(int pixels); /// scroll up document by the given number of pixels. @@ -149,14 +162,25 @@ public: /// return the pixel height of the document view. int workHeight() const; + /// return the inline completion postfix. + docstring const & inlineCompletion() const; + /// return the number of unique characters in the inline completion. + size_t const & inlineCompletionUniqueChars() const; + /// return the position in the buffer of the inline completion postfix. + DocIterator const & inlineCompletionPos() const; + /// set the inline completion postfix and its position in the buffer. + /// Updates the updateFlags in \c cur. + void setInlineCompletion(Cursor & cur, DocIterator const & pos, + docstring const & completion, size_t uniqueChars = 0); + /// translate and insert a character, using the correct keymap. void translateAndInsert(char_type c, Text * t, Cursor & cur); /// return true for events that will handle. FuncStatus getStatus(FuncRequest const & cmd); /// execute the given function. - /// \return the Update::flags for further metrics update. - Update::flags dispatch(FuncRequest const & argument); + /// \return true if the function has been processed. + bool dispatch(FuncRequest const & argument); /// request an X11 selection. /// \return the selected string. @@ -170,8 +194,7 @@ public: /// dispatch method helper for \c WorkArea /// \sa WorkArea - /// \retval true if a redraw is needed - bool workAreaDispatch(FuncRequest const & ev); + void mouseEventDispatch(FuncRequest const & ev); /// access to anchor. pit_type anchor_ref() const; @@ -190,7 +213,7 @@ public: bool checkDepm(Cursor & cur, Cursor & old); /// sets cursor. /// This is used when handling LFUN_MOUSE_PRESS. - bool mouseSetCursor(Cursor & cur); + bool mouseSetCursor(Cursor & cur, bool select = false); /// sets the selection. /* When \c backwards == false, set anchor @@ -201,14 +224,8 @@ public: void putSelectionAt(DocIterator const & cur, int length, bool backwards); - /// return the internal \c ViewMetricsInfo. - /// This is used specifically by the \c Workrea. - /// \sa WorkArea - /// \sa ViewMetricsInfo - ViewMetricsInfo const & viewMetricsInfo(); /// update the internal \c ViewMetricsInfo. - /// \param singlepar indicates wether - void updateMetrics(bool singlepar = false); + void updateMetrics(); /// TextMetrics const & textMetrics(Text const * t) const; @@ -217,9 +234,9 @@ public: ParagraphMetrics const & parMetrics(Text const *, pit_type) const; /// - CoordCache & coordCache() { return coord_cache_; } + CoordCache & coordCache(); /// - CoordCache const & coordCache() const { return coord_cache_; } + CoordCache const & coordCache() const; /// Point getPos(DocIterator const & dit, bool boundary) const; @@ -229,9 +246,9 @@ public: void draw(frontend::Painter & pain); /// get this view's keyboard map handler. - Intl & getIntl() { return *intl_.get(); } + Intl & getIntl(); /// - Intl const & getIntl() const { return *intl_.get(); } + Intl const & getIntl() const; // // Messages to the GUI @@ -244,11 +261,8 @@ public: /// This signal is emitted when some dialog needs to be shown with /// some data. - void showDialogWithData(std::string const & name, std::string const & data); - - /// This signal is emitted when some inset dialogs needs to be shown. - void showInsetDialog(std::string const & name, std::string const & data, - Inset * inset); + void showDialog(std::string const & name, std::string const & data, + Inset * inset = 0); /// This signal is emitted when some dialogs needs to be updated. void updateDialog(std::string const & name, std::string const & data); @@ -257,17 +271,22 @@ public: void setGuiDelegate(frontend::GuiBufferViewDelegate *); /// - docstring contentsOfPlaintextFile(std::string const & f, bool asParagraph); + docstring contentsOfPlaintextFile(support::FileName const & f); // Insert plain text file (if filename is empty, prompt for one) - void insertPlaintextFile(std::string const & fileName, bool asParagraph); + void insertPlaintextFile(support::FileName const & f, bool asParagraph); + /// + void insertLyXFile(support::FileName const & f); + private: + /// noncopyable + BufferView(BufferView const &); + void operator=(BufferView const &); + // the position relative to (0, baseline) of outermost paragraph Point coordOffset(DocIterator const & dit, bool boundary) const; /// Update current paragraph metrics. /// \return true if no further update is needed. bool singleParUpdate(); - /// - bool multiParSel(); /// Search recursively for the the innermost inset that covers (x, y) position. /// \retval 0 if no inset is found. @@ -275,58 +294,19 @@ private: Text const & text, //< The Text where we start searching. int x, //< x-coordinate on screen int y //< y-coordinate on screen - ); + ) const; /// int width_; /// int height_; /// - ScrollbarParameters scrollbarParameters_; - - /// - ViewMetricsInfo metrics_info_; - /// - CoordCache coord_cache_; + bool full_screen_; /// Buffer & buffer_; - /// Estimated average par height for scrollbar. - int wh_; - /// - void menuInsertLyXFile(std::string const & filen); - - /// this is used to handle XSelection events in the right manner. - struct { - CursorSlice cursor; - CursorSlice anchor; - bool set; - } xsel_cache_; - /// - Cursor cursor_; - /// - bool multiparsel_cache_; - /// - pit_type anchor_ref_; - /// - int offset_ref_; - /// - void updateOffsetRef(); - /// - bool need_centering_; - - /// keyboard mapping object. - boost::scoped_ptr const intl_; - - /// last visited inset (kept to send setMouseHover(false) ) - Inset * last_inset_; - - /// A map from a Text to the associated text metrics - typedef std::map TextMetricsCache; - mutable TextMetricsCache text_metrics_; - - // Whom to notify. Not owned, so don't delete. - frontend::GuiBufferViewDelegate * gui_; + struct Private; + Private * const d; }; /// some space for drawing the 'nested' markers (in pixel) @@ -335,9 +315,6 @@ inline int nestMargin() { return 15; } /// margin for changebar inline int changebarMargin() { return 12; } -/// right margin -inline int rightMargin() { return 10; } - } // namespace lyx #endif // BUFFERVIEW_H