#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 "CoordCache.h"
+#include "Cursor.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"
#include "ParIterator.h"
#include "rowpainter.h"
#include "Text.h"
-#include "Undo.h"
+#include "TextClass.h"
#include "VSpace.h"
+#include "mathed/MacroTable.h"
+#include "mathed/MathMacroTemplate.h"
+
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include <boost/current_function.hpp>
+using std::make_pair;
using std::max;
using std::min;
using std::endl;
+using std::pair;
namespace lyx {
}
+bool TextMetrics::has(pit_type pit) const
+{
+ return par_metrics_.find(pit) != par_metrics_.end();
+}
+
+
ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
{
return const_cast<TextMetrics *>(this)->parMetrics(pit, true);
}
-ParagraphMetrics & TextMetrics::parMetrics(pit_type pit,
- bool redo)
+
+pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
+{
+ ParMetricsCache::const_iterator it = par_metrics_.begin();
+ return make_pair(it->first, &it->second);
+}
+
+
+pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
+{
+ ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
+ return make_pair(it->first, &it->second);
+}
+
+
+ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
{
ParMetricsCache::iterator pmc_it = par_metrics_.find(pit);
if (pmc_it == par_metrics_.end()) {
pmc_it = par_metrics_.insert(
- std::make_pair(pit, ParagraphMetrics(text_->getPar(pit)))).first;
+ make_pair(pit, ParagraphMetrics(text_->getPar(pit)))).first;
}
- if (pmc_it->second.rows().empty() && redo) {
+ if (pmc_it->second.rows().empty() && redo)
redoParagraph(pit);
- }
return pmc_it->second;
}
-bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
+int TextMetrics::parPosition(pit_type pit) const
+{
+ if (pit < par_metrics_.begin()->first)
+ return -1000000;
+ if (pit > par_metrics_.rbegin()->first)
+ return +1000000;
+
+ return par_metrics_[pit].position();
+}
+
+
+bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
{
BOOST_ASSERT(mi.base.textwidth);
max_width_ = mi.base.textwidth;
Dimension const old_dim = dim_;
// reset dimension.
dim_ = Dimension();
+ dim_.wid = min_width;
pit_type const npar = text_->paragraphs().size();
if (npar > 1)
// If there is more than one row, expand the text to
void TextMetrics::applyOuterFont(Font & font) const
{
Font lf(font_);
- lf.reduce(bv_->buffer().params().getFont());
- lf.realize(font);
+ lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
+ lf.fontInfo().realize(font.fontInfo());
lf.setLanguage(font.language());
font = lf;
}
applyOuterFont(f);
bool lab = layout->labeltype == LABEL_MANUAL && pos < body_pos;
- Font const & lf = lab ? layout->labelfont : layout->font;
- Font rlf = lab ? layout->reslabelfont : layout->resfont;
+ FontInfo const & lf = lab ? layout->labelfont : layout->font;
+ FontInfo rlf = lab ? layout->reslabelfont : layout->resfont;
// In case the default family has been customized
- if (lf.family() == Font::INHERIT_FAMILY)
- rlf.setFamily(params.getFont().family());
- return f.realize(rlf);
+ if (lf.family() == INHERIT_FAMILY)
+ rlf.setFamily(params.getFont().fontInfo().family());
+ f.fontInfo().realize(rlf);
+ return f;
}
// The uncommon case need not be optimized as much
- Font const & layoutfont = pos < body_pos ?
+ FontInfo const & layoutfont = pos < body_pos ?
layout->labelfont : layout->font;
Font font = par.getFontSettings(params, pos);
- font.realize(layoutfont);
+ font.fontInfo().realize(layoutfont);
if (!text_->isMainText(buffer))
applyOuterFont(font);
// NOTE: the cast to pit_type should be removed when pit_type
// changes to a unsigned integer.
if (pit < pit_type(pars.size()))
- font.realize(outerFont(pit, pars));
+ font.fontInfo().realize(outerFont(pit, pars).fontInfo());
// Realize with the fonts of lesser depth.
- font.realize(params.getFont());
+ font.fontInfo().realize(params.getFont().fontInfo());
return font;
}
// when layout is set; when material is pasted.
int const moveCursor = par.checkBiblio(buffer.params().trackChanges);
if (moveCursor > 0)
- const_cast<Cursor &>(bv_->cursor()).posRight();
+ const_cast<Cursor &>(bv_->cursor()).posForward();
else if (moveCursor < 0) {
Cursor & cursor = const_cast<Cursor &>(bv_->cursor());
if (cursor.pos() >= -moveCursor)
- cursor.posLeft();
+ cursor.posBackward();
}
// Optimisation: this is used in the next two loops
// 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();
+ MacroContext mc(buffer, par);
+ InsetList::const_iterator ii = par.insetList().begin();
+ InsetList::const_iterator iend = par.insetList().end();
for (; ii != iend; ++ii) {
- Dimension old_dim = ii->inset->dimension();
+ // the macro must come here, _before_ the metric call, because
+ // the macro should see itself to detect recursions. To find out
+ // whether the macro definition is a redefinition it will look
+ // at the MacroData::redefinition_. So it doesn't get confused
+ // by the already existing macro definition of itself in the
+ // macro context.
+ if (ii->inset->lyxCode() == MATHMACRO_CODE) {
+ // get macro data
+ MathMacroTemplate const & macroTemplate
+ = static_cast<MathMacroTemplate const &>(*ii->inset);
+
+ // valid?
+ if (macroTemplate.validMacro()) {
+ MacroData macro = macroTemplate.asMacroData();
+
+ // redefinition?
+ macro.setRedefinition(mc.has(macroTemplate.name()));
+
+ // register macro (possibly overwrite the previous one of this paragraph)
+ mc.insert(macroTemplate.name(), macro);
+ }
+ }
+
+ // do the metric calculation
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);
+ MetricsInfo mi(bv_, font.fontInfo(), w, mc);
+ 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 = rowHeight(pit, first, end);
dim.wid = rowWidth(right_margin, pit, first, end);
- boost::tie(dim.asc, dim.des) = rowHeight(pit, first, end);
if (row_index == pm.rows().size())
pm.rows().push_back(Row());
Row & row = pm.rows()[row_index];
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;
// Make sure that if a par ends in newline, there is one more row
// under it
if (first > 0 && par.isNewline(first - 1)) {
- Dimension dim;
+ Dimension dim = rowHeight(pit, first, first);
dim.wid = rowWidth(right_margin, pit, first, first);
- boost::tie(dim.asc, dim.des) = rowHeight(pit, first, first);
if (row_index == pm.rows().size())
pm.rows().push_back(Row());
Row & row = pm.rows()[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);
// The test on par.size() is to catch zero-size pars, which
// would trigger the assert in Paragraph::getInset().
//inset = par.size() ? par.getInset(row.pos()) : 0;
- if (row.pos() < par.size()
- && par.isInset(row.pos()))
- {
- switch(par.getInset(row.pos())->display()) {
- case Inset::AlignLeft:
- align = LYX_ALIGN_BLOCK;
- break;
- case Inset::AlignCenter:
- align = LYX_ALIGN_CENTER;
- break;
- case Inset::Inline:
- case Inset::AlignRight:
- // unchanged (use align)
- break;
- }
+ if (row.pos() < par.size() && par.isInset(row.pos())) {
+ switch(par.getInset(row.pos())->display()) {
+ case Inset::AlignLeft:
+ align = LYX_ALIGN_BLOCK;
+ break;
+ case Inset::AlignCenter:
+ align = LYX_ALIGN_CENTER;
+ break;
+ case Inset::Inline:
+ case Inset::AlignRight:
+ // unchanged (use align)
+ break;
+ }
}
switch (align) {
}
-namespace {
-
// this needs special handling - only newlines count as a break point
-pos_type addressBreakPoint(pos_type i, Paragraph const & par)
+static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
{
pos_type const end = par.size();
return end;
}
-};
-
int TextMetrics::labelEnd(pit_type const pit) const
{
point = i;
else
point = i + 1;
-
}
// exit on last registered breakpoint:
break;
}
-boost::tuple<int, int> TextMetrics::rowHeight(pit_type const pit, pos_type const first,
+Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
pos_type const end) const
{
Paragraph const & par = text_->getPar(pit);
// often.
Buffer const & buffer = bv_->buffer();
Font font = getDisplayFont(pit, first);
- Font::FONT_SIZE const tmpsize = font.size();
- font = text_->getLayoutFont(buffer, pit);
- Font::FONT_SIZE const size = font.size();
- font.setSize(tmpsize);
+ FontSize const tmpsize = font.fontInfo().size();
+ font.fontInfo() = text_->getLayoutFont(buffer, pit);
+ FontSize const size = font.fontInfo().size();
+ font.fontInfo().setSize(tmpsize);
- Font labelfont = text_->getLabelFont(buffer, par);
+ FontInfo labelfont = text_->getLabelFont(buffer, par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
FontMetrics const & fontmetrics = theFontMetrics(font);
int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
// insets may be taller
- InsetList::const_iterator ii = par.insetlist.begin();
- InsetList::const_iterator iend = par.insetlist.end();
+ 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());
}
}
// cosmetic error for now.
int labeladdon = 0;
- Font::FONT_SIZE maxsize =
+ FontSize maxsize =
par.highestFontInRange(first, end, size);
- if (maxsize > font.size()) {
+ if (maxsize > font.fontInfo().size()) {
// use standard paragraph font with the maximal size
- Font maxfont = font;
+ FontInfo maxfont = font.fontInfo();
maxfont.setSize(maxsize);
FontMetrics const & maxfontmetrics = theFontMetrics(maxfont);
maxasc = max(maxasc, maxfontmetrics.maxAscent());
// 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()
maxdesc += 20;
}
- return boost::make_tuple(maxasc + labeladdon, maxdesc);
+ return Dimension(0, maxasc + labeladdon, maxdesc);
}
/// For the main Text, it is possible that this pit is not
/// yet in the CoordCache when moving cursor up.
/// x Paragraph coordinate is always 0 for main text anyway.
- int const xo = main_text_? 0 : bv_->coordCache().get(text_, pit).x_;
+ int const xo = origin_.x_;
x -= xo;
Paragraph const & par = text_->getPar(pit);
ParagraphMetrics const & pm = par_metrics_[pit];
}
+void TextMetrics::newParMetricsDown()
+{
+ pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
+ pit_type const pit = last.first + 1;
+ if (pit == int(text_->paragraphs().size()))
+ return;
+
+ // do it and update its position.
+ redoParagraph(pit);
+ par_metrics_[pit].setPosition(last.second.position()
+ + last.second.descent());
+}
+
+
+void TextMetrics::newParMetricsUp()
+{
+ pair<pit_type, ParagraphMetrics> const & first = *par_metrics_.begin();
+ if (first.first == 0)
+ return;
+
+ pit_type const pit = first.first - 1;
+ // do it and update its position.
+ redoParagraph(pit);
+ par_metrics_[pit].setPosition(first.second.position()
+ - first.second.ascent());
+}
+
// y is screen coordinate
pit_type TextMetrics::getPitNearY(int y)
{
BOOST_ASSERT(!text_->paragraphs().empty());
- BOOST_ASSERT(bv_->coordCache().getParPos().find(text_) != bv_->coordCache().getParPos().end());
- CoordCache::InnerParPosCache const & cc = bv_->coordCache().getParPos().find(text_)->second;
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
- << ": y: " << y << " cache size: " << cc.size()
+ << ": y: " << y << " cache size: " << par_metrics_.size()
<< endl;
// look for highest numbered paragraph with y coordinate less than given y
pit_type pit = 0;
int yy = -1;
- CoordCache::InnerParPosCache::const_iterator it = cc.begin();
- CoordCache::InnerParPosCache::const_iterator et = cc.end();
- CoordCache::InnerParPosCache::const_iterator last = et; last--;
+ ParMetricsCache::const_iterator it = par_metrics_.begin();
+ ParMetricsCache::const_iterator et = par_metrics_.end();
+ ParMetricsCache::const_iterator last = et; last--;
- ParagraphMetrics const & pm = par_metrics_[it->first];
+ ParagraphMetrics const & pm = it->second;
// If we are off-screen (before the visible part)
if (y < 0
// and even before the first paragraph in the cache.
- && y < it->second.y_ - int(pm.ascent())) {
+ && y < it->second.position() - int(pm.ascent())) {
// and we are not at the first paragraph in the inset.
if (it->first == 0)
return 0;
pit = it->first - 1;
// rebreak it and update the CoordCache.
redoParagraph(pit);
- bv_->coordCache().parPos()[text_][pit] =
- Point(0, it->second.y_ - pm.descent());
+ par_metrics_[pit].setPosition(it->second.position() - pm.descent());
return pit;
}
// If we are off-screen (after the visible part)
if (y > bv_->workHeight()
// and even after the first paragraph in the cache.
- && y >= last->second.y_ + int(pm_last.descent())) {
+ && y >= last->second.position() + int(pm_last.descent())) {
pit = last->first + 1;
// and we are not at the last paragraph in the inset.
if (pit == int(text_->paragraphs().size()))
// then this is the paragraph we are looking for.
// rebreak it and update the CoordCache.
redoParagraph(pit);
- bv_->coordCache().parPos()[text_][pit] =
- Point(0, last->second.y_ + pm_last.ascent());
+ par_metrics_[pit].setPosition(last->second.position() + pm_last.ascent());
return pit;
}
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< " examining: pit: " << it->first
- << " y: " << it->second.y_
+ << " y: " << it->second.position()
<< endl;
ParagraphMetrics const & pm = par_metrics_[it->first];
- if (it->first >= pit && int(it->second.y_) - int(pm.ascent()) <= y) {
+ if (it->first >= pit && int(it->second.position()) - int(pm.ascent()) <= y) {
pit = it->first;
- yy = it->second.y_;
+ yy = it->second.position();
}
}
{
ParagraphMetrics const & pm = par_metrics_[pit];
- int yy = bv_->coordCache().get(text_, pit).y_ - pm.ascent();
+ 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;
ParagraphMetrics const & pm = par_metrics_[pit];
- int yy = bv_->coordCache().get(text_, pit).y_ - pm.ascent();
+ int yy = pm.position() - pm.ascent();
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< ": x: " << x
BOOST_ASSERT(pit != -1);
Paragraph const & par = text_->paragraphs()[pit];
+ ParagraphMetrics const & pm = par_metrics_[pit];
LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< " 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;
-#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;
// 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);
}
cur.dispatch(
FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
- finishUndo();
+ cur.finishUndo();
cur.updateFlags(Update::Force | Update::FitCursor);
}
{
BOOST_ASSERT(text_ == cur.text());
if (cur.lastpos() == 0) {
- // Paragraph is empty, so we just go to the right
- text_->cursorRight(cur);
+ // Paragraph is empty, so we just go forward
+ text_->cursorForward(cur);
} else {
cur.resetAnchor();
cur.selection() = true; // to avoid deletion
&& pit > 0 && pars[pit - 1].layout()->nextnoindent)
parindent.erase();
- Font const labelfont = text_->getLabelFont(buffer, par);
+ FontInfo const labelfont = text_->getLabelFont(buffer, par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
switch (layout->margintype) {
if (par_metrics_.empty())
return;
- CoordCache::InnerParPosCache & ppcache = bv_->coordCache().parPos()[text_];
+ origin_.x_ = x;
+ origin_.y_ = y;
- ParMetricsCache::const_iterator it = par_metrics_.begin();
- ParMetricsCache::const_iterator const pm_end = par_metrics_.end();
+ ParMetricsCache::iterator it = par_metrics_.begin();
+ ParMetricsCache::iterator const pm_end = par_metrics_.end();
y -= it->second.ascent();
for (; it != pm_end; ++it) {
ParagraphMetrics const & pmi = it->second;
y += pmi.ascent();
pit_type const pit = it->first;
// Save the paragraph position in the cache.
- ppcache[pit] = Point(x, y);
+ it->second.setPosition(y);
drawParagraph(pi, pit, x, y);
y += pmi.descent();
}
Bidi bidi;
+ bool const original_drawing_state = pi.pain.isDrawingEnabled();
+
y -= rb->ascent();
for (RowList::const_iterator rit = rb; rit != re; ++rit) {
y += rit->ascent();
bool const inside = (y + rit->descent() >= 0
&& y - rit->ascent() < ww);
// it is not needed to draw on screen if we are not inside.
- pi.pain.setDrawingEnabled(inside);
+ pi.pain.setDrawingEnabled(inside && original_drawing_state);
RowPainter rp(pi, *text_, pit, *rit, bidi, x, y);
// Row signature; has row changed since last paint?
// (if paragraph background was not cleared)
if (row_selection || (!pi.full_repaint && row_has_changed)) {
pi.pain.fillRectangle(x, y - rit->ascent(),
- width(), rit->height(),
- Color_color(Color::color(pi.background_color)));
+ width(), rit->height(), pi.background_color);
}
if (row_selection) {
- lyxerr << "row selected" << endl;
DocIterator beg = bv_->cursor().selectionBegin();
DocIterator end = bv_->cursor().selectionEnd();
beg.pit() = pit;
// 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 << "]";
}
pi.full_repaint = tmp;
}
// Re-enable screen drawing for future use of the painter.
- pi.pain.setDrawingEnabled(true);
+ pi.pain.setDrawingEnabled(original_drawing_state);
//LYXERR(Debug::PAINTING) << "." << endl;
}
// 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 {
if (middleTop < middleBottom) {
// draw middle rectangle
pi.pain.fillRectangle(x, middleTop, width(), middleBottom - middleTop,
- Color::selection);
+ Color_selection);
}
if (!clipBelow) {
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
if (drawOnBegMargin) {
if (text_->isRTL(buffer, beg.paragraph()))
- pi.pain.fillRectangle(x + x1, y1, width() - x1, y2 - y1, Color::selection);
+ pi.pain.fillRectangle(x + x1, y1, width() - x1, y2 - y1, Color_selection);
else
- pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color::selection);
+ pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color_selection);
}
if (drawOnEndMargin) {
if (text_->isRTL(buffer, beg.paragraph()))
- pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color::selection);
+ pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color_selection);
else
- pi.pain.fillRectangle(x + x2, y1, width() - x2, y2 - y1, Color::selection);
+ pi.pain.fillRectangle(x + x2, y1, width() - x2, y2 - y1, Color_selection);
}
// if we are on a boundary from the beginning, it's probably
while (cur < end) {
bool drawNow = false;
- // simplified cursorRight code below which does not
+ // simplified cursorForward code below which does not
// descend into insets and which does not go into the
- // next line. Compare the logic with the original cursorRight
+ // next line. Compare the logic with the original cursorForward
// if left of boundary -> just jump to right side
// but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
if (!(cur < end) || drawNow) {
x2 = cursorX(cur.top(), cur.boundary());
pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
- Color::selection);
+ Color_selection);
// reset x1, so it is set again next round (which will be on the
// right side of a boundary or at the selection end)
int defaultRowHeight()
{
- return int(theFontMetrics(Font(Font::ALL_SANE)).maxHeight() * 1.2);
+ return int(theFontMetrics(sane_font).maxHeight() * 1.2);
}
} // namespace lyx