Fix bug 886 and others not reported related with the document paper size.

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 8b0460572dac25d3ec02d9c008da55f73b218e9b..4af5de3635253578a15bdc3e17f1481d8e6dbfbd 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -61,6 +61,7 @@ using lyx::pos_type;
 using std::endl;
 using std::ostringstream;
 using std::string;
+using std::min;
 
 
 LyXText::LyXText(BufferView * bv)
@@ -669,7 +670,6 @@ void LyXText::setCursor(CursorSlice & cur, pit_type par,
        BOOST_ASSERT(par != int(paragraphs().size()));
        cur.pit() = par;
        cur.pos() = pos;
-       cur.boundary() = boundary;
 
        // now some strict checking
        Paragraph & para = getPar(par);
@@ -692,6 +692,7 @@ void LyXText::setCursor(CursorSlice & cur, pit_type par,
 void LyXText::setCursorIntern(LCursor & cur,
        pit_type par, pos_type pos, bool setfont, bool boundary)
 {
+       cur.boundary(boundary);
        setCursor(cur.top(), par, pos, boundary);
        cur.setTargetX();
        if (setfont)
@@ -842,6 +843,7 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
                        tmpx += singleWidth(par, end - 1);
                c = end - 1;
        }
+
        // Air gap above display inset:
        if (row.pos() < end && c >= end && end < par.size()
            && par.isInset(end) && par.getInset(end)->display()) {
@@ -854,7 +856,16 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
        }
 
        x = int(tmpx) + xo;
-       return c - row.pos();
+
+        if (end == par.size())
+                return c - row.pos();
+
+       if (c && !par.isSeparator(c-1)) {
+               boundary = true;
+               return c - row.pos();
+       }
+
+        return min(c - row.pos(), end - 1 - row.pos());
 }
 
 
@@ -923,12 +934,12 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
        pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
        cur.pit() = pit;
        cur.pos() = pos;
-       cur.boundary() = bound;
+       cur.boundary(bound);
        cur.x_target() = x;
 
        // try to descend into nested insets
        InsetBase * inset = checkInsetHit(x, y);
-       lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
+       //lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
        if (!inset) {
                // Either we deconst editXY or better we move current_font
                // and real_current_font to LCursor
@@ -989,7 +1000,7 @@ bool LyXText::cursorLeft(LCursor & cur)
 
 bool LyXText::cursorRight(LCursor & cur)
 {
-       if (false && cur.boundary()) {
+       if (cur.boundary()) {
                return setCursor(cur, cur.pit(), cur.pos(), true, false);
        }
 
@@ -1013,11 +1024,16 @@ bool LyXText::cursorRight(LCursor & cur)
 bool LyXText::cursorUp(LCursor & cur)
 {
        Paragraph const & par = cur.paragraph();
-       int const row = par.pos2row(cur.pos());
+       int row;
        int const x = cur.targetX();
 
+       if (cur.pos() && cur.boundary())
+               row = par.pos2row(cur.pos()-1);
+       else
+               row = par.pos2row(cur.pos());
+
        if (!cur.selection()) {
-               int const y = bv_funcs::getPos(cur).y_;
+               int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
                LCursor old = cur;
                editXY(cur, x, y - par.rows()[row].ascent() - 1);
 
@@ -1052,11 +1068,16 @@ bool LyXText::cursorUp(LCursor & cur)
 bool LyXText::cursorDown(LCursor & cur)
 {
        Paragraph const & par = cur.paragraph();
-       int const row = par.pos2row(cur.pos());
+       int row;
        int const x = cur.targetX();
 
+       if (cur.pos() && cur.boundary())
+               row = par.pos2row(cur.pos()-1);
+       else
+               row = par.pos2row(cur.pos());
+
        if (!cur.selection()) {
-               int const y = bv_funcs::getPos(cur).y_;
+               int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
                LCursor old = cur;
                editXY(cur, x, y + par.rows()[row].descent() + 1);