bug 2298: cursorTop/Bottom/Home/End does not redraw after dEPM

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 67825e9d0853ab0b9c32abbd38cd1504cfc073a5..e5cc72d73857f4001d6e76f87c6abcf198227dbe 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -75,7 +75,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);
@@ -133,7 +133,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).
@@ -165,8 +165,7 @@ public:
        bool setCursor(LCursor & cur, pit_type par, pos_type pos,
                       bool setfont = true, bool boundary = false);
        ///
-       void setCursor(CursorSlice &, pit_type par,
-                      pos_type pos, bool boundary = false);
+       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);
@@ -177,8 +176,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.
@@ -210,21 +209,26 @@ 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);
-       ///
-       void cursorBottom(LCursor & cur);
+       bool cursorTop(LCursor & cur);
        ///
-       void Delete(LCursor & cur);
-       ///
-       void backspace(LCursor & cur);
+       bool cursorBottom(LCursor & cur);
+       /// Delete character at cursor. Honour change tracking
+       bool Delete(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);
        ///
        bool selectWordWhenUnderCursor(LCursor & cur, lyx::word_location);
        ///
@@ -327,6 +331,9 @@ public:
        ///
        int cursorY(CursorSlice const & cursor, bool boundary) const;
 
+       /// delete double space or empty paragraphs around old cursor
+       bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old);
+
        ///
        friend class LyXScreen;
 
@@ -339,8 +346,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_;
 
@@ -363,9 +368,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);
 
@@ -373,9 +375,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);
        ///