#include "bufferlist.h"
#include "bufferparams.h"
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "Bullet.h"
#include "coordcache.h"
#include "cursor.h"
#include "lyxrc.h"
#include "lyxrow.h"
#include "paragraph.h"
+#include "TextMetrics.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "pariterator.h"
using std::min;
-LyXText::LyXText(BufferView * bv)
- : maxwidth_(bv ? bv->workWidth() : 100),
- current_font(LyXFont::ALL_INHERIT),
+LyXText::LyXText()
+ : current_font(LyXFont::ALL_INHERIT),
background_color_(LColor::background),
autoBreakRows_(false)
{}
-void LyXText::init(BufferView * bv)
-{
- BOOST_ASSERT(bv);
- maxwidth_ = bv->workWidth();
- dim_.wid = maxwidth_;
- dim_.asc = 10;
- dim_.des = 10;
-
- pit_type const end = paragraphs().size();
- for (pit_type pit = 0; pit != end; ++pit)
- pars_[pit].rows().clear();
-
- updateLabels(*bv->buffer());
-}
-
-
bool LyXText::isMainText(Buffer const & buffer) const
{
return &buffer.text() == this;
bool LyXText::cursorHome(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- Row const & row = cur.paragraph().getRow(cur.pos(),cur.boundary());
+ ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
+ Row const & row = pm.getRow(cur.pos(),cur.boundary());
return setCursor(cur, cur.pit(), row.pos());
}
{
LCursor old = cur;
setCursorIntern(cur, par, pos, setfont, boundary);
- return deleteEmptyParagraphMechanism(cur, old);
+ return cur.bv().checkDepm(cur, old);
}
BOOST_ASSERT(this == cur.text());
cur.boundary(boundary);
setCursor(cur.top(), par, pos);
- cur.setTargetX();
if (setfont)
setCurrentFont(cur);
}
// x is an absolute screen coord
// returns the column near the specified x-coordinate of the row
// x is set to the real beginning of this column
-pos_type LyXText::getColumnNearX(BufferView const & bv, pit_type const pit,
- Row const & row, int & x, bool & boundary) const
+pos_type LyXText::getColumnNearX(BufferView const & bv, int right_margin,
+ pit_type const pit, Row const & row, int & x, bool & boundary) const
{
Buffer const & buffer = *bv.buffer();
+ TextMetrics const & tm = bv.textMetrics(this);
int const xo = bv.coordCache().get(this, pit).x_;
x -= xo;
- RowMetrics const r = computeRowMetrics(buffer, pit, row);
+ RowMetrics const r = tm.computeRowMetrics(pit, row);
Paragraph const & par = pars_[pit];
pos_type vc = row.pos();
<< endl;
// look for highest numbered paragraph with y coordinate less than given y
- bool found = false;
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--;
+ TextMetrics & tm = bv.textMetrics(this);
+ ParagraphMetrics const & pm = tm.parMetrics(it->first);
+
// 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(pars_[it->first].ascent())) {
+ && y < it->second.y_ - int(pm.ascent())) {
// and we are not at the first paragraph in the inset.
if (it->first == 0)
return 0;
// then this is the paragraph we are looking for.
pit = it->first - 1;
// rebreak it and update the CoordCache.
- redoParagraph(bv, pit);
+ tm.redoParagraph(pit);
bv.coordCache().parPos()[this][pit] =
- Point(0, it->second.y_ - pars_[it->first].descent());
+ Point(0, it->second.y_ - pm.descent());
return pit;
}
+ ParagraphMetrics const & pm_last = bv.parMetrics(this, last->first);
+
// 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(pars_[last->first].descent())) {
+ && y >= last->second.y_ + int(pm_last.descent())) {
pit = last->first + 1;
// and we are not at the last paragraph in the inset.
- if (pit == pars_.size())
- return it->first;
+ if (pit == int(pars_.size()))
+ return last->first;
// then this is the paragraph we are looking for.
// rebreak it and update the CoordCache.
- redoParagraph(bv, pit);
+ tm.redoParagraph(pit);
bv.coordCache().parPos()[this][pit] =
- Point(0, last->second.y_ + pars_[last->first].ascent());
+ Point(0, last->second.y_ + pm_last.ascent());
return pit;
}
<< " y: " << it->second.y_
<< endl;
- if (it->first >= pit && int(it->second.y_) - int(pars_[it->first].ascent()) <= y) {
+ ParagraphMetrics const & pm = bv.parMetrics(this, it->first);
+
+ if (it->first >= pit && int(it->second.y_) - int(pm.ascent()) <= y) {
pit = it->first;
yy = it->second.y_;
}
Row const & LyXText::getRowNearY(BufferView const & bv, int y, pit_type pit) const
{
- Paragraph const & par = pars_[pit];
- int yy = bv.coordCache().get(this, pit).y_ - par.ascent();
- BOOST_ASSERT(!par.rows().empty());
- RowList::const_iterator rit = par.rows().begin();
- RowList::const_iterator const rlast = boost::prior(par.rows().end());
+ ParagraphMetrics const & pm = bv.parMetrics(this, pit);
+
+ int yy = bv.coordCache().get(this, pit).y_ - pm.ascent();
+ BOOST_ASSERT(!pm.rows().empty());
+ RowList::const_iterator rit = pm.rows().begin();
+ RowList::const_iterator const rlast = boost::prior(pm.rows().end());
for (; rit != rlast; yy += rit->height(), ++rit)
if (yy + rit->height() > y)
break;
}
pit_type pit = getPitNearY(cur.bv(), y);
BOOST_ASSERT(pit != -1);
+
Row const & row = getRowNearY(cur.bv(), y, pit);
bool bound = false;
+ TextMetrics const & tm = cur.bv().textMetrics(this);
+ ParagraphMetrics const & pm = tm.parMetrics(pit);
+ int right_margin = tm.rightMargin(pm);
int xx = x; // is modified by getColumnNearX
pos_type const pos = row.pos()
- + getColumnNearX(cur.bv(), pit, row, xx, bound);
+ + getColumnNearX(cur.bv(), right_margin, pit, row, xx, bound);
cur.pit() = pit;
cur.pos() = pos;
cur.boundary(bound);
return setCursor(cur, cur.pit(), cur.pos(), true, true);
}
if (cur.pos() != 0) {
- bool boundary = cur.boundary();
bool updateNeeded = setCursor(cur, cur.pit(), cur.pos() - 1, true, false);
if (!checkAndActivateInset(cur, false)) {
+ /** FIXME: What's this cause purpose???
+ bool boundary = cur.boundary();
if (false && !boundary &&
bidi.isBoundary(cur.buffer(), cur.paragraph(), cur.pos() + 1))
updateNeeded |=
setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+ */
}
return updateNeeded;
}
// Tell BufferView to test for FitCursor in any case!
cur.updateFlags(Update::FitCursor);
- Paragraph const & par = cur.paragraph();
+ ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
+
int row;
int const x = cur.targetX();
if (cur.pos() && cur.boundary())
- row = par.pos2row(cur.pos()-1);
+ row = pm.pos2row(cur.pos()-1);
else
- row = par.pos2row(cur.pos());
+ row = pm.pos2row(cur.pos());
if (!cur.selection()) {
int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
// Go to middle of previous row. 16 found to work OK;
// 12 = top/bottom margin of display math
int const margin = 3 * InsetMathHull::displayMargin() / 2;
- editXY(cur, x, y - par.rows()[row].ascent() - margin);
+ editXY(cur, x, y - pm.rows()[row].ascent() - margin);
cur.clearSelection();
// This happens when you move out of an inset.
if (dummy == old)
++dummy.pos();
- return deleteEmptyParagraphMechanism(dummy, old);
+ cur.bv().checkDepm(dummy, old);
}
bool updateNeeded = false;
} else if (cur.pit() > 0) {
--cur.pit();
//cannot use 'par' now
+ ParagraphMetrics const & pmcur = cur.bv().parMetrics(this, cur.pit());
updateNeeded |= setCursor(cur, cur.pit(),
- x2pos(cur.bv(), cur.pit(), cur.paragraph().rows().size() - 1, x));
+ x2pos(cur.bv(), cur.pit(), pmcur.rows().size() - 1, x));
}
cur.x_target() = x;
// Tell BufferView to test for FitCursor in any case!
cur.updateFlags(Update::FitCursor);
- Paragraph const & par = cur.paragraph();
+ ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
+
int row;
int const x = cur.targetX();
if (cur.pos() && cur.boundary())
- row = par.pos2row(cur.pos()-1);
+ row = pm.pos2row(cur.pos()-1);
else
- row = par.pos2row(cur.pos());
+ row = pm.pos2row(cur.pos());
if (!cur.selection()) {
int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
LCursor old = cur;
// To middle of next row
int const margin = 3 * InsetMathHull::displayMargin() / 2;
- editXY(cur, x, y + par.rows()[row].descent() + margin);
+ editXY(cur, x, y + pm.rows()[row].descent() + margin);
cur.clearSelection();
// This happens when you move out of an inset.
LCursor dummy = cur;
if (dummy == old)
++dummy.pos();
-
- bool const changed = deleteEmptyParagraphMechanism(dummy, old);
+
+ bool const changed = cur.bv().checkDepm(dummy, old);
// Make sure that cur gets back whatever happened to dummy(Lgb)
if (changed)
cur = dummy;
- return changed;
+ return false;
}
bool updateNeeded = false;
- if (row + 1 < int(par.rows().size())) {
+ if (row + 1 < int(pm.rows().size())) {
updateNeeded |= setCursor(cur, cur.pit(),
x2pos(cur.bv(), cur.pit(), row + 1, x));
} else if (cur.pit() + 1 < int(paragraphs().size())) {
}
-bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
+bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur,
+ LCursor & old, bool & need_anchor_change)
{
- // Would be wrong to delete anything if we have a selection.
- if (cur.selection())
- return false;
-
//lyxerr[Debug::DEBUG] << "DEPM: cur:\n" << cur << "old:\n" << old << endl;
// old should point to us
BOOST_ASSERT(old.text() == this);
// correct all cursor parts
if (same_par) {
fixCursorAfterDelete(cur.top(), old.top());
- cur.resetAnchor();
+ need_anchor_change = true;
}
return true;
}
// their address has changed. Therefore we
// need to `regenerate' cur. (JMarc)
cur.updateInsets(&(cur.bottom().inset()));
- cur.resetAnchor();
+ need_anchor_change = true;
}
}
- // There is a crash reported by Edwin Leuven (16/04/2006) because of:
- //ParIterator par_it(old);
- //updateLabels(old.buffer(), par_it);
- // So for now we do the full update:
- updateLabels(old.buffer());
return true;
}
if (oldpar.stripLeadingSpaces())
- cur.resetAnchor();
+ need_anchor_change = true;
return false;
}
recordUndo(cur, Undo::ATOMIC, par, par);
}
-
-int defaultRowHeight()
-{
- return int(theFontMetrics(LyXFont(LyXFont::ALL_SANE)).maxHeight() * 1.2);
-}
-
-
} // namespace lyx
projects / lyx.git / blobdiff