break;
}
- if (token == "\\the_end") {
- lex.printError("\\the_end read in inset! Error in document!");
+ if (token == "\\end_document") {
+ lex.printError("\\end_document read in inset! Error in document!");
return;
}
return;
}
+ bv->hideCursor();
+
if (!owner())
x += scroll();
}
if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
- inset_x = cix(bv) - x + drawTextXOffset;
+ inset_x = cix() - x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
x += TEXT_TO_INSET_OFFSET;
- RowList::iterator rowit = text_.rows().begin();
+ RowList::iterator rit = text_.rows().begin();
RowList::iterator end = text_.rows().end();
- int y_offset = baseline - rowit->ascent_of_text();
- int ph = pain.paperHeight();
+ int y_offset = baseline - rit->ascent_of_text();
+ int y2 = pain.paperHeight();
int first = 0;
int y = y_offset;
- while (rowit != end && y + rowit->height() <= 0) {
- y += rowit->height();
- first += rowit->height();
- ++rowit;
+ while (rit != end && y + rit->height() <= 0) {
+ y += rit->height();
+ first += rit->height();
+ ++rit;
}
if (y_offset < 0) {
text_.top_y(-y_offset);
first = 0;
}
- int yf = y_offset + first;
- y = 0;
-
- bv->hideCursor();
+ int yo = y_offset + first;
- while (rowit != end && yf < ph) {
- paintRows(*bv, text_, rowit,
- y + y_offset + first, int(x), y + text_.top_y());
- y += rowit->height();
- yf += rowit->height();
- ++rowit;
- }
+ paintRows(*bv, text_, rit, x, 0, yo, y2, yo);
text_.clearPaint();
- if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
+ if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked))
drawFrame(pain, int(start_x));
- }
- if (need_update != INIT) {
+ if (need_update != INIT)
need_update = NONE;
- }
}
}
-void InsetText::lockInset(BufferView * bv, UpdatableInset * inset)
+void InsetText::lockInset(BufferView * /*bv*/, UpdatableInset * inset)
{
the_locking_inset = inset;
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
inset_pos = cpos();
inset_par = cpar();
if (the_locking_inset && the_locking_inset == inset) {
if (cpar() == inset_par && cpos() == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
return false;
found = tl_inset->updateInsetInInset(bv, inset);
ustat = FULL;
- } else {
+ } else {
text_.updateInset(tl_inset);
setUpdateStatus(ustat);
}
if (the_locking_inset &&
cpar() == inset_par && cpos() == inset_pos)
{
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
}
if (cur == text_.cursor)
return;
text_.setSelection();
- bool flag = (text_.toggle_cursor.par() != text_.toggle_end_cursor.par() ||
- text_.toggle_cursor.pos() != text_.toggle_end_cursor.pos());
- if (flag) {
- updateLocal(bv, SELECTION, false);
- }
+ updateLocal(bv, SELECTION, false);
}
the_locking_inset->getCursor(bv, x, y);
return;
}
- x = cx(&bv);
+ x = cx();
y = cy() + InsetText::y();
}
the_locking_inset->getCursorPos(bv, x, y);
return;
}
- x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
+ x = cx() - top_x - TEXT_TO_INSET_OFFSET;
y = cy() - TEXT_TO_INSET_OFFSET;
}
the_locking_inset->fitInsetCursor(bv);
return;
}
- LyXFont const font = text_.getFont(bv->buffer(), cpar(), cpos());
+
+ LyXFont const font = text_.getFont(cpar(), cpos());
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
- if (bv->fitLockedInsetCursor(cx(bv), cy(), asc, desc))
+ if (bv->fitLockedInsetCursor(cx(), cy(), asc, desc))
need_update |= FULL;
}
x = dim_.wid;
if (y < 0)
y = dim_.des;
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
inset->localDispatch(cmd);
}
-int InsetText::cx(BufferView * bv) const
+int InsetText::cx() const
{
int x = text_.cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
- text_.cursor.pos());
+ LyXFont font = text_.getFont(text_.cursor.par(), text_.cursor.pos());
if (font.isVisibleRightToLeft())
x -= the_locking_inset->width();
}
}
-int InsetText::cix(BufferView * bv) const
+int InsetText::cix() const
{
int x = text_.cursor.ix() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
- text_.cursor.pos());
+ LyXFont font = text_.getFont(text_.cursor.par(), text_.cursor.pos());
if (font.isVisibleRightToLeft())
x -= the_locking_inset->width();
}
// seems to be unneeded
#if 1
if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
text_.init(bv);
restoreLyXTextState();
if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
text_.top_y(bv->screen().topCursorVisible(&text_));
void InsetText::toggleSelection(BufferView * bv, bool kill_selection)
{
- if (the_locking_inset) {
+ if (the_locking_inset)
the_locking_inset->toggleSelection(bv, kill_selection);
- }
int x = top_x + TEXT_TO_INSET_OFFSET;
- RowList::iterator rowit = text_.rows().begin();
+ RowList::iterator rit = text_.rows().begin();
RowList::iterator end = text_.rows().end();
- int y_offset = top_baseline - rowit->ascent_of_text();
+ int y_offset = top_baseline - rit->ascent_of_text();
int y = y_offset;
- while ((rowit != end) && ((y + rowit->height()) <= 0)) {
- y += rowit->height();
- ++rowit;
+ while (rit != end && y + rit->height() <= 0) {
+ y += rit->height();
+ ++rit;
}
if (y_offset < 0)
y_offset = y;
text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- return (result != lyx::find::SR_NOT_FOUND);
+ return result != lyx::find::SR_NOT_FOUND;
}
+
bool InsetText::searchBackward(BufferView * bv, string const & str,
bool cs, bool mw)
{
text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- return (result != lyx::find::SR_NOT_FOUND);
+ return result != lyx::find::SR_NOT_FOUND;
}