ar.po: updates from Hatim

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index d164438ad57f6a5946c2b101ccfa4c4b030b35f6..31b6e94fc484d70f451592857780e07cabc7c6b9 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -18,7 +18,6 @@
 #include "DocumentClassPtr.h"
 #include "update_flags.h"
 
-#include "support/shared_ptr.h"
 #include "support/strfwd.h"
 #include "support/types.h"
 
@@ -33,6 +32,7 @@ class Buffer;
 class Change;
 class CoordCache;
 class Cursor;
+class CursorSlice;
 class DispatchResult;
 class DocIterator;
 class DocumentClass;
@@ -40,9 +40,11 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class PainterInfo;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
+class TexRow;
 class Text;
 class TextMetrics;
 
@@ -116,9 +118,20 @@ public:
         */
        void processUpdateFlags(Update::flags flags);
 
-       /// move the screen to fit the cursor.
+       /// return true if one shall move the screen to fit the cursor.
        /// Only to be called with good y coordinates (after a bv::metrics)
-       bool fitCursor();
+       bool needsFitCursor() const;
+
+       // Returns the amount of horizontal scrolling applied to the
+       // top-level row where the cursor lies
+       int horizScrollOffset() const;
+
+       // Points to the top-level row where the cursor lies (during draw).
+       CursorSlice const & currentRowSlice() const;
+
+       // Points to the top-level row where the cursor lied at last draw event.
+       CursorSlice const & lastRowSlice() const;
+
        /// reset the scrollbar to reflect current view position.
        void updateScrollbar();
        /// return the Scrollbar Parameters.
@@ -147,6 +160,8 @@ public:
 
        /// set the cursor based on the given TeX source row.
        void setCursorFromRow(int row);
+       ///
+       void setCursorFromRow(int row, TexRow const & texrow);
 
        /// set cursor to the given inset. Return true if found.
        bool setCursorFromInset(Inset const *);
@@ -155,11 +170,11 @@ public:
        void recenter();
        /// Ensure that the BufferView cursor is visible.
        /// This method will automatically scroll and update the BufferView
-       /// if needed.
-       void showCursor(); 
+       /// (metrics+drawing) if needed.
+       void showCursor();
        /// Ensure the passed cursor \p dit is visible.
        /// This method will automatically scroll and update the BufferView
-       /// if needed.
+       /// (metrics+drawing) if needed.
        /// \param recenter Whether the cursor should be centered on screen
        void showCursor(DocIterator const & dit, bool recenter,
                bool update);
@@ -318,6 +333,8 @@ public:
        void clearLastInset(Inset * inset) const;
        /// Is the mouse hovering a clickable inset or element?
        bool clickableInset() const;
+       ///
+       void makeDocumentClass();
 
 private:
        /// noncopyable
@@ -330,11 +347,18 @@ private:
        /// \return true if no further update is needed.
        bool singleParUpdate();
 
+       // Set the row on which the cursor lives.
+       void setCurrentRowSlice(CursorSlice const & rowSlice);
+
+       // Check whether the row where the cursor lives needs to be scrolled.
+       // Update the drawing strategy if needed.
+       void checkCursorScrollOffset(PainterInfo & pi);
+
        /// The minimal size of the document that is visible. Used
        /// when it is allowed to scroll below the document.
        int minVisiblePart();
 
-       /// Search recursively for the the innermost inset that covers (x, y) position.
+       /// Search recursively for the innermost inset that covers (x, y) position.
        /// \retval 0 if no inset is found.
        Inset const * getCoveringInset(
                Text const & text, //< The Text where we start searching.