#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"
#include "ParIterator.h"
#include "rowpainter.h"
#include "Text.h"
-#include "Undo.h"
#include "VSpace.h"
#include "frontends/FontMetrics.h"
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();
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;
}
// 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)
- right_margin;
Font const & font = ii->inset->noFontChange() ?
bufferfont : getDisplayFont(pit, ii->pos);
- MetricsInfo mi(bv_, font, w);
+ MetricsInfo mi(bv_, font.fontInfo(), w);
ii->inset->metrics(mi, dim);
Dimension const old_dim = pm.insetDimension(ii->inset);
pm.setInsetDimension(ii->inset, 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);
// 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);
// 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) {
// 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()
{
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;
<< " 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;
// 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 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) {
DocIterator beg = bv_->cursor().selectionBegin();
// 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 {
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
projects / lyx.git / blobdiff