Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index da216279640438be70b5b936bf50500bac7b70cb..c9652b6b5a1d8f9d623e07b2449b401ce3341b49 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -35,6 +35,8 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+namespace frontend { class Painter; }
+
 class Buffer;
 class Change;
 class DocIterator;
@@ -79,19 +81,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.
-       void 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
@@ -112,9 +109,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<pit_type, pos_type, int> 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
@@ -131,8 +128,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.
@@ -158,10 +159,9 @@ 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
@@ -217,6 +217,10 @@ public:
        CoordCache const & coordCache() const {
                return coord_cache_;
        }
+
+       ///
+       void draw(frontend::Painter & pain);
+
        /// get this view's keyboard map handler.
        Intl & getIntl() { return *intl_.get(); }
        ///
@@ -268,7 +272,7 @@ private:
        ///
        CoordCache coord_cache_;
        ///
-       Buffer * buffer_;
+       Buffer & buffer_;
 
        /// Estimated average par height for scrollbar.
        int wh_;
@@ -289,6 +293,10 @@ private:
        pit_type anchor_ref_;
        ///
        int offset_ref_;
+       ///
+       void updateOffsetRef();
+       ///
+       bool need_centering_;
 
        /// keyboard mapping object.
        boost::scoped_ptr<Intl> const intl_;
@@ -301,6 +309,14 @@ private:
        mutable TextMetricsCache text_metrics_;
 };
 
+/// some space for drawing the 'nested' markers (in pixel)
+inline int nestMargin() { return 15; }
+
+/// margin for changebar
+inline int changebarMargin() { return 12; }
+
+/// right margin
+inline int rightMargin() { return 10; }
 
 } // namespace lyx