revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 375683de7c61cfa6bf51d0e854c1c992aae98dd7..fdc9181ab2cf0a4d64df01a4c904fd55570358e5 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,6 +15,8 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "metricsinfo.h"
+
 #include "frontends/LyXKeySym.h"
 
 #include "support/types.h"
@@ -26,7 +28,6 @@
 class Buffer;
 class Change;
 class DocIterator;
-class ErrorList;
 class FuncRequest;
 class FuncStatus;
 class Language;
@@ -34,12 +35,7 @@ class LCursor;
 class LyXText;
 class LyXView;
 class ParIterator;
-
-namespace lyx {
-namespace frontend {
-class Painter;
-}
-}
+class ViewMetricsInfo;
 
 namespace Update {
        enum flags {
@@ -101,9 +97,8 @@ public:
        void setBuffer(Buffer * b);
        /// return the buffer being viewed
        Buffer * buffer() const;
-
-       /// return the painter object for drawing onto the view
-       lyx::frontend::Painter & painter() const;
+       /// return the first layout of the Buffer.
+       std::string firstLayout();
 
        /// return the owning main view
        LyXView * owner() const;
@@ -113,9 +108,6 @@ public:
 
        /// reload the contained buffer
        void reload();
-       /// create a new buffer based on template
-       void newFile(std::string const & fname, std::string const & tname,
-                    bool named = true);
        /// load a buffer into the view
        bool loadLyXFile(std::string const & name, bool tolastfiles = true);
 
@@ -123,9 +115,10 @@ public:
         *  to do a fitcursor, and to force an update if screen
         *  position changes. \c forceupdate means to force an update
         *  in any case.
+        * \return true if a full updateMetrics() is needed.
         */
+       bool update(Update::flags flags = Update::FitCursor | Update::Force);
 
-       void update(Update::flags flags = Update::FitCursor | Update::Force);
        /// move the screen to fit the cursor. Only to be called with
        /// good y coordinates (after a bv::metrics)
        bool fitCursor();
@@ -155,28 +148,20 @@ public:
        /// return the lyxtext we are using
        LyXText const * getLyXText() const;
 
-       /// simple replacing. Use the font of the first selected character
-       void replaceSelectionWithString(std::string const & str);
-
        /// move cursor to the named label
        void gotoLabel(std::string const & label);
 
-       /// get the stored error list
-       ErrorList const & getErrorList() const;
-       /// show the error list to the user
-       void showErrorList(std::string const &) const;
        /// set the cursor based on the given TeX source row
        void setCursorFromRow(int row);
 
-       /// hide the cursor if it is visible
-       void hideCursor();
-
        /// 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 the view by a number of pixels
        void scrollDocView(int pixels);
+       /// Set the cursor position based on the scrollbar one.
+       void setCursorFromScrollbar();
 
        /// return the pixel width of the document view
        int workWidth() const;
@@ -199,9 +184,6 @@ public:
        ///
        void workAreaResize(int width, int height);
 
-       /// Receive a keypress
-       void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
-
        /// a function should be executed from the workarea
        bool workAreaDispatch(FuncRequest const & ev);
 
@@ -231,6 +213,10 @@ public:
         */
        void putSelectionAt(DocIterator const & cur,
                int length, bool backwards);
+       ///
+       ViewMetricsInfo const & viewMetricsInfo();
+       ///
+       void updateMetrics(bool singlepar = false);
 
 private:
        ///