X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=11efee42987ed6c784e400b1d845fcdf60c51cde;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=93a4ae9be474f5be2838cee6d2a61bdfb9241bbc;hpb=eacbcb3f3acc2ab63fb3942cd452b698133bc097;p=lyx.git diff --git a/src/BufferView.h b/src/BufferView.h index 93a4ae9be4..11efee4298 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -15,17 +15,13 @@ #ifndef BUFFER_VIEW_H #define BUFFER_VIEW_H -#include "CoordCache.h" -#include "Cursor.h" -#include "MetricsInfo.h" -#include "TextMetrics.h" +#include "Dimension.h" #include "update_flags.h" +#include "support/strfwd.h" #include "support/types.h" -#include -#include -#include +#include #include #include @@ -35,18 +31,30 @@ namespace lyx { namespace support { class FileName; } +namespace frontend { class Painter; } +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 ParIterator; class ParagraphMetrics; +class Text; +class TextMetrics; class ViewMetricsInfo; +enum CursorStatus { + CUR_INSIDE, + CUR_ABOVE, + CUR_BELOW +}; + /// Scrollbar Parameters. struct ScrollbarParameters { @@ -79,20 +87,14 @@ struct ScrollbarParameters */ class BufferView : boost::noncopyable { public: - BufferView(); - + /// + BufferView(Buffer & buffer); + /// ~BufferView(); - /// set the buffer we are viewing. - /// \todo FIXME: eventually, we will create a new BufferView - /// when switching Buffers, so this method should go. - /// returns the buffer currently set - Buffer * setBuffer(Buffer * b); /// return the buffer being viewed. - Buffer * buffer() const; - - /// resize the BufferView. - void resize(); + Buffer & buffer(); + Buffer const & buffer() const; /// perform pending metrics updates. /** \c Update::FitCursor means first to do a FitCursor, and to @@ -100,7 +102,7 @@ public: * \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) @@ -113,9 +115,9 @@ public: /// Save the current position as bookmark. /// if idx == 0, save to temp_bookmark void saveBookmark(unsigned int idx); - /// goto a specified position, try top_id first, and then bottom_pit - /// return the bottom_pit and top_id of the new paragraph - boost::tuple moveToPosition( + /// goto a specified position, try top_id first, and then bottom_pit. + /// \return true if success + bool moveToPosition( pit_type bottom_pit, ///< Paragraph pit, used when par_id is zero or invalid. pos_type bottom_pos, ///< Paragraph pit, used when par_id is zero or invalid. int top_id, ///< Paragraph ID, \sa Paragraph @@ -132,8 +134,12 @@ public: /// center the document view around the cursor. void center(); - /// scroll document by the given number of lines of default height. - void scroll(int lines); + /// scroll down document by the given number of pixels. + void scrollDown(int pixels); + /// scroll up document by the given number of pixels. + void scrollUp(int pixels); + /// scroll document by the given number of pixels. + void scroll(int pixels); /// Scroll the view by a number of pixels. void scrollDocView(int pixels); /// Set the cursor position based on the scrollbar one. @@ -159,19 +165,19 @@ public: /// clear the X11 selection. void clearSelection(); - /// resize method helper for \c WorkArea + /// resize the BufferView. /// \sa WorkArea - /// \sa resise - void workAreaResize(int width, int height); + void resize(int width, int height); /// 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; + /// + CursorStatus cursorStatus(DocIterator const & dit) const; /// access to full cursor. Cursor & cursor(); /// access to full cursor. @@ -184,7 +190,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 @@ -211,41 +217,56 @@ 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; + + + /// + 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 + // /// This signal is emitted when some message shows up. - boost::signal message; + void message(docstring const & msg); /// This signal is emitted when some dialog needs to be shown. - boost::signal showDialog; + void showDialog(std::string const & name); /// This signal is emitted when some dialog needs to be shown with /// some data. - boost::signal showDialogWithData; + void showDialogWithData(std::string const & name, std::string const & data); /// This signal is emitted when some inset dialogs needs to be shown. - boost::signal showInsetDialog; + void showInsetDialog(std::string const & name, std::string const & data, + Inset * inset); /// This signal is emitted when some dialogs needs to be updated. - boost::signal updateDialog; + void updateDialog(std::string const & name, std::string const & data); - /// This signal is emitted when the layout at the cursor is changed. - boost::signal layoutChanged; + /// + void setGuiDelegate(frontend::GuiBufferViewDelegate *); + + /// + docstring contentsOfPlaintextFile(std::string const & f, bool asParagraph); + // Insert plain text file (if filename is empty, prompt for one) + void insertPlaintextFile(std::string const & fileName, bool asParagraph); private: + // 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(); @@ -262,46 +283,25 @@ private: /// int height_; /// - ScrollbarParameters scrollbarParameters_; + Buffer & buffer_; - /// - ViewMetricsInfo metrics_info_; - /// - CoordCache coord_cache_; - /// - 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(); - /// keyboard mapping object. - boost::scoped_ptr const intl_; + struct Private; + Private * const d; +}; - /// last visited inset (kept to send setMouseHover(false) ) - Inset * last_inset_; +/// some space for drawing the 'nested' markers (in pixel) +inline int nestMargin() { return 15; } - /// A map from a Text to the associated text metrics - typedef std::map TextMetricsCache; - mutable TextMetricsCache text_metrics_; -}; +/// margin for changebar +inline int changebarMargin() { return 12; } +/// right margin +inline int rightMargin() { return 10; } } // namespace lyx