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 7b51412d69a4f22cb796d5eb09fc8748e1cc73a6..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)
@@ -103,30 +104,45 @@ InsetBase * LyXText::checkInsetHit(int x, int y) const
 
        Paragraph const & par = pars_[pit];
 
-       lyxerr << "checkInsetHit: x: " << x << " y: " << y << endl;
-       lyxerr << "  pit: " << pit << endl;
+       lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": x: " << x
+                << " y: " << y
+                << "  pit: " << pit
+                << endl;
        InsetList::const_iterator iit = par.insetlist.begin();
        InsetList::const_iterator iend = par.insetlist.end();
        for (; iit != iend; ++iit) {
                InsetBase * inset = iit->inset;
 #if 1
-               lyxerr << "examining inset " << inset << endl;
+               lyxerr[Debug::DEBUG]
+                        << BOOST_CURRENT_FUNCTION
+                        << ": examining inset " << inset << endl;
+                
                if (theCoords.getInsets().has(inset))
-                       lyxerr
-                               << " xo: " << inset->xo() << "..."
+                       lyxerr[Debug::DEBUG]
+                                << BOOST_CURRENT_FUNCTION
+                               << ": xo: " << inset->xo() << "..."
                                << inset->xo() + inset->width()
                                << " yo: " << inset->yo() - inset->ascent()
                                << "..."
-                               << inset->yo() + inset->descent() << endl;
+                               << inset->yo() + inset->descent()
+                                << endl;
                else
-                       lyxerr << " inset has no cached position" << endl;
+                       lyxerr[Debug::DEBUG]
+                                << BOOST_CURRENT_FUNCTION
+                                << ": inset has no cached position" << endl;
 #endif
                if (inset->covers(x, y)) {
-                       lyxerr << "Hit inset: " << inset << endl;
+                       lyxerr[Debug::DEBUG]
+                                << BOOST_CURRENT_FUNCTION
+                                << ": Hit inset: " << inset << endl;
                        return inset;
                }
        }
-       lyxerr << "No inset hit. " << endl;
+       lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": No inset hit. " << endl;
        return 0;
 }
 
@@ -654,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);
@@ -677,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)
@@ -827,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()) {
@@ -839,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());
 }
 
 
@@ -849,8 +875,10 @@ pit_type LyXText::getPitNearY(int y) const
        BOOST_ASSERT(!paragraphs().empty());
        BOOST_ASSERT(theCoords.getParPos().find(this) != theCoords.getParPos().end());
        CoordCache::InnerParPosCache const & cc = theCoords.getParPos().find(this)->second;
-       lyxerr << "LyXText::getPitNearY: y: " << y << " cache size: "
-               << cc.size() << endl;
+       lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": y: " << y << " cache size: " << cc.size()
+                << endl;
 
        // look for highest numbered paragraph with y coordinate less than given y
        pit_type pit = 0;
@@ -858,15 +886,23 @@ pit_type LyXText::getPitNearY(int y) const
        CoordCache::InnerParPosCache::const_iterator it = cc.begin();
        CoordCache::InnerParPosCache::const_iterator et = cc.end();
        for (; it != et; ++it) {
-               lyxerr << "  examining: pit: " << it->first << " y: "
-                       << it->second.y_ << endl;
+               lyxerr[Debug::DEBUG]
+                        << BOOST_CURRENT_FUNCTION
+                        << "  examining: pit: " << it->first
+                        << " y: " << it->second.y_
+                        << endl;
+                
                if (it->first >= pit && int(it->second.y_) - int(pars_[it->first].ascent()) <= y) {
                        pit = it->first;
                        yy = it->second.y_;
                }
        }
 
-       lyxerr << " found best y: " << yy << " for pit: " << pit << endl;
+       lyxerr[Debug::DEBUG]
+                << BOOST_CURRENT_FUNCTION
+                << ": found best y: " << yy << " for pit: " << pit
+                << endl;
+        
        return pit;
 }
 
@@ -887,7 +923,7 @@ Row const & LyXText::getRowNearY(int y, pit_type pit) const
 
 // x,y are absolute screen coordinates
 // sets cursor recursively descending into nested editable insets
-InsetBase * LyXText::editXY(LCursor & cur, int x, int y) const
+InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
 {
        pit_type pit = getPitNearY(y);
        BOOST_ASSERT(pit != -1);
@@ -898,16 +934,16 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y) const
        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
-               const_cast<LyXText *>(this)->setCurrentFont(cur);
+               setCurrentFont(cur);
                return 0;
        }
 
@@ -921,7 +957,7 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y) const
                --cur.pos();
        inset = inset->editXY(cur, x, y);
        if (cur.top().text() == this)
-               const_cast<LyXText *>(this)->setCurrentFont(cur);
+               setCurrentFont(cur);
        return inset;
 }
 
@@ -964,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);
        }
 
@@ -988,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);
 
@@ -1027,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);