#include "TextMetrics.h"
+#include "Bidi.h"
#include "Buffer.h"
#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 "Layout.h"
#include "Length.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
-pair<pit_type, ParagraphMetrics> const & TextMetrics::first() const
+pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
{
- pair<pit_type, ParagraphMetrics> const & pm = *par_metrics_.begin();
- return pm;
+ ParMetricsCache::const_iterator it = par_metrics_.begin();
+ return make_pair(it->first, &it->second);
}
-pair<pit_type, ParagraphMetrics> const & TextMetrics::last() const
+pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
{
- pair<pit_type, ParagraphMetrics> const & pm = *par_metrics_.rbegin();
- return pm;
+ ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
+ return make_pair(it->first, &it->second);
}
int TextMetrics::parPosition(pit_type pit) const
{
- pair<pit_type, ParagraphMetrics> first = *par_metrics_.begin();
- pair<pit_type, ParagraphMetrics> last = *par_metrics_.rbegin();
- if (pit < first.first)
- return -1000000;
- else if (pit > last.first)
+ if (pit < par_metrics_.begin()->first)
+ return -1000000;
+ else if (pit > par_metrics_.rbegin()->first)
return +1000000;
return par_metrics_[pit].position();
InsetList::const_iterator ii = par.insetlist.begin();
InsetList::const_iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
- Dimension old_dim = ii->inset->dimension();
Dimension dim;
int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
- right_margin;
Font const & font = ii->inset->noFontChange() ?
bufferfont : getDisplayFont(pit, ii->pos);
MetricsInfo mi(bv_, font, w);
- changed |= ii->inset->metrics(mi, dim);
+ ii->inset->metrics(mi, dim);
+ Dimension const old_dim = pm.insetDimension(ii->inset);
+ pm.setInsetDimension(ii->inset, dim);
changed |= (old_dim != dim);
}
if (row_index || end < par.size())
// If there is more than one row, expand the text to
// the full allowable width. This setting here is needed
- // for the computeRowMetrics below().
+ // for the computeRowMetrics() below.
dim_.wid = max_width_;
dim.wid = rowWidth(right_margin, pit, first, end);
else
row.setSelection(-1, -1);
row.setDimension(dim);
- computeRowMetrics(pit, row);
+ int const max_row_width = max(dim_.wid, dim.wid);
+ computeRowMetrics(pit, row, max_row_width);
pm.computeRowSignature(row, bparams);
first = end;
++row_index;
row.pos(first);
row.endpos(first);
row.setDimension(dim);
- computeRowMetrics(pit, row);
+ int const max_row_width = max(dim_.wid, dim.wid);
+ computeRowMetrics(pit, row, max_row_width);
pm.computeRowSignature(row, bparams);
pm.dim().des += dim.height();
}
void TextMetrics::computeRowMetrics(pit_type const pit,
- Row & row) const
+ Row & row, int width) const
{
row.label_hfill = 0;
Buffer & buffer = bv_->buffer();
Paragraph const & par = text_->getPar(pit);
- double w = dim_.wid - row.width();
+ double w = width - row.width();
// FIXME: put back this assertion when the crash on new doc is solved.
//BOOST_ASSERT(w >= 0);
int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
// insets may be taller
+ ParagraphMetrics const & pm = par_metrics_[pit];
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) {
- maxasc = max(maxasc, ii->inset->ascent());
- maxdesc = max(maxdesc, ii->inset->descent());
+ maxasc = max(maxasc, dim.ascent());
+ maxdesc = max(maxdesc, dim.descent());
}
}
{
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.
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;
BOOST_ASSERT(pit != -1);
Paragraph const & par = text_->paragraphs()[pit];
+ ParagraphMetrics const & pm = par_metrics_[pit];
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
InsetList::const_iterator iend = par.insetlist.end();
for (; iit != iend; ++iit) {
Inset * inset = iit->inset;
-#if 1
+
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< ": examining inset " << inset << endl;
- if (bv_->coordCache().getInsets().has(inset))
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": xo: " << inset->xo(*bv_) << "..."
- << inset->xo(*bv_) + inset->width()
- << " yo: " << inset->yo(*bv_) - inset->ascent()
- << "..."
- << inset->yo(*bv_) + inset->descent()
- << endl;
- else
+ if (!bv_->coordCache().getInsets().has(inset)) {
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< ": inset has no cached position" << endl;
-#endif
- if (inset->covers(*bv_, x, y)) {
+ return 0;
+ }
+
+ Dimension const & dim = pm.insetDimension(inset);
+ Point p = bv_->coordCache().getInsets().xy(inset);
+
+ LYXERR(Debug::DEBUG)
+ << BOOST_CURRENT_FUNCTION
+ << ": xo: " << p.x_ << "..." << p.x_ + dim.wid
+ << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des
+ << endl;
+
+ if (x >= p.x_
+ && x <= p.x_ + dim.wid
+ && y >= p.y_ - dim.asc
+ && y <= p.y_ + dim.des) {
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< ": Hit inset: " << inset << endl;
return inset;
}
}
+
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< ": No inset hit. " << endl;
// 12 lines lower):
if (lyxerr.debugging(Debug::PAINTING)) {
if (text_->isMainText(bv_->buffer()))
- LYXERR(Debug::PAINTING) << "\n{" <<
+ LYXERR(Debug::PAINTING) << "\n{" << inside <<
pi.full_repaint << row_has_changed << "}";
else
- LYXERR(Debug::PAINTING) << "[" <<
+ LYXERR(Debug::PAINTING) << "[" << inside <<
pi.full_repaint << row_has_changed << "]";
}
// 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 {
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
projects / lyx.git / blobdiff