#include <config.h>
#include "lyxtext.h"
-#include "lyxrow.h"
#include "paragraph.h"
#include "BufferView.h"
#include "funcrequest.h"
bv()->owner()->message(_("No more insets"));
}
}
- update();
+ bv()->update();
selection.cursor = cursor;
}
{
int y = top_y();
- if (cursorRow() == rows().begin()) {
+ RowList::iterator rit = cursorRow();
+
+ if (rit == firstRow()) {
if (y > 0)
bv()->updateScrollbar();
return;
}
- RowList::iterator cursorrow = cursorRow();
-
setCursorFromCoordinates(cursor.x_fix(), y);
finishUndo();
int new_y;
- if (cursorrow == bv()->text->cursorRow()) {
+ if (rit == bv()->text->cursorRow()) {
// we have a row which is taller than the workarea. The
// simplest solution is to move to the previous row instead.
cursorUp(true);
if (inset_owner) {
new_y = bv()->text->cursor.iy()
+ bv()->theLockingInset()->insetInInsetY() + y
- + cursorRow()->height()
+ + rit->height()
- bv()->workHeight() + 1;
} else {
new_y = cursor.y()
- - cursorRow()->baseline()
- + cursorRow()->height()
+ - rit->baseline()
+ + rit->height()
- bv()->workHeight() + 1;
}
}
- //bv()->screen().draw(bv()->text, bv(), new_y < 0 ? 0 : new_y);
- if (cursorRow() != rows().begin()) {
- LyXCursor cur;
- setCursor(cur, boost::prior(cursorRow())->par(),
- boost::prior(cursorRow())->pos(), false);
- if (cur.y() > top_y()) {
- cursorUp(true);
- }
- }
+
+ LyXCursor cur;
+ ParagraphList::iterator pit = cursor.par();
+ previousRow(pit, rit);
+ setCursor(cur, pit, rit->pos(), false);
+ if (cur.y() > top_y())
+ cursorUp(true);
bv()->updateScrollbar();
}
{
int topy = top_y();
- if (boost::next(cursorRow()) == rows().end()) {
- int y = cursor.y() - cursorRow()->baseline() +
- cursorRow()->height();
- if (y > topy + bv()->workHeight()) {
- //bv()->screen().draw(bv()->text, bv(), bv()->text->top_y() + bv()->workHeight());
+ RowList::iterator rit = cursorRow();
+ if (rit == lastRow()) {
+ int y = cursor.y() - rit->baseline() + cursorRow()->height();
+ if (y > topy + bv()->workHeight())
bv()->updateScrollbar();
- }
return;
}
+ bv()->theLockingInset()->insetInInsetY());
}
- getRowNearY(y);
+ ParagraphList::iterator dummypit;
+ getRowNearY(y, dummypit);
- RowList::iterator cursorrow = cursorRow();
setCursorFromCoordinates(cursor.x_fix(), y);
// + bv->workHeight());
finishUndo();
int new_y;
- if (cursorrow == bv()->text->cursorRow()) {
+ if (rit == bv()->text->cursorRow()) {
// we have a row which is taller than the workarea. The
// simplest solution is to move to the next row instead.
cursorDown(true);
if (inset_owner) {
new_y = bv()->text->cursor.iy()
+ bv()->theLockingInset()->insetInInsetY()
- + y - cursorRow()->baseline();
+ + y - rit->baseline();
} else {
- new_y = cursor.y() - cursorRow()->baseline();
- }
- }
- //bv()->screen().draw(bv()->text, bv(), new_y);
-
- RowList::iterator next_row = boost::next(cursorRow());
- if (next_row != rows().end()) {
- LyXCursor cur;
- setCursor(cur, next_row->par(), next_row->pos(), false);
- if (cur.y() < top_y() + bv()->workHeight()) {
- cursorDown(true);
+ new_y = cursor.y() - cursorRow()->baseline();
}
}
+
+ ParagraphList::iterator pit = cursor.par();
+ nextRow(pit, rit);
+ LyXCursor cur;
+ setCursor(cur, pit, rit->pos(), false);
+ if (cur.y() < top_y() + bv()->workHeight())
+ cursorDown(true);
bv()->updateScrollbar();
}
-void LyXText::update()
-{
- bv()->update();
-}
-
namespace {
void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
{
- lt->update();
+ bv->update();
InsetSpecialChar * new_inset = new InsetSpecialChar(kind);
replaceSelection(lt);
if (!bv->insertInset(new_inset))
if (tmp->params().startOfAppendix()) {
recordUndo(bv, Undo::ATOMIC, tmp);
tmp->params().startOfAppendix(false);
- int tmpy;
- setHeightOfRow(getRow(tmp, 0, tmpy));
+ setHeightOfRow(tmp, getRow(tmp, 0));
break;
}
}
// we can set the refreshing parameters now
updateCounters();
- redoHeightOfParagraph();
+ redoParagraph(cursor.par());
setCursor(cursor.par(), cursor.pos());
- update();
+ bv->update();
break;
}
case LFUN_DELETE_WORD_FORWARD:
bv->beforeChange(this);
deleteWordForward();
- update();
finishChange(bv);
break;
case LFUN_DELETE_WORD_BACKWARD:
bv->beforeChange(this);
deleteWordBackward();
- update();
finishChange(bv);
break;
case LFUN_DELETE_LINE_FORWARD:
bv->beforeChange(this);
deleteLineForward();
- update();
finishChange(bv);
break;
else
cursorRightOneWord();
finishChange(bv);
- update();
break;
case LFUN_WORDLEFT:
}
moveCursorUpdate(bv, false);
bv->owner()->view_state_changed();
- bv->switchKeyMap();
break;
case LFUN_DELETE_SKIP:
} else {
cutSelection(true, false);
}
- update();
+ bv->update();
break;
}
bv->owner()->view_state_changed();
bv->switchKeyMap();
- update();
+ bv->update();
break;
case LFUN_BACKSPACE_SKIP:
selection.cursor = cur;
}
} else {
- update();
cutSelection(true, false);
}
- update();
+ bv->update();
break;
case LFUN_BREAKPARAGRAPH:
replaceSelection(bv->getLyXText());
breakParagraph(bv->buffer()->paragraphs, 0);
- update();
+ bv->update();
selection.cursor = cursor;
bv->switchKeyMap();
bv->owner()->view_state_changed();
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
replaceSelection(bv->getLyXText());
breakParagraph(bv->buffer()->paragraphs, 1);
- update();
+ bv->update();
selection.cursor = cursor;
bv->switchKeyMap();
bv->owner()->view_state_changed();
else {
breakParagraph(bv->buffer()->paragraphs, 0);
}
- update();
+ bv->update();
selection.cursor = cur;
bv->switchKeyMap();
bv->owner()->view_state_changed();
if (cur_spacing != new_spacing || cur_value != new_value) {
pit->params().spacing(Spacing(new_spacing, new_value));
redoParagraph();
- update();
+ bv->update();
}
break;
}
case LFUN_INSET_TOGGLE:
bv->beforeChange(this);
- update();
toggleInset();
- update();
+ bv->update();
bv->switchKeyMap();
break;
case LFUN_SPACE_INSERT:
- if (cursor.par()->layout()->free_spacing) {
+ if (cursor.par()->layout()->free_spacing)
insertChar(' ');
- update();
- } else {
+ else
doInsertInset(this, cmd, false, false);
- }
moveCursorUpdate(bv, false);
break;
case LFUN_MARK_OFF:
bv->beforeChange(this);
- update();
+ bv->update();
selection.cursor = cursor;
cmd.message(N_("Mark off"));
break;
case LFUN_MARK_ON:
bv->beforeChange(this);
selection.mark(true);
- update();
+ bv->update();
selection.cursor = cursor;
cmd.message(N_("Mark on"));
break;
cmd.message(N_("Mark set"));
}
selection.cursor = cursor;
- update();
+ bv->update();
break;
case LFUN_UPCASE_WORD:
- update();
changeCase(LyXText::text_uppercase);
- if (inset_owner)
- bv->updateInset();
- update();
+ bv->update();
break;
case LFUN_LOWCASE_WORD:
changeCase(LyXText::text_lowercase);
- if (inset_owner)
- bv->updateInset();
- update();
+ bv->update();
break;
case LFUN_CAPITALIZE_WORD:
changeCase(LyXText::text_capitalization);
- if (inset_owner)
- bv->updateInset();
- update();
+ bv->update();
break;
case LFUN_TRANSPOSE_CHARS:
recordUndo(bv, Undo::ATOMIC, cursor.par());
- if (transposeChars(cursor))
- checkParagraph(cursor.par(), cursor.pos());
- if (inset_owner)
- bv->updateInset();
- update();
+ redoParagraph();
+ bv->update();
break;
case LFUN_PASTE: {
}
pasteSelection(sel_index);
clearSelection(); // bug 393
- update();
+ bv->update();
bv->switchKeyMap();
break;
}
case LFUN_CUT:
cutSelection(true, true);
cmd.message(_("Cut"));
- update();
+ bv->update();
break;
case LFUN_COPY:
return UNDISPATCHED;
cursorTop();
finishChange(bv, true);
- update();
break;
case LFUN_ENDBUFSEL:
return UNDISPATCHED;
cursorBottom();
finishChange(bv, true);
- update();
break;
case LFUN_GETXY:
current_layout = layout;
setLayout(layout);
bv->owner()->setLayout(layout);
- update();
+ bv->update();
bv->switchKeyMap();
}
break;
else
insertStringAsLines(clip);
clearSelection();
- update();
+ bv->update();
}
break;
}
int const datetmp_len =
::strftime(datetmp, 32, arg.c_str(), now_tm);
- for (int i = 0; i < datetmp_len; i++) {
+ for (int i = 0; i < datetmp_len; i++)
insertChar(datetmp[i]);
- update();
- }
+
selection.cursor = cursor;
moveCursorUpdate(bv, false);
break;
if (!isInInset() && bv->theLockingInset())
break;
if (cmd.button() == mouse_button::button1) {
- if (!isInInset())
- bv->screen().toggleSelection(this, bv);
cursorHome();
selection.cursor = cursor;
cursorEnd();
setSelection();
- if (!isInInset())
- bv->screen().toggleSelection(this, bv, false);
- update();
+ bv->update();
bv->haveSelection(selection.set());
}
break;
if (!isInInset() && bv->theLockingInset())
break;
if (cmd.button() == mouse_button::button1) {
- if (!isInInset()) {
- bv->screen().toggleSelection(this, bv);
- selectWord(lyx::WHOLE_WORD_STRICT);
- bv->screen().toggleSelection(this, bv, false);
- } else {
- selectWord(lyx::WHOLE_WORD_STRICT);
- }
- update();
+ selectWord(lyx::WHOLE_WORD_STRICT);
+ bv->update();
bv->haveSelection(selection.set());
}
break;
bv->text->setSelection();
bv->update();
- bv->fitCursor();
break;
}
selection_possible = true;
// Clear the selection
- bv->screen().toggleSelection(bv->text, bv);
bv->text->clearSelection();
bv->update();
bv->updateScrollbar();
// stack. They don't *have* to
// alter the document...
// (Joacim)
- // ...or maybe the SetCursorParUndo()
+ // ...or maybe the recordUndo()
// below isn't necessary at all anylonger?
if (inset_hit->lyxCode() == InsetOld::REF_CODE)
recordUndo(bv, Undo::ATOMIC);
bv->owner()->getIntl().getTransManager().
TranslateAndInsert(*cit, this);
- update();
selection.cursor = cursor;
moveCursorUpdate(bv, false);
case LFUN_INSET_CAPTION:
#endif
case LFUN_INSERT_NOTE:
+ case LFUN_INSERT_BRANCH:
case LFUN_INSERT_BIBITEM:
case LFUN_INSET_ERT:
case LFUN_INSET_FLOAT:
projects / lyx.git / blobdiff