Cosmetics.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index a27d010f78c2f8f5f536117cabed059a312589b0..8899edd1aa36761f0b7616f5e8f4a974e9c6b5f2 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -24,7 +24,7 @@
 #include "support/types.h"
 
 #include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/signal.hpp>
 
 #include <utility>
@@ -35,6 +35,8 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+namespace frontend { class Painter; }
+
 class Buffer;
 class Change;
 class DocIterator;
@@ -46,6 +48,12 @@ class Text;
 class ParIterator;
 class ParagraphMetrics;
 class ViewMetricsInfo;
+ 
+enum CursorStatus {
+       CUR_INSIDE,
+       CUR_ABOVE,
+       CUR_BELOW
+};
 
 /// Scrollbar Parameters.
 struct ScrollbarParameters
@@ -79,19 +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.
-       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 +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<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 +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.
@@ -158,10 +165,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
@@ -171,6 +177,8 @@ public:
        /// access to anchor.
        pit_type anchor_ref() const;
 
+       ///
+       CursorStatus cursorStatus(DocIterator const & dit) const;
        /// access to full cursor.
        Cursor & cursor();
        /// access to full cursor.
@@ -210,13 +218,17 @@ public:
        ParagraphMetrics const & parMetrics(Text const *, pit_type) const;
 
        ///
-       CoordCache & coordCache() {
-               return coord_cache_;
-       }
+       CoordCache & coordCache() { return coord_cache_; }
        ///
-       CoordCache const & coordCache() const {
-               return coord_cache_;
-       }
+       CoordCache const & coordCache() const { return coord_cache_; }
+
+       ///
+       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(); }
        ///
@@ -241,10 +253,12 @@ public:
        boost::signal<void(std::string name,
                std::string data)> updateDialog;
 
-       /// This signal is emitted when the layout at the cursor is changed.
-       boost::signal<void(std::string layout)> layoutChanged;
-
 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();
 
@@ -268,7 +282,7 @@ private:
        ///
        CoordCache coord_cache_;
        ///
-       Buffer * buffer_;
+       Buffer & buffer_;
 
        /// Estimated average par height for scrollbar.
        int wh_;
@@ -289,6 +303,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 +319,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