#include "lyxrow.h"
#include "metricsinfo.h"
#include "paragraph.h"
+#include "ParagraphMetrics.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
+#include "TextMetrics.h"
#include "vspace.h"
#include "frontends/FontMetrics.h"
using std::endl;
using std::max;
-using std::min;
using std::string;
void paintFirst();
void paintLast();
void paintText();
+ int maxWidth() { return max_width_; }
private:
void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
/// LyXText for the row
LyXText const & text_;
+ TextMetrics & text_metrics_;
ParagraphList const & pars_;
/// The row to paint
/// Row's paragraph
pit_type const pit_;
Paragraph const & par_;
+ ParagraphMetrics const & pm_;
+ int max_width_;
/// is row erased? (change tracking)
bool erased_;
RowPainter::RowPainter(PainterInfo & pi,
LyXText const & text, pit_type pit, Row const & row, int x, int y)
- : bv_(*pi.base.bv), pain_(pi.pain), text_(text), pars_(text.paragraphs()),
+ : bv_(*pi.base.bv), pain_(pi.pain), text_(text),
+ text_metrics_(pi.base.bv->textMetrics(&text)),
+ pars_(text.paragraphs()),
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
+ pm_(text_metrics_.parMetrics(pit)),
+ max_width_(bv_.workWidth()),
erased_(pi.erased_),
- xo_(x), yo_(y), width_(text_.width())
+ xo_(x), yo_(y), width_(text_metrics_.width())
{
- RowMetrics m = text_.computeRowMetrics(*bv_.buffer(), pit, row_);
+ RowMetrics m = text_metrics_.computeRowMetrics(pit_, row_);
x_ = m.x + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
int RowPainter::leftMargin() const
{
- return text_.leftMargin(*bv_.buffer(), pit_, row_.pos());
+ return text_.leftMargin(*bv_.buffer(), max_width_, pit_, row_.pos());
}
bool tmp = refreshInside;
if (!in || !in->wide()) {
refreshInside = true;
- if (lyxerr.debugging(Debug::PAINTING)) {
- lyxerr << endl << "Paint inset fully" << endl;
- }
+ LYXERR(Debug::PAINTING) << endl << "Paint inset fully" << endl;
}
if (refreshInside)
inset->drawSelection(pi, int(x_), yo_);
x_ += inset->width();
#ifdef DEBUG_METRICS
Dimension dim;
- BOOST_ASSERT(text_.maxwidth_ > 0);
- int const w = text_.maxwidth_ - leftMargin() - text_.rightMargin(*bv_.buffer(), par_);
+ BOOST_ASSERT(max_witdh_ > 0);
+ int right_margin = text_metrics_.rightMargin(pm_);
+ int const w = max_witdh_ - leftMargin() - right_margin;
MetricsInfo mi(&bv_, font, w);
inset->metrics(mi, dim);
if (inset->width() > dim.wid)
if (isPrintableNonspace(c)) {
int const width2 = text_.singleWidth(par_, i, c,
text_.getFont(*bv_.buffer(), par_, i));
- // FIXME UNICODE
- // This does not work anymore, and non-ascii
- // characters in source files are forbidden
- // anyway.
- // dalet / resh
- dx = (c == 'ø' || c == 'ã')
+ dx = (c == 0x05e8 || // resh
+ c == 0x05d3) // dalet
? width2 - width
: (width2 - width) / 2;
}
}
// Draw nikud
- // FIXME UNICODE
pain_.text(int(x_) + dx, yo_, str, font);
}
pain_.text(int(x_) + dx, yo_, str, font);
}
+
void RowPainter::paintChars(pos_type & vpos, LyXFont const & font,
bool hebrew, bool arabic)
{
if (!isPrintableNonspace(c))
break;
+ /* Because we do our own bidi, at this point the strings are
+ * already in visual order. However, Qt also applies its own
+ * bidi algorithm to strings that it paints to the screen.
+ * Therefore, if we were to paint Hebrew/Arabic words as a
+ * single string, the letters in the words would get reversed
+ * again. In order to avoid that, we don't collect Hebrew/
+ * Arabic characters, but rather paint them one at a time.
+ * See also http://thread.gmane.org/gmane.editors.lyx.devel/79740
+ */
+ if (hebrew)
+ break;
+
+ /* FIXME: these checks are irrelevant, since 'arabic' and
+ * 'hebrew' alone are already going to trigger a break.
+ * However, this should not be removed completely, because
+ * if an alternative solution is found which allows grouping
+ * of arabic and hebrew characters, then these breaks may have
+ * to be re-applied.
+
if (arabic && Encodings::isComposeChar_arabic(c))
break;
if (hebrew && Encodings::isComposeChar_hebrew(c))
break;
+ */
- if (arabic)
+ if (arabic) {
c = par_.transformChar(c, pos);
+ /* see comment in hebrew, explaining why we break */
+ break;
+ }
str.push_back(c);
}
+ docstring s(&str[0], str.size());
+
if (prev_change != Change::UNCHANGED) {
LyXFont copy(font);
if (prev_change == Change::DELETED) {
} else if (prev_change == Change::INSERTED) {
copy.setColor(LColor::newtext);
}
- x_ += pain_.text(int(x_), yo_, &str[0], str.size(), copy);
+ x_ += pain_.text(int(x_), yo_, s, copy);
} else {
- x_ += pain_.text(int(x_), yo_, &str[0], str.size(), font);
+ x_ += pain_.text(int(x_), yo_, s, font);
}
}
// special case languages
std::string const & lang = orig_font.language()->lang();
bool const hebrew = lang == "hebrew";
- bool const arabic = lang == "arabic" &&
- (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
- lyxrc.font_norm_type == LyXRC::ISO_10646_1);
+ bool const arabic = lang == "arabic";
// draw as many chars as we can
if ((!hebrew && !arabic)
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
if (is_rtl)
x = leftMargin();
- x += (width_ - text_.rightMargin(buffer, par_) - leftMargin()) / 2;
+ x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
x -= fm.width(str) / 2;
} else if (is_rtl) {
x = width_ - leftMargin() - fm.width(str);
int const length = fm.maxAscent() / 2;
LColor::color col = par_.isInserted(par_.size()) ? LColor::newtext : LColor::strikeout;
- pain_.line(x_ + 1, yo_ + 2, x_ + 1, yo_ + 2 - length, col,
+ pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
Painter::line_solid, Painter::line_thick);
- pain_.line(x_ + 1 - length, yo_ + 2, x_ + 1, yo_ + 2, col,
+ pain_.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
Painter::line_solid, Painter::line_thick);
}
docstring const & str = par_.layout()->endlabelstring();
double const x = is_rtl ?
x_ - fm.width(str)
- : - text_.rightMargin(*bv_.buffer(), par_) - row_.width();
+ : - text_metrics_.rightMargin(pm_) - row_.width();
pain_.text(int(x), yo_, str, font);
break;
}
}
-size_type calculateRowSignature(Row const & row, Paragraph const & par,
- int x, int y)
-{
- boost::crc_32_type crc;
- for (pos_type i = row.pos(); i < row.endpos(); ++i) {
- char_type const b[] = { par.getChar(i) };
- crc.process_bytes(b, 1);
- }
- char_type const b[] = { x, y, row.width() };
- crc.process_bytes(b, 3);
- return crc.checksum();
-}
-
-
bool CursorOnRow(PainterInfo & pi, pit_type const pit,
RowList::const_iterator rit, LyXText const & text)
{
}
+// FIXME: once wide() is obsolete, remove this as well!
+bool inNarrowInset(PainterInfo & pi)
+{
+ // check whether the current inset is nested in a non-wide inset
+ LCursor & cur = pi.base.bv->cursor();
+ for (int i = cur.depth() - 1; --i >= 0; ) {
+ InsetBase * const in = &cur[i].inset();
+ if (in) {
+ InsetText * t =
+ const_cast<InsetText *>(in->asTextInset());
+ if (t)
+ return !t->wide();
+ }
+ }
+ return false;
+}
+
+
void paintPar
(PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y,
bool repaintAll)
pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y);
Paragraph const & par = text.paragraphs()[pit];
- if (par.rows().empty())
+ ParagraphMetrics const & pm = pi.base.bv->parMetrics(&text, pit);
+ if (pm.rows().empty())
return;
- RowList::const_iterator const rb = par.rows().begin();
- RowList::const_iterator const re = par.rows().end();
+ RowList::const_iterator const rb = pm.rows().begin();
+ RowList::const_iterator const re = pm.rows().end();
y -= rb->ascent();
size_type rowno = 0;
bool tmp = refreshInside;
// Row signature; has row changed since last paint?
- size_type const row_sig = calculateRowSignature(*rit, par, x, y);
- bool row_has_changed = par.rowSignature()[rowno] != row_sig;
+ bool row_has_changed = pm.rowChangeStatus()[rowno];
bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
- bool in_inset_alone_on_row = innerCursorOnRow(pi, pit, rit,
- text);
+ bool in_inset_alone_on_row =
+ innerCursorOnRow(pi, pit, rit, text);
+ bool leftEdgeFixed =
+ (par.getAlign() == LYX_ALIGN_LEFT ||
+ par.getAlign() == LYX_ALIGN_BLOCK);
+ bool inNarrowIns = inNarrowInset(pi);
// If this is the only object on the row, we can make it wide
//
// to touch the paragraph contents. So either we move this "wide"
// property out of InsetText or we localize the feature to the painting
// done here.
+ // JSpitzm: We should aim at removing wide() altogether while retaining
+ // typing speed within insets.
for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
InsetBase const * const in = par.getInset(i);
if (in) {
InsetText * t = const_cast<InsetText *>(in->asTextInset());
if (t)
- t->setWide(in_inset_alone_on_row);
+ t->setWide(in_inset_alone_on_row
+ && leftEdgeFixed
+ && !inNarrowIns);
}
}
// from cache, or cursor is inside an inset _on this row_,
// then paint the row
if (repaintAll || row_has_changed || cursor_on_row) {
- // Add to row signature cache
- par.rowSignature()[rowno] = row_sig;
-
bool const inside = (y + rit->descent() >= 0
&& y - rit->ascent() < ww);
// it is not needed to draw on screen if we are not inside.
// Clear background of this row
// (if paragraph background was not cleared)
if (!repaintAll &&
- (!in_inset_alone_on_row || row_has_changed)) {
+ (!(in_inset_alone_on_row && leftEdgeFixed)
+ || row_has_changed)) {
pi.pain.fillRectangle(x, y - rit->ascent(),
- text.maxwidth_, rit->height(),
+ rp.maxWidth(), rit->height(),
text.backgroundColor());
// If outer row has changed, force nested
// insets to repaint completely
// 12 lines lower):
if (lyxerr.debugging(Debug::PAINTING)) {
if (text.isMainText(*pi.base.bv->buffer()))
- lyxerr[Debug::PAINTING] << "#";
+ LYXERR(Debug::PAINTING) << "#";
else
- lyxerr[Debug::PAINTING] << "[" <<
+ LYXERR(Debug::PAINTING) << "[" <<
repaintAll << row_has_changed <<
cursor_on_row << "]";
}
rp.paintChangeBar();
if (rit == rb)
rp.paintFirst();
- rp.paintText();
+ rp.paintText();
if (rit + 1 == re)
rp.paintLast();
}
// Re-enable screen drawing for future use of the painter.
pi.pain.setDrawingEnabled(true);
- if (lyxerr.debugging(Debug::PAINTING)) {
- lyxerr[Debug::PAINTING] << "." << endl;
- }
+ LYXERR(Debug::PAINTING) << "." << endl;
}
} // namespace anon
PainterInfo pi(const_cast<BufferView *>(&bv), pain);
// Should the whole screen, including insets, be refreshed?
- bool repaintAll = select || !vi.singlepar;
+ // FIXME: We should also distinguish DecorationUpdate to avoid text
+ // drawing if possible. This is not possible to do easily right now
+ // because of the single backing pixmap.
+ bool repaintAll = select || vi.update_strategy != SingleParUpdate;
if (repaintAll) {
// Clear background (if not delegated to rows)
// draw contents
for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
refreshInside = repaintAll;
- Paragraph const & par = text.getPar(pit);
- yy += par.ascent();
+ ParagraphMetrics const & pm = bv.parMetrics(&text, pit);
+ yy += pm.ascent();
paintPar(pi, text, pit, 0, yy, repaintAll);
- yy += par.descent();
- }
-
- // Cache one paragraph above and one below
- // Note MV: this cannot be suppressed even for singlepar.
- // Try viewing the User Guide Mobius figure
-
- if (vi.p1 > 0) {
- text.redoParagraph(bv, vi.p1 - 1);
- bv.coordCache().parPos()[&text][vi.p1 - 1] =
- Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
- }
-
- if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
- text.redoParagraph(bv, vi.p2 + 1);
- bv.coordCache().parPos()[&text][vi.p2 + 1] =
- Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
+ yy += pm.descent();
}
// and grey out above (should not happen later)
// lyxerr << "par ascent: " << text.getPar(vi.p1).ascent() << endl;
- if (vi.y1 > 0 && !vi.singlepar)
+ if (vi.y1 > 0 && vi.update_strategy != SingleParUpdate)
pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, LColor::bottomarea);
// and possibly grey out below
// lyxerr << "par descent: " << text.getPar(vi.p1).ascent() << endl;
- if (vi.y2 < bv.workHeight() && !vi.singlepar)
+ if (vi.y2 < bv.workHeight() && vi.update_strategy != SingleParUpdate)
pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea);
}
{
// lyxerr << " paintTextInset: y: " << y << endl;
- y -= text.getPar(0).ascent();
+ y -= pi.base.bv->parMetrics(&text, 0).ascent();
// This flag cannot be set from within same inset:
bool repaintAll = refreshInside;
for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
- y += text.getPar(pit).ascent();
+ ParagraphMetrics const & pmi
+ = pi.base.bv->parMetrics(&text, pit);
+ y += pmi.ascent();
paintPar(pi, text, pit, x, y, repaintAll);
- y += text.getPar(pit).descent();
+ y += pmi.descent();
}
}