small simplification

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index de433e09e92b66bafe785a3b5763e54e03deaa23..1c02f954d7ea9202e9f1bcae62bd83a3308fda6b 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -23,9 +23,7 @@
 
 #include "support/types.h"
 
-#include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
-#include <boost/signal.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <utility>
 #include <string>
@@ -36,6 +34,7 @@ namespace lyx {
 namespace support { class FileName; }
 
 namespace frontend { class Painter; }
+namespace frontend { class GuiBufferViewDelegate; }
 
 class Buffer;
 class Change;
@@ -48,6 +47,12 @@ class Text;
 class ParIterator;
 class ParagraphMetrics;
 class ViewMetricsInfo;
+ 
+enum CursorStatus {
+       CUR_INSIDE,
+       CUR_ABOVE,
+       CUR_BELOW
+};
 
 /// Scrollbar Parameters.
 struct ScrollbarParameters
@@ -83,7 +88,7 @@ class BufferView : boost::noncopyable {
 public:
        ///
        BufferView(Buffer & buffer);
-
+       ///
        ~BufferView();
 
        /// return the buffer being viewed.
@@ -171,6 +176,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 +217,13 @@ 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);
@@ -226,29 +233,32 @@ public:
        ///
        Intl const & getIntl() const { return *intl_.get(); }
 
+       //
+       // Messages to the GUI
+       //
        /// This signal is emitted when some message shows up.
-       boost::signal<void(docstring)> message;
+       void message(docstring const & msg);
 
        /// This signal is emitted when some dialog needs to be shown.
-       boost::signal<void(std::string name)> showDialog;
+       void showDialog(std::string const & name);
 
        /// This signal is emitted when some dialog needs to be shown with
        /// some data.
-       boost::signal<void(std::string name,
-               std::string data)> 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<void(std::string name, std::string data,
-               Inset * inset)> 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<void(std::string name,
-               std::string data)> 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<void(docstring layout)> layoutChanged;
+       ///
+       void setGuiDelegate(frontend::GuiBufferViewDelegate *);
 
 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();
@@ -310,6 +320,9 @@ private:
        /// A map from a Text to the associated text metrics
        typedef std::map<Text const *, TextMetrics> TextMetricsCache;
        mutable TextMetricsCache text_metrics_;
+
+       // Whom to notify. Not owned, so don't delete.
+       frontend::GuiBufferViewDelegate * gui_;
 };
 
 /// some space for drawing the 'nested' markers (in pixel)