#include "ParagraphParameters.h"
#include "counters.h"
#include "lyxrow_funcs.h"
+#include "metricsinfo.h"
#include "paragraph_funcs.h"
#include "insets/insetbibitem.h"
#include <boost/tuple/tuple.hpp>
+#include <algorithm>
+
using namespace lyx::support;
using std::vector;
{
anchor_row_ = rows().end();
need_break_row = rows().end();
- refresh_row = rows().end();
-
- clearPaint();
+ need_refresh_ = true;
}
{
anchor_row_ = rows().end();
need_break_row = rows().end();
- refresh_row = rows().end();
-
- clearPaint();
+ need_refresh_ = true;
}
-void LyXText::init(BufferView * bview, bool reinit)
+void LyXText::init(BufferView * bview)
{
- if (reinit) {
- rowlist_.clear();
- need_break_row = rows().end();
- width = height = 0;
- top_y(0);
- clearPaint();
- } else if (!rowlist_.empty())
- return;
+ bv_owner = bview;
+
+ rowlist_.clear();
+ need_break_row = rows().end();
+ width = height = 0;
+ need_refresh_ = true;
+
+ anchor_row_ = rows().end();
+ anchor_row_offset_ = 0;
ParagraphList::iterator pit = ownerParagraphs().begin();
ParagraphList::iterator end = ownerParagraphs().end();
current_font = getFont(bview->buffer(), pit, 0);
- for (; pit != end; ++pit) {
+ for (; pit != end; ++pit)
insertParagraph(pit, rowlist_.end());
- }
+
setCursorIntern(rowlist_.begin()->par(), 0);
selection.cursor = cursor;
font.update(fnt, buf->params.language, toggleall);
// Let the insets convert their font
if (pit->isInset(pos)) {
- Inset * inset = pit->getInset(pos);
+ InsetOld * inset = pit->getInset(pos);
if (isEditableInset(inset)) {
UpdatableInset * uinset =
static_cast<UpdatableInset *>(inset);
// removes the row and reset the touched counters
void LyXText::removeRow(RowList::iterator rit)
{
- /* FIXME: when we cache the bview, this should just
- * become a postPaint(), I think */
- if (refresh_row == rit) {
- if (rit == rows().begin())
- refresh_row = boost::next(rit);
- else
- refresh_row = boost::prior(rit);
-
- // what about refresh_y
- }
-
if (anchor_row_ == rit) {
if (rit != rows().begin()) {
anchor_row_ = boost::prior(rit);
}
-Inset * LyXText::getInset() const
+InsetOld * LyXText::getInset() const
{
ParagraphList::iterator pit = cursor.par();
pos_type const pos = cursor.pos();
void LyXText::toggleInset()
{
- Inset * inset = getInset();
+ InsetOld * inset = getInset();
// is there an editable inset at cursor position?
if (!isEditableInset(inset)) {
// No, try to see if we are inside a collapsable inset
// do we want to keep this?? (JMarc)
if (!isHighlyEditableInset(inset))
- setCursorParUndo(bv());
+ recordUndo(bv(), Undo::ATOMIC);
if (inset->isOpen()) {
inset->close(bv());
++endpit;
}
- setUndo(bv(), Undo::EDIT, sstart_cur.par(), boost::prior(undoendpit));
+ recordUndo(bv(), Undo::ATOMIC, sstart_cur.par(), boost::prior(undoendpit));
// ok we have a selection. This is always between sstart_cur
// and sel_end cursor
bv()->owner()->dispatch(FuncRequest(LFUN_HOME));
bv()->owner()->dispatch(FuncRequest(LFUN_ENDSEL));
bv()->owner()->dispatch(FuncRequest(LFUN_CUT));
- Inset * inset = new InsetEnvironment(params, layout);
+ InsetOld * inset = new InsetEnvironment(params, layout);
if (bv()->insertInset(inset)) {
//inset->edit(bv());
//bv()->owner()->dispatch(FuncRequest(LFUN_PASTE));
ParagraphList::iterator pastend = boost::next(end);
if (!test_only)
- setUndo(bv(), Undo::EDIT, start, end);
+ recordUndo(bv(), Undo::ATOMIC, start, end);
bool changed = false;
// ok we have a selection. This is always between sel_start_cursor
// and sel_end cursor
- setUndo(bv(), Undo::EDIT, selection.start.par(), selection.end.par());
+ recordUndo(bv(), Undo::ATOMIC, selection.start.par(), selection.end.par());
freezeUndo();
cursor = selection.start;
while (cursor.par() != selection.end.par() ||
void LyXText::redoHeightOfParagraph()
{
RowList::iterator tmprow = cursorRow();
- int y = cursor.y() - tmprow->baseline();
setHeightOfRow(tmprow);
while (tmprow != rows().begin()
&& boost::prior(tmprow)->par() == tmprow->par()) {
--tmprow;
- y -= tmprow->height();
setHeightOfRow(tmprow);
}
- postPaint(y);
+ postPaint();
setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
}
-void LyXText::redoDrawingOfParagraph(LyXCursor const & cur)
-{
- RowList::iterator tmprow = getRow(cur);
-
- int y = cur.y() - tmprow->baseline();
- setHeightOfRow(tmprow);
-
- while (tmprow != rows().begin()
- && boost::prior(tmprow)->par() == tmprow->par()) {
- --tmprow;
- y -= tmprow->height();
- }
-
- postPaint(y);
- setCursor(cur.par(), cur.pos());
-}
-
-
// deletes and inserts again all paragraphs between the cursor
// and the specified par
// This function is needed after SetLayout and SetFont etc.
ParagraphList::iterator endpit)
{
RowList::iterator tmprit = getRow(cur);
- int y = cur.y() - tmprit->baseline();
ParagraphList::iterator first_phys_pit;
RowList::iterator prevrit;
&& boost::prior(tmprit)->par() == first_phys_pit)
{
--tmprit;
- y -= tmprit->height();
}
prevrit = boost::prior(tmprit);
}
if (tmppit == endpit)
break;
}
- if (prevrit != rows().end()) {
+ if (prevrit != rows().end())
setHeightOfRow(prevrit);
- postPaint(y - prevrit->height());
- } else {
+ else
setHeightOfRow(rows().begin());
- postPaint(0);
- }
+ postPaint();
if (tmprit != rows().end())
setHeightOfRow(tmprit);
void LyXText::fullRebreak()
{
- need_break_row = rows().begin();
- partialRebreak();
+ init(bv());
setCursorIntern(cursor.par(), cursor.pos());
}
+void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
+{
+ //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth << "\n";
+
+ // rebuild row cache
+ rowlist_.clear();
+ need_break_row = rows().end();
+ width = height = 0;
+
+ anchor_row_ = rows().end();
+ anchor_row_offset_ = 0;
+
+ ParagraphList::iterator pit = ownerParagraphs().begin();
+ ParagraphList::iterator end = ownerParagraphs().end();
+
+ for (; pit != end; ++pit) {
+ InsetList::iterator ii = pit->insetlist.begin();
+ InsetList::iterator iend = pit->insetlist.end();
+ for (; ii != iend; ++ii) {
+ Dimension dim;
+ MetricsInfo m = mi;
+ 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);
+ }
+
+ // 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.des = height - dim.asc;
+ dim.wid = std::max(mi.base.textwidth, int(width));
+}
+
+
void LyXText::partialRebreak()
{
if (rows().empty()) {
bool const lsel = TextCursor::setSelection();
if (inset_owner && (selection.set() || lsel))
- inset_owner->setUpdateStatus(bv(), InsetText::SELECTION);
+ inset_owner->setUpdateStatus(InsetText::SELECTION);
}
selection.cursor = cursor;
}
if (inset_owner)
- inset_owner->setUpdateStatus(bv(), InsetText::CURSOR_PAR);
+ inset_owner->setUpdateStatus(InsetText::CURSOR_PAR);
}
++endpit;
}
- setUndo(bv(), Undo::EDIT, selection.start.par(),
+ recordUndo(bv(), Undo::ATOMIC, selection.start.par(),
boost::prior(undoendpit));
while (tmppit != boost::prior(selection.start.par())) {
setCursor(tmppit, 0);
- postPaint(cursor.y() - cursorRow()->baseline());
ParagraphList::iterator pit = cursor.par();
ParagraphParameters & params = pit->params();
params.noindent(noindent);
tmppit = boost::prior(pit);
}
+ postPaint();
redoParagraphs(selection.start, endpit);
// the caption hack:
if (layout->labeltype == LABEL_SENSITIVE) {
ParagraphList::iterator tmppit = pit;
- Inset * in = 0;
+ InsetOld * in = 0;
bool isOK = false;
while (tmppit != ownerParagraphs().end() &&
tmppit->inInset()
// the single '=' is intended below
&& (in = tmppit->inInset()->owner())) {
- if (in->lyxCode() == Inset::FLOAT_CODE ||
- in->lyxCode() == Inset::WRAP_CODE) {
+ if (in->lyxCode() == InsetOld::FLOAT_CODE ||
+ in->lyxCode() == InsetOld::WRAP_CODE) {
isOK = true;
break;
} else {
if (isOK) {
string type;
- if (in->lyxCode() == Inset::FLOAT_CODE)
+ if (in->lyxCode() == InsetOld::FLOAT_CODE)
type = static_cast<InsetFloat*>(in)->params().type;
- else if (in->lyxCode() == Inset::WRAP_CODE)
+ else if (in->lyxCode() == InsetOld::WRAP_CODE)
type = static_cast<InsetWrap*>(in)->params().type;
else
Assert(0);
}
-void LyXText::insertInset(Inset * inset)
+void LyXText::insertInset(InsetOld * inset)
{
if (!cursor.par()->insetAllowed(inset->lyxCode()))
return;
- setUndo(bv(), Undo::FINISH, cursor.par());
+ recordUndo(bv(), Undo::ATOMIC, cursor.par());
freezeUndo();
cursor.par()->insertInset(cursor.pos(), inset);
// Just to rebreak and refresh correctly.
++endpit;
}
- setUndo(bv(), Undo::DELETE, selection.start.par(),
+ recordUndo(bv(), Undo::DELETE, selection.start.par(),
boost::prior(undoendpit));
if (!CutAndPaste::checkPastePossible())
return;
- setUndo(bv(), Undo::INSERT, cursor.par());
+ recordUndo(bv(), Undo::INSERT, cursor.par());
ParagraphList::iterator endpit;
PitPosPair ppp;
cursor.par(), cursor.pos(),
bv()->buffer()->params.textclass,
sel_index, el);
- parseErrors(*bv()->buffer(), el);
+ bufferErrors(*bv()->buffer(), el);
bv()->showErrorList(_("Paste"));
redoParagraphs(cursor, endpit);
// simple replacing. The font of the first selected character is used
void LyXText::replaceSelectionWithString(string const & str)
{
- setCursorParUndo(bv());
+ recordUndo(bv(), Undo::ATOMIC);
freezeUndo();
if (!selection.set()) { // create a dummy selection
pos_type pos = cursor.pos();
ParagraphList::iterator endpit = boost::next(cursor.par());
- setCursorParUndo(bv());
+ recordUndo(bv(), Undo::ATOMIC);
// only to be sure, should not be neccessary
clearSelection();
{
LyXCursor tmpcursor;
- int y = 0;
pos_type z;
- RowList::iterator row = getRow(pit, pos, y);
+ RowList::iterator row = getRow(pit, pos);
RowList::iterator beg = rows().begin();
// is there a break one row above
- if (row != beg
- && boost::prior(row)->par() == row->par()) {
+ if (row != beg && boost::prior(row)->par() == row->par()) {
z = rowBreakPoint(*boost::prior(row));
if (z >= row->pos()) {
// set the dimensions of the row above
- y -= boost::prior(row)->height();
- postPaint(y);
+ postPaint();
breakAgain(boost::prior(row));
}
}
- int const tmpheight = row->height();
- pos_type const tmplast = lastPos(*this, row);
-
breakAgain(row);
- if (row->height() == tmpheight && lastPos(*this, row) == tmplast) {
- postRowPaint(row, y);
- } else {
- postPaint(y);
- }
-
- // check the special right address boxes
- if (pit->layout()->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
- tmpcursor.par(pit);
- tmpcursor.y(y);
- tmpcursor.x(0);
- tmpcursor.x_fix(0);
- tmpcursor.pos(pos);
- redoDrawingOfParagraph(tmpcursor);
- }
+ postPaint();
// set the cursor again. Otherwise dangling pointers are possible
// also set the selection
// returns false if inset wasn't found
-bool LyXText::updateInset(Inset * inset)
+bool LyXText::updateInset(InsetOld * inset)
{
// first check the current paragraph
int pos = cursor.par()->getPositionOfInset(inset);
cur.par(pit);
cur.pos(pos);
cur.boundary(boundary);
+ if (rows().empty())
+ return;
// get the cursor y position in text
int y = 0;
RowList::iterator beg = rows().begin();
RowList::iterator old_row = row;
- cur.irow(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
boost::prior(row)->par() == row->par() &&
pos < pit->size() &&
pit->getChar(pos) == Paragraph::META_INSET) {
- Inset * ins = pit->getInset(pos);
+ InsetOld * ins = pit->getInset(pos);
if (ins && (ins->needFullRow() || ins->display())) {
--row;
y -= row->height();
pos_type pos, pos_type last, bool boundary) const
{
pos_type cursor_vpos = 0;
- float x;
- float fill_separator;
- float fill_hfill;
- float fill_label_hfill;
+ int x;
+ int fill_separator;
+ int fill_hfill;
+ int fill_label_hfill;
// This call HAS to be here because of the BidiTables!!!
prepareToPrint(rit, x, fill_separator, fill_hfill,
fill_label_hfill);
pos_type
LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
{
- float tmpx = 0.0;
- float fill_separator;
- float fill_hfill;
- float fill_label_hfill;
+ int tmpx = 0;
+ int fill_separator;
+ int fill_hfill;
+ int fill_label_hfill;
- prepareToPrint(rit, tmpx, fill_separator,
- fill_hfill, fill_label_hfill);
+ prepareToPrint(rit, tmpx, fill_separator, fill_hfill, fill_label_hfill);
pos_type vc = rit->pos();
pos_type last = lastPrintablePos(*this, rit);
bool left_side = false;
pos_type body_pos = rit_par->beginningOfBody();
- float last_tmpx = tmpx;
+ int last_tmpx = tmpx;
if (body_pos > 0 &&
(body_pos - 1 > last ||
// check for empty row
if (!rit_par->size()) {
- x = int(tmpx);
+ x = tmpx;
return 0;
}
} else if (rit_par->isSeparator(c)) {
tmpx += singleWidth(rit_par, c);
if (c >= body_pos)
- tmpx+= fill_separator;
+ tmpx += fill_separator;
} else {
tmpx += singleWidth(rit_par, c);
}
void LyXText::setCursorFromCoordinates(int x, int y)
{
- LyXCursor old_cursor = cursor;
-
+ //LyXCursor old_cursor = cursor;
setCursorFromCoordinates(cursor, x, y);
setCurrentFont();
- deleteEmptyParagraphMechanism(old_cursor);
+#warning DEPM disabled, otherwise crash when entering new table
+ //deleteEmptyParagraphMechanism(old_cursor);
}
|| !cur.par()->isInset(cur.pos()))
return false;
- Inset const * inset = cur.par()->getInset(cur.pos());
+ InsetOld const * inset = cur.par()->getInset(cur.pos());
if (inset->needFullRow() || inset->display())
return true;
float x = getCursorX(next_row, cur.pos(), last, bound);
cur.ix(int(x));
cur.iy(y + row->height() + next_row->baseline());
- cur.irow(next_row);
} else {
cur.iy(cur.y());
cur.ix(cur.x());
- cur.irow(row);
}
cur.boundary(bound);
}
int y1 = cursor.iy() - topy;
int y2 = y1;
y -= topy;
- Inset * inset_hit = checkInsetHit(x, y1);
+ InsetOld * inset_hit = checkInsetHit(x, y1);
if (inset_hit && isHighlyEditableInset(inset_hit)) {
inset_hit->localDispatch(
FuncRequest(bv(), LFUN_INSET_EDIT, x, y - (y2 - y1), mouse_button::none));
{
#if 1
int x = cursor.x_fix();
- int y = cursor.y() - cursorRow()->baseline() +
- cursorRow()->height() + 1;
+ int y = cursor.y() - cursorRow()->baseline() + cursorRow()->height() + 1;
setCursorFromCoordinates(x, y);
- if (!selecting && cursorRow() == cursor.irow()) {
+ if (!selecting && cursorRow() == cursorIRow()) {
int topy = top_y();
int y1 = cursor.iy() - topy;
int y2 = y1;
y -= topy;
- Inset * inset_hit = checkInsetHit(x, y1);
+ InsetOld * inset_hit = checkInsetHit(x, y1);
if (inset_hit && isHighlyEditableInset(inset_hit)) {
FuncRequest cmd(bv(), LFUN_INSET_EDIT, x, y - (y2 - y1), mouse_button::none);
inset_hit->localDispatch(cmd);
&& selection.cursor.pos() == old_cursor.pos());
if (getRow(old_cursor) != rows().begin()) {
- RowList::iterator
- prevrow = boost::prior(getRow(old_cursor));
- postPaint(old_cursor.y() - getRow(old_cursor)->baseline() - prevrow->height());
+ 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
++endpit;
}
- setUndo(bv(), Undo::DELETE, old_cursor.par(),
+ recordUndo(bv(), Undo::DELETE, old_cursor.par(),
boost::prior(endpit));
cursor = tmpcursor;
setHeightOfRow(prevrow);
} else {
RowList::iterator nextrow = boost::next(getRow(old_cursor));
- postPaint(old_cursor.y() - getRow(old_cursor)->baseline());
+ postPaint();
tmpcursor = cursor;
cursor = old_cursor; // that undo can restore the right cursor position
++endpit;
}
- setUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
+ recordUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
cursor = tmpcursor;
// delete old row
}
-LyXText::refresh_status LyXText::refreshStatus() const
+bool LyXText::needRefresh() const
{
- return refresh_status_;
+ return need_refresh_;
}
void LyXText::clearPaint()
{
- refresh_status_ = REFRESH_NONE;
- refresh_row = rows().end();
- refresh_y = 0;
-}
-
-
-void LyXText::postPaint(int start_y)
-{
- refresh_status old = refresh_status_;
-
- refresh_status_ = REFRESH_AREA;
- refresh_row = rows().end();
-
- 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->cursorRow(), t->cursor.y() - t->cursorRow()->baseline());
+ need_refresh_ = false;
}
-// FIXME: we should probably remove this y parameter,
-// make refresh_y be 0, and use row->y etc.
-void LyXText::postRowPaint(RowList::iterator rit, int start_y)
+void LyXText::postPaint()
{
- 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 = rit;
-
- if (!inset_owner)
- return;
+ need_refresh_ = true;
// 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->cursorRow(), t->cursor.y() - t->cursorRow()->baseline());
+ if (inset_owner)
+ bv()->text->postPaint();
}
projects / lyx.git / blobdiff