Fix bug 2195: Slowness in rendering inside insets, especially on the Mac

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index bb969dff47ad1b6b3fe0a55d0fa581facaf6a138..c6ac78f6f7af61561e1dd911ede071772871df26 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -40,27 +40,29 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 class FuncRequest;
+class FuncStatus;
+class ViewMetricsInfo;
 
 
 ///
-struct BufferView::Pimpl : public boost::signals::trackable {
+class BufferView::Pimpl : public boost::signals::trackable {
+public:
        ///
-       Pimpl(BufferView & bv, LyXView * owner,
-             int xpos, int ypos, int width, int height);
+       Pimpl(BufferView & bv, LyXView * owner, int width, int height);
        ///
        Painter & painter() const;
        /// return the screen for this bview
        LyXScreen & screen() const;
        ///
        void setBuffer(Buffer * buf);
-       /// Return true if the cursor was fitted.
-       bool fitCursor();
-       ///
-       void redoCurrentBuffer();
        ///
        void resizeCurrentBuffer();
+       //
+       bool fitCursor();
+       //
+       bool multiParSel();
        ///
-       void update();
+       void update(Update::flags flags = Update::Force);
        ///
        void newFile(std::string const &, std::string const &, bool);
        ///
@@ -99,15 +101,15 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void center();
        /// a function should be executed from the workarea
        bool workAreaDispatch(FuncRequest const & ev);
+       /// return true for events that will handle
+       FuncStatus getStatus(FuncRequest const & cmd);
        /// a function should be executed
        bool dispatch(FuncRequest const & ev);
+       /// Flag: do a full redraw of inside text of inset
+       bool repaintAll() { return refresh_inside_; }
        ///
-       int top_y() const;
-       ///
-       void top_y(int y);
+       void repaintAll(bool r) {refresh_inside_ = r; }
 private:
-       /// the y coordinate of the top of the screen
-       int top_y_;
        /// An error list (replaces the error insets)
        ErrorList errorlist_;
        /// add an error to the list
@@ -149,6 +151,8 @@ private:
        boost::scoped_ptr<LyXScreen> screen_;
        ///
        boost::scoped_ptr<WorkArea> workarea_;
+       /// Estimated average par height for scrollbar
+       int wh_;
        ///
        Timeout cursor_timeout;
        ///
@@ -156,7 +160,8 @@ private:
        ///
        bool using_xterm_cursor;
        ///
-       struct Position {
+       class Position {
+       public:
                /// Filename
                std::string filename;
                /// Cursor paragraph Id
@@ -171,8 +176,6 @@ private:
        };
        ///
        std::vector<Position> saved_positions;
-       /// Get next inset of this class from current cursor position
-       InsetBase * getInsetByCode(InsetBase::Code code);
        ///
        void MenuInsertLyXFile(std::string const & filen);
        /// our workarea
@@ -185,5 +188,16 @@ private:
        } xsel_cache_;
        ///
        LCursor cursor_;
+       ///
+       bool multiparsel_cache_;
+       ///
+       lyx::pit_type anchor_ref_;
+       ///
+       int offset_ref_;
+       ///
+       ViewMetricsInfo metrics(bool singlepar = false);
+       /// Working variable indicating a full screen refresh
+       mutable bool refresh_inside_;
+       
 };
 #endif // BUFFERVIEW_PIMPL_H