Update cursor and scrollbar after resize.

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 0c432f8d9b210b5b22a4625b34d50e2b7783a8f0..0f8ba1c7f0a7bc1edbd3f99f72fe82dd8dd117c6 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -14,6 +14,7 @@
 #ifndef TEXT_H
 #define TEXT_H
 
+#include "DocIterator.h"
 #include "ParagraphList.h"
 
 namespace lyx {
@@ -25,11 +26,12 @@ class CursorSlice;
 class DocIterator;
 class ErrorList;
 class Font;
+class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
-class Color_color;
 class Cursor;
+class Lexer;
 class PainterInfo;
 class Spacing;
 
@@ -46,9 +48,9 @@ public:
        bool empty() const;
 
        ///
-       Font getLayoutFont(Buffer const & buffer, pit_type pit) const;
+       FontInfo getLayoutFont(Buffer const & buffer, pit_type pit) const;
        ///
-       Font getLabelFont(Buffer const & buffer,
+       FontInfo getLabelFont(Buffer const & buffer,
                Paragraph const & par) const;
        /** Set font of character at position \p pos in paragraph \p pit.
         *  Must not be called if \p pos denotes an inset with text contents,
@@ -162,20 +164,32 @@ public:
        ///
        void recUndo(Cursor & cur, pit_type first) const;
 
-       /// Move cursor one position left
+       /// Move cursor one position backwards
        /**
         * Returns true if an update is needed after the move.
         */
-       bool cursorLeft(Cursor & cur);
-       /// Move cursor one position right
+       bool cursorBackward(Cursor & cur);
+       /// Move cursor visually one position to the left
        /**
+        * \param skip_inset if true, don't enter insets
         * Returns true if an update is needed after the move.
         */
-       bool cursorRight(Cursor & cur);
+       bool cursorVisLeft(Cursor & cur, bool skip_inset = false);
+       /// Move cursor one position forward
+       /**
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorForward(Cursor & cur);
+       /// Move cursor visually one position to the right
+       /**
+        * \param skip_inset if true, don't enter insets
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorVisRight(Cursor & cur, bool skip_inset = false);
        ///
-       bool cursorLeftOneWord(Cursor & cur);
+       bool cursorBackwardOneWord(Cursor & cur);
        ///
-       bool cursorRightOneWord(Cursor & cur);
+       bool cursorForwardOneWord(Cursor & cur);
        /// Delete from cursor up to the end of the current or next word.
        void deleteWordForward(Cursor & cur);
        /// Delete from cursor to start of current or prior word.
@@ -199,15 +213,6 @@ public:
        bool dissolveInset(Cursor & cur);
        ///
        bool selectWordWhenUnderCursor(Cursor & cur, word_location);
-       ///
-       enum TextCase {
-               ///
-               text_lowercase = 0,
-               ///
-               text_capitalization = 1,
-               ///
-               text_uppercase = 2
-       };
        /// Change the case of the word at cursor position.
        void changeCase(Cursor & cur, TextCase action);
        /// Transposes the character at the cursor with the one before it
@@ -248,11 +253,15 @@ public:
 
        ///
        bool checkAndActivateInset(Cursor & cur, bool front);
+       ///
+       bool checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft);
 
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        /// returns whether we've seen our usual 'end' marker
-       bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList);
+       /// insetPtr is the containing Inset
+       bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList, 
+                 InsetText * insetPtr);
 
        /// delete double spaces, leading spaces, and empty paragraphs around old cursor.
        /// \retval true if a change has happened and we need a redraw.
@@ -265,6 +274,14 @@ public:
        /// from \first to \last paragraph
        void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges);
 
+       /// To resolve macros properly the texts get their DocIterator.
+       /// Every macro definition is stored with its DocIterator
+       /// as well. Only those macros with a smaller iterator become 
+       /// visible in a paragraph.
+       DocIterator macrocontextPosition() const;
+       ///
+       void setMacrocontextPosition(DocIterator const & pos);
+
 public:
        ///
        ParagraphList pars_;
@@ -286,7 +303,7 @@ private:
        /// handle the case where bibitems were deleted
        bool handleBibitems(Cursor & cur);
        ///
-       void charInserted();
+       void charInserted(Cursor & cur);
        /// set 'number' font property
        void number(Cursor & cur);
 
@@ -295,6 +312,9 @@ private:
        /// \param asParagraphs whether to paste as paragraphs or as lines
        void pasteString(Cursor & cur, docstring const & str,
                        bool asParagraphs);
+
+       /// position of the text in the buffer.
+       DocIterator macrocontext_position_;
 };
 
 } // namespace lyx