#include <config.h>
-#ifdef __GNUG__
-#pragma implementation "lyxtext.h"
-#endif
-
#include "lyxtext.h"
#include "LString.h"
#include "paragraph.h"
#include "counters.h"
#include "insets/inseterror.h"
-#include "insets/insetbib.h"
+#include "insets/insetbibitem.h"
#include "insets/insetspecialchar.h"
#include "insets/insettext.h"
#include "insets/insetfloat.h"
#include "support/textutils.h"
#include "support/lstrings.h"
+#include "BoostFormat.h"
+
using std::vector;
using std::copy;
using std::endl;
LyXText::LyXText(BufferView * bv)
- : height(0), width(0), first_y(0),
- bv_owner(bv), inset_owner(0), the_locking_inset(0),
- need_break_row(0), refresh_y(0), refresh_row(0),
- status_(LyXText::UNCHANGED), firstrow(0), lastrow(0)
-{}
+ : height(0), width(0), anchor_row_(0), anchor_row_offset_(0),
+ inset_owner(0), the_locking_inset(0), need_break_row(0),
+ bv_owner(bv)
+{
+ refresh_row = 0;
+ clearPaint();
+}
-LyXText::LyXText(InsetText * inset)
- : height(0), width(0), first_y(0),
- bv_owner(0), inset_owner(inset), the_locking_inset(0),
- need_break_row(0), refresh_y(0), refresh_row(0),
- status_(LyXText::UNCHANGED), firstrow(0), lastrow(0)
-{}
+LyXText::LyXText(BufferView * bv, InsetText * inset)
+ : height(0), width(0), anchor_row_(0), anchor_row_offset_(0),
+ inset_owner(inset), the_locking_inset(0), need_break_row(0),
+ bv_owner(bv)
+{
+ refresh_row = 0;
+ clearPaint();
+}
void LyXText::init(BufferView * bview, bool reinit)
{
if (reinit) {
- // Delete all rows, this does not touch the paragraphs!
- Row * tmprow = firstrow;
- while (firstrow) {
- tmprow = firstrow->next();
- delete firstrow;
- firstrow = tmprow;
- }
-
- lastrow = 0;
- refresh_row = 0;
+ rowlist_.clear();
need_break_row = 0;
width = height = 0;
copylayouttype.erase();
- first_y = refresh_y = 0;
- status_ = LyXText::UNCHANGED;
- } else if (firstrow)
+ top_y(0);
+ clearPaint();
+ } else if (firstRow())
return;
Paragraph * par = ownerParagraph();
current_font = getFont(bview->buffer(), par, 0);
while (par) {
- insertParagraph(bview, par, lastrow);
+ if (rowlist_.empty())
+ insertParagraph(par, 0);
+ else
+ insertParagraph(par, lastRow());
par = par->next();
}
- setCursorIntern(bview, firstrow->par(), 0);
+ setCursorIntern(firstRow()->par(), 0);
selection.cursor = cursor;
- updateCounters(bview);
-}
-
-
-LyXText::~LyXText()
-{
- // Delete all rows, this does not touch the paragraphs!
- Row * tmprow = firstrow;
- while (firstrow) {
- tmprow = firstrow->next();
- delete firstrow;
- firstrow = tmprow;
- }
+ updateCounters();
}
// We specialize the 95% common case:
if (!par->getDepth()) {
if (layout->labeltype == LABEL_MANUAL
- && pos < beginningOfMainBody(buf, par)) {
+ && pos < par->beginningOfBody()) {
// 1% goes here
LyXFont f = par->getFontSettings(buf->params, pos);
if (par->inInset())
LyXFont layoutfont;
- if (pos < beginningOfMainBody(buf, par)) {
+ if (pos < par->beginningOfBody()) {
// 1% goes here
layoutfont = layout->labelfont;
} else {
}
-void LyXText::setCharFont(BufferView * bv, Paragraph * par,
+void LyXText::setCharFont(Paragraph * par,
pos_type pos, LyXFont const & fnt,
bool toggleall)
{
- Buffer const * buf = bv->buffer();
+ Buffer const * buf = bv()->buffer();
LyXFont font = getFont(buf, par, pos);
font.update(fnt, buf->params.language, toggleall);
// Let the insets convert their font
if (isEditableInset(inset)) {
UpdatableInset * uinset =
static_cast<UpdatableInset *>(inset);
- uinset->setFont(bv, fnt, toggleall, true);
+ uinset->setFont(bv(), fnt, toggleall, true);
}
}
// Get concrete layout font to reduce against
LyXFont layoutfont;
- if (pos < beginningOfMainBody(buf, par))
+ if (pos < par->beginningOfBody())
layoutfont = layout->labelfont;
else
layoutfont = layout->font;
}
-// inserts a new row behind the specified row, increments
+// inserts a new row before the specified row, increments
// the touched counters
void LyXText::insertRow(Row * row, Paragraph * par,
- pos_type pos) const
+ pos_type pos)
{
Row * tmprow = new Row;
- if (!row) {
- tmprow->previous(0);
- tmprow->next(firstrow);
- firstrow = tmprow;
- } else {
- tmprow->previous(row);
- tmprow->next(row->next());
- row->next(tmprow);
- }
-
- if (tmprow->next())
- tmprow->next()->previous(tmprow);
-
- if (tmprow->previous())
- tmprow->previous()->next(tmprow);
-
-
tmprow->par(par);
tmprow->pos(pos);
- if (row == lastrow)
- lastrow = tmprow;
+ if (!row) {
+ rowlist_.insert(rowlist_.begin(), tmprow);
+ } else {
+ rowlist_.insert(row->next(), tmprow);
+ }
}
// removes the row and reset the touched counters
-void LyXText::removeRow(Row * row) const
+void LyXText::removeRow(Row * row)
{
+ lyx::Assert(row);
+
Row * row_prev = row->previous();
- if (row->next())
- row->next()->previous(row_prev);
- if (!row_prev) {
- firstrow = row->next();
-// lyx::Assert(firstrow);
- } else {
- row_prev->next(row->next());
- }
- if (row == lastrow) {
- lyx::Assert(!row->next());
- lastrow = row_prev;
- }
+ Row * row_next = row->next();
+ int const row_height = row->height();
+
+ /* FIXME: when we cache the bview, this should just
+ * become a postPaint(), I think */
if (refresh_row == row) {
- refresh_row = row_prev ? row_prev : row->next();
- // what about refresh_y, refresh_height
+ refresh_row = row_prev ? row_prev : row_next;
+ // what about refresh_y
+ }
+
+ if (anchor_row_ == row) {
+ if (row_prev) {
+ anchor_row_ = row_prev;
+ anchor_row_offset_ += row_prev->height();
+ } else {
+ anchor_row_ = row_next;
+ anchor_row_offset_ -= row_height;
+ }
}
- height -= row->height(); // the text becomes smaller
+ // the text becomes smaller
+ height -= row_height;
- delete row;
+ rowlist_.erase(row);
}
// remove all following rows of the paragraph of the specified row.
-void LyXText::removeParagraph(Row * row) const
+void LyXText::removeParagraph(Row * row)
{
Paragraph * tmppar = row->par();
row = row->next();
}
-// insert the specified paragraph behind the specified row
-void LyXText::insertParagraph(BufferView * bview, Paragraph * par,
- Row * row) const
+void LyXText::insertParagraph(Paragraph * par, Row * row)
{
// insert a new row, starting at position 0
insertRow(row, par, 0);
- // and now append the whole paragraph behind the new row
+ // and now append the whole paragraph before the new row
if (!row) {
- firstrow->height(0);
- appendParagraph(bview, firstrow);
+ appendParagraph(firstRow());
} else {
- row->next()->height(0);
- appendParagraph(bview, row->next());
+ appendParagraph(row->next());
}
}
Inset * LyXText::getInset() const
{
- Inset * inset = 0;
- if (cursor.pos() == 0 && cursor.par()->bibkey) {
- inset = cursor.par()->bibkey;
- } else if (cursor.pos() < cursor.par()->size()
+ if (cursor.pos() < cursor.par()->size()
&& cursor.par()->isInset(cursor.pos())) {
- inset = cursor.par()->getInset(cursor.pos());
+ return cursor.par()->getInset(cursor.pos());
}
- return inset;
+ return 0;
}
-void LyXText::toggleInset(BufferView * bview)
+void LyXText::toggleInset()
{
Inset * inset = getInset();
// is there an editable inset at cursor position?
// No, try to see if we are inside a collapsable inset
if (inset_owner && inset_owner->owner()
&& inset_owner->owner()->isOpen()) {
- bview->unlockInset(static_cast<UpdatableInset *>(inset_owner->owner()));
- inset_owner->owner()->close(bview);
- bview->getLyXText()->cursorRight(bview);
+ bv()->unlockInset(static_cast<UpdatableInset *>(inset_owner->owner()));
+ inset_owner->owner()->close(bv());
+ bv()->getLyXText()->cursorRight(bv());
}
return;
}
- //bview->owner()->message(inset->editMessage());
+ //bv()->owner()->message(inset->editMessage());
// do we want to keep this?? (JMarc)
if (!isHighlyEditableInset(inset))
- setCursorParUndo(bview);
+ setCursorParUndo(bv());
if (inset->isOpen()) {
- inset->close(bview);
+ inset->close(bv());
} else {
- inset->open(bview);
+ inset->open(bv());
}
-#if 0
- inset->open(bview, !inset->isOpen());
-#endif
+
+ bv()->updateInset(inset);
}
/* used in setlayout */
// Asger is not sure we want to do this...
-void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf,
- Paragraph * par)
+void LyXText::makeFontEntriesLayoutSpecific(Buffer const & buf,
+ Paragraph & par)
{
- LyXLayout_ptr const & layout = par->layout();
+ LyXLayout_ptr const & layout = par.layout();
LyXFont layoutfont;
- for (pos_type pos = 0; pos < par->size(); ++pos) {
- if (pos < beginningOfMainBody(buf, par))
+ for (pos_type pos = 0; pos < par.size(); ++pos) {
+ if (pos < par.beginningOfBody())
layoutfont = layout->labelfont;
else
layoutfont = layout->font;
- LyXFont tmpfont = par->getFontSettings(buf->params, pos);
+ LyXFont tmpfont = par.getFontSettings(buf.params, pos);
tmpfont.reduce(layoutfont);
- par->setFont(pos, tmpfont);
+ par.setFont(pos, tmpfont);
}
}
-Paragraph * LyXText::setLayout(BufferView * bview,
- LyXCursor & cur, LyXCursor & sstart_cur,
+Paragraph * LyXText::setLayout(LyXCursor & cur, LyXCursor & sstart_cur,
LyXCursor & send_cur,
string const & layout)
{
endpar = endpar->next(); // because of parindents etc.
}
- setUndo(bview, Undo::EDIT, sstart_cur.par(), undoendpar);
+ setUndo(bv(), Undo::EDIT, sstart_cur.par(), undoendpar);
// ok we have a selection. This is always between sstart_cur
// and sel_end cursor
Paragraph * epar = send_cur.par()->next();
LyXLayout_ptr const & lyxlayout =
- bview->buffer()->params.getLyXTextClass()[layout];
+ bv()->buffer()->params.getLyXTextClass()[layout];
do {
par->applyLayout(lyxlayout);
- makeFontEntriesLayoutSpecific(bview->buffer(), par);
+ makeFontEntriesLayoutSpecific(*bv()->buffer(), *par);
Paragraph * fppar = par;
fppar->params().spaceTop(lyxlayout->fill_top ?
VSpace(VSpace::VFILL)
: VSpace(VSpace::NONE));
if (lyxlayout->margintype == MARGIN_MANUAL)
par->setLabelWidthString(lyxlayout->labelstring());
- if (lyxlayout->labeltype != LABEL_BIBLIO
- && fppar->bibkey) {
- delete fppar->bibkey;
- fppar->bibkey = 0;
- }
cur.par(par);
par = par->next();
} while (par != epar);
// set layout over selection and make a total rebreak of those paragraphs
-void LyXText::setLayout(BufferView * bview, string const & layout)
+void LyXText::setLayout(string const & layout)
{
LyXCursor tmpcursor = cursor; /* store the current cursor */
selection.start = cursor; // dummy selection
selection.end = cursor;
}
- Paragraph * endpar = setLayout(bview, cursor, selection.start,
+ Paragraph * endpar = setLayout(cursor, selection.start,
selection.end, layout);
- redoParagraphs(bview, selection.start, endpar);
+ redoParagraphs(selection.start, endpar);
// we have to reset the selection, because the
// geometry could have changed
- setCursor(bview, selection.start.par(),
+ setCursor(selection.start.par(),
selection.start.pos(), false);
selection.cursor = cursor;
- setCursor(bview, selection.end.par(), selection.end.pos(), false);
- updateCounters(bview);
+ setCursor(selection.end.par(), selection.end.pos(), false);
+ updateCounters();
clearSelection();
- setSelection(bview);
- setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true);
+ setSelection();
+ setCursor(tmpcursor.par(), tmpcursor.pos(), true);
}
// increment depth over selection and
// make a total rebreak of those paragraphs
-void LyXText::incDepth(BufferView * bview)
+void LyXText::incDepth()
{
// If there is no selection, just use the current paragraph
if (!selection.set()) {
endpar = endpar->next(); // because of parindents etc.
}
- setUndo(bview, Undo::EDIT,
+ setUndo(bv(), Undo::EDIT,
selection.start.par(), undoendpar);
LyXCursor tmpcursor = cursor; // store the current cursor
cursor.par(cursor.par()->next());
}
- redoParagraphs(bview, selection.start, endpar);
+ redoParagraphs(selection.start, endpar);
// we have to reset the selection, because the
// geometry could have changed
- setCursor(bview, selection.start.par(), selection.start.pos());
+ setCursor(selection.start.par(), selection.start.pos());
selection.cursor = cursor;
- setCursor(bview, selection.end.par(), selection.end.pos());
- updateCounters(bview);
+ setCursor(selection.end.par(), selection.end.pos());
+ updateCounters();
clearSelection();
- setSelection(bview);
- setCursor(bview, tmpcursor.par(), tmpcursor.pos());
+ setSelection();
+ setCursor(tmpcursor.par(), tmpcursor.pos());
}
// decrement depth over selection and
// make a total rebreak of those paragraphs
-void LyXText::decDepth(BufferView * bview)
+void LyXText::decDepth()
{
// if there is no selection just set the layout
// of the current paragraph
endpar = endpar->next(); // because of parindents etc.
}
- setUndo(bview, Undo::EDIT,
+ setUndo(bv(), Undo::EDIT,
selection.start.par(), undoendpar);
LyXCursor tmpcursor = cursor; // store the current cursor
cursor.par(cursor.par()->next());
}
- redoParagraphs(bview, selection.start, endpar);
+ redoParagraphs(selection.start, endpar);
// we have to reset the selection, because the
// geometry could have changed
- setCursor(bview, selection.start.par(),
+ setCursor(selection.start.par(),
selection.start.pos());
selection.cursor = cursor;
- setCursor(bview, selection.end.par(), selection.end.pos());
- updateCounters(bview);
+ setCursor(selection.end.par(), selection.end.pos());
+ updateCounters();
clearSelection();
- setSelection(bview);
- setCursor(bview, tmpcursor.par(), tmpcursor.pos());
+ setSelection();
+ setCursor(tmpcursor.par(), tmpcursor.pos());
}
// set font over selection and make a total rebreak of those paragraphs
-void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall)
+void LyXText::setFont(LyXFont const & font, bool toggleall)
{
// if there is no selection just set the current_font
if (!selection.set()) {
// Determine basis font
LyXFont layoutfont;
- if (cursor.pos() < beginningOfMainBody(bview->buffer(),
- cursor.par())) {
- layoutfont = getLabelFont(bview->buffer(),
+ if (cursor.pos() < cursor.par()->beginningOfBody()) {
+ layoutfont = getLabelFont(bv()->buffer(),
cursor.par());
} else {
- layoutfont = getLayoutFont(bview->buffer(),
+ layoutfont = getLayoutFont(bv()->buffer(),
cursor.par());
}
// Update current font
real_current_font.update(font,
- bview->buffer()->params.language,
+ bv()->buffer()->params.language,
toggleall);
// Reduce to implicit settings
// ok we have a selection. This is always between sel_start_cursor
// and sel_end cursor
- setUndo(bview, Undo::EDIT,
+ setUndo(bv(), Undo::EDIT,
selection.start.par(), selection.end.par()->next());
freezeUndo();
cursor = selection.start;
{
if (cursor.pos() < cursor.par()->size()) {
// an open footnote should behave like a closed one
- setCharFont(bview, cursor.par(), cursor.pos(),
+ setCharFont(cursor.par(), cursor.pos(),
font, toggleall);
cursor.pos(cursor.pos() + 1);
} else {
}
unFreezeUndo();
- redoParagraphs(bview, selection.start, selection.end.par()->next());
+ redoParagraphs(selection.start, selection.end.par()->next());
// we have to reset the selection, because the
// geometry could have changed, but we keep
// it for user convenience
- setCursor(bview, selection.start.par(), selection.start.pos());
+ setCursor(selection.start.par(), selection.start.pos());
selection.cursor = cursor;
- setCursor(bview, selection.end.par(), selection.end.pos());
- setSelection(bview);
- setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
+ setCursor(selection.end.par(), selection.end.pos());
+ setSelection();
+ setCursor(tmpcursor.par(), tmpcursor.pos(), true,
tmpcursor.boundary());
}
-void LyXText::redoHeightOfParagraph(BufferView * bview, LyXCursor const & cur)
+void LyXText::redoHeightOfParagraph()
{
- Row * tmprow = cur.row();
- int y = cur.y() - tmprow->baseline();
+ Row * tmprow = cursor.row();
+ int y = cursor.y() - tmprow->baseline();
- setHeightOfRow(bview, tmprow);
+ setHeightOfRow(tmprow);
while (tmprow->previous()
&& tmprow->previous()->par() == tmprow->par()) {
tmprow = tmprow->previous();
y -= tmprow->height();
- setHeightOfRow(bview, tmprow);
+ setHeightOfRow(tmprow);
}
- // we can set the refreshing parameters now
- status(bview, LyXText::NEED_MORE_REFRESH);
- refresh_y = y;
- refresh_row = tmprow;
- setCursor(bview, cur.par(), cur.pos(), false, cursor.boundary());
+ postPaint(y);
+
+ setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
}
-void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur)
+void LyXText::redoDrawingOfParagraph(LyXCursor const & cur)
{
Row * tmprow = cur.row();
int y = cur.y() - tmprow->baseline();
- setHeightOfRow(bview, tmprow);
+ setHeightOfRow(tmprow);
while (tmprow->previous()
&& tmprow->previous()->par() == tmprow->par()) {
y -= tmprow->height();
}
- // we can set the refreshing parameters now
- if (status_ == LyXText::UNCHANGED || y < refresh_y) {
- refresh_y = y;
- refresh_row = tmprow;
- }
- status(bview, LyXText::NEED_MORE_REFRESH);
- setCursor(bview, cur.par(), cur.pos());
+ postPaint(y);
+ setCursor(cur.par(), cur.pos());
}
// deletes and inserts again all paragaphs between the cursor
// and the specified par
// This function is needed after SetLayout and SetFont etc.
-void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur,
- Paragraph const * endpar) const
+void LyXText::redoParagraphs(LyXCursor const & cur,
+ Paragraph const * endpar)
{
- Row * tmprow2;
- Paragraph * tmppar = 0;
- Paragraph * first_phys_par = 0;
-
Row * tmprow = cur.row();
int y = cur.y() - tmprow->baseline();
+ Paragraph * first_phys_par = 0;
if (!tmprow->previous()) {
// a trick/hack for UNDO
// This is needed because in an UNDO/REDO we could have changed
// the ownerParagrah() so the paragraph inside the row is NOT
// my really first par anymore. Got it Lars ;) (Jug 20011206)
first_phys_par = ownerParagraph();
+ lyxerr << "ownerParagraph" << endl;
+
} else {
first_phys_par = tmprow->par();
+ lyxerr << "tmprow->par()" << endl;
+
+ // Find first row of this paragraph.
while (tmprow->previous()
&& tmprow->previous()->par() == first_phys_par)
{
}
}
- // we can set the refreshing parameters now
- status(bview, LyXText::NEED_MORE_REFRESH);
- refresh_y = y;
- refresh_row = tmprow->previous(); /* the real refresh row will
- be deleted, so I store
- the previous here */
- // remove it
+ Row * prevrow = tmprow->previous();
+
+ // Remove all the rows until we reach endpar
+ Paragraph * tmppar = 0;
if (tmprow->next())
tmppar = tmprow->next()->par();
- else
- tmppar = 0;
while (tmprow->next() && tmppar != endpar) {
removeRow(tmprow->next());
if (tmprow->next()) {
}
}
- // remove the first one
- tmprow2 = tmprow; /* this is because tmprow->previous()
- can be 0 */
+ // Remove the first of the paragraphs rows.
+ // This is because tmprow->previous() can be 0
+ Row * tmprow2 = tmprow;
tmprow = tmprow->previous();
removeRow(tmprow2);
+ // Reinsert the paragraphs.
tmppar = first_phys_par;
-
do {
if (tmppar) {
- insertParagraph(bview, tmppar, tmprow);
+ insertParagraph(tmppar, tmprow);
if (!tmprow) {
- tmprow = firstrow;
+ tmprow = firstRow();
}
while (tmprow->next()
&& tmprow->next()->par() == tmppar) {
} while (tmppar && tmppar != endpar);
// this is because of layout changes
- if (refresh_row) {
- refresh_y -= refresh_row->height();
- setHeightOfRow(bview, refresh_row);
+ if (prevrow) {
+ setHeightOfRow(prevrow);
+ const_cast<LyXText *>(this)->postPaint(y - prevrow->height());
} else {
- refresh_row = firstrow;
- refresh_y = 0;
- setHeightOfRow(bview, refresh_row);
+ setHeightOfRow(firstRow());
+ const_cast<LyXText *>(this)->postPaint(0);
}
if (tmprow && tmprow->next())
- setHeightOfRow(bview, tmprow->next());
- updateCounters(bview);
+ setHeightOfRow(tmprow->next());
+ updateCounters();
}
-void LyXText::fullRebreak(BufferView * bview)
+void LyXText::fullRebreak()
{
- if (!firstrow) {
- init(bview);
+ if (!firstRow()) {
+ init(bv());
return;
}
if (need_break_row) {
- breakAgain(bview, need_break_row);
+ breakAgain(need_break_row);
need_break_row = 0;
return;
}
// They also delete the corresponding row
// need the selection cursor:
-void LyXText::setSelection(BufferView * bview)
+void LyXText::setSelection()
{
bool const lsel = selection.set();
selection.set(false);
if (inset_owner && (selection.set() || lsel))
- inset_owner->setUpdateStatus(bview, InsetText::SELECTION);
+ inset_owner->setUpdateStatus(bv(), InsetText::SELECTION);
}
}
-void LyXText::clearSelection() const
+void LyXText::clearSelection()
{
selection.set(false);
selection.mark(false);
}
-void LyXText::cursorHome(BufferView * bview) const
+void LyXText::cursorHome()
{
- setCursor(bview, cursor.par(), cursor.row()->pos());
+ setCursor(cursor.par(), cursor.row()->pos());
}
-void LyXText::cursorEnd(BufferView * bview) const
+void LyXText::cursorEnd()
{
if (!cursor.row()->next()
|| cursor.row()->next()->par() != cursor.row()->par()) {
- setCursor(bview, cursor.par(), rowLast(cursor.row()) + 1);
+ setCursor(cursor.par(), cursor.row()->lastPos() + 1);
} else {
if (!cursor.par()->empty() &&
- (cursor.par()->getChar(rowLast(cursor.row())) == ' '
- || cursor.par()->isNewline(rowLast(cursor.row())))) {
- setCursor(bview, cursor.par(), rowLast(cursor.row()));
+ (cursor.par()->getChar(cursor.row()->lastPos()) == ' '
+ || cursor.par()->isNewline(cursor.row()->lastPos()))) {
+ setCursor(cursor.par(), cursor.row()->lastPos());
} else {
- setCursor(bview,cursor.par(),
- rowLast(cursor.row()) + 1);
+ setCursor(cursor.par(),
+ cursor.row()->lastPos() + 1);
}
}
}
-void LyXText::cursorTop(BufferView * bview) const
+void LyXText::cursorTop()
{
while (cursor.par()->previous())
cursor.par(cursor.par()->previous());
- setCursor(bview, cursor.par(), 0);
+ setCursor(cursor.par(), 0);
}
-void LyXText::cursorBottom(BufferView * bview) const
+void LyXText::cursorBottom()
{
while (cursor.par()->next())
cursor.par(cursor.par()->next());
- setCursor(bview, cursor.par(), cursor.par()->size());
+ setCursor(cursor.par(), cursor.par()->size());
}
-void LyXText::toggleFree(BufferView * bview,
- LyXFont const & font, bool toggleall)
+void LyXText::toggleFree(LyXFont const & font, bool toggleall)
{
// If the mask is completely neutral, tell user
if (font == LyXFont(LyXFont::ALL_IGNORE)) {
// Could only happen with user style
- bview->owner()->message(_("No font change defined. Use Character under the Layout menu to define font change."));
+ bv()->owner()->message(_("No font change defined. Use Character under the Layout menu to define font change."));
return;
}
LyXCursor resetCursor = cursor;
bool implicitSelection = (font.language() == ignore_language
&& font.number() == LyXFont::IGNORE)
- ? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false;
+ ? selectWordWhenUnderCursor(WHOLE_WORD_STRICT) : false;
// Set font
- setFont(bview, font, toggleall);
+ setFont(font, toggleall);
// Implicit selections are cleared afterwards
//and cursor is set to the original position.
if (implicitSelection) {
clearSelection();
cursor = resetCursor;
- setCursor(bview, cursor.par(), cursor.pos());
+ setCursor(cursor.par(), cursor.pos());
selection.cursor = cursor;
}
if (inset_owner)
- inset_owner->setUpdateStatus(bview, InsetText::CURSOR_PAR);
+ inset_owner->setUpdateStatus(bv(), InsetText::CURSOR_PAR);
}
-string LyXText::getStringToIndex(BufferView * bview)
+string LyXText::getStringToIndex()
{
- string idxstring;
-
// Try implicit word selection
// If there is a change in the language the implicit word selection
// is disabled.
LyXCursor const reset_cursor = cursor;
- bool const implicitSelection = selectWordWhenUnderCursor(bview, PREVIOUS_WORD);
+ bool const implicitSelection = selectWordWhenUnderCursor(PREVIOUS_WORD);
- if (!selection.set()) {
- bview->owner()->message(_("Nothing to index!"));
- return string();
- }
- if (selection.start.par() != selection.end.par()) {
- bview->owner()->message(_("Cannot index more than one paragraph!"));
- return string();
- }
+ string idxstring;
+ if (!selection.set())
+ bv()->owner()->message(_("Nothing to index!"));
+ else if (selection.start.par() != selection.end.par())
+ bv()->owner()->message(_("Cannot index more than one paragraph!"));
+ else
+ idxstring = selectionAsString(bv()->buffer(), false);
- idxstring = selectionAsString(bview->buffer(), false);
+ // Reset cursors to their original position.
+ cursor = reset_cursor;
+ setCursor(cursor.par(), cursor.pos());
+ selection.cursor = cursor;
- // Implicit selections are cleared afterwards
- //and cursor is set to the original position.
- if (implicitSelection) {
+ // Clear the implicit selection.
+ if (implicitSelection)
clearSelection();
- cursor = reset_cursor;
- setCursor(bview, cursor.par(), cursor.pos());
- selection.cursor = cursor;
- }
- return idxstring;
-}
-
-pos_type LyXText::beginningOfMainBody(Buffer const * /*buf*/,
- Paragraph const * par) const
-{
- if (par->layout()->labeltype != LABEL_MANUAL)
- return 0;
- else
- return par->beginningOfMainBody();
+ return idxstring;
}
// they do not duplicate themself and you cannnot make dirty things with
// them!
-void LyXText::setParagraph(BufferView * bview,
- bool line_top, bool line_bottom,
+void LyXText::setParagraph(bool line_top, bool line_bottom,
bool pagebreak_top, bool pagebreak_bottom,
VSpace const & space_top,
VSpace const & space_bottom,
Spacing const & spacing,
LyXAlignment align,
- string labelwidthstring,
+ string const & labelwidthstring,
bool noindent)
{
LyXCursor tmpcursor = cursor;
endpar = endpar->next();
}
- setUndo(bview, Undo::EDIT, selection.start.par(), undoendpar);
+ setUndo(bv(), Undo::EDIT, selection.start.par(), undoendpar);
Paragraph * tmppar = selection.end.par();
while (tmppar != selection.start.par()->previous()) {
- setCursor(bview, tmppar, 0);
- status(bview, LyXText::NEED_MORE_REFRESH);
- refresh_row = cursor.row();
- refresh_y = cursor.y() - cursor.row()->baseline();
+ setCursor(tmppar, 0);
+ postPaint(cursor.y() - cursor.row()->baseline());
cursor.par()->params().lineTop(line_top);
cursor.par()->params().lineBottom(line_bottom);
cursor.par()->params().pagebreakTop(pagebreak_top);
tmppar = cursor.par()->previous();
}
- redoParagraphs(bview, selection.start, endpar);
+ redoParagraphs(selection.start, endpar);
clearSelection();
- setCursor(bview, selection.start.par(), selection.start.pos());
+ setCursor(selection.start.par(), selection.start.pos());
selection.cursor = cursor;
- setCursor(bview, selection.end.par(), selection.end.pos());
- setSelection(bview);
- setCursor(bview, tmpcursor.par(), tmpcursor.pos());
+ setCursor(selection.end.par(), selection.end.pos());
+ setSelection();
+ setCursor(tmpcursor.par(), tmpcursor.pos());
if (inset_owner)
- bview->updateInset(inset_owner, true);
+ bv()->updateInset(inset_owner);
}
// set the counter of a paragraph. This includes the labels
-void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
+void LyXText::setCounter(Buffer const * buf, Paragraph * par)
{
LyXTextClass const & textclass = buf->params.getLyXTextClass();
LyXLayout_ptr const & layout = par->layout();
// is it a layout that has an automatic label?
if (layout->labeltype >= LABEL_COUNTER_CHAPTER) {
+ int const i = layout->labeltype - LABEL_COUNTER_CHAPTER;
- int i = layout->labeltype - LABEL_COUNTER_CHAPTER;
- string numbertype;
- string langtype;
ostringstream s;
if (i >= 0 && i <= buf->params.secnumdepth) {
+ string numbertype;
+ string langtype;
textclass.counters().step(layout->latexname());
// Is there a label? Useful for Chapter layout
if (!par->params().appendix()) {
- if (!layout->labelstring().empty())
- par->params().labelString(layout->labelstring());
- else
- par->params().labelString(string());
+ s << layout->labelstring();
} else {
- if (!layout->labelstring_appendix().empty())
- par->params().labelString(layout->labelstring_appendix());
- else
- par->params().labelString(string());
+ s << layout->labelstring_appendix();
}
- // Use if an integer is here less than elegant. For now.
+ // Use of an integer is here less than elegant. For now.
int head = textclass.maxcounter() - LABEL_COUNTER_CHAPTER;
if (!par->params().appendix()) {
numbertype = "sectioning";
.numberLabel(layout->latexname(),
numbertype, langtype, head);
- par->params().labelString(par->params().labelString()
- + STRCONV(s.str()));
+ par->params().labelString(STRCONV(s.str()));
// reset enum counters
textclass.counters().reset("enum");
textclass.counters().step(enumcounter);
s << textclass.counters()
- .numberLabel(enumcounter,
- "enumeration", langtype);
+ .numberLabel(enumcounter, "enumeration");
par->params().labelString(STRCONV(s.str()));
}
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
textclass.counters().step("bibitem");
int number = textclass.counters().value("bibitem");
- if (!par->bibkey) {
- InsetCommandParams p("bibitem");
- par->bibkey = new InsetBibKey(p);
+ if (par->bibitem()) {
+ par->bibitem()->setCounter(number);
+ par->params().labelString(layout->labelstring());
}
- par->bibkey->setCounter(number);
- par->params().labelString(layout->labelstring());
-
// In biblio should't be following counters but...
} else {
string s = layout->labelstring();
textclass.counters().step(fl.type());
// Doesn't work... yet.
+#warning use boost.format
+#if USE_BOOST_FORMAT
+ s = boost::io::str(boost::format(_("%1$s #:")) % fl.name());
+ // s << boost::format(_("%1$s %1$d:")
+ // % fl.name()
+ // % buf->counters().value(fl.name());
+#else
ostringstream o;
- //o << fl.name() << " " << buf->counters().value(fl.name()) << ":";
+ //o << fl.name() << ' ' << buf->counters().value(fl.name()) << ":";
o << fl.name() << " #:";
s = STRCONV(o.str());
+#endif
} else {
// par->SetLayout(0);
// s = layout->labelstring;
- s = (par->getParLanguage(buf->params)->lang() == "hebrew")
- ? " :úåòîùî øñç" : "Senseless: ";
+ s = _("Senseless: ");
}
}
par->params().labelString(s);
// Updates all counters. Paragraphs with changed label string will be rebroken
-void LyXText::updateCounters(BufferView * bview) const
+void LyXText::updateCounters()
{
- Paragraph * par;
-
- Row * row = firstrow;
- par = row->par();
+ Row * row = firstRow();
+ Paragraph * par = row->par();
// CHECK if this is really needed. (Lgb)
- bview->buffer()->params.getLyXTextClass().counters().reset();
+ bv()->buffer()->params.getLyXTextClass().counters().reset();
while (par) {
while (row->par() != par)
string const oldLabel = par->params().labelString();
- setCounter(bview->buffer(), par);
+ // setCounter can potentially change the labelString.
+ setCounter(bv()->buffer(), par);
string const & newLabel = par->params().labelString();
if (oldLabel.empty() && !newLabel.empty()) {
removeParagraph(row);
- appendParagraph(bview, row);
+ appendParagraph(row);
}
par = par->next();
}
-void LyXText::insertInset(BufferView * bview, Inset * inset)
+void LyXText::insertInset(Inset * inset)
{
if (!cursor.par()->insetAllowed(inset->lyxCode()))
return;
- setUndo(bview, Undo::FINISH, cursor.par(), cursor.par()->next());
+ setUndo(bv(), Undo::FINISH, cursor.par(), cursor.par()->next());
freezeUndo();
cursor.par()->insertInset(cursor.pos(), inset);
// Just to rebreak and refresh correctly.
// The character will not be inserted a second time
- insertChar(bview, Paragraph::META_INSET);
+ 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
// does not return the inset!
if (isHighlyEditableInset(inset)) {
- cursorLeft(bview, true);
+ cursorLeft(true);
}
unFreezeUndo();
}
}
-void LyXText::pasteEnvironmentType(BufferView * bview)
+void LyXText::pasteEnvironmentType()
{
- setLayout(bview, copylayouttype);
+ // do nothing if there has been no previous copyEnvironmentType()
+ if (!copylayouttype.empty())
+ setLayout(copylayouttype);
}
-void LyXText::cutSelection(BufferView * bview, bool doclear, bool realcut)
+void LyXText::cutSelection(bool doclear, bool realcut)
{
// Stuff what we got on the clipboard. Even if there is no selection.
// finished. The solution used currently just works, to make it
// faster we need to be more clever and probably also have more
// calls to stuffClipboard. (Lgb)
- bview->stuffClipboard(selectionAsString(bview->buffer(), true));
+ bv()->stuffClipboard(selectionAsString(bv()->buffer(), true));
// This doesn't make sense, if there is no selection
if (!selection.set())
endpar = endpar->next(); // because of parindents etc.
}
- setUndo(bview, Undo::DELETE,
+ setUndo(bv(), Undo::DELETE,
selection.start.par(), undoendpar);
// there are two cases: cut only within one paragraph or
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
selection.start.pos(), pos,
- bview->buffer()->params.textclass,
+ bv()->buffer()->params.textclass,
doclear, realcut);
selection.end.pos(pos);
} else {
int pos = selection.end.pos();
CutAndPaste::cutSelection(selection.start.par(), &endpar,
selection.start.pos(), pos,
- bview->buffer()->params.textclass,
+ bv()->buffer()->params.textclass,
doclear, realcut);
cursor.par(endpar);
selection.end.par(endpar);
if (doclear)
selection.start.par()->stripLeadingSpaces();
- redoParagraphs(bview, selection.start, endpar);
+ redoParagraphs(selection.start, endpar);
// cutSelection can invalidate the cursor so we need to set
// it anew. (Lgb)
- cursor = selection.start;
+ // we prefer the end for when tracking changes
+ cursor = selection.end;
// need a valid cursor. (Lgb)
clearSelection();
- setCursor(bview, cursor.par(), cursor.pos());
+ setCursor(cursor.par(), cursor.pos());
selection.cursor = cursor;
- updateCounters(bview);
+ updateCounters();
}
-void LyXText::copySelection(BufferView * bview)
+void LyXText::copySelection()
{
// stuff the selection onto the X clipboard, from an explicit copy request
- bview->stuffClipboard(selectionAsString(bview->buffer(), true));
+ bv()->stuffClipboard(selectionAsString(bv()->buffer(), true));
// this doesnt make sense, if there is no selection
if (!selection.set())
CutAndPaste::copySelection(selection.start.par(), selection.end.par(),
selection.start.pos(), selection.end.pos(),
- bview->buffer()->params.textclass);
+ bv()->buffer()->params.textclass);
}
-void LyXText::pasteSelection(BufferView * bview)
+void LyXText::pasteSelection()
{
// this does not make sense, if there is nothing to paste
- if (!CutAndPaste::checkPastePossible(cursor.par()))
+ if (!CutAndPaste::checkPastePossible())
return;
- setUndo(bview, Undo::INSERT,
+ setUndo(bv(), Undo::INSERT,
cursor.par(), cursor.par()->next());
Paragraph * endpar;
int pos = cursor.pos();
CutAndPaste::pasteSelection(&actpar, &endpar, pos,
- bview->buffer()->params.textclass);
+ bv()->buffer()->params.textclass);
- redoParagraphs(bview, cursor, endpar);
+ redoParagraphs(cursor, endpar);
- setCursor(bview, cursor.par(), cursor.pos());
+ setCursor(cursor.par(), cursor.pos());
clearSelection();
selection.cursor = cursor;
- setCursor(bview, actpar, pos);
- setSelection(bview);
- updateCounters(bview);
+ setCursor(actpar, pos);
+ setSelection();
+ updateCounters();
}
-// sets the selection over the number of characters of string, no check!!
-void LyXText::setSelectionOverString(BufferView * bview, string const & str)
+void LyXText::setSelectionRange(lyx::pos_type length)
{
- if (str.empty())
+ if (!length)
return;
selection.cursor = cursor;
- for (string::size_type i = 0; i < str.length(); ++i)
- cursorRight(bview);
- setSelection(bview);
+ while (length--)
+ cursorRight(bv());
+ setSelection();
}
// simple replacing. The font of the first selected character is used
-void LyXText::replaceSelectionWithString(BufferView * bview,
- string const & str)
+void LyXText::replaceSelectionWithString(string const & str)
{
- setCursorParUndo(bview);
+ setCursorParUndo(bv());
freezeUndo();
if (!selection.set()) { // create a dummy selection
// Get font setting before we cut
pos_type pos = selection.end.pos();
LyXFont const font = selection.start.par()
- ->getFontSettings(bview->buffer()->params,
+ ->getFontSettings(bv()->buffer()->params,
selection.start.pos());
// Insert the new string
}
// Cut the selection
- cutSelection(bview, true, false);
+ cutSelection(true, false);
unFreezeUndo();
}
// needed to insert the selection
-void LyXText::insertStringAsLines(BufferView * bview, string const & str)
+void LyXText::insertStringAsLines(string const & str)
{
Paragraph * par = cursor.par();
pos_type pos = cursor.pos();
Paragraph * endpar = cursor.par()->next();
- setCursorParUndo(bview);
+ setCursorParUndo(bv());
// only to be sure, should not be neccessary
clearSelection();
- bview->buffer()->insertStringAsLines(par, pos, current_font, str);
+ bv()->buffer()->insertStringAsLines(par, pos, current_font, str);
- redoParagraphs(bview, cursor, endpar);
- setCursor(bview, cursor.par(), cursor.pos());
+ redoParagraphs(cursor, endpar);
+ setCursor(cursor.par(), cursor.pos());
selection.cursor = cursor;
- setCursor(bview, par, pos);
- setSelection(bview);
+ setCursor(par, pos);
+ setSelection();
}
// turns double-CR to single CR, others where converted into one
// blank. Then InsertStringAsLines is called
-void LyXText::insertStringAsParagraphs(BufferView * bview, string const & str)
+void LyXText::insertStringAsParagraphs(string const & str)
{
string linestr(str);
bool newline_inserted = false;
newline_inserted = false;
}
}
- insertStringAsLines(bview, linestr);
+ insertStringAsLines(linestr);
}
-void LyXText::checkParagraph(BufferView * bview, Paragraph * par,
+void LyXText::checkParagraph(Paragraph * par,
pos_type pos)
{
LyXCursor tmpcursor;
// is there a break one row above
if (row->previous() && row->previous()->par() == row->par()) {
- z = nextBreakPoint(bview, row->previous(), workWidth(bview));
+ z = rowBreakPoint(*row->previous());
if (z >= row->pos()) {
// set the dimensions of the row above
y -= row->previous()->height();
- refresh_y = y;
- refresh_row = row->previous();
- status(bview, LyXText::NEED_MORE_REFRESH);
+ postPaint(y);
- breakAgain(bview, row->previous());
+ breakAgain(row->previous());
// set the cursor again. Otherwise
// dangling pointers are possible
- setCursor(bview, cursor.par(), cursor.pos(),
+ setCursor(cursor.par(), cursor.pos(),
false, cursor.boundary());
selection.cursor = cursor;
return;
}
int const tmpheight = row->height();
- pos_type const tmplast = rowLast(row);
- refresh_y = y;
- refresh_row = row;
+ pos_type const tmplast = row->lastPos();
- breakAgain(bview, row);
- if (row->height() == tmpheight && rowLast(row) == tmplast)
- status(bview, LyXText::NEED_VERY_LITTLE_REFRESH);
- else
- status(bview, LyXText::NEED_MORE_REFRESH);
+ breakAgain(row);
+ if (row->height() == tmpheight && row->lastPos() == tmplast) {
+ postRowPaint(row, y);
+ } else {
+ postPaint(y);
+ }
// check the special right address boxes
if (par->layout()->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
tmpcursor.x(0);
tmpcursor.x_fix(0);
tmpcursor.pos(pos);
- redoDrawingOfParagraph(bview, tmpcursor);
+ redoDrawingOfParagraph(tmpcursor);
}
// set the cursor again. Otherwise dangling pointers are possible
if (selection.set()) {
tmpcursor = cursor;
- setCursorIntern(bview, selection.cursor.par(), selection.cursor.pos(),
+ setCursorIntern(selection.cursor.par(), selection.cursor.pos(),
false, selection.cursor.boundary());
selection.cursor = cursor;
- setCursorIntern(bview, selection.start.par(),
+ setCursorIntern(selection.start.par(),
selection.start.pos(),
false, selection.start.boundary());
selection.start = cursor;
- setCursorIntern(bview, selection.end.par(),
+ setCursorIntern(selection.end.par(),
selection.end.pos(),
false, selection.end.boundary());
selection.end = cursor;
- setCursorIntern(bview, last_sel_cursor.par(),
+ setCursorIntern(last_sel_cursor.par(),
last_sel_cursor.pos(),
false, last_sel_cursor.boundary());
last_sel_cursor = cursor;
cursor = tmpcursor;
}
- setCursorIntern(bview, cursor.par(), cursor.pos(),
+ setCursorIntern(cursor.par(), cursor.pos(),
false, cursor.boundary());
}
// returns false if inset wasn't found
-bool LyXText::updateInset(BufferView * bview, Inset * inset)
+bool LyXText::updateInset(Inset * inset)
{
// first check the current paragraph
int pos = cursor.par()->getPositionOfInset(inset);
if (pos != -1) {
- checkParagraph(bview, cursor.par(), pos);
+ checkParagraph(cursor.par(), pos);
return true;
}
do {
pos = par->getPositionOfInset(inset);
if (pos != -1) {
- checkParagraph(bview, par, pos);
+ checkParagraph(par, pos);
return true;
}
par = par->next();
}
-bool LyXText::setCursor(BufferView * bview, Paragraph * par,
+bool LyXText::setCursor(Paragraph * par,
pos_type pos,
- bool setfont, bool boundary) const
+ bool setfont, bool boundary)
{
LyXCursor old_cursor = cursor;
- setCursorIntern(bview, par, pos, setfont, boundary);
- return deleteEmptyParagraphMechanism(bview, old_cursor);
+ setCursorIntern(par, pos, setfont, boundary);
+ return deleteEmptyParagraphMechanism(old_cursor);
}
-void LyXText::setCursor(BufferView * bview, LyXCursor & cur, Paragraph * par,
- pos_type pos, bool boundary) const
+void LyXText::setCursor(LyXCursor & cur, Paragraph * par,
+ pos_type pos, bool boundary)
{
lyx::Assert(par);
- lyx::Assert(bview);
cur.par(par);
cur.pos(pos);
Inset * ins;
if (row->previous() && pos &&
row->previous()->par() == row->par() &&
+ pos < par->size() &&
par->getChar(pos) == Paragraph::META_INSET &&
- (ins=par->getInset(pos)) && (ins->needFullRow() || ins->display()))
+ (ins = par->getInset(pos)) && (ins->needFullRow() || ins->display()))
{
row = row->previous();
y -= row->height();
// y is now the cursor baseline
cur.y(y);
- pos_type last = rowLastPrintable(old_row);
+ pos_type last = old_row->lastPrintablePos();
- if (pos > last + 1) {
+ // None of these should happen, but we're scaredy-cats
+ if (pos > par->size()) {
+ lyxerr << "dont like 1 please report" << endl;
+ pos = 0;
+ cur.pos(0);
+ } else if (pos > last + 1) {
+ lyxerr << "dont like 2 please report" << endl;
// This shouldn't happen.
pos = last + 1;
cur.pos(pos);
} else if (pos < row->pos()) {
+ lyxerr << "dont like 3 please report" << endl;
pos = row->pos();
cur.pos(pos);
}
// now get the cursors x position
- float x = getCursorX(bview, row, pos, last, boundary);
+ float x = getCursorX(row, pos, last, boundary);
cur.x(int(x));
cur.x_fix(cur.x());
if (old_row != row) {
- x = getCursorX(bview, old_row, pos, last, boundary);
+ x = getCursorX(old_row, pos, last, boundary);
cur.ix(int(x));
} else
cur.ix(cur.x());
+ //if the cursor is in a visible row, anchor to it
+ int topy = top_y();
+ if (topy < y && y < topy + bv()->workHeight())
+ anchor_row(row);
}
-float LyXText::getCursorX(BufferView * bview, Row * row,
- pos_type pos, pos_type last, bool boundary) const
+float LyXText::getCursorX(Row * row,
+ pos_type pos, pos_type last, bool boundary) const
{
pos_type cursor_vpos = 0;
float x;
float fill_hfill;
float fill_label_hfill;
// This call HAS to be here because of the BidiTables!!!
- prepareToPrint(bview, row, x, fill_separator, fill_hfill,
+ prepareToPrint(row, x, fill_separator, fill_hfill,
fill_label_hfill);
if (last < row->pos())
cursor_vpos = row->pos();
else if (pos > last && !boundary)
- cursor_vpos = (row->par()->isRightToLeftPar(bview->buffer()->params))
+ cursor_vpos = (row->par()->isRightToLeftPar(bv()->buffer()->params))
? row->pos() : last + 1;
else if (pos > row->pos() &&
(pos > last || boundary))
cursor_vpos = (bidi_level(pos) % 2 == 0)
? log2vis(pos) : log2vis(pos) + 1;
- pos_type main_body =
- beginningOfMainBody(bview->buffer(), row->par());
- if ((main_body > 0) &&
- ((main_body-1 > last) ||
- !row->par()->isLineSeparator(main_body-1)))
- main_body = 0;
+ pos_type body_pos = row->par()->beginningOfBody();
+ if ((body_pos > 0) &&
+ ((body_pos-1 > last) ||
+ !row->par()->isLineSeparator(body_pos - 1)))
+ body_pos = 0;
for (pos_type vpos = row->pos(); vpos < cursor_vpos; ++vpos) {
pos_type pos = vis2log(vpos);
- if (main_body > 0 && pos == main_body - 1) {
+ if (body_pos > 0 && pos == body_pos - 1) {
x += fill_label_hfill +
font_metrics::width(
row->par()->layout()->labelsep,
- getLabelFont(bview->buffer(),
+ getLabelFont(bv()->buffer(),
row->par()));
- if (row->par()->isLineSeparator(main_body - 1))
- x -= singleWidth(bview,
- row->par(), main_body - 1);
+ if (row->par()->isLineSeparator(body_pos - 1))
+ x -= singleWidth(
+ row->par(), body_pos - 1);
}
- if (hfillExpansion(bview->buffer(), row, pos)) {
- x += singleWidth(bview, row->par(), pos);
- if (pos >= main_body)
+ if (row->hfillExpansion(pos)) {
+ x += singleWidth(row->par(), pos);
+ if (pos >= body_pos)
x += fill_hfill;
else
x += fill_label_hfill;
} else if (row->par()->isSeparator(pos)) {
- x += singleWidth(bview, row->par(), pos);
- if (pos >= main_body)
+ x += singleWidth(row->par(), pos);
+ if (pos >= body_pos)
x += fill_separator;
} else
- x += singleWidth(bview, row->par(), pos);
+ x += singleWidth(row->par(), pos);
}
return x;
}
-void LyXText::setCursorIntern(BufferView * bview, Paragraph * par,
- pos_type pos, bool setfont, bool boundary) const
+void LyXText::setCursorIntern(Paragraph * par,
+ pos_type pos, bool setfont, bool boundary)
{
InsetText * it = static_cast<InsetText *>(par->inInset());
if (it) {
// I moved the lyxerr stuff in here so we can see if
// this is actually really needed and where!
// (Jug)
- // it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont, boundary);
+ // it->getLyXText(bv())->setCursorIntern(bv(), par, pos, setfont, boundary);
return;
}
}
- setCursor(bview, cursor, par, pos, boundary);
+ setCursor(cursor, par, pos, boundary);
if (setfont)
- setCurrentFont(bview);
+ setCurrentFont();
}
-void LyXText::setCurrentFont(BufferView * bview) const
+void LyXText::setCurrentFont()
{
pos_type pos = cursor.pos();
if (cursor.boundary() && pos > 0)
}
current_font =
- cursor.par()->getFontSettings(bview->buffer()->params, pos);
- real_current_font = getFont(bview->buffer(), cursor.par(), pos);
+ cursor.par()->getFontSettings(bv()->buffer()->params, pos);
+ real_current_font = getFont(bv()->buffer(), cursor.par(), pos);
if (cursor.pos() == cursor.par()->size() &&
- isBoundary(bview->buffer(), cursor.par(), cursor.pos()) &&
+ isBoundary(bv()->buffer(), cursor.par(), cursor.pos()) &&
!cursor.boundary()) {
Language const * lang =
- cursor.par()->getParLanguage(bview->buffer()->params);
+ cursor.par()->getParLanguage(bv()->buffer()->params);
current_font.setLanguage(lang);
current_font.setNumber(LyXFont::OFF);
real_current_font.setLanguage(lang);
}
-void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const
+// 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(Row * row, int & x,
+ bool & boundary) const
+{
+ float tmpx = 0.0;
+ float fill_separator;
+ float fill_hfill;
+ float fill_label_hfill;
+
+ prepareToPrint(row, tmpx, fill_separator,
+ fill_hfill, fill_label_hfill);
+
+ pos_type vc = row->pos();
+ pos_type last = row->lastPrintablePos();
+ pos_type c = 0;
+
+ LyXLayout_ptr const & layout = row->par()->layout();
+
+ bool left_side = false;
+
+ pos_type body_pos = row->par()->beginningOfBody();
+ float last_tmpx = tmpx;
+
+ if (body_pos > 0 &&
+ (body_pos - 1 > last ||
+ !row->par()->isLineSeparator(body_pos - 1)))
+ body_pos = 0;
+
+ // check for empty row
+ if (!row->par()->size()) {
+ x = int(tmpx);
+ return 0;
+ }
+
+ while (vc <= last && tmpx <= x) {
+ c = vis2log(vc);
+ last_tmpx = tmpx;
+ if (body_pos > 0 && c == body_pos-1) {
+ tmpx += fill_label_hfill +
+ font_metrics::width(layout->labelsep,
+ getLabelFont(bv()->buffer(), row->par()));
+ if (row->par()->isLineSeparator(body_pos - 1))
+ tmpx -= singleWidth(row->par(), body_pos-1);
+ }
+
+ if (row->hfillExpansion(c)) {
+ tmpx += singleWidth(row->par(), c);
+ if (c >= body_pos)
+ tmpx += fill_hfill;
+ else
+ tmpx += fill_label_hfill;
+ } else if (row->par()->isSeparator(c)) {
+ tmpx += singleWidth(row->par(), c);
+ if (c >= body_pos)
+ tmpx+= fill_separator;
+ } else {
+ tmpx += singleWidth(row->par(), c);
+ }
+ ++vc;
+ }
+
+ if ((tmpx + last_tmpx) / 2 > x) {
+ tmpx = last_tmpx;
+ left_side = true;
+ }
+
+ if (vc > last + 1) // This shouldn't happen.
+ vc = last + 1;
+
+ boundary = false;
+ bool const lastrow = lyxrc.rtl_support // This is not needed, but gives
+ // some speedup if rtl_support=false
+ && (!row->next() || row->next()->par() != row->par());
+ bool const rtl = (lastrow)
+ ? row->par()->isRightToLeftPar(bv()->buffer()->params)
+ : false; // If lastrow is false, we don't need to compute
+ // the value of rtl.
+
+ if (lastrow &&
+ ((rtl && left_side && vc == row->pos() && x < tmpx - 5) ||
+ (!rtl && !left_side && vc == last + 1 && x > tmpx + 5)))
+ c = last + 1;
+ else if (vc == row->pos()) {
+ c = vis2log(vc);
+ if (bidi_level(c) % 2 == 1)
+ ++c;
+ } else {
+ c = vis2log(vc - 1);
+ bool const rtl = (bidi_level(c) % 2 == 1);
+ if (left_side == rtl) {
+ ++c;
+ boundary = isBoundary(bv()->buffer(), row->par(), c);
+ }
+ }
+
+ if (row->pos() <= last && c > last
+ && row->par()->isNewline(last)) {
+ if (bidi_level(last) % 2 == 0)
+ tmpx -= singleWidth(row->par(), last);
+ else
+ tmpx += singleWidth(row->par(), last);
+ c = last;
+ }
+
+ c -= row->pos();
+ x = int(tmpx);
+ return c;
+}
+
+
+void LyXText::setCursorFromCoordinates(int x, int y)
{
LyXCursor old_cursor = cursor;
- setCursorFromCoordinates(bview, cursor, x, y);
- setCurrentFont(bview);
- deleteEmptyParagraphMechanism(bview, old_cursor);
+ setCursorFromCoordinates(cursor, x, y);
+ setCurrentFont();
+ deleteEmptyParagraphMechanism(old_cursor);
}
}
-void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur,
- int x, int y) const
+void LyXText::setCursorFromCoordinates(LyXCursor & cur,
+ int x, int y)
{
// Get the row first.
Row * row = getRowNearY(y);
bool bound = false;
- pos_type const column = getColumnNearX(bview, row, x, bound);
+ pos_type const column = getColumnNearX(row, x, bound);
cur.par(row->par());
cur.pos(row->pos() + column);
cur.x(x);
cur.row(row);
if (beforeFullRowInset(*row, cur)) {
- pos_type last = rowLastPrintable(row);
- float x = getCursorX(bview, row->next(), cur.pos(), last, bound);
+ pos_type last = row->lastPrintablePos();
+ float x = getCursorX(row->next(), cur.pos(), last, bound);
cur.ix(int(x));
cur.iy(y + row->height() + row->next()->baseline());
cur.irow(row->next());
}
-void LyXText::cursorLeft(BufferView * bview, bool internal) const
+void LyXText::cursorLeft(bool internal)
{
if (cursor.pos() > 0) {
bool boundary = cursor.boundary();
- setCursor(bview, cursor.par(), cursor.pos() - 1, true, false);
+ setCursor(cursor.par(), cursor.pos() - 1, true, false);
if (!internal && !boundary &&
- isBoundary(bview->buffer(), cursor.par(), cursor.pos() + 1))
- setCursor(bview, cursor.par(), cursor.pos() + 1, true, true);
+ isBoundary(bv()->buffer(), cursor.par(), cursor.pos() + 1))
+ setCursor(cursor.par(), cursor.pos() + 1, true, true);
} else if (cursor.par()->previous()) { // steps into the above paragraph.
Paragraph * par = cursor.par()->previous();
- setCursor(bview, par, par->size());
+ setCursor(par, par->size());
}
}
-void LyXText::cursorRight(BufferView * bview, bool internal) const
+void LyXText::cursorRight(bool internal)
{
if (!internal && cursor.boundary() &&
!cursor.par()->isNewline(cursor.pos()))
- setCursor(bview, cursor.par(), cursor.pos(), true, false);
+ setCursor(cursor.par(), cursor.pos(), true, false);
else if (cursor.pos() < cursor.par()->size()) {
- setCursor(bview, cursor.par(), cursor.pos() + 1, true, false);
+ setCursor(cursor.par(), cursor.pos() + 1, true, false);
if (!internal &&
- isBoundary(bview->buffer(), cursor.par(), cursor.pos()))
- setCursor(bview, cursor.par(), cursor.pos(), true, true);
+ isBoundary(bv()->buffer(), cursor.par(), cursor.pos()))
+ setCursor(cursor.par(), cursor.pos(), true, true);
} else if (cursor.par()->next())
- setCursor(bview, cursor.par()->next(), 0);
+ setCursor(cursor.par()->next(), 0);
}
-void LyXText::cursorUp(BufferView * bview, bool selecting) const
+void LyXText::cursorUp(bool selecting)
{
#if 1
int x = cursor.x_fix();
int y = cursor.y() - cursor.row()->baseline() - 1;
- setCursorFromCoordinates(bview, x, y);
+ setCursorFromCoordinates(x, y);
if (!selecting) {
- int y1 = cursor.iy() - first_y;
+ int topy = top_y();
+ int y1 = cursor.iy() - topy;
int y2 = y1;
- y -= first_y;
- Inset * inset_hit = checkInsetHit(bview, x, y1);
+ y -= topy;
+ Inset * inset_hit = checkInsetHit(x, y1);
if (inset_hit && isHighlyEditableInset(inset_hit)) {
- inset_hit->edit(bview, x, y - (y2 - y1), mouse_button::none);
+ inset_hit->edit(bv(), x, y - (y2 - y1), mouse_button::none);
}
}
#else
- setCursorFromCoordinates(bview, cursor.x_fix(),
+ setCursorFromCoordinates(bv(), cursor.x_fix(),
cursor.y() - cursor.row()->baseline() - 1);
#endif
}
-void LyXText::cursorDown(BufferView * bview, bool selecting) const
+void LyXText::cursorDown(bool selecting)
{
#if 1
int x = cursor.x_fix();
int y = cursor.y() - cursor.row()->baseline() +
cursor.row()->height() + 1;
- setCursorFromCoordinates(bview, x, y);
+ setCursorFromCoordinates(x, y);
if (!selecting && cursor.row() == cursor.irow()) {
- int y1 = cursor.iy() - first_y;
+ int topy = top_y();
+ int y1 = cursor.iy() - topy;
int y2 = y1;
- y -= first_y;
- Inset * inset_hit = checkInsetHit(bview, x, y1);
+ y -= topy;
+ Inset * inset_hit = checkInsetHit(x, y1);
if (inset_hit && isHighlyEditableInset(inset_hit)) {
- inset_hit->edit(bview, x, y - (y2 - y1), mouse_button::none);
+ inset_hit->edit(bv(), x, y - (y2 - y1), mouse_button::none);
}
}
#else
- setCursorFromCoordinates(bview, cursor.x_fix(),
+ setCursorFromCoordinates(bv(), cursor.x_fix(),
cursor.y() - cursor.row()->baseline()
+ cursor.row()->height() + 1);
#endif
}
-void LyXText::cursorUpParagraph(BufferView * bview) const
+void LyXText::cursorUpParagraph()
{
if (cursor.pos() > 0) {
- setCursor(bview, cursor.par(), 0);
+ setCursor(cursor.par(), 0);
}
else if (cursor.par()->previous()) {
- setCursor(bview, cursor.par()->previous(), 0);
+ setCursor(cursor.par()->previous(), 0);
}
}
-void LyXText::cursorDownParagraph(BufferView * bview) const
+void LyXText::cursorDownParagraph()
{
if (cursor.par()->next()) {
- setCursor(bview, cursor.par()->next(), 0);
+ setCursor(cursor.par()->next(), 0);
} else {
- setCursor(bview, cursor.par(), cursor.par()->size());
+ setCursor(cursor.par(), cursor.par()->size());
}
}
// fix the cursor `cur' after a characters has been deleted at `where'
// position. Called by deleteEmptyParagraphMechanism
-void LyXText::fixCursorAfterDelete(BufferView * bview,
- LyXCursor & cur,
- LyXCursor const & where) const
+void LyXText::fixCursorAfterDelete(LyXCursor & cur,
+ LyXCursor const & where)
{
// if cursor is not in the paragraph where the delete occured,
// do nothing
cur.pos(cur.par()->size());
// recompute row et al. for this cursor
- setCursor(bview, cur, cur.par(), cur.pos(), cur.boundary());
+ setCursor(cur, cur.par(), cur.pos(), cur.boundary());
}
-bool LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
- LyXCursor const & old_cursor) const
+bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
{
// Would be wrong to delete anything if we have a selection.
if (selection.set())
&& old_cursor.par()->isLineSeparator(old_cursor.pos())
&& old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) {
old_cursor.par()->erase(old_cursor.pos() - 1);
- redoParagraphs(bview, old_cursor, old_cursor.par()->next());
+ redoParagraphs(old_cursor, old_cursor.par()->next());
#ifdef WITH_WARNINGS
#warning This will not work anymore when we have multiple views of the same buffer
// automated way in LyXCursor code. (JMarc 26/09/2001)
#endif
// correct all cursors held by the LyXText
- fixCursorAfterDelete(bview, cursor, old_cursor);
- fixCursorAfterDelete(bview, selection.cursor,
+ fixCursorAfterDelete(cursor, old_cursor);
+ fixCursorAfterDelete(selection.cursor,
old_cursor);
- fixCursorAfterDelete(bview, selection.start,
+ fixCursorAfterDelete(selection.start,
old_cursor);
- fixCursorAfterDelete(bview, selection.end, old_cursor);
- fixCursorAfterDelete(bview, last_sel_cursor,
+ fixCursorAfterDelete(selection.end, old_cursor);
+ fixCursorAfterDelete(last_sel_cursor,
old_cursor);
- fixCursorAfterDelete(bview, toggle_cursor, old_cursor);
- fixCursorAfterDelete(bview, toggle_end_cursor,
+ fixCursorAfterDelete(toggle_cursor, old_cursor);
+ fixCursorAfterDelete(toggle_end_cursor,
old_cursor);
return false;
}
// ok, we will delete anything
LyXCursor tmpcursor;
- // make sure that you do not delete any environments
- status(bview, LyXText::NEED_MORE_REFRESH);
deleted = true;
if (old_cursor.row()->previous()) {
- refresh_row = old_cursor.row()->previous();
- refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height();
+ const_cast<LyXText *>(this)->postPaint(old_cursor.y() - old_cursor.row()->baseline()
+ - old_cursor.row()->previous()->height());
tmpcursor = cursor;
cursor = old_cursor; // that undo can restore the right cursor position
Paragraph * endpar = old_cursor.par()->next();
endpar = endpar->next();
}
}
- setUndo(bview, Undo::DELETE, old_cursor.par(), endpar);
+ setUndo(bv(), Undo::DELETE, old_cursor.par(), endpar);
cursor = tmpcursor;
// delete old row
* the parindent that can occur or dissappear.
* The next row can change its height, if
* there is another layout before */
- if (refresh_row->next()) {
- breakAgain(bview, refresh_row->next());
- updateCounters(bview);
+ if (refresh_row) {
+ if (refresh_row->next()) {
+ breakAgain(refresh_row->next());
+ updateCounters();
+ }
+ setHeightOfRow(refresh_row);
}
- setHeightOfRow(bview, refresh_row);
} else {
- refresh_row = old_cursor.row()->next();
- refresh_y = old_cursor.y() - old_cursor.row()->baseline();
+ Row * nextrow = old_cursor.row()->next();
+ const_cast<LyXText *>(this)->postPaint(
+ old_cursor.y() - old_cursor.row()->baseline());
tmpcursor = cursor;
cursor = old_cursor; // that undo can restore the right cursor position
endpar = endpar->next();
}
}
- setUndo(bview, Undo::DELETE, old_cursor.par(), endpar);
+ setUndo(bv(), Undo::DELETE, old_cursor.par(), endpar);
cursor = tmpcursor;
// delete old row
the parindent that can occur or dissappear.
The next row can change its height, if
there is another layout before */
- if (refresh_row) {
- breakAgain(bview, refresh_row);
- updateCounters(bview);
+ if (nextrow) {
+ breakAgain(nextrow);
+ updateCounters();
}
}
// correct cursor y
- setCursorIntern(bview, cursor.par(), cursor.pos());
+ setCursorIntern(cursor.par(), cursor.pos());
if (selection.cursor.par() == old_cursor.par()
&& selection.cursor.pos() == old_cursor.pos()) {
}
if (!deleted) {
if (old_cursor.par()->stripLeadingSpaces()) {
- redoParagraphs(bview, old_cursor,
+ redoParagraphs(old_cursor,
old_cursor.par()->next());
// correct cursor y
- setCursorIntern(bview, cursor.par(), cursor.pos());
+ setCursorIntern(cursor.par(), cursor.pos());
selection.cursor = cursor;
}
}
}
-LyXText::text_status LyXText::status() const
+LyXText::refresh_status LyXText::refreshStatus() const
{
- return status_;
+ return refresh_status_;
}
-void LyXText::status(BufferView * bview, LyXText::text_status st) const
+void LyXText::clearPaint()
{
- LyXText * t = bview->text;
+ refresh_status_ = REFRESH_NONE;
+ refresh_row = 0;
+ refresh_y = 0;
+}
- // We should only go up with refreshing code so this means that if
- // we have a MORE refresh we should never set it to LITTLE if we still
- // didn't handle it (and then it will be UNCHANGED. Now as long as
- // we stay inside one LyXText this may work but we need to tell the
- // outermost LyXText that it should REALLY draw us if there is some
- // change in a Inset::LyXText. So you see that when we are inside a
- // inset's LyXText we give the LITTLE to the outermost LyXText to
- // tell'em that it should redraw the actual row (where the inset
- // resides! Capito?!
- if (status_ != NEED_MORE_REFRESH || st != NEED_VERY_LITTLE_REFRESH) {
- status_ = st;
- if (inset_owner && st != UNCHANGED) {
- t->status(bview, NEED_VERY_LITTLE_REFRESH);
- if (!t->refresh_row) {
- t->refresh_row = t->cursor.row();
- t->refresh_y = t->cursor.y() -
- t->cursor.row()->baseline();
- }
- }
+void LyXText::postPaint(int start_y)
+{
+ refresh_status old = refresh_status_;
+
+ refresh_status_ = REFRESH_AREA;
+ refresh_row = 0;
+
+ if (old != REFRESH_NONE && refresh_y < start_y)
+ return;
+
+ refresh_y = start_y;
+
+ if (!inset_owner)
+ return;
+
+ // We are an inset's lyxtext. Tell the top-level lyxtext
+ // it needs to update the row we're in.
+ LyXText * t = bv()->text;
+ t->postRowPaint(t->cursor.row(), t->cursor.y() - t->cursor.row()->baseline());
+}
+
+
+// FIXME: we should probably remove this y parameter,
+// make refresh_y be 0, and use row->y etc.
+void LyXText::postRowPaint(Row * row, int start_y)
+{
+ if (refresh_status_ != REFRESH_NONE && refresh_y < start_y) {
+ refresh_status_ = REFRESH_AREA;
+ return;
+ } else {
+ refresh_y = start_y;
}
+
+ if (refresh_status_ == REFRESH_AREA)
+ return;
+
+ refresh_status_ = REFRESH_ROW;
+ refresh_row = row;
+
+ if (!inset_owner)
+ return;
+
+ // We are an inset's lyxtext. Tell the top-level lyxtext
+ // it needs to update the row we're in.
+ LyXText * t = bv()->text;
+ t->postRowPaint(t->cursor.row(), t->cursor.y() - t->cursor.row()->baseline());
+}
+
+
+bool LyXText::isInInset() const
+{
+ // Sub-level has non-null bv owner and
+ // non-null inset owner.
+ return inset_owner != 0 && bv_owner != 0;
+}
+
+
+int defaultRowHeight()
+{
+ LyXFont const font(LyXFont::ALL_SANE);
+ return int(font_metrics::maxAscent(font)
+ + font_metrics::maxDescent(font) * 1.5);
}
projects / lyx.git / blobdiff