Second Locale patch.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 9c50f9597b3fd0ffc83f69a7113ec52dda2662b9..531b38f08bc67830f7d52b5695970440bbacab78 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -23,11 +23,10 @@
 
 class Buffer;
 class Change;
-class Encoding;
+class DocIterator;
 class ErrorList;
 class FuncRequest;
-class InsetBase;
-class InsetOld;
+class FuncStatus;
 class Language;
 class LCursor;
 class LyXText;
@@ -35,9 +34,27 @@ class LyXScreen;
 class LyXView;
 class Painter;
 class ParIterator;
-class PosIterator;
-class TeXErrors;
-class UpdatableInset;
+
+
+namespace Update {
+       enum flags {
+               FitCursor = 1,
+               Force = 2,
+               SinglePar = 4
+       };
+
+inline flags operator|(flags const f, flags const g)
+{
+       return static_cast<flags>(int(f) | int(g));
+}
+
+inline flags operator&(flags const f, flags const g)
+{
+       return static_cast<flags>(int(f) & int(g));
+}
+
+} // namespace
+
 
 /**
  * A buffer view encapsulates a view onto a particular
@@ -53,12 +70,12 @@ public:
         * Create a view with the given owner main window,
         * of the given dimensions.
         */
-       BufferView(LyXView * owner, int x, int y, int w, int h);
+       BufferView(LyXView * owner, int w, int h);
 
        ~BufferView();
 
        /// set the buffer we are viewing
-       void buffer(Buffer * b);
+       void setBuffer(Buffer * b);
        /// return the buffer being viewed
        Buffer * buffer() const;
 
@@ -69,31 +86,29 @@ public:
        /// return the owning main view
        LyXView * owner() const;
 
-       /// return the visible top y
-       int top_y() const;
-
-       /// set the visible top y
-       void top_y(int);
-
        /// resize event has happened
        void resize();
 
        /// reload the contained buffer
        void reload();
        /// create a new buffer based on template
-       bool newFile(std::string const & fname, std::string const & tname,
+       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);
 
-       /// fit the user cursor within the visible view
+       /** perform pending painting updates. \c fitcursor means first
+        *  to do a fitcursor, and to force an update if screen
+        *  position changes. \c forceupdate means to force an update
+        *  in any case.
+        */
+
+       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();
-       /// perform pending painting updates
-       void update();
        /// reset the scrollbar to reflect current view position
        void updateScrollbar();
-       /// FIXME
-       void redoCurrentBuffer();
 
        /// FIXME
        bool available() const;
@@ -109,15 +124,12 @@ public:
        Change const getCurrentChange();
 
        /// return the lyxtext we are using
-       LyXText * getLyXText() const;
+       LyXText * getLyXText();
 
-       /// return the current encoding at the cursor
-       Encoding const * getEncoding() const;
-
-       /// return the parent language of the given inset
-       Language const * getParentLanguage(InsetOld * inset) const;
+       /// return the lyxtext we are using
+       LyXText const * getLyXText() const;
 
-       /// simple replacing. Use the font of the first selected character 
+       /// simple replacing. Use the font of the first selected character
        void replaceSelectionWithString(std::string const & str);
 
        /// move cursor to the named label
@@ -130,12 +142,6 @@ public:
        /// set the cursor based on the given TeX source row
        void setCursorFromRow(int row);
 
-       /// Inserts a lyx file at cursor position. return false if it fails
-       bool insertLyXFile(std::string const & file);
-
-       /// FIXME
-       bool fitLockedInsetCursor(int x, int y, int asc, int desc);
-
        /// hide the cursor if it is visible
        void hideCursor();
 
@@ -144,7 +150,7 @@ public:
        /// 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);
+       void scrollDocView(int pixels);
 
        /// return the pixel width of the document view
        int workWidth() const;
@@ -161,12 +167,19 @@ public:
        /// tell the window system we have a selection
        void haveSelection(bool sel);
 
+       /// return true for events that will handle
+       FuncStatus getStatus(FuncRequest const & cmd);
        /// execute the given function
        bool dispatch(FuncRequest const & argument);
-       
+
        /// clear the X selection
        void unsetXSel();
 
+       /// access to offset
+       int offset_ref() const;
+       /// access to anchor
+       lyx::pit_type anchor_ref() const;
+
        /// access to full cursor
        LCursor & cursor();
        /// access to full cursor
@@ -174,15 +187,21 @@ public:
        ///
        LyXText * text() const;
        ///
-       void setCursor(ParIterator const & par, lyx::pos_type pos);
-       ///
-       void putSelectionAt(PosIterator const & cur, int length, bool backwards);
+       void setCursor(DocIterator const &);
+       /* Sets the selection. When \c backwards == false, set anchor
+        * to \c cur and cursor to \c cur + \c length. When \c
+        * backwards == true, set anchor to \c cur and cursor to \c
+        * cur + \c length.
+        */
+       void putSelectionAt(DocIterator const & cur,
+               int length, bool backwards);
+
 
 private:
        ///
-       struct Pimpl;
+       class Pimpl;
        ///
-       friend struct BufferView::Pimpl;
+       friend class BufferView::Pimpl;
        ///
        Pimpl * pimpl_;
 };