2003-02-26 17:04:10 +00:00
|
|
|
/**
|
2007-04-26 04:41:58 +00:00
|
|
|
* \file rowpainter.cpp
|
2003-02-26 17:04:10 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
|
|
|
* \author various
|
|
|
|
* \author John Levon
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
* Full author contact details are available in file CREDITS.
|
2003-02-26 17:04:10 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
2003-09-06 23:36:02 +00:00
|
|
|
#include "rowpainter.h"
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Buffer.h"
|
|
|
|
#include "CoordCache.h"
|
2007-04-26 14:56:30 +00:00
|
|
|
#include "Cursor.h"
|
2003-10-22 16:30:57 +00:00
|
|
|
#include "debug.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "BufferParams.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
#include "BufferView.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Encoding.h"
|
2003-02-26 17:04:10 +00:00
|
|
|
#include "gettext.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Language.h"
|
2007-04-26 17:34:20 +00:00
|
|
|
#include "Color.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "LyXRC.h"
|
|
|
|
#include "Row.h"
|
|
|
|
#include "MetricsInfo.h"
|
|
|
|
#include "Paragraph.h"
|
2006-12-29 23:54:48 +00:00
|
|
|
#include "ParagraphMetrics.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
#include "paragraph_funcs.h"
|
|
|
|
#include "ParagraphParameters.h"
|
2006-12-29 23:54:48 +00:00
|
|
|
#include "TextMetrics.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "VSpace.h"
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-10-07 16:15:06 +00:00
|
|
|
#include "frontends/FontMetrics.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
#include "frontends/Painter.h"
|
|
|
|
|
2007-04-25 01:24:38 +00:00
|
|
|
#include "insets/InsetText.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
|
|
|
#include "support/textutils.h"
|
2003-06-30 23:56:22 +00:00
|
|
|
|
2005-12-30 19:02:52 +00:00
|
|
|
#include <boost/crc.hpp>
|
|
|
|
|
2006-10-07 16:15:06 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
namespace lyx {
|
|
|
|
|
|
|
|
using frontend::Painter;
|
|
|
|
using frontend::FontMetrics;
|
2003-11-24 16:26:55 +00:00
|
|
|
|
|
|
|
using std::endl;
|
2003-10-06 15:43:21 +00:00
|
|
|
using std::max;
|
|
|
|
using std::string;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2004-01-30 11:41:12 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
namespace {
|
|
|
|
|
2006-07-03 20:37:34 +00:00
|
|
|
/// Flag: do a full redraw of inside text of inset
|
|
|
|
/// Working variable indicating a full screen refresh
|
|
|
|
bool refreshInside;
|
|
|
|
|
2003-07-14 17:50:00 +00:00
|
|
|
/**
|
|
|
|
* A class used for painting an individual row of text.
|
|
|
|
*/
|
|
|
|
class RowPainter {
|
|
|
|
public:
|
2003-11-24 16:26:55 +00:00
|
|
|
/// initialise and run painter
|
2004-11-30 01:59:49 +00:00
|
|
|
RowPainter(PainterInfo & pi, LyXText const & text,
|
2005-01-31 16:29:48 +00:00
|
|
|
pit_type pit, Row const & row, int x, int y);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
2003-07-14 17:50:00 +00:00
|
|
|
// paint various parts
|
|
|
|
void paintAppendix();
|
|
|
|
void paintDepthBar();
|
|
|
|
void paintChangeBar();
|
|
|
|
void paintFirst();
|
|
|
|
void paintLast();
|
2004-11-30 01:59:49 +00:00
|
|
|
void paintText();
|
2006-12-29 23:54:48 +00:00
|
|
|
int maxWidth() { return max_width_; }
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
|
|
private:
|
2006-02-03 17:21:51 +00:00
|
|
|
void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
|
2006-10-21 00:16:43 +00:00
|
|
|
void paintHebrewComposeChar(pos_type & vpos, LyXFont const & font);
|
|
|
|
void paintArabicComposeChar(pos_type & vpos, LyXFont const & font);
|
2006-10-22 18:49:18 +00:00
|
|
|
void paintChars(pos_type & vpos, LyXFont const & font,
|
2006-04-05 23:56:29 +00:00
|
|
|
bool hebrew, bool arabic);
|
2003-07-14 17:50:00 +00:00
|
|
|
int paintAppendixStart(int y);
|
2006-10-21 00:16:43 +00:00
|
|
|
void paintFromPos(pos_type & vpos);
|
|
|
|
void paintInset(pos_type const pos, LyXFont const & font);
|
2003-07-14 17:50:00 +00:00
|
|
|
|
|
|
|
/// return left margin
|
|
|
|
int leftMargin() const;
|
|
|
|
|
|
|
|
/// return the label font for this row
|
|
|
|
LyXFont const getLabelFont() const;
|
|
|
|
|
|
|
|
/// bufferview to paint on
|
2006-10-13 16:44:44 +00:00
|
|
|
BufferView & bv_;
|
2003-07-14 17:50:00 +00:00
|
|
|
|
|
|
|
/// Painter to use
|
|
|
|
Painter & pain_;
|
|
|
|
|
|
|
|
/// LyXText for the row
|
|
|
|
LyXText const & text_;
|
2006-12-29 23:54:48 +00:00
|
|
|
TextMetrics & text_metrics_;
|
2005-07-18 11:00:15 +00:00
|
|
|
ParagraphList const & pars_;
|
2003-07-14 17:50:00 +00:00
|
|
|
|
|
|
|
/// The row to paint
|
2005-01-31 16:29:48 +00:00
|
|
|
Row const & row_;
|
2003-07-14 17:50:00 +00:00
|
|
|
|
|
|
|
/// Row's paragraph
|
2004-11-24 21:53:46 +00:00
|
|
|
pit_type const pit_;
|
2004-08-15 00:01:45 +00:00
|
|
|
Paragraph const & par_;
|
2006-12-29 23:54:48 +00:00
|
|
|
ParagraphMetrics const & pm_;
|
|
|
|
int max_width_;
|
2003-07-14 17:50:00 +00:00
|
|
|
|
2005-09-07 10:37:05 +00:00
|
|
|
/// is row erased? (change tracking)
|
|
|
|
bool erased_;
|
|
|
|
|
2003-07-14 17:50:00 +00:00
|
|
|
// Looks ugly - is
|
2004-11-30 01:59:49 +00:00
|
|
|
double const xo_;
|
|
|
|
int const yo_; // current baseline
|
2003-07-28 12:20:42 +00:00
|
|
|
double x_;
|
2003-07-14 17:50:00 +00:00
|
|
|
int width_;
|
2003-07-28 12:20:42 +00:00
|
|
|
double separator_;
|
|
|
|
double hfill_;
|
|
|
|
double label_hfill_;
|
2003-07-14 17:50:00 +00:00
|
|
|
};
|
|
|
|
|
2003-07-28 12:20:42 +00:00
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
RowPainter::RowPainter(PainterInfo & pi,
|
2005-01-31 16:29:48 +00:00
|
|
|
LyXText const & text, pit_type pit, Row const & row, int x, int y)
|
2006-12-29 23:54:48 +00:00
|
|
|
: bv_(*pi.base.bv), pain_(pi.pain), text_(text),
|
|
|
|
text_metrics_(pi.base.bv->textMetrics(&text)),
|
|
|
|
pars_(text.paragraphs()),
|
2004-11-30 01:59:49 +00:00
|
|
|
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
|
2006-12-29 23:54:48 +00:00
|
|
|
pm_(text_metrics_.parMetrics(pit)),
|
|
|
|
max_width_(bv_.workWidth()),
|
2005-09-07 10:37:05 +00:00
|
|
|
erased_(pi.erased_),
|
2006-12-29 23:54:48 +00:00
|
|
|
xo_(x), yo_(y), width_(text_metrics_.width())
|
2003-11-24 16:26:55 +00:00
|
|
|
{
|
2006-12-29 23:54:48 +00:00
|
|
|
RowMetrics m = text_metrics_.computeRowMetrics(pit_, row_);
|
2004-03-01 12:23:17 +00:00
|
|
|
x_ = m.x + xo_;
|
2004-08-14 15:55:22 +00:00
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
|
|
|
|
//row_.dump();
|
|
|
|
|
2004-03-01 12:23:17 +00:00
|
|
|
separator_ = m.separator;
|
|
|
|
hfill_ = m.hfill;
|
|
|
|
label_hfill_ = m.label_hfill;
|
2003-11-24 16:26:55 +00:00
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
BOOST_ASSERT(pit >= 0);
|
|
|
|
BOOST_ASSERT(pit < int(text.paragraphs().size()));
|
2003-11-24 16:26:55 +00:00
|
|
|
}
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
LyXFont const RowPainter::getLabelFont() const
|
|
|
|
{
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
return text_.getLabelFont(*bv_.buffer(), par_);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int RowPainter::leftMargin() const
|
|
|
|
{
|
2006-12-29 23:54:48 +00:00
|
|
|
return text_.leftMargin(*bv_.buffer(), max_width_, pit_, row_.pos());
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-11-03 15:39:58 +00:00
|
|
|
// If you want to debug inset metrics uncomment the following line:
|
|
|
|
// #define DEBUG_METRICS
|
|
|
|
// This draws green lines around each inset.
|
|
|
|
|
|
|
|
|
2005-06-10 14:55:01 +00:00
|
|
|
void RowPainter::paintInset(pos_type const pos, LyXFont const & font)
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
2004-08-15 00:01:45 +00:00
|
|
|
InsetBase const * inset = par_.getInset(pos);
|
2003-09-09 17:25:35 +00:00
|
|
|
BOOST_ASSERT(inset);
|
2004-04-07 20:20:15 +00:00
|
|
|
PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
|
2005-12-17 15:03:41 +00:00
|
|
|
// FIXME: We should always use font, see documentation of
|
2007-04-25 01:24:38 +00:00
|
|
|
// noFontChange() in InsetBase.h.
|
2005-12-17 15:03:41 +00:00
|
|
|
pi.base.font = inset->noFontChange() ?
|
2006-02-05 13:20:16 +00:00
|
|
|
bv_.buffer()->params().getFont() :
|
2005-12-17 15:03:41 +00:00
|
|
|
font;
|
2004-08-14 23:57:29 +00:00
|
|
|
pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
|
2006-10-19 12:49:11 +00:00
|
|
|
pi.erased_ = erased_ || par_.isDeleted(pos);
|
2006-11-03 15:39:58 +00:00
|
|
|
#ifdef DEBUG_METRICS
|
|
|
|
int const x1 = int(x_);
|
|
|
|
#endif
|
2006-10-13 16:44:44 +00:00
|
|
|
bv_.coordCache().insets().add(inset, int(x_), yo_);
|
2006-03-18 17:39:54 +00:00
|
|
|
InsetText const * const in = inset->asTextInset();
|
2006-03-10 16:10:35 +00:00
|
|
|
// non-wide insets are painted completely. Recursive
|
2006-07-03 20:37:34 +00:00
|
|
|
bool tmp = refreshInside;
|
2006-11-07 15:24:34 +00:00
|
|
|
if (!in || !in->wide()) {
|
2006-07-03 20:37:34 +00:00
|
|
|
refreshInside = true;
|
2007-04-01 14:51:13 +00:00
|
|
|
LYXERR(Debug::PAINTING) << endl << "Paint inset fully" << endl;
|
2006-03-17 19:45:28 +00:00
|
|
|
}
|
2006-07-03 20:37:34 +00:00
|
|
|
if (refreshInside)
|
2006-03-10 16:10:35 +00:00
|
|
|
inset->drawSelection(pi, int(x_), yo_);
|
2004-11-30 01:59:49 +00:00
|
|
|
inset->draw(pi, int(x_), yo_);
|
2006-07-03 20:37:34 +00:00
|
|
|
refreshInside = tmp;
|
2003-07-18 14:04:49 +00:00
|
|
|
x_ += inset->width();
|
2006-11-03 15:39:58 +00:00
|
|
|
#ifdef DEBUG_METRICS
|
|
|
|
Dimension dim;
|
2006-12-29 23:54:48 +00:00
|
|
|
BOOST_ASSERT(max_witdh_ > 0);
|
|
|
|
int right_margin = text_metrics_.rightMargin(pm_);
|
|
|
|
int const w = max_witdh_ - leftMargin() - right_margin;
|
2006-11-03 15:39:58 +00:00
|
|
|
MetricsInfo mi(&bv_, font, w);
|
|
|
|
inset->metrics(mi, dim);
|
|
|
|
if (inset->width() > dim.wid)
|
|
|
|
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
|
|
|
|
<< " draw width " << inset->width()
|
|
|
|
<< "> metrics width " << dim.wid << "." << std::endl;
|
|
|
|
if (inset->ascent() > dim.asc)
|
|
|
|
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
|
|
|
|
<< " draw ascent " << inset->ascent()
|
|
|
|
<< "> metrics ascent " << dim.asc << "." << std::endl;
|
|
|
|
if (inset->descent() > dim.des)
|
|
|
|
lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
|
|
|
|
<< " draw ascent " << inset->descent()
|
|
|
|
<< "> metrics descent " << dim.des << "." << std::endl;
|
|
|
|
BOOST_ASSERT(inset->width() <= dim.wid);
|
|
|
|
BOOST_ASSERT(inset->ascent() <= dim.asc);
|
|
|
|
BOOST_ASSERT(inset->descent() <= dim.des);
|
|
|
|
int const x2 = x1 + dim.wid;
|
|
|
|
int const y1 = yo_ + dim.des;
|
|
|
|
int const y2 = yo_ - dim.asc;
|
2007-04-26 17:34:20 +00:00
|
|
|
pi.pain.line(x1, y1, x1, y2, Color::green);
|
|
|
|
pi.pain.line(x1, y1, x2, y1, Color::green);
|
|
|
|
pi.pain.line(x2, y1, x2, y2, Color::green);
|
|
|
|
pi.pain.line(x1, y2, x2, y2, Color::green);
|
2006-11-03 15:39:58 +00:00
|
|
|
#endif
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-06-10 14:55:01 +00:00
|
|
|
void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
2003-10-23 13:28:49 +00:00
|
|
|
pos_type pos = text_.bidi.vis2log(vpos);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-10-17 14:46:45 +00:00
|
|
|
docstring str;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// first char
|
2006-04-09 02:30:40 +00:00
|
|
|
char_type c = par_.getChar(pos);
|
2003-02-26 17:04:10 +00:00
|
|
|
str += c;
|
|
|
|
++vpos;
|
|
|
|
|
2006-10-11 17:24:46 +00:00
|
|
|
int const width = theFontMetrics(font).width(c);
|
2003-02-26 17:04:10 +00:00
|
|
|
int dx = 0;
|
|
|
|
|
|
|
|
for (pos_type i = pos - 1; i >= 0; --i) {
|
2004-08-15 00:01:45 +00:00
|
|
|
c = par_.getChar(i);
|
2006-04-09 00:26:19 +00:00
|
|
|
if (!Encodings::isComposeChar_hebrew(c)) {
|
2006-04-08 09:09:57 +00:00
|
|
|
if (isPrintableNonspace(c)) {
|
2006-10-30 20:10:35 +00:00
|
|
|
int const width2 = text_.singleWidth(par_, i, c,
|
|
|
|
text_.getFont(*bv_.buffer(), par_, i));
|
2007-03-25 14:04:29 +00:00
|
|
|
dx = (c == 0x05e8 || // resh
|
|
|
|
c == 0x05d3) // dalet
|
2003-02-26 17:04:10 +00:00
|
|
|
? width2 - width
|
|
|
|
: (width2 - width) / 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Draw nikud
|
2006-10-17 14:46:45 +00:00
|
|
|
pain_.text(int(x_) + dx, yo_, str, font);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-06-10 14:55:01 +00:00
|
|
|
void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
2003-10-23 13:28:49 +00:00
|
|
|
pos_type pos = text_.bidi.vis2log(vpos);
|
2006-10-17 14:46:45 +00:00
|
|
|
docstring str;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// first char
|
2006-04-09 02:30:40 +00:00
|
|
|
char_type c = par_.getChar(pos);
|
2004-08-15 00:01:45 +00:00
|
|
|
c = par_.transformChar(c, pos);
|
2004-01-26 10:13:15 +00:00
|
|
|
str += c;
|
2003-02-26 17:04:10 +00:00
|
|
|
++vpos;
|
|
|
|
|
2006-10-11 17:24:46 +00:00
|
|
|
int const width = theFontMetrics(font).width(c);
|
2003-02-26 17:04:10 +00:00
|
|
|
int dx = 0;
|
|
|
|
|
2003-04-09 21:34:31 +00:00
|
|
|
for (pos_type i = pos - 1; i >= 0; --i) {
|
2004-08-15 00:01:45 +00:00
|
|
|
c = par_.getChar(i);
|
2006-04-09 00:26:19 +00:00
|
|
|
if (!Encodings::isComposeChar_arabic(c)) {
|
2006-04-08 09:09:57 +00:00
|
|
|
if (isPrintableNonspace(c)) {
|
2006-10-30 20:10:35 +00:00
|
|
|
int const width2 = text_.singleWidth(par_, i, c,
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
text_.getFont(*bv_.buffer(), par_, i));
|
2003-02-26 17:04:10 +00:00
|
|
|
dx = (width2 - width) / 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Draw nikud
|
2006-10-17 14:46:45 +00:00
|
|
|
pain_.text(int(x_) + dx, yo_, str, font);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
2007-02-26 15:13:08 +00:00
|
|
|
|
2006-10-22 18:49:18 +00:00
|
|
|
void RowPainter::paintChars(pos_type & vpos, LyXFont const & font,
|
2005-06-10 14:55:01 +00:00
|
|
|
bool hebrew, bool arabic)
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
2006-10-22 18:49:18 +00:00
|
|
|
// This method takes up 70% of time when typing
|
2003-10-23 13:28:49 +00:00
|
|
|
pos_type pos = text_.bidi.vis2log(vpos);
|
2003-10-27 11:44:10 +00:00
|
|
|
pos_type const end = row_.endpos();
|
2005-07-18 12:13:32 +00:00
|
|
|
FontSpan const font_span = par_.fontSpan(pos);
|
2006-05-08 20:30:52 +00:00
|
|
|
Change::Type const prev_change = par_.lookupChange(pos).type;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// first character
|
2006-08-13 22:54:59 +00:00
|
|
|
std::vector<char_type> str;
|
2006-10-22 13:51:37 +00:00
|
|
|
str.reserve(100);
|
2006-08-13 22:54:59 +00:00
|
|
|
str.push_back(par_.getChar(pos));
|
2006-10-22 18:49:18 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
if (arabic) {
|
2006-08-13 22:54:59 +00:00
|
|
|
char_type c = str[0];
|
2004-08-15 00:01:45 +00:00
|
|
|
str[0] = par_.transformChar(c, pos);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
// collect as much similar chars as we can
|
2005-06-10 14:55:01 +00:00
|
|
|
for (++vpos ; vpos < end ; ++vpos) {
|
|
|
|
pos = text_.bidi.vis2log(vpos);
|
2005-07-18 12:13:32 +00:00
|
|
|
if (pos < font_span.first || pos > font_span.last)
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
|
|
|
|
2006-10-20 13:00:49 +00:00
|
|
|
if (prev_change != par_.lookupChange(pos).type)
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2006-04-09 02:30:40 +00:00
|
|
|
char_type c = par_.getChar(pos);
|
2005-06-10 14:55:01 +00:00
|
|
|
|
2006-04-08 09:09:57 +00:00
|
|
|
if (!isPrintableNonspace(c))
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2007-03-25 10:53:01 +00:00
|
|
|
/* 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
|
|
|
|
*/
|
2007-03-23 09:18:07 +00:00
|
|
|
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.
|
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
if (arabic && Encodings::isComposeChar_arabic(c))
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
2003-10-23 08:15:57 +00:00
|
|
|
|
2006-04-09 00:26:19 +00:00
|
|
|
if (hebrew && Encodings::isComposeChar_hebrew(c))
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
2007-03-23 09:18:07 +00:00
|
|
|
*/
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2007-03-23 09:18:07 +00:00
|
|
|
if (arabic) {
|
2004-08-15 00:01:45 +00:00
|
|
|
c = par_.transformChar(c, pos);
|
2007-03-25 10:53:01 +00:00
|
|
|
/* see comment in hebrew, explaining why we break */
|
2007-03-23 09:18:07 +00:00
|
|
|
break;
|
|
|
|
}
|
2003-10-27 15:39:59 +00:00
|
|
|
|
2006-08-13 22:54:59 +00:00
|
|
|
str.push_back(c);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
2007-02-26 15:13:08 +00:00
|
|
|
docstring s(&str[0], str.size());
|
|
|
|
|
2006-10-22 18:49:18 +00:00
|
|
|
if (prev_change != Change::UNCHANGED) {
|
|
|
|
LyXFont copy(font);
|
|
|
|
if (prev_change == Change::DELETED) {
|
2007-04-26 17:34:20 +00:00
|
|
|
copy.setColor(Color::strikeout);
|
2006-10-22 18:49:18 +00:00
|
|
|
} else if (prev_change == Change::INSERTED) {
|
2007-04-26 17:34:20 +00:00
|
|
|
copy.setColor(Color::newtext);
|
2006-10-22 18:49:18 +00:00
|
|
|
}
|
2007-02-26 15:13:08 +00:00
|
|
|
x_ += pain_.text(int(x_), yo_, s, copy);
|
2006-10-22 18:49:18 +00:00
|
|
|
} else {
|
2007-02-26 15:13:08 +00:00
|
|
|
x_ += pain_.text(int(x_), yo_, s, font);
|
2006-10-22 18:49:18 +00:00
|
|
|
}
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-03 17:21:51 +00:00
|
|
|
void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc)
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
|
|
|
if (!lyxrc.mark_foreign_language)
|
|
|
|
return;
|
2005-06-10 14:55:01 +00:00
|
|
|
if (font.language() == latex_language)
|
2003-02-26 17:04:10 +00:00
|
|
|
return;
|
2005-06-10 14:55:01 +00:00
|
|
|
if (font.language() == bv_.buffer()->params().language)
|
2003-02-26 17:04:10 +00:00
|
|
|
return;
|
|
|
|
|
2006-02-03 17:21:51 +00:00
|
|
|
int const y = yo_ + 1 + desc;
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.line(int(orig_x), y, int(x_), y, Color::language);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-03-22 17:26:03 +00:00
|
|
|
void RowPainter::paintFromPos(pos_type & vpos)
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
2003-10-23 13:28:49 +00:00
|
|
|
pos_type const pos = text_.bidi.vis2log(vpos);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
LyXFont orig_font = text_.getFont(*bv_.buffer(), par_, pos);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2003-07-28 12:20:42 +00:00
|
|
|
double const orig_x = x_;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2005-09-07 10:37:05 +00:00
|
|
|
if (par_.isInset(pos)) {
|
2005-06-10 14:55:01 +00:00
|
|
|
paintInset(pos, orig_font);
|
2003-02-26 17:04:10 +00:00
|
|
|
++vpos;
|
2006-02-03 17:21:51 +00:00
|
|
|
paintForeignMark(orig_x, orig_font,
|
|
|
|
par_.getInset(pos)->descent());
|
2003-03-22 17:26:03 +00:00
|
|
|
return;
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// usual characters, no insets
|
2006-04-09 02:30:40 +00:00
|
|
|
char_type const c = par_.getChar(pos);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// special case languages
|
2005-07-18 14:25:20 +00:00
|
|
|
std::string const & lang = orig_font.language()->lang();
|
|
|
|
bool const hebrew = lang == "hebrew";
|
2007-03-26 08:24:38 +00:00
|
|
|
bool const arabic = lang == "arabic";
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// draw as many chars as we can
|
|
|
|
if ((!hebrew && !arabic)
|
2006-04-09 00:26:19 +00:00
|
|
|
|| (hebrew && !Encodings::isComposeChar_hebrew(c))
|
|
|
|
|| (arabic && !Encodings::isComposeChar_arabic(c))) {
|
2005-06-10 14:55:01 +00:00
|
|
|
paintChars(vpos, orig_font, hebrew, arabic);
|
2003-02-26 17:04:10 +00:00
|
|
|
} else if (hebrew) {
|
2005-06-10 14:55:01 +00:00
|
|
|
paintHebrewComposeChar(vpos, orig_font);
|
2003-02-26 17:04:10 +00:00
|
|
|
} else if (arabic) {
|
2005-06-10 14:55:01 +00:00
|
|
|
paintArabicComposeChar(vpos, orig_font);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
paintForeignMark(orig_x, orig_font);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RowPainter::paintChangeBar()
|
|
|
|
{
|
2003-10-23 08:15:57 +00:00
|
|
|
pos_type const start = row_.pos();
|
2006-10-31 20:07:26 +00:00
|
|
|
pos_type end = row_.endpos();
|
|
|
|
|
|
|
|
if (par_.size() == end) {
|
|
|
|
// this is the last row of the paragraph;
|
|
|
|
// thus, we must also consider the imaginary end-of-par character
|
|
|
|
end++;
|
|
|
|
}
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-03-13 11:05:07 +00:00
|
|
|
if (start == end || !par_.isChanged(start, end))
|
2003-02-26 17:04:10 +00:00
|
|
|
return;
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2003-10-23 08:15:57 +00:00
|
|
|
int const height = text_.isLastRow(pit_, row_)
|
2004-11-30 01:59:49 +00:00
|
|
|
? row_.ascent()
|
|
|
|
: row_.height();
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.fillRectangle(5, yo_ - row_.ascent(), 3, height, Color::changebar);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
void RowPainter::paintAppendix()
|
|
|
|
{
|
2004-08-15 00:01:45 +00:00
|
|
|
if (!par_.params().appendix())
|
2003-03-13 19:55:39 +00:00
|
|
|
return;
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
int y = yo_ - row_.ascent();
|
2003-03-13 19:55:39 +00:00
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
if (par_.params().startOfAppendix())
|
2003-03-13 19:55:39 +00:00
|
|
|
y += 2 * defaultRowHeight();
|
|
|
|
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.line(1, y, 1, yo_ + row_.height(), Color::appendix);
|
|
|
|
pain_.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color::appendix);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RowPainter::paintDepthBar()
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
depth_type const depth = par_.getDepth();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
if (depth <= 0)
|
|
|
|
return;
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
depth_type prev_depth = 0;
|
2003-10-23 08:15:57 +00:00
|
|
|
if (!text_.isFirstRow(pit_, row_)) {
|
2004-11-24 21:53:46 +00:00
|
|
|
pit_type pit2 = pit_;
|
2003-10-23 08:15:57 +00:00
|
|
|
if (row_.pos() == 0)
|
2003-08-14 12:06:11 +00:00
|
|
|
--pit2;
|
2004-03-25 09:16:36 +00:00
|
|
|
prev_depth = pars_[pit2].getDepth();
|
2003-08-14 12:06:11 +00:00
|
|
|
}
|
2003-06-18 17:43:49 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
depth_type next_depth = 0;
|
2003-10-23 08:15:57 +00:00
|
|
|
if (!text_.isLastRow(pit_, row_)) {
|
2004-11-24 21:53:46 +00:00
|
|
|
pit_type pit2 = pit_;
|
2004-03-25 09:16:36 +00:00
|
|
|
if (row_.endpos() >= pars_[pit2].size())
|
2003-08-14 12:06:11 +00:00
|
|
|
++pit2;
|
2004-03-25 09:16:36 +00:00
|
|
|
next_depth = pars_[pit2].getDepth();
|
2003-08-14 12:06:11 +00:00
|
|
|
}
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
for (depth_type i = 1; i <= depth; ++i) {
|
2004-08-14 15:55:22 +00:00
|
|
|
int const w = nestMargin() / 5;
|
2004-08-14 21:56:40 +00:00
|
|
|
int x = int(xo_) + w * i;
|
|
|
|
// only consider the changebar space if we're drawing outermost text
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
if (text_.isMainText(*bv_.buffer()))
|
2004-08-14 15:55:22 +00:00
|
|
|
x += changebarMargin();
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
int const starty = yo_ - row_.ascent();
|
|
|
|
int const h = row_.height() - 1 - (i - next_depth - 1) * 3;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.line(x, starty, x, starty + h, Color::depthbar);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2003-07-28 12:20:42 +00:00
|
|
|
if (i > prev_depth)
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.fillRectangle(x, starty, w, 2, Color::depthbar);
|
2003-07-28 12:20:42 +00:00
|
|
|
if (i > next_depth)
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.fillRectangle(x, starty + h, w, 2, Color::depthbar);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-03-13 19:55:39 +00:00
|
|
|
int RowPainter::paintAppendixStart(int y)
|
|
|
|
{
|
|
|
|
LyXFont pb_font;
|
2007-04-26 17:34:20 +00:00
|
|
|
pb_font.setColor(Color::appendix);
|
2003-09-16 09:01:15 +00:00
|
|
|
pb_font.decSize();
|
2003-03-13 19:55:39 +00:00
|
|
|
|
|
|
|
int w = 0;
|
|
|
|
int a = 0;
|
|
|
|
int d = 0;
|
2006-10-17 14:46:45 +00:00
|
|
|
|
|
|
|
docstring const label = _("Appendix");
|
|
|
|
theFontMetrics(pb_font).rectText(label, w, a, d);
|
2003-03-13 19:55:39 +00:00
|
|
|
|
2003-07-28 12:20:42 +00:00
|
|
|
int const text_start = int(xo_ + (width_ - w) / 2);
|
2003-03-13 19:55:39 +00:00
|
|
|
int const text_end = text_start + w;
|
|
|
|
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.rectText(text_start, y + d, label, pb_font, Color::none, Color::none);
|
2003-03-13 19:55:39 +00:00
|
|
|
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.line(int(xo_ + 1), y, text_start, y, Color::appendix);
|
|
|
|
pain_.line(text_end, y, int(xo_ + width_ - 2), y, Color::appendix);
|
2003-03-13 19:55:39 +00:00
|
|
|
|
|
|
|
return 3 * defaultRowHeight();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
void RowPainter::paintFirst()
|
|
|
|
{
|
2004-08-15 00:01:45 +00:00
|
|
|
ParagraphParameters const & parparams = par_.params();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2003-03-13 19:55:39 +00:00
|
|
|
int y_top = 0;
|
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
// start of appendix?
|
2003-07-28 12:20:42 +00:00
|
|
|
if (parparams.startOfAppendix())
|
2005-05-05 13:11:05 +00:00
|
|
|
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2003-08-28 07:41:31 +00:00
|
|
|
Buffer const & buffer = *bv_.buffer();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
LyXLayout_ptr const & layout = par_.layout();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2003-09-09 09:47:59 +00:00
|
|
|
if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
|
2004-03-25 09:16:36 +00:00
|
|
|
if (pit_ != 0) {
|
2003-02-26 17:04:10 +00:00
|
|
|
if (layout->latextype == LATEX_PARAGRAPH
|
2004-08-15 00:01:45 +00:00
|
|
|
&& !par_.getDepth()) {
|
2003-09-09 09:47:59 +00:00
|
|
|
y_top += buffer.params().getDefSkip().inPixels(bv_);
|
2003-02-26 17:04:10 +00:00
|
|
|
} else {
|
2004-03-25 09:16:36 +00:00
|
|
|
LyXLayout_ptr const & playout = pars_[pit_ - 1].layout();
|
2003-02-26 17:04:10 +00:00
|
|
|
if (playout->latextype == LATEX_PARAGRAPH
|
2004-03-25 09:16:36 +00:00
|
|
|
&& !pars_[pit_ - 1].getDepth()) {
|
2003-02-26 17:04:10 +00:00
|
|
|
// is it right to use defskip here, too? (AS)
|
2003-09-09 09:47:59 +00:00
|
|
|
y_top += buffer.params().getDefSkip().inPixels(bv_);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
bool const is_rtl = text_.isRTL(buffer, par_);
|
2003-12-01 13:35:49 +00:00
|
|
|
bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
|
2004-08-15 00:01:45 +00:00
|
|
|
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// should we print a label?
|
|
|
|
if (layout->labeltype >= LABEL_STATIC
|
|
|
|
&& (layout->labeltype != LABEL_STATIC
|
2003-10-22 16:30:57 +00:00
|
|
|
|| layout->latextype != LATEX_ENVIRONMENT
|
|
|
|
|| is_seq)) {
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2005-04-19 09:04:25 +00:00
|
|
|
LyXFont const font = getLabelFont();
|
2006-10-11 17:24:46 +00:00
|
|
|
FontMetrics const & fm = theFontMetrics(font);
|
2006-10-07 16:15:06 +00:00
|
|
|
|
2006-10-20 19:26:23 +00:00
|
|
|
docstring const str = par_.getLabelstring();
|
2005-04-19 09:04:25 +00:00
|
|
|
if (!str.empty()) {
|
2003-07-28 12:20:42 +00:00
|
|
|
double x = x_;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
// this is special code for the chapter layout. This is
|
|
|
|
// printed in an extra row and has a pagebreak at
|
|
|
|
// the top.
|
2003-09-12 17:13:22 +00:00
|
|
|
if (layout->counter == "chapter") {
|
2005-04-19 09:04:25 +00:00
|
|
|
double spacing_val = 1.0;
|
|
|
|
if (!parparams.spacing().isDefault()) {
|
|
|
|
spacing_val = parparams.spacing().getValue();
|
|
|
|
} else {
|
|
|
|
spacing_val = buffer.params().spacing().getValue();
|
|
|
|
}
|
2005-09-19 10:18:37 +00:00
|
|
|
|
2006-10-07 16:15:06 +00:00
|
|
|
int const labeladdon = int(fm.maxHeight() * layout->spacing.getValue() * spacing_val);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-10-07 16:15:06 +00:00
|
|
|
int const maxdesc = int(fm.maxDescent() * layout->spacing.getValue() * spacing_val)
|
2005-04-19 09:04:25 +00:00
|
|
|
+ int(layout->parsep) * defaultRowHeight();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2005-04-19 09:04:25 +00:00
|
|
|
if (is_rtl) {
|
|
|
|
x = width_ - leftMargin() -
|
2006-10-17 14:46:45 +00:00
|
|
|
fm.width(str);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
2005-04-26 11:12:20 +00:00
|
|
|
|
2006-10-17 14:46:45 +00:00
|
|
|
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
|
2003-02-26 17:04:10 +00:00
|
|
|
} else {
|
2006-10-17 14:46:45 +00:00
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
docstring lab = from_utf8(layout->labelsep);
|
2003-02-26 17:04:10 +00:00
|
|
|
if (is_rtl) {
|
2004-02-27 09:18:03 +00:00
|
|
|
x = width_ - leftMargin()
|
2006-10-17 14:46:45 +00:00
|
|
|
+ fm.width(lab);
|
2003-02-26 17:04:10 +00:00
|
|
|
} else {
|
2006-10-17 14:46:45 +00:00
|
|
|
x = x_ - fm.width(lab)
|
|
|
|
- fm.width(str);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
2006-10-17 14:46:45 +00:00
|
|
|
pain_.text(int(x), yo_, str, font);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// the labels at the top of an environment.
|
|
|
|
// More or less for bibliography
|
2003-10-22 16:30:57 +00:00
|
|
|
} else if (is_seq &&
|
2003-02-26 17:04:10 +00:00
|
|
|
(layout->labeltype == LABEL_TOP_ENVIRONMENT ||
|
|
|
|
layout->labeltype == LABEL_BIBLIO ||
|
|
|
|
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
|
|
|
|
LyXFont font = getLabelFont();
|
2004-08-15 00:01:45 +00:00
|
|
|
if (!par_.getLabelstring().empty()) {
|
2006-10-20 19:26:23 +00:00
|
|
|
docstring const str = par_.getLabelstring();
|
2005-01-06 13:48:13 +00:00
|
|
|
double spacing_val = 1.0;
|
2005-07-18 14:25:20 +00:00
|
|
|
if (!parparams.spacing().isDefault())
|
2003-02-26 17:04:10 +00:00
|
|
|
spacing_val = parparams.spacing().getValue();
|
2005-07-18 14:25:20 +00:00
|
|
|
else
|
2003-09-09 17:00:19 +00:00
|
|
|
spacing_val = buffer.params().spacing().getValue();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-10-11 17:24:46 +00:00
|
|
|
FontMetrics const & fm = theFontMetrics(font);
|
2006-10-07 16:15:06 +00:00
|
|
|
|
|
|
|
int const labeladdon = int(fm.maxHeight()
|
|
|
|
* layout->spacing.getValue() * spacing_val);
|
2005-09-19 10:18:37 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
int maxdesc =
|
2006-10-07 16:15:06 +00:00
|
|
|
int(fm.maxDescent() * layout->spacing.getValue() * spacing_val
|
2003-02-26 17:04:10 +00:00
|
|
|
+ (layout->labelbottomsep * defaultRowHeight()));
|
|
|
|
|
2003-07-28 12:20:42 +00:00
|
|
|
double x = x_;
|
2003-02-26 17:04:10 +00:00
|
|
|
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
|
2005-12-02 13:20:26 +00:00
|
|
|
if (is_rtl)
|
|
|
|
x = leftMargin();
|
2006-12-29 23:54:48 +00:00
|
|
|
x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
|
2006-10-17 14:46:45 +00:00
|
|
|
x -= fm.width(str) / 2;
|
2003-02-26 17:04:10 +00:00
|
|
|
} else if (is_rtl) {
|
2006-10-17 14:46:45 +00:00
|
|
|
x = width_ - leftMargin() - fm.width(str);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
2006-10-17 14:46:45 +00:00
|
|
|
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RowPainter::paintLast()
|
|
|
|
{
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
|
2003-12-01 13:35:49 +00:00
|
|
|
int const endlabel = getEndLabel(pit_, text_.paragraphs());
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-11-23 18:59:05 +00:00
|
|
|
// paint imaginary end-of-paragraph character
|
|
|
|
|
|
|
|
if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
|
|
|
|
FontMetrics const & fm = theFontMetrics(bv_.buffer()->params().getFont());
|
|
|
|
int const length = fm.maxAscent() / 2;
|
2007-04-26 17:34:20 +00:00
|
|
|
Color::color col = par_.isInserted(par_.size()) ? Color::newtext : Color::strikeout;
|
2006-11-23 18:59:05 +00:00
|
|
|
|
2006-11-24 22:18:41 +00:00
|
|
|
pain_.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
|
2006-11-23 18:59:05 +00:00
|
|
|
Painter::line_solid, Painter::line_thick);
|
2006-11-24 22:18:41 +00:00
|
|
|
pain_.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
|
2006-11-23 18:59:05 +00:00
|
|
|
Painter::line_solid, Painter::line_thick);
|
|
|
|
}
|
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
// draw an endlabel
|
2006-11-23 18:59:05 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
switch (endlabel) {
|
|
|
|
case END_LABEL_BOX:
|
2003-10-28 11:18:40 +00:00
|
|
|
case END_LABEL_FILLED_BOX: {
|
2003-02-26 17:04:10 +00:00
|
|
|
LyXFont const font = getLabelFont();
|
2006-10-11 17:24:46 +00:00
|
|
|
FontMetrics const & fm = theFontMetrics(font);
|
2006-10-07 16:15:06 +00:00
|
|
|
int const size = int(0.75 * fm.maxAscent());
|
2004-11-30 01:59:49 +00:00
|
|
|
int const y = yo_ - size;
|
2004-08-14 15:55:22 +00:00
|
|
|
int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2004-03-01 21:10:47 +00:00
|
|
|
if (width_ - int(row_.width()) <= size)
|
2004-02-27 09:18:03 +00:00
|
|
|
x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2003-07-28 12:20:42 +00:00
|
|
|
if (endlabel == END_LABEL_BOX)
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.rectangle(x, y, size, size, Color::eolmarker);
|
2003-07-28 12:20:42 +00:00
|
|
|
else
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.fillRectangle(x, y, size, size, Color::eolmarker);
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2003-10-28 11:18:40 +00:00
|
|
|
|
|
|
|
case END_LABEL_STATIC: {
|
2003-02-26 17:04:10 +00:00
|
|
|
LyXFont font = getLabelFont();
|
2006-10-11 17:24:46 +00:00
|
|
|
FontMetrics const & fm = theFontMetrics(font);
|
2006-10-20 22:17:16 +00:00
|
|
|
docstring const & str = par_.layout()->endlabelstring();
|
2003-07-28 12:20:42 +00:00
|
|
|
double const x = is_rtl ?
|
2006-10-17 14:46:45 +00:00
|
|
|
x_ - fm.width(str)
|
2006-12-29 23:54:48 +00:00
|
|
|
: - text_metrics_.rightMargin(pm_) - row_.width();
|
2006-10-17 14:46:45 +00:00
|
|
|
pain_.text(int(x), yo_, str, font);
|
2003-02-26 17:04:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2003-10-28 11:18:40 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
case END_LABEL_NO_LABEL:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-03-22 17:26:03 +00:00
|
|
|
void RowPainter::paintText()
|
2003-02-26 17:04:10 +00:00
|
|
|
{
|
2003-10-27 11:44:10 +00:00
|
|
|
pos_type const end = row_.endpos();
|
2004-08-15 00:01:45 +00:00
|
|
|
pos_type body_pos = par_.beginOfBody();
|
2003-03-09 12:37:22 +00:00
|
|
|
if (body_pos > 0 &&
|
2004-08-15 00:01:45 +00:00
|
|
|
(body_pos > end || !par_.isLineSeparator(body_pos - 1))) {
|
2003-03-09 12:37:22 +00:00
|
|
|
body_pos = 0;
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
LyXLayout_ptr const & layout = par_.layout();
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
bool running_strikeout = false;
|
|
|
|
bool is_struckout = false;
|
2003-07-18 07:47:07 +00:00
|
|
|
int last_strikeout_x = 0;
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
// Use font span to speed things up, see below
|
2005-07-18 14:25:20 +00:00
|
|
|
FontSpan font_span;
|
|
|
|
LyXFont font;
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
Buffer const & buffer = *bv_.buffer();
|
2005-07-18 14:25:20 +00:00
|
|
|
|
2003-10-27 15:39:59 +00:00
|
|
|
for (pos_type vpos = row_.pos(); vpos < end; ) {
|
2003-02-26 17:04:10 +00:00
|
|
|
if (x_ > bv_.workWidth())
|
|
|
|
break;
|
2003-10-27 12:41:26 +00:00
|
|
|
|
2004-08-15 16:52:44 +00:00
|
|
|
pos_type const pos = text_.bidi.vis2log(vpos);
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
if (pos >= par_.size()) {
|
2003-03-13 10:30:28 +00:00
|
|
|
++vpos;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-07-18 14:25:20 +00:00
|
|
|
// Use font span to speed things up, see above
|
|
|
|
if (vpos < font_span.first || vpos > font_span.last) {
|
|
|
|
font_span = par_.fontSpan(vpos);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
font = text_.getFont(buffer, par_, vpos);
|
2005-07-18 14:25:20 +00:00
|
|
|
}
|
|
|
|
|
2006-10-30 20:10:35 +00:00
|
|
|
const int width_pos =
|
|
|
|
text_.singleWidth(par_, pos, par_.getChar(pos), font);
|
2005-07-18 14:25:20 +00:00
|
|
|
|
2004-08-15 16:52:44 +00:00
|
|
|
if (x_ + width_pos < 0) {
|
|
|
|
x_ += width_pos;
|
2003-02-26 17:04:10 +00:00
|
|
|
++vpos;
|
|
|
|
continue;
|
|
|
|
}
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2006-10-19 12:49:11 +00:00
|
|
|
is_struckout = par_.isDeleted(pos);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
|
|
|
if (is_struckout && !running_strikeout) {
|
|
|
|
running_strikeout = true;
|
2003-07-28 12:20:42 +00:00
|
|
|
last_strikeout_x = int(x_);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
bool const highly_editable_inset = par_.isInset(pos)
|
|
|
|
&& isHighlyEditableInset(par_.getInset(pos));
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2005-07-18 14:25:20 +00:00
|
|
|
// If we reach the end of a struck out range, paint it.
|
|
|
|
// We also don't paint across things like tables
|
2003-02-26 17:04:10 +00:00
|
|
|
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
|
2005-07-18 14:25:20 +00:00
|
|
|
// Calculate 1/3 height of the buffer's default font
|
2006-10-11 17:24:46 +00:00
|
|
|
FontMetrics const & fm
|
|
|
|
= theFontMetrics(bv_.buffer()->params().getFont());
|
2006-10-07 16:15:06 +00:00
|
|
|
int const middle = yo_ - fm.maxAscent() / 3;
|
2003-07-28 12:20:42 +00:00
|
|
|
pain_.line(last_strikeout_x, middle, int(x_), middle,
|
2007-04-26 17:34:20 +00:00
|
|
|
Color::strikeout, Painter::line_solid, Painter::line_thin);
|
2003-02-26 17:04:10 +00:00
|
|
|
running_strikeout = false;
|
|
|
|
}
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2003-03-09 12:37:22 +00:00
|
|
|
if (body_pos > 0 && pos == body_pos - 1) {
|
2006-10-17 14:46:45 +00:00
|
|
|
// FIXME UNICODE
|
|
|
|
int const lwidth = theFontMetrics(getLabelFont())
|
2006-10-21 00:16:43 +00:00
|
|
|
.width(from_utf8(layout->labelsep));
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2004-08-15 16:52:44 +00:00
|
|
|
x_ += label_hfill_ + lwidth - width_pos;
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
|
2004-08-15 00:01:45 +00:00
|
|
|
if (par_.isHfill(pos)) {
|
2003-02-26 17:04:10 +00:00
|
|
|
x_ += 1;
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
int const y0 = yo_;
|
2003-02-26 17:04:10 +00:00
|
|
|
int const y1 = y0 - defaultRowHeight() / 2;
|
|
|
|
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.line(int(x_), y1, int(x_), y0, Color::added_space);
|
2003-02-26 17:04:10 +00:00
|
|
|
|
2006-10-21 07:24:11 +00:00
|
|
|
if (par_.hfillExpansion(row_, pos)) {
|
2003-02-26 17:04:10 +00:00
|
|
|
int const y2 = (y0 + y1) / 2;
|
|
|
|
|
2003-03-09 12:37:22 +00:00
|
|
|
if (pos >= body_pos) {
|
2003-07-28 12:20:42 +00:00
|
|
|
pain_.line(int(x_), y2, int(x_ + hfill_), y2,
|
2007-04-26 17:34:20 +00:00
|
|
|
Color::added_space,
|
2003-02-26 17:04:10 +00:00
|
|
|
Painter::line_onoffdash);
|
|
|
|
x_ += hfill_;
|
|
|
|
} else {
|
2003-07-28 12:20:42 +00:00
|
|
|
pain_.line(int(x_), y2, int(x_ + label_hfill_), y2,
|
2007-04-26 17:34:20 +00:00
|
|
|
Color::added_space,
|
2003-02-26 17:04:10 +00:00
|
|
|
Painter::line_onoffdash);
|
|
|
|
x_ += label_hfill_;
|
|
|
|
}
|
2007-04-26 17:34:20 +00:00
|
|
|
pain_.line(int(x_), y1, int(x_), y0, Color::added_space);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
x_ += 2;
|
|
|
|
++vpos;
|
2004-08-15 00:01:45 +00:00
|
|
|
} else if (par_.isSeparator(pos)) {
|
2004-08-15 16:52:44 +00:00
|
|
|
x_ += width_pos;
|
2003-03-09 12:37:22 +00:00
|
|
|
if (pos >= body_pos)
|
2003-02-26 17:04:10 +00:00
|
|
|
x_ += separator_;
|
|
|
|
++vpos;
|
|
|
|
} else {
|
2003-03-22 17:26:03 +00:00
|
|
|
paintFromPos(vpos);
|
2003-02-26 17:04:10 +00:00
|
|
|
}
|
|
|
|
}
|
2003-03-04 09:27:27 +00:00
|
|
|
|
2003-02-26 17:04:10 +00:00
|
|
|
// if we reach the end of a struck out range, paint it
|
|
|
|
if (running_strikeout) {
|
2005-03-22 10:57:10 +00:00
|
|
|
// calculate 1/3 height of the buffer's default font
|
2006-10-11 17:24:46 +00:00
|
|
|
FontMetrics const & fm
|
|
|
|
= theFontMetrics(bv_.buffer()->params().getFont());
|
2006-10-07 16:15:06 +00:00
|
|
|
int const middle = yo_ - fm.maxAscent() / 3;
|
2003-07-28 12:20:42 +00:00
|
|
|
pain_.line(last_strikeout_x, middle, int(x_), middle,
|
2007-04-26 17:34:20 +00:00
|
|
|
Color::strikeout, Painter::line_solid, Painter::line_thin);
|
2003-02-26 17:04:10 +00:00
|
|
|
running_strikeout = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
bool CursorOnRow(PainterInfo & pi, pit_type const pit,
|
2006-03-10 16:10:35 +00:00
|
|
|
RowList::const_iterator rit, LyXText const & text)
|
2005-12-30 19:02:52 +00:00
|
|
|
{
|
2006-03-10 16:10:35 +00:00
|
|
|
// Is there a cursor on this row (or inside inset on row)
|
2007-04-26 14:56:30 +00:00
|
|
|
Cursor & cur = pi.base.bv->cursor();
|
2006-10-21 00:16:43 +00:00
|
|
|
for (size_type d = 0; d < cur.depth(); ++d) {
|
2006-03-10 16:10:35 +00:00
|
|
|
CursorSlice const & sl = cur[d];
|
|
|
|
if (sl.text() == &text
|
|
|
|
&& sl.pit() == pit
|
2006-04-05 23:56:29 +00:00
|
|
|
&& sl.pos() >= rit->pos()
|
2006-03-18 17:04:28 +00:00
|
|
|
&& sl.pos() <= rit->endpos())
|
2006-01-01 23:06:23 +00:00
|
|
|
return true;
|
2006-03-10 16:10:35 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
bool innerCursorOnRow(PainterInfo & pi, pit_type pit,
|
2006-03-10 16:10:35 +00:00
|
|
|
RowList::const_iterator rit, LyXText const & text)
|
|
|
|
{
|
|
|
|
// Is there a cursor inside an inset on this row, and is this inset
|
|
|
|
// the only "character" on this row
|
2007-04-26 14:56:30 +00:00
|
|
|
Cursor & cur = pi.base.bv->cursor();
|
2006-03-10 16:10:35 +00:00
|
|
|
if (rit->pos() + 1 != rit->endpos())
|
|
|
|
return false;
|
2006-10-21 00:16:43 +00:00
|
|
|
for (size_type d = 0; d < cur.depth(); d++) {
|
2006-03-10 16:10:35 +00:00
|
|
|
CursorSlice const & sl = cur[d];
|
|
|
|
if (sl.text() == &text
|
2006-04-05 23:56:29 +00:00
|
|
|
&& sl.pit() == pit
|
2006-03-10 16:10:35 +00:00
|
|
|
&& sl.pos() == rit->pos())
|
|
|
|
return d < cur.depth() - 1;
|
|
|
|
}
|
2005-12-30 19:02:52 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-04-10 08:20:12 +00:00
|
|
|
// 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
|
2007-04-26 14:56:30 +00:00
|
|
|
Cursor & cur = pi.base.bv->cursor();
|
2007-04-10 08:20:12 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
void paintPar
|
2005-12-30 19:02:52 +00:00
|
|
|
(PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y,
|
|
|
|
bool repaintAll)
|
2003-07-14 17:50:00 +00:00
|
|
|
{
|
2004-11-30 01:59:49 +00:00
|
|
|
// lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl;
|
|
|
|
int const ww = pi.base.bv->workHeight();
|
2005-01-06 15:40:49 +00:00
|
|
|
|
2006-10-13 16:44:44 +00:00
|
|
|
pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y);
|
2006-07-08 14:40:22 +00:00
|
|
|
|
2005-07-18 11:00:15 +00:00
|
|
|
Paragraph const & par = text.paragraphs()[pit];
|
2006-12-29 23:54:48 +00:00
|
|
|
ParagraphMetrics const & pm = pi.base.bv->parMetrics(&text, pit);
|
|
|
|
if (pm.rows().empty())
|
2006-07-08 14:40:22 +00:00
|
|
|
return;
|
2004-11-30 01:59:49 +00:00
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
RowList::const_iterator const rb = pm.rows().begin();
|
|
|
|
RowList::const_iterator const re = pm.rows().end();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
|
|
y -= rb->ascent();
|
2006-10-21 00:16:43 +00:00
|
|
|
size_type rowno = 0;
|
2005-12-30 19:02:52 +00:00
|
|
|
for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
|
2004-11-30 01:59:49 +00:00
|
|
|
y += rit->ascent();
|
2006-07-03 20:37:34 +00:00
|
|
|
// Allow setting of refreshInside for nested insets in
|
2006-03-10 16:10:35 +00:00
|
|
|
// this row only
|
2006-07-03 20:37:34 +00:00
|
|
|
bool tmp = refreshInside;
|
2005-01-06 15:40:49 +00:00
|
|
|
|
2005-12-30 19:02:52 +00:00
|
|
|
// Row signature; has row changed since last paint?
|
2007-01-06 09:15:59 +00:00
|
|
|
bool row_has_changed = pm.rowChangeStatus()[rowno];
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-10 16:10:35 +00:00
|
|
|
bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
|
2007-04-10 08:20:12 +00:00
|
|
|
bool in_inset_alone_on_row =
|
|
|
|
innerCursorOnRow(pi, pit, rit, text);
|
2006-12-17 10:11:28 +00:00
|
|
|
bool leftEdgeFixed =
|
|
|
|
(par.getAlign() == LYX_ALIGN_LEFT ||
|
|
|
|
par.getAlign() == LYX_ALIGN_BLOCK);
|
2007-04-10 08:20:12 +00:00
|
|
|
bool inNarrowIns = inNarrowInset(pi);
|
2006-03-10 16:10:35 +00:00
|
|
|
|
|
|
|
// If this is the only object on the row, we can make it wide
|
2006-11-07 15:21:47 +00:00
|
|
|
//
|
|
|
|
// FIXME: there is a const_cast here because paintPar() is not supposed
|
|
|
|
// 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.
|
2007-04-10 08:20:12 +00:00
|
|
|
// JSpitzm: We should aim at removing wide() altogether while retaining
|
|
|
|
// typing speed within insets.
|
2006-03-10 16:10:35 +00:00
|
|
|
for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
|
2006-03-18 17:39:54 +00:00
|
|
|
InsetBase const * const in = par.getInset(i);
|
|
|
|
if (in) {
|
2006-11-07 15:21:47 +00:00
|
|
|
InsetText * t = const_cast<InsetText *>(in->asTextInset());
|
2006-03-18 17:39:54 +00:00
|
|
|
if (t)
|
2007-04-10 08:20:12 +00:00
|
|
|
t->setWide(in_inset_alone_on_row
|
|
|
|
&& leftEdgeFixed
|
|
|
|
&& !inNarrowIns);
|
2006-03-17 19:45:28 +00:00
|
|
|
}
|
2006-03-10 16:10:35 +00:00
|
|
|
}
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
// If selection is on, the current row signature differs
|
|
|
|
// from cache, or cursor is inside an inset _on this row_,
|
2005-12-30 19:02:52 +00:00
|
|
|
// then paint the row
|
2006-03-10 16:10:35 +00:00
|
|
|
if (repaintAll || row_has_changed || cursor_on_row) {
|
2006-10-30 10:09:59 +00:00
|
|
|
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);
|
2006-10-21 16:03:53 +00:00
|
|
|
RowPainter rp(pi, text, pit, *rit, x, y);
|
2006-04-05 23:56:29 +00:00
|
|
|
// Clear background of this row
|
2005-12-30 19:02:52 +00:00
|
|
|
// (if paragraph background was not cleared)
|
2006-04-05 23:56:29 +00:00
|
|
|
if (!repaintAll &&
|
2006-12-17 10:11:28 +00:00
|
|
|
(!(in_inset_alone_on_row && leftEdgeFixed)
|
|
|
|
|| row_has_changed)) {
|
2006-06-20 12:39:39 +00:00
|
|
|
pi.pain.fillRectangle(x, y - rit->ascent(),
|
2006-12-29 23:54:48 +00:00
|
|
|
rp.maxWidth(), rit->height(),
|
2005-12-30 19:02:52 +00:00
|
|
|
text.backgroundColor());
|
2006-03-10 16:10:35 +00:00
|
|
|
// If outer row has changed, force nested
|
|
|
|
// insets to repaint completely
|
|
|
|
if (row_has_changed)
|
2006-07-03 20:37:34 +00:00
|
|
|
refreshInside = true;
|
2005-12-30 19:02:52 +00:00
|
|
|
}
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2005-12-30 19:02:52 +00:00
|
|
|
// Instrumentation for testing row cache (see also
|
|
|
|
// 12 lines lower):
|
2006-11-07 21:31:33 +00:00
|
|
|
if (lyxerr.debugging(Debug::PAINTING)) {
|
|
|
|
if (text.isMainText(*pi.base.bv->buffer()))
|
2007-04-01 10:09:49 +00:00
|
|
|
LYXERR(Debug::PAINTING) << "#";
|
2006-11-07 21:31:33 +00:00
|
|
|
else
|
2007-04-01 10:09:49 +00:00
|
|
|
LYXERR(Debug::PAINTING) << "[" <<
|
2006-11-07 21:31:33 +00:00
|
|
|
repaintAll << row_has_changed <<
|
|
|
|
cursor_on_row << "]";
|
|
|
|
}
|
2005-12-30 19:02:52 +00:00
|
|
|
rp.paintAppendix();
|
|
|
|
rp.paintDepthBar();
|
|
|
|
rp.paintChangeBar();
|
|
|
|
if (rit == rb)
|
|
|
|
rp.paintFirst();
|
2006-12-01 16:12:24 +00:00
|
|
|
rp.paintText();
|
2005-12-30 19:02:52 +00:00
|
|
|
if (rit + 1 == re)
|
|
|
|
rp.paintLast();
|
|
|
|
}
|
2004-11-30 01:59:49 +00:00
|
|
|
y += rit->descent();
|
2006-03-10 16:10:35 +00:00
|
|
|
// Restore, see above
|
2006-07-03 20:37:34 +00:00
|
|
|
refreshInside = tmp;
|
2004-04-07 20:20:15 +00:00
|
|
|
}
|
2006-10-30 10:09:59 +00:00
|
|
|
// Re-enable screen drawing for future use of the painter.
|
|
|
|
pi.pain.setDrawingEnabled(true);
|
|
|
|
|
2007-04-01 14:51:13 +00:00
|
|
|
LYXERR(Debug::PAINTING) << "." << endl;
|
2003-07-28 18:40:05 +00:00
|
|
|
}
|
|
|
|
|
2003-08-19 16:46:47 +00:00
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
2006-10-28 09:59:43 +00:00
|
|
|
void paintText(BufferView & bv,
|
2006-07-08 21:16:21 +00:00
|
|
|
Painter & pain)
|
2004-04-07 20:20:15 +00:00
|
|
|
{
|
2006-10-26 13:36:04 +00:00
|
|
|
BOOST_ASSERT(bv.buffer());
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
Buffer const & buffer = *bv.buffer();
|
|
|
|
LyXText & text = buffer.text();
|
2005-12-30 19:02:52 +00:00
|
|
|
bool const select = bv.cursor().selection();
|
2006-10-28 09:59:43 +00:00
|
|
|
ViewMetricsInfo const & vi = bv.viewMetricsInfo();
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
PainterInfo pi(const_cast<BufferView *>(&bv), pain);
|
2006-03-10 16:10:35 +00:00
|
|
|
// Should the whole screen, including insets, be refreshed?
|
2007-01-20 01:23:07 +00:00
|
|
|
// 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;
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-10 16:10:35 +00:00
|
|
|
if (repaintAll) {
|
|
|
|
// Clear background (if not delegated to rows)
|
2005-12-30 19:02:52 +00:00
|
|
|
pain.fillRectangle(0, vi.y1, bv.workWidth(), vi.y2 - vi.y1,
|
2006-09-16 13:34:09 +00:00
|
|
|
text.backgroundColor());
|
2005-12-30 19:02:52 +00:00
|
|
|
}
|
|
|
|
if (select) {
|
2006-09-16 13:34:09 +00:00
|
|
|
text.drawSelection(pi, 0, 0);
|
2005-12-30 19:02:52 +00:00
|
|
|
}
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
|
|
int yy = vi.y1;
|
|
|
|
// draw contents
|
|
|
|
for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
|
2006-07-03 20:37:34 +00:00
|
|
|
refreshInside = repaintAll;
|
2006-12-29 23:54:48 +00:00
|
|
|
ParagraphMetrics const & pm = bv.parMetrics(&text, pit);
|
|
|
|
yy += pm.ascent();
|
2006-09-16 13:34:09 +00:00
|
|
|
paintPar(pi, text, pit, 0, yy, repaintAll);
|
2006-12-29 23:54:48 +00:00
|
|
|
yy += pm.descent();
|
2004-11-30 01:59:49 +00:00
|
|
|
}
|
2005-01-06 15:40:49 +00:00
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
// and grey out above (should not happen later)
|
2006-09-16 13:34:09 +00:00
|
|
|
// lyxerr << "par ascent: " << text.getPar(vi.p1).ascent() << endl;
|
2007-01-20 01:23:07 +00:00
|
|
|
if (vi.y1 > 0 && vi.update_strategy != SingleParUpdate)
|
2007-04-26 17:34:20 +00:00
|
|
|
pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, Color::bottomarea);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
|
|
// and possibly grey out below
|
2006-09-16 13:34:09 +00:00
|
|
|
// lyxerr << "par descent: " << text.getPar(vi.p1).ascent() << endl;
|
2007-01-20 01:23:07 +00:00
|
|
|
if (vi.y2 < bv.workHeight() && vi.update_strategy != SingleParUpdate)
|
2007-04-26 17:34:20 +00:00
|
|
|
pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, Color::bottomarea);
|
2003-08-19 16:46:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
|
2003-08-19 16:46:47 +00:00
|
|
|
{
|
2004-11-30 01:59:49 +00:00
|
|
|
// lyxerr << " paintTextInset: y: " << y << endl;
|
|
|
|
|
2006-12-29 23:54:48 +00:00
|
|
|
y -= pi.base.bv->parMetrics(&text, 0).ascent();
|
2006-11-23 18:59:05 +00:00
|
|
|
// This flag cannot be set from within same inset:
|
2006-07-03 20:37:34 +00:00
|
|
|
bool repaintAll = refreshInside;
|
2004-11-30 01:59:49 +00:00
|
|
|
for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
|
2006-12-29 23:54:48 +00:00
|
|
|
ParagraphMetrics const & pmi
|
|
|
|
= pi.base.bv->parMetrics(&text, pit);
|
|
|
|
y += pmi.ascent();
|
2006-03-10 16:10:35 +00:00
|
|
|
paintPar(pi, text, pit, x, y, repaintAll);
|
2006-12-29 23:54:48 +00:00
|
|
|
y += pmi.descent();
|
2004-11-30 01:59:49 +00:00
|
|
|
}
|
2003-08-19 16:46:47 +00:00
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|