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 8f1b515bf0332d88f5a430461c0d8051b9079544..c6ac78f6f7af61561e1dd911ede071772871df26 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -45,7 +45,8 @@ class ViewMetricsInfo;
 
 
 ///
-struct BufferView::Pimpl : public boost::signals::trackable {
+class BufferView::Pimpl : public boost::signals::trackable {
+public:
        ///
        Pimpl(BufferView & bv, LyXView * owner, int width, int height);
        ///
@@ -58,8 +59,10 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void resizeCurrentBuffer();
        //
        bool fitCursor();
+       //
+       bool multiParSel();
        ///
-       void update(bool fitcursor = false, bool forceupdate = true);
+       void update(Update::flags flags = Update::Force);
        ///
        void newFile(std::string const &, std::string const &, bool);
        ///
@@ -102,6 +105,10 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        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_; }
+       ///
+       void repaintAll(bool r) {refresh_inside_ = r; }
 private:
        /// An error list (replaces the error insets)
        ErrorList errorlist_;
@@ -144,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;
        ///
@@ -151,7 +160,8 @@ private:
        ///
        bool using_xterm_cursor;
        ///
-       struct Position {
+       class Position {
+       public:
                /// Filename
                std::string filename;
                /// Cursor paragraph Id
@@ -179,13 +189,15 @@ private:
        ///
        LCursor cursor_;
        ///
+       bool multiparsel_cache_;
        ///
        lyx::pit_type anchor_ref_;
        ///
        int offset_ref_;
        ///
-       ViewMetricsInfo metrics();
-
-
+       ViewMetricsInfo metrics(bool singlepar = false);
+       /// Working variable indicating a full screen refresh
+       mutable bool refresh_inside_;
+       
 };
 #endif // BUFFERVIEW_PIMPL_H