cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 52f9b6b34b292b945551576f8049c539693cf2d0..c4e345234f8d77aad73dec12c6ddc107d050e45d 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -21,7 +21,7 @@
 #include "lyxfont.h"
 #include "layout.h"
 #include "lyxlayout_ptr_fwd.h"
-#include "ParagraphList_fwd.h"
+#include "ParagraphList.h"
 
 #include <iosfwd>
 
@@ -30,6 +30,7 @@ class BufferParams;
 class BufferView;
 class CursorSlice;
 class Dimension;
+class ErrorList;
 class InsetBase;
 class InsetBase_code;
 class FuncRequest;
@@ -50,6 +51,8 @@ public:
        ///
        typedef lyx::pos_type pos_type;
        ///
+       typedef lyx::char_type char_type;
+       ///
        typedef lyx::pit_type pit_type;
 
        /// constructor
@@ -75,7 +78,7 @@ public:
        void breakParagraph(LCursor & cur, bool keep_layout = false);
 
        /// set layout over selection
-       pit_type setLayout(pit_type start, pit_type end,
+       void setLayout(pit_type start, pit_type end,
                std::string const & layout);
        ///
        void setLayout(LCursor & cur, std::string const & layout);
@@ -108,7 +111,7 @@ public:
        std::string getStringToIndex(LCursor const & cur);
 
        /// insert a character at cursor position
-       void insertChar(LCursor & cur, char c);
+       void insertChar(LCursor & cur, lyx::char_type c);
        /// insert an inset at cursor position
        void insertInset(LCursor & cur, InsetBase * inset);
 
@@ -133,7 +136,7 @@ public:
        /// read-write access to individual paragraph
        Paragraph & getPar(pit_type pit) { return pars_[pit]; }
        // Returns the current font and depth as a message.
-       std::string LyXText::currentState(LCursor & cur);
+       std::string currentState(LCursor & cur);
 
        /** returns row near the specified
          * y-coordinate in given paragraph (relative to the screen).
@@ -168,7 +171,7 @@ public:
        void setCursor(CursorSlice &, pit_type par, pos_type pos);
        ///
        void setCursorIntern(LCursor & cur, pit_type par,
-                pos_type pos, bool setfont = true, bool boundary = false);
+                pos_type pos, bool setfont = true, bool boundary = false);
        ///
        void setCurrentFont(LCursor & cur);
 
@@ -176,8 +179,8 @@ public:
        void recUndo(pit_type first, pit_type last) const;
        ///
        void recUndo(pit_type first) const;
-       ///
-       void setCursorFromCoordinates(LCursor & cur, int x, int y);
+       /// returns true if par was empty and was removed
+       bool setCursorFromCoordinates(LCursor & cur, int x, int y);
        ///
        InsetBase * editXY(LCursor & cur, int x, int y);
        /// Move cursor one line up.
@@ -209,21 +212,28 @@ public:
        ///
        bool cursorDownParagraph(LCursor & cur);
        ///
-       void cursorHome(LCursor & cur);
+       bool cursorHome(LCursor & cur);
        ///
-       void cursorEnd(LCursor & cur);
+       bool cursorEnd(LCursor & cur);
        ///
        bool cursorPrevious(LCursor & cur);
        ///
        bool cursorNext(LCursor & cur);
        ///
-       void cursorTop(LCursor & cur);
+       bool cursorTop(LCursor & cur);
        ///
-       void cursorBottom(LCursor & cur);
-       ///
-       void Delete(LCursor & cur);
-       ///
-       void backspace(LCursor & cur);
+       bool cursorBottom(LCursor & cur);
+       /// Erase character at cursor. Honour change tracking
+       bool erase(LCursor & cur);
+       /** At cursor position 0, merge paragraph with the one before it.
+        * Ignore CT (this is used in \c acceptChange, \c rejectChange for
+        * physical deletion of paragraph break)
+        */
+       bool backspacePos0(LCursor & cur);
+       /// Delete character before cursor. Honour CT
+       bool backspace(LCursor & cur);
+       // Dissolve the inset under cursor
+       bool dissolveInset(LCursor & cur);
        ///
        bool selectWordWhenUnderCursor(LCursor & cur, lyx::word_location);
        ///
@@ -252,9 +262,9 @@ public:
        /* these things are for search and replace */
 
        /// needed to insert the selection
-       void insertStringAsLines(LCursor & cur, std::string const & str);
+       void insertStringAsLines(LCursor & cur, lyx::docstring const & str);
        /// needed to insert the selection
-       void insertStringAsParagraphs(LCursor & cur, std::string const & str);
+       void insertStringAsParagraphs(LCursor & cur, lyx::docstring const & str);
 
        /// current text width
        int width() const;
@@ -269,7 +279,7 @@ public:
        int singleWidth(Paragraph const & par, pos_type pos) const;
        ///
        int singleWidth(Paragraph const & par,
-               pos_type pos, char c, LyXFont const & Font) const;
+               pos_type pos, char_type c, LyXFont const & Font) const;
 
        /// return the color of the canvas
        LColor_color backgroundColor() const;
@@ -315,7 +325,7 @@ public:
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        /// returns whether we've seen our usual 'end' marker
-       bool read(Buffer const & buf, LyXLex & lex);
+       bool read(Buffer const & buf, LyXLex & lex, ErrorList & errorList);
 
        ///
        int ascent() const;
@@ -326,8 +336,8 @@ public:
        ///
        int cursorY(CursorSlice const & cursor, bool boundary) const;
 
-       ///
-       friend class LyXScreen;
+       /// delete double space or empty paragraphs around old cursor
+       bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old);
 
 public:
        ///
@@ -338,8 +348,6 @@ public:
        LyXFont current_font;
        /// the current font
        LyXFont real_current_font;
-       /// our buffer's default layout font. This is textclass specific
-       LyXFont defaultfont_;
        ///
        int background_color_;
 
@@ -362,9 +370,6 @@ private:
        /// change on pit
        pit_type undoSpan(pit_type pit);
 
-       /// used in setlayout
-       void makeFontEntriesLayoutSpecific(BufferParams const &, Paragraph & par);
-
        /// Calculate and set the height of the row
        void setHeightOfRow(pit_type, Row & row);
 
@@ -372,9 +377,6 @@ private:
        // position. Called by deleteEmptyParagraphMechanism
        void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
 
-       /// delete double space or empty paragraphs around old cursor
-       bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor const & old);
-
        ///
        void deleteWordForward(LCursor & cur);
        ///