#include "frontends/font_metrics.h"
#include "debug.h"
#include "lyxrc.h"
-#include "lyxrow.h"
#include "FloatList.h"
#include "language.h"
#include "ParagraphParameters.h"
using lyx::pos_type;
-LyXText::LyXText(BufferView * bv)
- : height(0), width(0), anchor_row_offset_(0),
- inset_owner(0), the_locking_inset(0), bv_owner(bv)
+LyXText::LyXText(BufferView * bv, InsetText * inset, bool ininset,
+ ParagraphList & paragraphs)
+ : height(0), width(0), anchor_y_(0),
+ inset_owner(inset), the_locking_inset(0), bv_owner(bv),
+ in_inset_(ininset), paragraphs_(paragraphs)
{
- anchor_row_ = rows().end();
- need_refresh_ = true;
-}
-
-
-LyXText::LyXText(BufferView * bv, InsetText * inset)
- : height(0), width(0), anchor_row_offset_(0),
- inset_owner(inset), the_locking_inset(0), bv_owner(bv)
-{
- anchor_row_ = rows().end();
- need_refresh_ = true;
}
{
bv_owner = bview;
- rowlist_.clear();
- width = height = 0;
- need_refresh_ = true;
+ ParagraphList::iterator const beg = ownerParagraphs().begin();
+ ParagraphList::iterator const end = ownerParagraphs().end();
+ for (ParagraphList::iterator pit = beg; pit != end; ++pit)
+ pit->rows.clear();
- anchor_row_ = rows().end();
- anchor_row_offset_ = 0;
+ width = 0;
+ height = 0;
- current_font = getFont(ownerParagraphs().begin(), 0);
+ anchor_y_ = 0;
- redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());
+ current_font = getFont(beg, 0);
- setCursorIntern(rowlist_.begin()->par(), 0);
+ redoParagraphs(beg, end);
+ setCursorIntern(beg, 0);
selection.cursor = cursor;
updateCounters();
// The difference is that this one is used for displaying, and thus we
// are allowed to make cosmetic improvements. For instance make footnotes
// smaller. (Asger)
-// If position is -1, we get the layout font of the paragraph.
-// If position is -2, we get the font of the manual label of the paragraph.
LyXFont LyXText::getFont(ParagraphList::iterator pit, pos_type pos) const
{
Assert(pos >= 0);
}
-// removes the row and reset the touched counters
-void LyXText::removeRow(RowList::iterator rit)
-{
- if (anchor_row_ == rit) {
- if (rit != rows().begin()) {
- anchor_row_ = boost::prior(rit);
- anchor_row_offset_ += anchor_row_->height();
- } else {
- anchor_row_ = boost::next(rit);
- anchor_row_offset_ -= rit->height();
- }
- }
-
- // the text becomes smaller
- height -= rit->height();
-
- rowlist_.erase(rit);
-}
-
-
-// remove all following rows of the paragraph of the specified row.
-void LyXText::removeParagraph(RowList::iterator rit)
-{
- ParagraphList::iterator tmppit = rit->par();
- ++rit;
-
- while (rit != rows().end() && rit->par() == tmppit) {
- RowList::iterator tmprit = boost::next(rit);
- removeRow(rit);
- rit = tmprit;
- }
-}
-
-
-void LyXText::insertParagraph(ParagraphList::iterator pit,
- RowList::iterator rowit)
-{
- // insert a new row, starting at position 0
- Row newrow(pit, 0);
- RowList::iterator rit = rowlist_.insert(rowit, newrow);
-
- // and now append the whole paragraph before the new row
- appendParagraph(rit);
-}
-
-
InsetOld * LyXText::getInset() const
{
ParagraphList::iterator pit = cursor.par();
if (!isHighlyEditableInset(inset))
recordUndo(bv(), Undo::ATOMIC);
- if (inset->isOpen()) {
+ if (inset->isOpen())
inset->close(bv());
- } else {
+ else
inset->open(bv());
- }
- bv()->updateInset(inset);
+ bv()->updateInset();
}
do {
pit->applyLayout(lyxlayout);
makeFontEntriesLayoutSpecific(bv()->buffer()->params, *pit);
- ParagraphList::iterator fppit = pit;
- fppit->params().spaceTop(lyxlayout->fill_top ?
+ pit->params().spaceTop(lyxlayout->fill_top ?
VSpace(VSpace::VFILL)
: VSpace(VSpace::NONE));
- fppit->params().spaceBottom(lyxlayout->fill_bottom ?
+ pit->params().spaceBottom(lyxlayout->fill_bottom ?
VSpace(VSpace::VFILL)
: VSpace(VSpace::NONE));
if (lyxlayout->margintype == MARGIN_MANUAL)
bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
{
- ParagraphList::iterator pit(cursor.par());
- ParagraphList::iterator end(cursor.par());
+ ParagraphList::iterator pit = cursor.par();
+ ParagraphList::iterator end = cursor.par();
ParagraphList::iterator start = pit;
if (selection.set()) {
if (depth < prev_after_depth
&& pit->layout()->labeltype != LABEL_BIBLIO) {
changed = true;
- if (!test_only) {
+ if (!test_only)
pit->params().depth(depth + 1);
- }
-
}
} else if (depth) {
changed = true;
if (test_only)
return changed;
-
redoParagraphs(start, pastend);
// We need to actually move the text->cursor. I don't
}
-void LyXText::redoHeightOfParagraph()
-{
- RowList::iterator tmprow = cursorRow();
-
- setHeightOfRow(tmprow);
-
- while (tmprow != rows().begin()
- && boost::prior(tmprow)->par() == tmprow->par()) {
- --tmprow;
- setHeightOfRow(tmprow);
- }
-
- postPaint();
-
- setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
-}
-
-
-RowList::iterator LyXText::firstRow(ParagraphList::iterator pit)
-{
- RowList::iterator rit;
- for (rit = rows().begin(); rit != rows().end(); ++rit)
- if (rit->par() == pit)
- break;
- return rit;
-}
-
-
// rebreaks all paragraphs between the specified pars
// This function is needed after SetLayout and SetFont etc.
void LyXText::redoParagraphs(ParagraphList::iterator start,
void LyXText::redoParagraph(ParagraphList::iterator pit)
{
- RowList::iterator rit = firstRow(pit);
+ RowList::iterator rit = pit->rows.begin();
+ RowList::iterator end = pit->rows.end();
- // remove paragraph from rowlist
- while (rit != rows().end() && rit->par() == pit) {
- RowList::iterator rit2 = rit++;
- removeRow(rit2);
+ // remove rows of paragraph
+ for (int i = 0; rit != end; ++rit, ++i)
+ height -= rit->height();
+
+ pit->rows.clear();
+
+ // rebreak the paragraph
+ // insert a new row, starting at position 0
+
+ pos_type z = 0;
+ pit->rows.push_back(Row(z));
+ bool done = false;
+ while (!done) {
+ z = rowBreakPoint(pit, pit->rows.back());
+
+ RowList::iterator tmprow = boost::prior(pit->rows.end());
+
+ if (z >= pit->size())
+ done = true;
+ else {
+ ++z;
+ pit->rows.push_back(Row(z));
+ }
+
+ tmprow->fill(fill(pit, tmprow, workWidth()));
+ setHeightOfRow(pit, tmprow);
}
- // reinsert the paragraph
- insertParagraph(pit, rit);
- setHeightOfRow(rows().begin());
+ //lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n";
}
void LyXText::fullRebreak()
{
- lyxerr << "fullRebreak\n";
redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());
- setCursorIntern(cursor.par(), cursor.pos());
+ redoCursor();
selection.cursor = cursor;
}
void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
{
- lyxerr << "LyXText::metrics: width: " << mi.base.textwidth << "\n";
+ //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+ // << " workWidth: " << workWidth() << endl;
//Assert(mi.base.textwidth);
// rebuild row cache
- rowlist_.clear();
- width = height = 0;
+ width = 0;
+ height = 0;
- anchor_row_ = rows().end();
- anchor_row_offset_ = 0;
+ //anchor_y_ = 0;
ParagraphList::iterator pit = ownerParagraphs().begin();
ParagraphList::iterator end = ownerParagraphs().end();
for (; pit != end; ++pit) {
+ pit->rows.clear();
+
InsetList::iterator ii = pit->insetlist.begin();
InsetList::iterator iend = pit->insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
MetricsInfo m = mi;
+#warning FIXME: pos != 0
+ m.base.font = getFont(pit, 0);
ii->inset->metrics(m, dim);
}
- // insert a new row, starting at position 0
- Row newrow(pit, 0);
- RowList::iterator rit = rowlist_.insert(rowlist_.end(), newrow);
-
- // and now append the whole paragraph before the new row
- appendParagraph(rit);
+ redoParagraph(pit);
}
- // compute height
- //lyxerr << "height 0: " << height << "\n";
- //for (RowList::iterator rit = rows().begin(); rit != rows().end(); ++rit) {
- // height += rit->height();
- //}
- //lyxerr << "height 1: " << height << "\n";
-
// final dimension
- dim.asc = rows().begin()->ascent_of_text();
+ dim.asc = firstRow()->ascent_of_text();
dim.des = height - dim.asc;
dim.wid = std::max(mi.base.textwidth, int(width));
}
-void LyXText::partialRebreak()
-{
- if (rows().empty()) {
- init(bv());
- return;
- }
- breakAgain(rows().begin());
-}
-
-
// important for the screen
// need the selection cursor:
void LyXText::setSelection()
{
- bool const lsel = TextCursor::setSelection();
-
- if (inset_owner && (selection.set() || lsel))
- inset_owner->setUpdateStatus(InsetText::SELECTION);
+ TextCursor::setSelection();
}
RowList::iterator rit = cursorRow();
RowList::iterator next_rit = boost::next(rit);
- ParagraphList::iterator pit = rit->par();
- pos_type last_pos = lastPos(*this, rit);
+ RowList::iterator end = boost::next(rit);
+ ParagraphList::iterator pit = cursor.par();
+ pos_type last_pos = lastPos(*pit, rit);
- if (next_rit == rows().end() || next_rit->par() != pit) {
+ if (next_rit == end) {
++last_pos;
} else {
if (pit->empty() ||
setCursor(cursor.par(), cursor.pos());
selection.cursor = cursor;
}
- if (inset_owner)
- inset_owner->setUpdateStatus(InsetText::CURSOR_PAR);
}
// the DTP switches for paragraphs. LyX will store them in the first
-// physicla paragraph. When a paragraph is broken, the top settings rest,
-// the bottom settings are given to the new one. So I can make shure,
+// physical paragraph. When a paragraph is broken, the top settings rest,
+// the bottom settings are given to the new one. So I can make sure,
// they do not duplicate themself and you cannnot make dirty things with
// them!
params.noindent(noindent);
tmppit = boost::prior(pit);
}
- postPaint();
redoParagraphs(selection.start.par(), endpit);
setSelection();
setCursor(tmpcursor.par(), tmpcursor.pos());
if (inset_owner)
- bv()->updateInset(inset_owner);
+ bv()->updateInset();
}
pit->itemdepth = 0;
}
- /* Maybe we have to increment the enumeration depth.
- * BUT, enumeration in a footnote is considered in isolation from its
- * surrounding paragraph so don't increment if this is the
- * first line of the footnote
- * AND, bibliographies can't have their depth changed ie. they
- * are always of depth 0
- */
+ // Maybe we have to increment the enumeration depth.
+ // BUT, enumeration in a footnote is considered in isolation from its
+ // surrounding paragraph so don't increment if this is the
+ // first line of the footnote
+ // AND, bibliographies can't have their depth changed ie. they
+ // are always of depth 0
if (pit != ownerParagraphs().begin()
&& boost::prior(pit)->getDepth() < pit->getDepth()
&& boost::prior(pit)->layout()->labeltype == LABEL_COUNTER_ENUMI
}
if (layout->margintype == MARGIN_MANUAL) {
- if (pit->params().labelWidthString().empty()) {
+ if (pit->params().labelWidthString().empty())
pit->setLabelWidthString(layout->labelstring());
- }
} else {
pit->setLabelWidthString(string());
}
// Updates all counters. Paragraphs with changed label string will be rebroken
void LyXText::updateCounters()
{
- RowList::iterator rowit = rows().begin();
- ParagraphList::iterator pit = rowit->par();
-
- // CHECK if this is really needed. (Lgb)
+ // start over
bv()->buffer()->params.getLyXTextClass().counters().reset();
ParagraphList::iterator beg = ownerParagraphs().begin();
ParagraphList::iterator end = ownerParagraphs().end();
- for (; pit != end; ++pit) {
- while (rowit->par() != pit)
- ++rowit;
-
+ for (ParagraphList::iterator pit = beg; pit != end; ++pit) {
string const oldLabel = pit->params().labelString();
size_t maxdepth = 0;
string const & newLabel = pit->params().labelString();
- if (oldLabel.empty() && !newLabel.empty()) {
- removeParagraph(rowit);
- appendParagraph(rowit);
- }
+ if (oldLabel != newLabel)
+ redoParagraph(pit);
}
}
// Just to rebreak and refresh correctly.
// The character will not be inserted a second time
insertChar(Paragraph::META_INSET);
- // If we enter a highly editable inset the cursor should be to before
- // the inset. This couldn't happen before as Undo was not handled inside
- // inset now after the Undo LyX tries to call inset->Edit(...) again
- // and cannot do this as the cursor is behind the inset and GetInset
+ // If we enter a highly editable inset the cursor should be before
+ // the inset. After an Undo LyX tries to call inset->edit(...)
+ // and fails if the cursor is behind the inset and getInset
// does not return the inset!
- if (isHighlyEditableInset(inset)) {
+ if (isHighlyEditableInset(inset))
cursorLeft(true);
- }
unFreezeUndo();
}
}
recordUndo(bv(), Undo::DELETE, selection.start.par(),
- boost::prior(undoendpit));
-
+ boost::prior(undoendpit));
endpit = selection.end.par();
int endpos = selection.end.pos();
selection.start.par()->stripLeadingSpaces();
redoParagraphs(selection.start.par(), boost::next(endpit));
-#warning FIXME latent bug
- // endpit will be invalidated on redoParagraphs once ParagraphList
- // becomes a std::list? There are maybe other places on which this
- // can happend? (Ab)
// cutSelection can invalidate the cursor so we need to set
// it anew. (Lgb)
// we prefer the end for when tracking changes
}
-void LyXText::checkParagraph(ParagraphList::iterator pit, pos_type pos)
-{
- breakAgain(getRow(pit, pos));
- postPaint();
- setCursorIntern(cursor.par(), cursor.pos(), false, cursor.boundary());
-}
-
-
-// returns false if inset wasn't found
-bool LyXText::updateInset(InsetOld * inset)
-{
- // first check the current paragraph
- int pos = cursor.par()->getPositionOfInset(inset);
- if (pos != -1) {
- checkParagraph(cursor.par(), pos);
- return true;
- }
-
- // check every paragraph
- ParagraphList::iterator par = ownerParagraphs().begin();
- ParagraphList::iterator end = ownerParagraphs().end();
- for (; par != end; ++par) {
- pos = par->getPositionOfInset(inset);
- if (pos != -1) {
- checkParagraph(par, pos);
- return true;
- }
- }
-
- return false;
-}
-
-
bool LyXText::setCursor(ParagraphList::iterator pit,
pos_type pos,
bool setfont, bool boundary)
}
+void LyXText::redoCursor()
+{
+#warning maybe the same for selections?
+ setCursor(cursor, cursor.par(), cursor.pos(), cursor.boundary());
+}
+
+
void LyXText::setCursor(LyXCursor & cur, ParagraphList::iterator pit,
pos_type pos, bool boundary)
{
cur.par(pit);
cur.pos(pos);
cur.boundary(boundary);
- if (rows().empty())
+ if (noRows())
return;
// get the cursor y position in text
int y = 0;
RowList::iterator row = getRow(pit, pos, y);
- RowList::iterator beg = rows().begin();
-
RowList::iterator old_row = row;
// if we are before the first char of this row and are still in the
// same paragraph and there is a previous row then put the cursor on
// the end of the previous row
cur.iy(y + row->baseline());
- if (row != beg &&
- pos &&
- boost::prior(row)->par() == row->par() &&
- pos < pit->size() &&
- pit->getChar(pos) == Paragraph::META_INSET) {
+ if (row != pit->rows.begin()
+ && pos
+ && pos < pit->size()
+ && pit->getChar(pos) == Paragraph::META_INSET) {
InsetOld * ins = pit->getInset(pos);
if (ins && (ins->needFullRow() || ins->display())) {
--row;
// y is now the cursor baseline
cur.y(y);
- pos_type last = lastPrintablePos(*this, old_row);
+ pos_type last = lastPrintablePos(*pit, old_row);
// None of these should happen, but we're scaredy-cats
if (pos > pit->size()) {
- lyxerr << "dont like 1 please report" << endl;
+ lyxerr << "dont like 1, pos: " << pos << " size: " << pit->size() << endl;
pos = 0;
cur.pos(0);
} else if (pos > last + 1) {
}
// now get the cursors x position
- float x = getCursorX(row, pos, last, boundary);
+ float x = getCursorX(pit, row, pos, last, boundary);
cur.x(int(x));
cur.x_fix(cur.x());
if (old_row != row) {
- x = getCursorX(old_row, pos, last, boundary);
+ x = getCursorX(pit, old_row, pos, last, boundary);
cur.ix(int(x));
} else
cur.ix(cur.x());
}
-float LyXText::getCursorX(RowList::iterator rit,
+float LyXText::getCursorX(ParagraphList::iterator pit, RowList::iterator rit,
pos_type pos, pos_type last, bool boundary) const
{
pos_type cursor_vpos = 0;
double fill_hfill;
double fill_label_hfill;
// This call HAS to be here because of the BidiTables!!!
- prepareToPrint(rit, x, fill_separator, fill_hfill,
+ prepareToPrint(pit, rit, x, fill_separator, fill_hfill,
fill_label_hfill);
- ParagraphList::iterator rit_par = rit->par();
pos_type const rit_pos = rit->pos();
if (last < rit_pos)
cursor_vpos = rit_pos;
else if (pos > last && !boundary)
- cursor_vpos = (rit_par->isRightToLeftPar(bv()->buffer()->params))
+ cursor_vpos = (pit->isRightToLeftPar(bv()->buffer()->params))
? rit_pos : last + 1;
else if (pos > rit_pos && (pos > last || boundary))
- /// Place cursor after char at (logical) position pos - 1
+ // Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi_level(pos - 1) % 2 == 0)
? log2vis(pos - 1) + 1 : log2vis(pos - 1);
else
- /// Place cursor before char at (logical) position pos
+ // Place cursor before char at (logical) position pos
cursor_vpos = (bidi_level(pos) % 2 == 0)
? log2vis(pos) : log2vis(pos) + 1;
- pos_type body_pos = rit_par->beginningOfBody();
+ pos_type body_pos = pit->beginningOfBody();
if (body_pos > 0 &&
- (body_pos - 1 > last || !rit_par->isLineSeparator(body_pos - 1)))
+ (body_pos - 1 > last || !pit->isLineSeparator(body_pos - 1)))
body_pos = 0;
for (pos_type vpos = rit_pos; vpos < cursor_vpos; ++vpos) {
if (body_pos > 0 && pos == body_pos - 1) {
x += fill_label_hfill +
font_metrics::width(
- rit_par->layout()->labelsep, getLabelFont(rit_par));
- if (rit_par->isLineSeparator(body_pos - 1))
- x -= singleWidth(rit_par, body_pos - 1);
+ pit->layout()->labelsep, getLabelFont(pit));
+ if (pit->isLineSeparator(body_pos - 1))
+ x -= singleWidth(pit, body_pos - 1);
}
- if (hfillExpansion(*this, rit, pos)) {
- x += singleWidth(rit_par, pos);
+ if (hfillExpansion(*pit, rit, pos)) {
+ x += singleWidth(pit, pos);
if (pos >= body_pos)
x += fill_hfill;
else
x += fill_label_hfill;
- } else if (rit_par->isSeparator(pos)) {
- x += singleWidth(rit_par, pos);
+ } else if (pit->isSeparator(pos)) {
+ x += singleWidth(pit, pos);
if (pos >= body_pos)
x += fill_separator;
} else
- x += singleWidth(rit_par, pos);
+ x += singleWidth(pit, pos);
}
return x;
}
void LyXText::setCursorIntern(ParagraphList::iterator pit,
pos_type pos, bool setfont, bool boundary)
{
- UpdatableInset * it = pit->inInset();
- if (it) {
- if (it != inset_owner) {
- lyxerr[Debug::INSETS] << "InsetText is " << it
- << endl
- << "inset_owner is "
- << inset_owner << endl;
-#ifdef WITH_WARNINGS
-#warning I believe this code is wrong. (Lgb)
-#warning Jürgen, have a look at this. (Lgb)
-#warning Hmmm, I guess you are right but we
-#warning should verify when this is needed
-#endif
- // Jürgen, would you like to have a look?
- // I guess we need to move the outer cursor
- // and open and lock the inset (bla bla bla)
- // stuff I don't know... so can you have a look?
- // (Lgb)
- // I moved the lyxerr stuff in here so we can see if
- // this is actually really needed and where!
- // (Jug)
- // it->getLyXText(bv())->setCursorIntern(bv(), par, pos, setfont, boundary);
- return;
- }
- }
-
setCursor(cursor, pit, pos, boundary);
if (setfont)
setCurrentFont();
// 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(RowList::iterator rit, int & x, bool & boundary) const
+pos_type LyXText::getColumnNearX(ParagraphList::iterator pit,
+ RowList::iterator rit, int & x, bool & boundary) const
{
double tmpx = 0;
double fill_separator;
double fill_hfill;
double fill_label_hfill;
- prepareToPrint(rit, tmpx, fill_separator, fill_hfill, fill_label_hfill);
+ prepareToPrint(pit, rit, tmpx, fill_separator, fill_hfill, fill_label_hfill);
pos_type vc = rit->pos();
- pos_type last = lastPrintablePos(*this, rit);
+ pos_type last = lastPrintablePos(*pit, rit);
pos_type c = 0;
-
- ParagraphList::iterator rit_par = rit->par();
- LyXLayout_ptr const & layout = rit->par()->layout();
+ LyXLayout_ptr const & layout = pit->layout();
bool left_side = false;
- pos_type body_pos = rit_par->beginningOfBody();
+ pos_type body_pos = pit->beginningOfBody();
double last_tmpx = tmpx;
if (body_pos > 0 &&
(body_pos - 1 > last ||
- !rit_par->isLineSeparator(body_pos - 1)))
+ !pit->isLineSeparator(body_pos - 1)))
body_pos = 0;
// check for empty row
- if (!rit_par->size()) {
+ if (!pit->size()) {
x = int(tmpx);
return 0;
}
last_tmpx = tmpx;
if (body_pos > 0 && c == body_pos - 1) {
tmpx += fill_label_hfill +
- font_metrics::width(layout->labelsep, getLabelFont(rit_par));
- if (rit_par->isLineSeparator(body_pos - 1))
- tmpx -= singleWidth(rit_par, body_pos - 1);
+ font_metrics::width(layout->labelsep, getLabelFont(pit));
+ if (pit->isLineSeparator(body_pos - 1))
+ tmpx -= singleWidth(pit, body_pos - 1);
}
- if (hfillExpansion(*this, rit, c)) {
- tmpx += singleWidth(rit_par, c);
+ if (hfillExpansion(*pit, rit, c)) {
+ tmpx += singleWidth(pit, c);
if (c >= body_pos)
tmpx += fill_hfill;
else
tmpx += fill_label_hfill;
- } else if (rit_par->isSeparator(c)) {
- tmpx += singleWidth(rit_par, c);
+ } else if (pit->isSeparator(c)) {
+ tmpx += singleWidth(pit, c);
if (c >= body_pos)
tmpx += fill_separator;
} else {
- tmpx += singleWidth(rit_par, c);
+ tmpx += singleWidth(pit, c);
}
++vc;
}
boundary = false;
// This (rtl_support test) is not needed, but gives
- // some speedup if rtl_support=false
- RowList::iterator next_rit = boost::next(rit);
-
- bool const lastrow = lyxrc.rtl_support &&
- (next_rit == rowlist_.end() ||
- next_rit->par() != rit_par);
+ // some speedup if rtl_support == false
+ bool const lastrow = lyxrc.rtl_support
+ && boost::next(rit) == pit->rows.end();
// If lastrow is false, we don't need to compute
// the value of rtl.
bool const rtl = (lastrow)
- ? rit_par->isRightToLeftPar(bv()->buffer()->params)
+ ? pit->isRightToLeftPar(bv()->buffer()->params)
: false;
if (lastrow &&
- ((rtl && left_side && vc == rit->pos() && x < tmpx - 5) ||
- (!rtl && !left_side && vc == last + 1 && x > tmpx + 5)))
+ ((rtl && left_side && vc == rit->pos() && x < tmpx - 5) ||
+ (!rtl && !left_side && vc == last + 1 && x > tmpx + 5)))
c = last + 1;
else if (vc == rit->pos()) {
c = vis2log(vc);
bool const rtl = (bidi_level(c) % 2 == 1);
if (left_side == rtl) {
++c;
- boundary = isBoundary(bv()->buffer(), *rit_par, c);
+ boundary = isBoundary(bv()->buffer(), *pit, c);
}
}
- if (rit->pos() <= last && c > last
- && rit_par->isNewline(last)) {
+ if (rit->pos() <= last && c > last && pit->isNewline(last)) {
if (bidi_level(last) % 2 == 0)
- tmpx -= singleWidth(rit_par, last);
+ tmpx -= singleWidth(pit, last);
else
- tmpx += singleWidth(rit_par, last);
+ tmpx += singleWidth(pit, last);
c = last;
}
void LyXText::setCursorFromCoordinates(int x, int y)
{
- //LyXCursor old_cursor = cursor;
+ LyXCursor old_cursor = cursor;
setCursorFromCoordinates(cursor, x, y);
setCurrentFont();
-#warning DEPM disabled, otherwise crash when entering new table
- //deleteEmptyParagraphMechanism(old_cursor);
+ deleteEmptyParagraphMechanism(old_cursor);
}
bool beforeFullRowInset(LyXText & lt, LyXCursor const & cur)
{
RowList::iterator row = lt.getRow(cur);
- if (boost::next(row) == lt.rows().end())
- return false;
-
- Row const & next = *boost::next(row);
+ RowList::iterator next = boost::next(row);
- if (next.pos() != cur.pos() || next.par() != cur.par())
+ if (next == cur.par()->rows.end() || next->pos() != cur.pos())
return false;
- if (cur.pos() == cur.par()->size()
- || !cur.par()->isInset(cur.pos()))
+ if (cur.pos() == cur.par()->size() || !cur.par()->isInset(cur.pos()))
return false;
InsetOld const * inset = cur.par()->getInset(cur.pos());
void LyXText::setCursorFromCoordinates(LyXCursor & cur, int x, int y)
{
// Get the row first.
-
- RowList::iterator row = getRowNearY(y);
+ ParagraphList::iterator pit;
+ RowList::iterator row = getRowNearY(y, pit);
bool bound = false;
- pos_type const column = getColumnNearX(row, x, bound);
- cur.par(row->par());
+ pos_type const column = getColumnNearX(pit, row, x, bound);
+ cur.par(pit);
cur.pos(row->pos() + column);
cur.x(x);
cur.y(y + row->baseline());
- if (beforeFullRowInset(*this, cur)) {
- pos_type const last = lastPrintablePos(*this, row);
- RowList::iterator next_row = boost::next(row);
-
- float x = getCursorX(next_row, cur.pos(), last, bound);
- cur.ix(int(x));
- cur.iy(y + row->height() + next_row->baseline());
- } else {
+// if (beforeFullRowInset(*this, cur)) {
+// pos_type const last = lastPrintablePos(*this, pit, row);
+// RowList::iterator next_row = nextRow(row);
+// cur.ix(int(getCursorX(pit, next_row, cur.pos(), last, bound)));
+// cur.iy(y + row->height() + next_row->baseline());
+// } else {
cur.iy(cur.y());
cur.ix(cur.x());
- }
+// }
cur.boundary(bound);
}
if (!internal && !boundary &&
isBoundary(bv()->buffer(), *cursor.par(), cursor.pos() + 1))
setCursor(cursor.par(), cursor.pos() + 1, true, true);
- } else if (cursor.par() != ownerParagraphs().begin()) { // steps into the above paragraph.
+ } else if (cursor.par() != ownerParagraphs().begin()) {
+ // steps into the paragraph above
ParagraphList::iterator pit = boost::prior(cursor.par());
setCursor(pit, pit->size());
}
}
}
#else
- setCursorFromCoordinates(bv(), cursor.x_fix(),
- cursor.y() - cursorRow()->baseline() - 1);
+ lyxerr << "cursorUp: y " << cursor.y() << " bl: " <<
+ cursorRow()->baseline() << endl;
+ setCursorFromCoordinates(cursor.x_fix(),
+ cursor.y() - cursorRow()->baseline() - 1);
#endif
}
}
}
#else
- setCursorFromCoordinates(bv(), cursor.x_fix(),
- cursor.y() - cursorRow()->baseline()
- + cursorRow()->height() + 1);
+ setCursorFromCoordinates(cursor.x_fix(),
+ cursor.y() - cursorRow()->baseline() + cursorRow()->height() + 1);
#endif
}
void LyXText::cursorUpParagraph()
{
- if (cursor.pos() > 0) {
+ if (cursor.pos() > 0)
setCursor(cursor.par(), 0);
- }
- else if (cursor.par() != ownerParagraphs().begin()) {
+ else if (cursor.par() != ownerParagraphs().begin())
setCursor(boost::prior(cursor.par()), 0);
- }
}
ParagraphList::iterator par = cursor.par();
ParagraphList::iterator next_par = boost::next(par);
- if (next_par != ownerParagraphs().end()) {
+ if (next_par != ownerParagraphs().end())
setCursor(next_par, 0);
- } else {
+ else
setCursor(par, par->size());
- }
}
+
// fix the cursor `cur' after a characters has been deleted at `where'
// position. Called by deleteEmptyParagraphMechanism
-void LyXText::fixCursorAfterDelete(LyXCursor & cur,
- LyXCursor const & where)
+void LyXText::fixCursorAfterDelete(LyXCursor & cur, LyXCursor const & where)
{
// if cursor is not in the paragraph where the delete occured,
// do nothing
return false;
// We allow all kinds of "mumbo-jumbo" when freespacing.
- if (old_cursor.par()->layout()->free_spacing
- || old_cursor.par()->isFreeSpacing()) {
+ if (old_cursor.par()->isFreeSpacing())
return false;
- }
/* Ok I'll put some comments here about what is missing.
I have fixed BackSpace (and thus Delete) to not delete
// If the pos around the old_cursor were spaces, delete one of them.
if (old_cursor.par() != cursor.par()
|| old_cursor.pos() != cursor.pos()) {
- // Only if the cursor has really moved
+ // Only if the cursor has really moved
if (old_cursor.pos() > 0
&& old_cursor.pos() < old_cursor.par()->size()
&& old_cursor.par()->isLineSeparator(old_cursor.pos())
&& old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) {
- old_cursor.par()->erase(old_cursor.pos() - 1);
+ bool erased = old_cursor.par()->erase(old_cursor.pos() - 1);
redoParagraph(old_cursor.par());
+ if (!erased)
+ return false;
#ifdef WITH_WARNINGS
#warning This will not work anymore when we have multiple views of the same buffer
// In this case, we will have to correct also the cursors held by
fixCursorAfterDelete(selection.cursor, old_cursor);
fixCursorAfterDelete(selection.start, old_cursor);
fixCursorAfterDelete(selection.end, old_cursor);
- fixCursorAfterDelete(last_sel_cursor, old_cursor);
return false;
}
}
selection.cursor.par() == old_cursor.par()
&& selection.cursor.pos() == old_cursor.pos());
- if (getRow(old_cursor) != rows().begin()) {
- RowList::iterator prevrow = boost::prior(getRow(old_cursor));
- postPaint();
- tmpcursor = cursor;
- cursor = old_cursor; // that undo can restore the right cursor position
- #warning FIXME. --end() iterator is usable here
- ParagraphList::iterator endpit = boost::next(old_cursor.par());
- while (endpit != ownerParagraphs().end() &&
- endpit->getDepth()) {
- ++endpit;
- }
+ tmpcursor = cursor;
+ cursor = old_cursor; // that undo can restore the right cursor position
- recordUndo(bv(), Undo::DELETE, old_cursor.par(),
- boost::prior(endpit));
- cursor = tmpcursor;
-
- // delete old row
- removeRow(getRow(old_cursor));
- // delete old par
- ownerParagraphs().erase(old_cursor.par());
-
- /* Breakagain the next par. Needed because of
- * the parindent that can occur or dissappear.
- * The next row can change its height, if
- * there is another layout before */
- RowList::iterator tmprit = boost::next(prevrow);
- if (tmprit != rows().end()) {
- breakAgain(tmprit);
- updateCounters();
- }
- setHeightOfRow(prevrow);
- } else {
- RowList::iterator nextrow = boost::next(getRow(old_cursor));
- postPaint();
-
- tmpcursor = cursor;
- cursor = old_cursor; // that undo can restore the right cursor position
-#warning FIXME. --end() iterator is usable here
- ParagraphList::iterator endpit = boost::next(old_cursor.par());
- while (endpit != ownerParagraphs().end() &&
- endpit->getDepth()) {
- ++endpit;
- }
+ ParagraphList::iterator endpit = boost::next(old_cursor.par());
+ while (endpit != ownerParagraphs().end() && endpit->getDepth())
+ ++endpit;
+
+ recordUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
+ cursor = tmpcursor;
- recordUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
- cursor = tmpcursor;
-
- // delete old row
- removeRow(getRow(old_cursor));
- // delete old par
- ownerParagraphs().erase(old_cursor.par());
-
- /* Breakagain the next par. Needed because of
- the parindent that can occur or dissappear.
- The next row can change its height, if
- there is another layout before */
- if (nextrow != rows().end()) {
- breakAgain(nextrow);
- updateCounters();
- }
- }
+ // delete old par
+ ownerParagraphs().erase(old_cursor.par());
+ redoParagraph();
// correct cursor y
setCursorIntern(cursor.par(), cursor.pos());
ParagraphList & LyXText::ownerParagraphs() const
{
- if (inset_owner) {
- return inset_owner->paragraphs;
- }
- return bv_owner->buffer()->paragraphs;
-}
-
-
-bool LyXText::needRefresh() const
-{
- return need_refresh_;
-}
-
-
-void LyXText::clearPaint()
-{
- need_refresh_ = false;
-}
-
-
-void LyXText::postPaint()
-{
- need_refresh_ = true;
-
- // We are an inset's lyxtext. Tell the top-level lyxtext
- // it needs to update the row we're in.
- if (inset_owner)
- bv()->text->postPaint();
+ return paragraphs_;
}
bool LyXText::isInInset() const
{
- // Sub-level has non-null bv owner and
- // non-null inset owner.
- return inset_owner != 0 && bv_owner != 0;
+ // Sub-level has non-null bv owner and non-null inset owner.
+ return inset_owner != 0;
}