SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index a4726346c6934d81054e9bf27ab3d7897a585e3b..21d49f91e95f93bd34d3af613ef2f6479baed40f 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,11 +15,11 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "coordcache.h"
-#include "cursor.h"
-#include "metricsinfo.h"
+#include "CoordCache.h"
+#include "Cursor.h"
+#include "MetricsInfo.h"
 #include "TextMetrics.h"
-#include "UpdateFlags.h"
+#include "update_flags.h"
 
 #include "support/types.h"
 
@@ -41,8 +41,8 @@ class DocIterator;
 class FuncRequest;
 class FuncStatus;
 class Intl;
-class LCursor;
-class LyXText;
+class Cursor;
+class Text;
 class ParIterator;
 class ParagraphMetrics;
 class ViewMetricsInfo;
@@ -72,29 +72,21 @@ struct ScrollbarParameters
  * is a sliding window of the entire document rendering.
  * It is the official interface between the LyX core and
  * the frontend WorkArea.
- * 
+ *
  * \sa WorkArea
  * \sa Buffer
  * \sa CoordCache
  */
 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();
-
-       /// load a buffer into the view.
-       bool loadLyXFile(support::FileName const & name, bool tolastfiles = true);
+       Buffer & buffer();
+       Buffer const & buffer() const;
 
        /// perform pending metrics updates.
        /** \c Update::FitCursor means first to do a FitCursor, and to
@@ -146,8 +138,8 @@ public:
        /// return the pixel height of the document view.
        int workHeight() const;
 
-       /// switch between primary and secondary keymaps for RTL entry.
-       void switchKeyMap();
+       /// translate and insert a character, using the correct keymap.
+       void translateAndInsert(char_type c, Text * t, Cursor & cur);
 
        /// return true for events that will handle.
        FuncStatus getStatus(FuncRequest const & cmd);
@@ -175,18 +167,18 @@ public:
        pit_type anchor_ref() const;
 
        /// access to full cursor.
-       LCursor & cursor();
+       Cursor & cursor();
        /// access to full cursor.
-       LCursor const & cursor() const;
+       Cursor const & cursor() const;
        /// sets cursor.
        /// This will also open all relevant collapsable insets.
        void setCursor(DocIterator const &);
        /// Check deleteEmptyParagraphMechanism and update metrics if needed.
        /// \retval true if an update was needed.
-       bool checkDepm(LCursor & cur, LCursor & old);
+       bool checkDepm(Cursor & cur, Cursor & old);
        /// sets cursor.
        /// This is used when handling LFUN_MOUSE_PRESS.
-       bool mouseSetCursor(LCursor & cur);
+       bool mouseSetCursor(Cursor & cur);
 
        /// sets the selection.
        /* When \c backwards == false, set anchor
@@ -207,10 +199,10 @@ public:
        void updateMetrics(bool singlepar = false);
 
        ///
-       TextMetrics const & textMetrics(LyXText const * t) const;
-       TextMetrics & textMetrics(LyXText const * t);
+       TextMetrics const & textMetrics(Text const * t) const;
+       TextMetrics & textMetrics(Text const * t);
        ///
-       ParagraphMetrics const & parMetrics(LyXText const *, pit_type) const;
+       ParagraphMetrics const & parMetrics(Text const *, pit_type) const;
 
        ///
        CoordCache & coordCache() {
@@ -238,14 +230,14 @@ public:
 
        /// This signal is emitted when some inset dialogs needs to be shown.
        boost::signal<void(std::string name, std::string data,
-               InsetBase * inset)> showInsetDialog;
+               Inset * inset)> showInsetDialog;
 
        /// This signal is emitted when some dialogs needs to be updated.
        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;
+       boost::signal<void(docstring layout)> layoutChanged;
 
 private:
        ///
@@ -253,8 +245,8 @@ private:
 
        /// Search recursively for the the innermost inset that covers (x, y) position.
        /// \retval 0 if no inset is found.
-       InsetBase const * getCoveringInset(
-               LyXText const & text, //< The LyXText where we start searching.
+       Inset const * getCoveringInset(
+               Text const & text, //< The Text where we start searching.
                int x, //< x-coordinate on screen
                int y  //< y-coordinate on screen
                );
@@ -271,7 +263,7 @@ private:
        ///
        CoordCache coord_cache_;
        ///
-       Buffer * buffer_;
+       Buffer & buffer_;
 
        /// Estimated average par height for scrollbar.
        int wh_;
@@ -285,7 +277,7 @@ private:
                bool set;
        } xsel_cache_;
        ///
-       LCursor cursor_;
+       Cursor cursor_;
        ///
        bool multiparsel_cache_;
        ///
@@ -297,10 +289,10 @@ private:
        boost::scoped_ptr<Intl> const intl_;
 
        /// last visited inset (kept to send setMouseHover(false) )
-       InsetBase * last_inset_;
+       Inset * last_inset_;
 
-       /// A map from a LyXText to the associated text metrics
-       typedef std::map<LyXText const *, TextMetrics> TextMetricsCache;
+       /// A map from a Text to the associated text metrics
+       typedef std::map<Text const *, TextMetrics> TextMetricsCache;
        mutable TextMetricsCache text_metrics_;
 };