PrefShortcuts: list all shortcuts (bound and unbound), using a better implementation

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 6591de87606ad02cf320b5f06f91c0a1224c85c1..9331a03c735cded277f304a4ceaa0b8f0787b923 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -24,12 +24,13 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "bufferview_funcs.h"
 #include "Color.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
+#include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -38,7 +39,6 @@
 #include "ParIterator.h"
 #include "rowpainter.h"
 #include "Text.h"
-#include "Undo.h"
 #include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
@@ -382,8 +382,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        // FIXME: We should always use getFont(), see documentation of
        // noFontChange() in Inset.h.
        Font const bufferfont = buffer.params().getFont();
-       InsetList::const_iterator ii = par.insetlist.begin();
-       InsetList::const_iterator iend = par.insetlist.end();
+       InsetList::const_iterator ii = par.insetList().begin();
+       InsetList::const_iterator iend = par.insetList().end();
        for (; ii != iend; ++ii) {
                Dimension dim;
                int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
@@ -864,8 +864,8 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
 
        // insets may be taller
        ParagraphMetrics const & pm = par_metrics_[pit];
-       InsetList::const_iterator ii = par.insetlist.begin();
-       InsetList::const_iterator iend = par.insetlist.end();
+       InsetList::const_iterator ii = par.insetList().begin();
+       InsetList::const_iterator iend = par.insetList().end();
        for ( ; ii != iend; ++ii) {
                Dimension const & dim = pm.insetDimension(ii->inset);
                if (ii->pos >= first && ii->pos < end) {
@@ -902,8 +902,8 @@ boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const
                // some parskips VERY EASY IMPLEMENTATION
                if (bufparams.paragraph_separation
                    == BufferParams::PARSEP_SKIP
-                       && par.ownerCode() != Inset::ERT_CODE
-                       && par.ownerCode() != Inset::LISTINGS_CODE
+                       && par.ownerCode() != ERT_CODE
+                       && par.ownerCode() != LISTINGS_CODE
                        && pit > 0
                        && ((layout->isParagraph() && par.getDepth() == 0)
                            || (pars[pit - 1].layout()->isParagraph()
@@ -1177,7 +1177,7 @@ void TextMetrics::newParMetricsDown()
 {
        pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
        pit_type const pit = last.first + 1;
-       if (pit == text_->paragraphs().size())
+       if (pit == int(text_->paragraphs().size()))
                return;
 
        // do it and update its position.
@@ -1281,7 +1281,8 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
        int yy = pm.position() - pm.ascent();
        BOOST_ASSERT(!pm.rows().empty());
        RowList::const_iterator rit = pm.rows().begin();
-       RowList::const_iterator const rlast = boost::prior(pm.rows().end());
+       RowList::const_iterator rlast = pm.rows().end();
+       --rlast;
        for (; rit != rlast; yy += rit->height(), ++rit)
                if (yy + rit->height() > y)
                        break;
@@ -1411,8 +1412,8 @@ Inset * TextMetrics::checkInsetHit(int x, int y)
                << " y: " << y
                << "  pit: " << pit
                << endl;
-       InsetList::const_iterator iit = par.insetlist.begin();
-       InsetList::const_iterator iend = par.insetlist.end();
+       InsetList::const_iterator iit = par.insetList().begin();
+       InsetList::const_iterator iend = par.insetList().end();
        for (; iit != iend; ++iit) {
                Inset * inset = iit->inset;
 
@@ -1591,7 +1592,7 @@ void TextMetrics::cursorPrevious(Cursor & cur)
                // simplest solution is to move to the previous row instead.
                cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
 
-       finishUndo();
+       cur.finishUndo();
        cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
@@ -1611,7 +1612,7 @@ void TextMetrics::cursorNext(Cursor & cur)
                cur.dispatch(
                        FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
 
-       finishUndo();
+       cur.finishUndo();
        cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
@@ -1995,24 +1996,22 @@ void TextMetrics::drawSelection(PainterInfo & pi,
 
        // clip above
        int middleTop;
-       bool const clipAbove = 
-               (bv_funcs::status(bv_, beg) == bv_funcs::CUR_ABOVE);
+       bool const clipAbove = (bv_->cursorStatus(beg) == CUR_ABOVE);
        if (clipAbove)
                middleTop = 0;
        else
-               middleTop = bv_funcs::getPos(*bv_, beg, beg.boundary()).y_ + row1.descent();
+               middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent();
        
        // clip below
        int middleBottom;
-       bool const clipBelow = 
-               (bv_funcs::status(bv_, end) == bv_funcs::CUR_BELOW);
+       bool const clipBelow = (bv_->cursorStatus(end) == CUR_BELOW);
        if (clipBelow)
                middleBottom = bv_->workHeight();
        else
-               middleBottom = bv_funcs::getPos(*bv_, end, end.boundary()).y_ - row2.ascent();
+               middleBottom = bv_->getPos(end, end.boundary()).y_ - row2.ascent();
 
        // start and end in the same line?
-       if (!(clipAbove || clipBelow) && &row1 == &row2)
+       if (!clipAbove && !clipBelow && &row1 == &row2)
                // then only draw this row's selection
                drawRowSelection(pi, x, row1, beg, end, false, false);
        else {
@@ -2053,7 +2052,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
        DocIterator cur = beg;
        int x1 = cursorX(beg.top(), beg.boundary());
        int x2 = cursorX(end.top(), end.boundary());
-       int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+       int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
        int y2 = y1 + row.height();
        
        // draw the margins