#include "BufferView.h"
#include "funcrequest.h"
#include "lyxrc.h"
+#include "Lsstream.h"
#include "debug.h"
#include "bufferparams.h"
#include "buffer.h"
#include "intl.h"
#include "box.h"
#include "language.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
#include "frontends/LyXView.h"
#include "frontends/screen.h"
#include "frontends/Dialogs.h"
#include "insets/insettext.h"
#include "insets/insetquotes.h"
#include "insets/insetcommand.h"
+#include "insets/insetnewline.h"
#include "undo_funcs.h"
+#include "text_funcs.h"
+#include "Lsstream.h"
#include <ctime>
#include <clocale>
using std::endl;
using std::find;
using std::vector;
+using lyx::pos_type;
extern string current_layout;
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
LyXText * lt = bv->getLyXText();
if (selecting || lt->selection.mark()) {
- lt->setSelection(bv);
- if (lt->isTopLevel())
- bv->toggleToggle();
+ lt->setSelection();
+ if (lt->isInInset())
+ bv->updateInset(lt->inset_owner);
else
- bv->updateInset(lt->inset_owner, false);
+ bv->toggleToggle();
}
- if (lt->isTopLevel()) {
- //if (fitcur)
- // bv->update(lt, BufferView::SELECT|BufferView::FITCUR);
- //else
- bv->update(lt, BufferView::SELECT|BufferView::FITCUR);
- bv->showCursor();
- } else if (bv->text->status() != LyXText::UNCHANGED) {
- bv->theLockingInset()->hideInsetCursor(bv);
- bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
- bv->showCursor();
+ if (!lt->isInInset()) {
+ bv->update(lt, BufferView::SELECT);
+ } else if (bv->text->refreshStatus() != LyXText::REFRESH_NONE) {
+ bv->update(BufferView::SELECT);
}
if (!lt->selection.set())
// check if the given co-ordinates are inside an inset at the
// given cursor, if one exists. If so, the inset is returned,
// and the co-ordinates are made relative. Otherwise, 0 is returned.
- Inset * checkInset(BufferView * bv, LyXText const & text,
+ Inset * checkInset(BufferView * bv, LyXText & text,
LyXCursor const & cur, int & x, int & y)
{
lyx::pos_type const pos = cur.pos();
- Paragraph /*const*/ & par = *cur.par();
+ ParagraphList::iterator par = cur.par();
- if (pos >= par.size() || !par.isInset(pos))
+ if (pos >= par->size() || !par->isInset(pos))
return 0;
- Inset /*const*/ * inset = par.getInset(pos);
+ Inset /*const*/ * inset = par->getInset(pos);
if (!isEditableInset(inset))
return 0;
// get inset dimensions
- lyx::Assert(par.getInset(pos));
+ lyx::Assert(par->getInset(pos));
- LyXFont const & font = text.getFont(bv->buffer(), &par, pos);
+ LyXFont const & font = text.getFont(bv->buffer(), par, pos);
int const width = inset->width(bv, font);
int const inset_x = font.isVisibleRightToLeft()
return 0;
}
- text.setCursor(bv, &par, pos, true);
+ text.setCursor(par, pos, true);
x -= b.x1;
// The origin of an inset is on the baseline
} // anon namespace
-Inset * LyXText::checkInsetHit(BufferView * bv, int & x, int & y) const
+Inset * LyXText::checkInsetHit(int & x, int & y)
{
- int y_tmp = y + first_y;
+ int y_tmp = y + top_y();
LyXCursor cur;
- setCursorFromCoordinates(bv, cur, x, y_tmp);
+ setCursorFromCoordinates(cur, x, y_tmp);
- Inset * inset = checkInset(bv, *this, cur, x, y_tmp);
+ Inset * inset = checkInset(bv(), *this, cur, x, y_tmp);
if (inset) {
y = y_tmp;
return inset;
return 0;
// move back one
- setCursor(bv, cur, cur.par(), cur.pos() - 1, true);
+ setCursor(cur, cur.par(), cur.pos() - 1, true);
- inset = checkInset(bv, *this, cur, x, y_tmp);
+ inset = checkInset(bv(), *this, cur, x, y_tmp);
if (inset)
y = y_tmp;
return inset;
}
-bool LyXText::gotoNextInset(BufferView * bv,
- vector<Inset::Code> const & codes, string const & contents) const
+bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
+ string const & contents)
{
- LyXCursor res = cursor;
+ ParagraphList::iterator end = ownerParagraphs().end();
+ ParagraphList::iterator pit = cursor.par();
+ pos_type pos = cursor.pos();
+
Inset * inset;
do {
- if (res.pos() < res.par()->size() - 1) {
- res.pos(res.pos() + 1);
+ if (pos + 1 < pit->size()) {
+ ++pos;
} else {
- res.par(res.par()->next());
- res.pos(0);
+ ++pit;
+ pos = 0;
}
- } while (res.par() &&
- !(res.par()->isInset(res.pos())
- && (inset = res.par()->getInset(res.pos())) != 0
- && find(codes.begin(), codes.end(), inset->lyxCode())
- != codes.end()
- && (contents.empty() ||
- static_cast<InsetCommand *>(
- res.par()->getInset(res.pos()))->getContents()
- == contents)));
-
- if (res.par()) {
- setCursor(bv, res.par(), res.pos(), false);
+ } while (pit != end &&
+ !(pit->isInset(pos) &&
+ (inset = pit->getInset(pos)) != 0 &&
+ find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() &&
+ (contents.empty() ||
+ static_cast<InsetCommand *>(pit->getInset(pos))->getContents()
+ == contents)));
+
+ if (pit != end) {
+ setCursor(pit, pos, false);
return true;
}
return false;
}
-void LyXText::gotoInset(BufferView * bv, vector<Inset::Code> const & codes,
- bool same_content)
+void LyXText::gotoInset(vector<Inset::Code> const & codes,
+ bool same_content)
{
- bv->hideCursor();
- bv->beforeChange(this);
- update(bv, false);
+ bv()->beforeChange(this);
+ update();
string contents;
- if (same_content && cursor.par()->isInset(cursor.pos())) {
+ if (same_content && cursor.pos() < cursor.par()->size()
+ && cursor.par()->isInset(cursor.pos())) {
Inset const * inset = cursor.par()->getInset(cursor.pos());
if (find(codes.begin(), codes.end(), inset->lyxCode())
!= codes.end())
contents = static_cast<InsetCommand const *>(inset)->getContents();
}
- if (!gotoNextInset(bv, codes, contents)) {
- if (cursor.pos() || cursor.par() != ownerParagraph()) {
+ if (!gotoNextInset(codes, contents)) {
+ if (cursor.pos() || cursor.par() != ownerParagraphs().begin()) {
LyXCursor tmp = cursor;
- cursor.par(ownerParagraph());
+ cursor.par(ownerParagraphs().begin());
cursor.pos(0);
- if (!gotoNextInset(bv, codes, contents)) {
+ if (!gotoNextInset(codes, contents)) {
cursor = tmp;
- bv->owner()->message(_("No more insets"));
+ bv()->owner()->message(_("No more insets"));
}
} else {
- bv->owner()->message(_("No more insets"));
+ bv()->owner()->message(_("No more insets"));
}
}
- update(bv, false);
+ update();
selection.cursor = cursor;
}
-void LyXText::gotoInset(BufferView * bv, Inset::Code code, bool same_content)
+void LyXText::gotoInset(Inset::Code code, bool same_content)
{
- gotoInset(bv, vector<Inset::Code>(1, code), same_content);
+ gotoInset(vector<Inset::Code>(1, code), same_content);
}
-void LyXText::cursorPrevious(BufferView * bv)
+void LyXText::cursorPrevious()
{
- if (!cursor.row()->previous()) {
- if (first_y > 0) {
- int new_y = bv->text->first_y - bv->workHeight();
- bv->screen().draw(bv->text, bv, new_y < 0 ? 0 : new_y);
- bv->updateScrollbar();
+ int y = top_y();
+
+ if (cursor.row() == rows().begin()) {
+ if (y > 0) {
+ int new_y = bv()->text->top_y() - bv()->workHeight();
+ bv()->screen().draw(bv()->text, bv(), new_y < 0 ? 0 : new_y);
+ bv()->updateScrollbar();
}
return;
}
- int y = first_y;
- Row * cursorrow = cursor.row();
+ RowList::iterator cursorrow = cursor.row();
- setCursorFromCoordinates(bv, cursor.x_fix(), y);
+ setCursorFromCoordinates(cursor.x_fix(), y);
finishUndo();
int new_y;
- if (cursorrow == bv->text->cursor.row()) {
+ if (cursorrow == bv()->text->cursor.row()) {
// we have a row which is taller than the workarea. The
// simplest solution is to move to the previous row instead.
- cursorUp(bv, true);
+ cursorUp(true);
return;
// This is what we used to do, so we wouldn't skip right past
// tall rows, but it's not working right now.
#if 0
- new_y = bv->text->first_y - bv->workHeight();
+ new_y = bv->text->top_y() - bv->workHeight();
#endif
} else {
if (inset_owner) {
- new_y = bv->text->cursor.iy()
- + bv->theLockingInset()->insetInInsetY() + y
+ new_y = bv()->text->cursor.iy()
+ + bv()->theLockingInset()->insetInInsetY() + y
+ cursor.row()->height()
- - bv->workHeight() + 1;
+ - bv()->workHeight() + 1;
} else {
new_y = cursor.y()
- cursor.row()->baseline()
+ cursor.row()->height()
- - bv->workHeight() + 1;
+ - bv()->workHeight() + 1;
}
}
- bv->screen().draw(bv->text, bv, new_y < 0 ? 0 : new_y);
- if (cursor.row()->previous()) {
+ bv()->screen().draw(bv()->text, bv(), new_y < 0 ? 0 : new_y);
+ if (cursor.row() != rows().begin()) {
LyXCursor cur;
- setCursor(bv, cur, cursor.row()->previous()->par(),
- cursor.row()->previous()->pos(), false);
- if (cur.y() > first_y) {
- cursorUp(bv, true);
+ setCursor(cur, boost::prior(cursor.row())->par(),
+ boost::prior(cursor.row())->pos(), false);
+ if (cur.y() > top_y()) {
+ cursorUp(true);
}
}
- bv->updateScrollbar();
+ bv()->updateScrollbar();
}
-void LyXText::cursorNext(BufferView * bv)
+void LyXText::cursorNext()
{
- if (!cursor.row()->next()) {
+ int topy = top_y();
+
+ if (boost::next(cursor.row()) == rows().end()) {
int y = cursor.y() - cursor.row()->baseline() +
cursor.row()->height();
- if (y > int(first_y + bv->workHeight())) {
- bv->screen().draw(bv->text, bv,
- bv->text->first_y + bv->workHeight());
- bv->updateScrollbar();
+ if (y > topy + bv()->workHeight()) {
+ bv()->screen().draw(bv()->text, bv(), bv()->text->top_y() + bv()->workHeight());
+ bv()->updateScrollbar();
}
return;
}
- int y = first_y + bv->workHeight();
- if (inset_owner && !first_y) {
- y -= (bv->text->cursor.iy()
- - bv->text->first_y
- + bv->theLockingInset()->insetInInsetY());
+ int y = topy + bv()->workHeight();
+ if (inset_owner && !topy) {
+ y -= (bv()->text->cursor.iy()
+ - bv()->text->top_y()
+ + bv()->theLockingInset()->insetInInsetY());
}
getRowNearY(y);
- Row * cursorrow = cursor.row();
- setCursorFromCoordinates(bv, cursor.x_fix(), y);
+ RowList::iterator cursorrow = cursor.row();
+ setCursorFromCoordinates(cursor.x_fix(), y);
// + bv->workHeight());
finishUndo();
int new_y;
- if (cursorrow == bv->text->cursor.row()) {
+ if (cursorrow == bv()->text->cursor.row()) {
// we have a row which is taller than the workarea. The
// simplest solution is to move to the next row instead.
- cursorDown(bv, true);
+ cursorDown(true);
return;
// This is what we used to do, so we wouldn't skip right past
// tall rows, but it's not working right now.
#if 0
- new_y = bv->text->first_y + bv->workHeight();
+ new_y = bv->text->top_y() + bv->workHeight();
#endif
} else {
if (inset_owner) {
- new_y = bv->text->cursor.iy()
- + bv->theLockingInset()->insetInInsetY()
+ new_y = bv()->text->cursor.iy()
+ + bv()->theLockingInset()->insetInInsetY()
+ y - cursor.row()->baseline();
} else {
new_y = cursor.y() - cursor.row()->baseline();
}
}
- bv->screen().draw(bv->text, bv, new_y);
- if (cursor.row()->next()) {
+ bv()->screen().draw(bv()->text, bv(), new_y);
+ if (boost::next(cursor.row()) != rows().end()) {
LyXCursor cur;
- setCursor(bv, cur, cursor.row()->next()->par(),
- cursor.row()->next()->pos(), false);
- if (cur.y() < int(first_y + bv->workHeight())) {
- cursorDown(bv, true);
+ setCursor(cur, boost::next(cursor.row())->par(),
+ boost::next(cursor.row())->pos(), false);
+ if (cur.y() < top_y() + bv()->workHeight()) {
+ cursorDown(true);
}
}
- bv->updateScrollbar();
+ bv()->updateScrollbar();
}
-void LyXText::update(BufferView * bv, bool changed)
+void LyXText::update()
{
- BufferView::UpdateCodes c = BufferView::SELECT | BufferView::FITCUR;
- if (changed)
- bv->update(this, c | BufferView::CHANGE);
- else
- bv->update(this, c);
+ bv()->update(this, BufferView::SELECT);
}
namespace {
void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
{
- bv->hideCursor();
- lt->update(bv);
+ lt->update();
InsetSpecialChar * new_inset = new InsetSpecialChar(kind);
if (!bv->insertInset(new_inset))
delete new_inset;
else
- bv->updateInset(new_inset, true);
+ bv->updateInset(new_inset);
}
{
Inset * inset = createInset(cmd);
BufferView * bv = cmd.view();
-
+
if (inset) {
bool gotsel = false;
if (lt->selection.set()) {
- lt->cutSelection(bv, true, false);
+ lt->cutSelection(true, false);
gotsel = true;
}
if (bv->insertInset(inset)) {
- if (edit)
- inset->edit(bv);
+ if (edit) {
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, "left");
+ inset->localDispatch(cmd);
+ }
if (gotsel && pastesel)
bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION));
}
switch (cmd.action) {
case LFUN_APPENDIX: {
- Paragraph * par = cursor.par();
- bool start = !par->params().startOfAppendix();
+ ParagraphList::iterator pit = cursor.par();
+ bool start = !pit->params().startOfAppendix();
// ensure that we have only one start_of_appendix in this document
- Paragraph * tmp = ownerParagraph();
- for (; tmp; tmp = tmp->next()) {
+ ParagraphList::iterator tmp = ownerParagraphs().begin();
+ ParagraphList::iterator end = ownerParagraphs().end();
+
+ for (; tmp != end; ++tmp) {
if (tmp->params().startOfAppendix()) {
- setUndo(bv, Undo::EDIT, tmp, tmp->next());
+ setUndo(bv, Undo::EDIT, tmp);
tmp->params().startOfAppendix(false);
+ int tmpy;
+ setHeightOfRow(getRow(tmp, 0, tmpy));
break;
}
}
- setUndo(bv, Undo::EDIT, par, par->next());
- par->params().startOfAppendix(start);
+ setUndo(bv, Undo::EDIT, pit);
+ pit->params().startOfAppendix(start);
// we can set the refreshing parameters now
- status(cmd.view(), LyXText::NEED_MORE_REFRESH);
- refresh_y = 0;
- refresh_row = 0; // not needed for full update
- updateCounters(cmd.view());
- setCursor(cmd.view(), cursor.par(), cursor.pos());
- update(bv);
+ updateCounters();
+ redoHeightOfParagraph();
+ postPaint(0);
+ setCursor(cursor.par(), cursor.pos());
+ update();
break;
}
case LFUN_DELETE_WORD_FORWARD:
bv->beforeChange(this);
- update(bv, false);
- deleteWordForward(bv);
- update(bv);
+ update();
+ deleteWordForward();
+ update();
finishChange(bv);
break;
case LFUN_DELETE_WORD_BACKWARD:
bv->beforeChange(this);
- update(bv, false);
- deleteWordBackward(bv);
- update(bv, true);
+ update();
+ deleteWordBackward();
+ update();
finishChange(bv);
break;
case LFUN_DELETE_LINE_FORWARD:
bv->beforeChange(this);
- update(bv, false);
- deleteLineForward(bv);
- update(bv);
- finishChange(bv);
- break;
-
- case LFUN_SHIFT_TAB:
- case LFUN_TAB:
- if (!selection.mark())
- bv->beforeChange(this);
- update(bv, false);
- cursorTab(bv);
+ update();
+ deleteLineForward();
+ update();
finishChange(bv);
break;
case LFUN_WORDRIGHT:
if (!selection.mark())
bv->beforeChange(this);
- update(bv, false);
+ update();
if (cursor.par()->isRightToLeftPar(bv->buffer()->params))
- cursorLeftOneWord(bv);
+ cursorLeftOneWord();
else
- cursorRightOneWord(bv);
+ cursorRightOneWord();
finishChange(bv);
break;
case LFUN_WORDLEFT:
if (!selection.mark())
bv->beforeChange(this);
- update(bv, false);
+ update();
if (cursor.par()->isRightToLeftPar(bv->buffer()->params))
- cursorRightOneWord(bv);
+ cursorRightOneWord();
else
- cursorLeftOneWord(bv);
+ cursorLeftOneWord();
finishChange(bv);
break;
case LFUN_BEGINNINGBUF:
if (!selection.mark())
bv->beforeChange(this);
- update(bv, false);
- cursorTop(bv);
+ update();
+ cursorTop();
finishChange(bv);
break;
case LFUN_ENDBUF:
if (selection.mark())
bv->beforeChange(this);
- update(bv, false);
- cursorBottom(bv);
+ update();
+ cursorBottom();
finishChange(bv);
break;
case LFUN_RIGHTSEL:
- update(bv, false);
+ update();
if (cursor.par()->isRightToLeftPar(bv->buffer()->params))
cursorLeft(bv);
else
break;
case LFUN_LEFTSEL:
- update(bv, false);
+ update();
if (cursor.par()->isRightToLeftPar(bv->buffer()->params))
cursorRight(bv);
else
break;
case LFUN_UPSEL:
- update(bv, false);
- cursorUp(bv, true);
+ update();
+ cursorUp(true);
finishChange(bv, true);
break;
case LFUN_DOWNSEL:
- update(bv, false);
- cursorDown(bv, true);
+ update();
+ cursorDown(true);
finishChange(bv, true);
break;
case LFUN_UP_PARAGRAPHSEL:
- update(bv, false);
- cursorUpParagraph(bv);
+ update();
+ cursorUpParagraph();
finishChange(bv, true);
break;
case LFUN_DOWN_PARAGRAPHSEL:
- update(bv, false);
- cursorDownParagraph(bv);
+ update();
+ cursorDownParagraph();
finishChange(bv, true);
break;
case LFUN_PRIORSEL:
- update(bv, false);
- cursorPrevious(bv);
+ update();
+ cursorPrevious();
finishChange(bv, true);
break;
case LFUN_NEXTSEL:
- update(bv, false);
- cursorNext(bv);
+ update();
+ cursorNext();
finishChange(bv, true);
break;
case LFUN_HOMESEL:
- update(bv, false);
- cursorHome(bv);
+ update();
+ cursorHome();
finishChange(bv, true);
break;
case LFUN_ENDSEL:
- update(bv, false);
- cursorEnd(bv);
+ update();
+ cursorEnd();
finishChange(bv, true);
break;
case LFUN_WORDRIGHTSEL:
- update(bv, false);
+ update();
if (cursor.par()->isRightToLeftPar(bv->buffer()->params))
- cursorLeftOneWord(bv);
+ cursorLeftOneWord();
else
- cursorRightOneWord(bv);
+ cursorRightOneWord();
finishChange(bv, true);
break;
case LFUN_WORDLEFTSEL:
- update(bv, false);
+ update();
if (cursor.par()->isRightToLeftPar(bv->buffer()->params))
- cursorRightOneWord(bv);
+ cursorRightOneWord();
else
- cursorLeftOneWord(bv);
+ cursorLeftOneWord();
finishChange(bv, true);
break;
case LFUN_WORDSEL: {
- update(bv, false);
+ update();
LyXCursor cur1;
LyXCursor cur2;
getWord(cur1, cur2, WHOLE_WORD);
- setCursor(bv, cur1.par(), cur1.pos());
+ setCursor(cur1.par(), cur1.pos());
bv->beforeChange(this);
- setCursor(bv, cur2.par(), cur2.pos());
+ setCursor(cur2.par(), cur2.pos());
finishChange(bv, true);
break;
}
bool is_rtl = cursor.par()->isRightToLeftPar(bv->buffer()->params);
if (!selection.mark())
bv->beforeChange(this);
- update(bv, false);
+ update();
if (is_rtl)
- cursorLeft(bv, false);
+ cursorLeft(false);
if (cursor.pos() < cursor.par()->size()
&& cursor.par()->isInset(cursor.pos())
&& isHighlyEditableInset(cursor.par()->getInset(cursor.pos()))) {
Inset * tmpinset = cursor.par()->getInset(cursor.pos());
cmd.message(tmpinset->editMessage());
- tmpinset->edit(bv, !is_rtl);
+ FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "right" : "left");
+ tmpinset->localDispatch(cmd1);
break;
}
if (!is_rtl)
- cursorRight(bv, false);
+ cursorRight(false);
finishChange(bv);
break;
}
bool const is_rtl = cursor.par()->isRightToLeftPar(bv->buffer()->params);
if (!selection.mark())
bv->beforeChange(this);
- update(bv, false);
+ update();
LyXCursor const cur = cursor;
if (!is_rtl)
- cursorLeft(bv, false);
+ cursorLeft(false);
if ((is_rtl || cur != cursor) && // only if really moved!
cursor.pos() < cursor.par()->size() &&
cursor.par()->isInset(cursor.pos()) &&
isHighlyEditableInset(cursor.par()->getInset(cursor.pos()))) {
Inset * tmpinset = cursor.par()->getInset(cursor.pos());
cmd.message(tmpinset->editMessage());
- tmpinset->edit(bv, is_rtl);
+ FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "left" : "right");
+ tmpinset->localDispatch(cmd1);
break;
}
if (is_rtl)
- cursorRight(bv, false);
+ cursorRight(false);
finishChange(bv);
break;
}
if (!selection.mark())
bv->beforeChange(this);
bv->update(this, BufferView::UPDATE);
- cursorUpParagraph(bv);
+ cursorUpParagraph();
finishChange(bv);
break;
if (!selection.mark())
bv->beforeChange(this);
bv->update(this, BufferView::UPDATE);
- cursorDownParagraph(bv);
+ cursorDownParagraph();
finishChange(bv, false);
break;
if (!selection.mark())
bv->beforeChange(this);
bv->update(this, BufferView::UPDATE);
- cursorPrevious(bv);
+ cursorPrevious();
finishChange(bv, false);
// was:
// finishUndo();
if (!selection.mark())
bv->beforeChange(this);
bv->update(this, BufferView::UPDATE);
- cursorNext(bv);
+ cursorNext();
finishChange(bv, false);
break;
case LFUN_HOME:
if (!selection.mark())
bv->beforeChange(this);
- update(bv);
- cursorHome(bv);
+ update();
+ cursorHome();
finishChange(bv, false);
break;
case LFUN_END:
if (!selection.mark())
bv->beforeChange(this);
- update(bv);
- cursorEnd(bv);
+ update();
+ cursorEnd();
finishChange(bv, false);
break;
- case LFUN_BREAKLINE:
+ case LFUN_BREAKLINE: {
+ lyx::pos_type body = cursor.par()->beginningOfBody();
+
+ // Not allowed by LaTeX (labels or empty par)
+ if (cursor.pos() <= body)
+ break;
+
bv->beforeChange(this);
- insertChar(bv, Paragraph::META_NEWLINE);
- update(bv, true);
- setCursor(bv, cursor.par(), cursor.pos());
+ insertInset(new InsetNewline);
+ update();
+ setCursor(cursor.par(), cursor.pos());
moveCursorUpdate(bv, false);
break;
+ }
case LFUN_DELETE:
if (!selection.set()) {
- Delete(bv);
+ Delete();
selection.cursor = cursor;
- update(bv);
+ update();
// It is possible to make it a lot faster still
// just comment out the line below...
- bv->showCursor();
} else {
- update(bv, false);
+ update();
cutSelection(bv, true);
- update(bv);
+ update();
}
moveCursorUpdate(bv, false);
bv->owner()->view_state_changed();
if (cur.pos() == 0
&& !(cur.par()->params().spaceTop()
== VSpace (VSpace::NONE))) {
- setParagraph(bv,
+ setParagraph(
cur.par()->params().lineTop(),
cur.par()->params().lineBottom(),
cur.par()->params().pagebreakTop(),
cur.par()->params().align(),
cur.par()->params().labelWidthString(), 0);
cursorLeft(bv);
- update(bv);
+ update();
} else {
cursorLeft(bv);
- Delete(bv);
+ Delete();
selection.cursor = cursor;
}
} else {
- Delete(bv);
+ Delete();
selection.cursor = cursor;
}
} else {
- update(bv, false);
+ update();
cutSelection(bv, true);
}
- update(bv);
+ update();
break;
case LFUN_BACKSPACE:
if (!selection.set()) {
if (bv->owner()->getIntl().getTransManager().backspace()) {
- backspace(bv);
+ backspace();
selection.cursor = cursor;
- update(bv);
+ update();
// It is possible to make it a lot faster still
// just comment out the line below...
- bv->showCursor();
}
} else {
- update(bv, false);
+ update();
cutSelection(bv, true);
- update(bv);
+ update();
}
bv->owner()->view_state_changed();
bv->switchKeyMap();
if (cur.pos() == 0
&& !(cur.par()->params().spaceTop()
== VSpace (VSpace::NONE))) {
- setParagraph(bv,
+ setParagraph(
cur.par()->params().lineTop(),
cur.par()->params().lineBottom(),
cur.par()->params().pagebreakTop(),
cur.par()->params().align(),
cur.par()->params().labelWidthString(), 0);
} else {
- backspace(bv);
+ backspace();
selection.cursor = cur;
}
} else {
- update(bv, false);
+ update();
cutSelection(bv, true);
}
- update(bv);
+ update();
break;
case LFUN_BREAKPARAGRAPH:
bv->beforeChange(this);
- breakParagraph(bv, 0);
- update(bv);
+ breakParagraph(bv->buffer()->paragraphs, 0);
+ update();
selection.cursor = cursor;
bv->switchKeyMap();
bv->owner()->view_state_changed();
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
bv->beforeChange(this);
- breakParagraph(bv, 1);
- update(bv);
+ breakParagraph(bv->buffer()->paragraphs, 1);
+ update();
selection.cursor = cursor;
bv->switchKeyMap();
bv->owner()->view_state_changed();
bv->beforeChange(this);
if (cur.pos() == 0) {
if (cur.par()->params().spaceTop() == VSpace(VSpace::NONE)) {
- setParagraph(bv,
+ setParagraph(
cur.par()->params().lineTop(),
cur.par()->params().lineBottom(),
cur.par()->params().pagebreakTop(),
cur.par()->params().spacing(),
cur.par()->params().align(),
cur.par()->params().labelWidthString(), 1);
- //update(bv);
}
}
else {
- breakParagraph(bv, 0);
- //update(bv);
+ breakParagraph(bv->buffer()->paragraphs, 0);
}
- update(bv);
+ update();
selection.cursor = cur;
bv->switchKeyMap();
bv->owner()->view_state_changed();
}
case LFUN_PARAGRAPH_SPACING: {
- Paragraph * par = cursor.par();
- Spacing::Space cur_spacing = par->params().spacing().getSpace();
+ ParagraphList::iterator pit = cursor.par();
+ Spacing::Space cur_spacing = pit->params().spacing().getSpace();
float cur_value = 1.0;
if (cur_spacing == Spacing::Other)
- cur_value = par->params().spacing().getValue();
+ cur_value = pit->params().spacing().getValue();
- istringstream is(cmd.argument.c_str());
+ istringstream is(STRCONV(cmd.argument));
string tmp;
is >> tmp;
Spacing::Space new_spacing = cur_spacing;
<< cmd.argument << endl;
}
if (cur_spacing != new_spacing || cur_value != new_value) {
- par->params().spacing(Spacing(new_spacing, new_value));
- redoParagraph(bv);
- update(bv);
+ pit->params().spacing(Spacing(new_spacing, new_value));
+ redoParagraph();
+ update();
}
break;
}
+ case LFUN_INSET_SETTINGS:
+ lyx::Assert(bv->theLockingInset());
+ bv->theLockingInset()->getLockingInset()->showInsetDialog(bv);
+ break;
+
case LFUN_INSET_TOGGLE:
- bv->hideCursor();
bv->beforeChange(this);
- update(bv, false);
- toggleInset(bv);
- update(bv, false);
+ update();
+ toggleInset();
+ update();
bv->switchKeyMap();
break;
- case LFUN_PROTECTEDSPACE:
+ case LFUN_SPACE_INSERT:
if (cursor.par()->layout()->free_spacing) {
- insertChar(bv, ' ');
- update(bv);
+ insertChar(' ');
+ update();
} else {
- specialChar(this, bv, InsetSpecialChar::PROTECTED_SEPARATOR);
+ doInsertInset(this, cmd, false, false);
}
moveCursorUpdate(bv, false);
break;
specialChar(this, bv, InsetSpecialChar::LDOTS);
break;
- case LFUN_HFILL:
- bv->hideCursor();
- update(bv, false);
- insertChar(bv, Paragraph::META_HFILL);
- update(bv);
- break;
-
case LFUN_END_OF_SENTENCE:
specialChar(this, bv, InsetSpecialChar::END_OF_SENTENCE);
break;
case LFUN_MARK_OFF:
bv->beforeChange(this);
- update(bv, false);
+ update();
selection.cursor = cursor;
cmd.message(N_("Mark off"));
break;
case LFUN_MARK_ON:
bv->beforeChange(this);
selection.mark(true);
- update(bv, false);
+ update();
selection.cursor = cursor;
cmd.message(N_("Mark on"));
break;
case LFUN_SETMARK:
bv->beforeChange(this);
if (selection.mark()) {
- update(bv);
+ update();
cmd.message(N_("Mark removed"));
} else {
selection.mark(true);
- update(bv);
+ update();
cmd.message(N_("Mark set"));
}
selection.cursor = cursor;
break;
case LFUN_UPCASE_WORD:
- update(bv, false);
- changeCase(*bv, LyXText::text_uppercase);
+ update();
+ changeCase(LyXText::text_uppercase);
if (inset_owner)
- bv->updateInset(inset_owner, true);
- update(bv);
+ bv->updateInset(inset_owner);
+ update();
break;
case LFUN_LOWCASE_WORD:
- update(bv, false);
- changeCase(*bv, LyXText::text_lowercase);
+ update();
+ changeCase(LyXText::text_lowercase);
if (inset_owner)
- bv->updateInset(inset_owner, true);
- update(bv);
+ bv->updateInset(inset_owner);
+ update();
break;
case LFUN_CAPITALIZE_WORD:
- update(bv, false);
- changeCase(*bv, LyXText::text_capitalization);
+ update();
+ changeCase(LyXText::text_capitalization);
if (inset_owner)
- bv->updateInset(inset_owner, true);
- update(bv);
+ bv->updateInset(inset_owner);
+ update();
break;
case LFUN_TRANSPOSE_CHARS:
- update(bv, false);
- transposeChars(*bv);
+ update();
+ transposeChars(*this, cursor);
if (inset_owner)
- bv->updateInset(inset_owner, true);
- update(bv);
+ bv->updateInset(inset_owner);
+ update();
break;
case LFUN_PASTE:
cmd.message(_("Paste"));
- bv->hideCursor();
// clear the selection
bv->toggleSelection();
clearSelection();
- update(bv, false);
- pasteSelection(bv);
+ update();
+ pasteSelection();
clearSelection(); // bug 393
- update(bv, false);
- update(bv);
+ update();
bv->switchKeyMap();
break;
case LFUN_CUT:
- bv->hideCursor();
- update(bv, false);
+ update();
cutSelection(bv, true);
- update(bv);
+ update();
cmd.message(_("Cut"));
break;
case LFUN_COPY:
- copySelection(bv);
+ copySelection();
cmd.message(_("Copy"));
break;
case LFUN_BEGINNINGBUFSEL:
if (inset_owner)
return UNDISPATCHED;
- update(bv, false);
- cursorTop(bv);
+ update();
+ cursorTop();
finishChange(bv, true);
break;
case LFUN_ENDBUFSEL:
if (inset_owner)
return UNDISPATCHED;
- update(bv, false);
- cursorBottom(bv);
+ update();
+ cursorBottom();
finishChange(bv, true);
break;
case LFUN_SETXY: {
int x = 0;
int y = 0;
- istringstream is(cmd.argument.c_str());
+ istringstream is(STRCONV(cmd.argument));
is >> x >> y;
if (!is)
lyxerr << "SETXY: Could not parse coordinates in '"
<< cmd.argument << std::endl;
else
- setCursorFromCoordinates(bv, x, y);
+ setCursorFromCoordinates(x, y);
break;
}
}
bool change_layout = (current_layout != layout);
+
if (!change_layout && selection.set() &&
selection.start.par() != selection.end.par())
{
- Paragraph * spar = selection.start.par();
- Paragraph * epar = selection.end.par()->next();
- while (spar != epar) {
- if (spar->layout()->name() != current_layout) {
+ ParagraphList::iterator spit = selection.start.par();
+ ParagraphList::iterator epit = boost::next(selection.end.par());
+ while (spit != epit) {
+ if (spit->layout()->name() != current_layout) {
change_layout = true;
break;
}
- spar = spar->next();
+ ++spit;
}
}
+
if (change_layout) {
- bv->hideCursor();
current_layout = layout;
- update(bv, false);
- setLayout(bv, layout);
+ update();
+ setLayout(layout);
bv->owner()->setLayout(layout);
- update(bv);
+ update();
bv->switchKeyMap();
}
break;
case LFUN_PASTESELECTION: {
if (!bv->buffer())
break;
- bv->hideCursor();
// this was originally a beforeChange(bv->text), i.e
// the outermost LyXText!
bv->beforeChange(this);
string const clip = bv->getClipboard();
if (!clip.empty()) {
if (cmd.argument == "paragraph")
- insertStringAsParagraphs(bv, clip);
+ insertStringAsParagraphs(clip);
else
- insertStringAsLines(bv, clip);
+ insertStringAsLines(clip);
clearSelection();
- update(bv);
+ update();
}
break;
}
case LFUN_GOTOERROR:
- gotoInset(bv, Inset::ERROR_CODE, false);
+ gotoInset(Inset::ERROR_CODE, false);
break;
case LFUN_GOTONOTE:
- gotoInset(bv, Inset::NOTE_CODE, false);
+ gotoInset(Inset::NOTE_CODE, false);
break;
case LFUN_REFERENCE_GOTO:
vector<Inset::Code> tmp;
tmp.push_back(Inset::LABEL_CODE);
tmp.push_back(Inset::REF_CODE);
- gotoInset(bv, tmp, true);
+ gotoInset(tmp, true);
break;
}
case LFUN_QUOTE: {
- Paragraph const * par = cursor.par();
+ ParagraphList::iterator pit = cursor.par();
lyx::pos_type pos = cursor.pos();
char c;
if (!pos)
c = ' ';
- else if (par->isInset(pos - 1) && par->getInset(pos - 1)->isSpace())
+ else if (pit->isInset(pos - 1) && pit->getInset(pos - 1)->isSpace())
c = ' ';
else
- c = par->getChar(pos - 1);
+ c = pit->getChar(pos - 1);
- bv->hideCursor();
- LyXLayout_ptr const & style = par->layout();
+ LyXLayout_ptr const & style = pit->layout();
if (style->pass_thru ||
- par->getFontSettings(bv->buffer()->params,
+ pit->getFontSettings(bv->buffer()->params,
pos).language()->lang() == "hebrew" ||
(!bv->insertInset(new InsetQuotes(c, bv->buffer()->params))))
bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
::strftime(datetmp, 32, arg.c_str(), now_tm);
for (int i = 0; i < datetmp_len; i++) {
- insertChar(bv, datetmp[i]);
- update(bv, true);
+ insertChar(datetmp[i]);
+ update();
}
selection.cursor = cursor;
moveCursorUpdate(bv, false);
case LFUN_MOUSE_TRIPLE:
if (!bv->buffer())
break;
- if (isTopLevel() && bv->theLockingInset())
+ if (!isInInset() && bv->theLockingInset())
break;
if (cmd.button() == mouse_button::button1) {
- if (isTopLevel()) {
- bv->screen().hideCursor();
+ if (!isInInset()) {
bv->screen().toggleSelection(this, bv);
}
- cursorHome(bv);
+ cursorHome();
selection.cursor = cursor;
- cursorEnd(bv);
- setSelection(bv);
- if (isTopLevel())
+ cursorEnd();
+ setSelection();
+ if (!isInInset())
bv->screen().toggleSelection(this, bv, false);
- update(bv, false);
+ update();
bv->haveSelection(selection.set());
}
break;
case LFUN_MOUSE_DOUBLE:
if (!bv->buffer())
break;
- if (isTopLevel() && bv->theLockingInset())
+ if (!isInInset() && bv->theLockingInset())
break;
if (cmd.button() == mouse_button::button1) {
- if (isTopLevel()) {
- bv->screen().hideCursor();
+ if (!isInInset()) {
bv->screen().toggleSelection(this, bv);
- selectWord(bv, LyXText::WHOLE_WORD_STRICT);
+ selectWord(LyXText::WHOLE_WORD_STRICT);
bv->screen().toggleSelection(this, bv, false);
} else {
- selectWord(bv, LyXText::WHOLE_WORD_STRICT);
+ selectWord(LyXText::WHOLE_WORD_STRICT);
}
- update(bv, false);
+ update();
bv->haveSelection(selection.set());
}
break;
Inset * tli = bv->theLockingInset();
LyXCursor cursor = bv->text->cursor;
LyXFont font = bv->text->getFont(bv->buffer(),
- cursor.par(), cursor.pos());
+ cursor.par(), cursor.pos());
int width = tli->width(bv, font);
int inset_x = font.isVisibleRightToLeft()
? cursor.ix() - width : cursor.ix();
int start_x = inset_x + tli->scroll();
FuncRequest cmd1 = cmd;
cmd1.x = cmd.x - start_x;
- cmd1.y = cmd.y - cursor.iy() + bv->text->first_y;
+ cmd1.y = cmd.y - cursor.iy() + bv->text->top_y();
tli->localDispatch(cmd1);
break;
}
break;
}
- bv->screen().hideCursor();
-
- Row * cursorrow = bv->text->cursor.row();
- bv->text->setCursorFromCoordinates(bv, cmd.x, cmd.y + bv->text->first_y);
+ RowList::iterator cursorrow = bv->text->cursor.row();
+ bv->text->setCursorFromCoordinates(cmd.x, cmd.y + bv->text->top_y());
#if 0
// sorry for this but I have a strange error that the y value jumps at
// a certain point. This seems like an error in my xforms library or
#endif
// This is to allow jumping over large insets
if (cursorrow == bv->text->cursor.row()) {
- if (cmd.y >= int(bv->workHeight()))
- bv->text->cursorDown(bv, false);
+ if (cmd.y >= bv->workHeight())
+ bv->text->cursorDown(false);
else if (cmd.y < 0)
- bv->text->cursorUp(bv, false);
+ bv->text->cursorUp(false);
}
// Maybe an empty line was deleted
if (!bv->text->selection.set())
- bv->update(bv->text, BufferView::UPDATE);
- bv->text->setSelection(bv);
+ bv->update(BufferView::UPDATE);
+ bv->text->setSelection();
bv->screen().toggleToggle(bv->text, bv);
bv->fitCursor();
- bv->showCursor();
break;
}
int x = cmd.x;
int y = cmd.y;
- Inset * inset_hit = bv->text->checkInsetHit(bv, x, y);
+ Inset * inset_hit = bv->text->checkInsetHit(x, y);
// Middle button press pastes if we have a selection
// We do this here as if the selection was inside an inset
paste_internally = true;
}
- int const screen_first = bv->text->first_y;
+ int const screen_first = bv->text->top_y();
if (bv->theLockingInset()) {
// We are in inset locking mode
if (!inset_hit)
selection_possible = true;
- bv->screen().hideCursor();
// Clear the selection
bv->screen().toggleSelection(bv->text, bv);
bv->text->clearSelection();
- bv->text->fullRebreak(bv);
+ bv->text->fullRebreak();
bv->update();
bv->updateScrollbar();
// Highly editable inset, like math
UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
selection_possible = false;
- bv->owner()->updateLayoutChoice();
bv->owner()->message(inset->editMessage());
- //inset->edit(bv, x, y, cmd.button());
// We just have to lock the inset before calling a PressEvent on it!
- // we don't need the edit() call here! (Jug20020329)
if (!bv->lockInset(inset))
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());
}
if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
- bv->text->setCursorFromCoordinates(bv, x, y + screen_first);
+ bv->text->setCursorFromCoordinates(x, y + screen_first);
finishUndo();
bv->text->selection.cursor = bv->text->cursor;
bv->text->cursor.x_fix(bv->text->cursor.x());
- bv->owner()->updateLayoutChoice();
if (bv->fitCursor())
selection_possible = false;
// inset, inset_hit is 0, and inset_x == x, inset_y == y.
int x = cmd.x;
int y = cmd.y;
- Inset * inset_hit = bv->text->checkInsetHit(bv, x, y);
+ Inset * inset_hit = bv->text->checkInsetHit(x, y);
if (bv->theLockingInset()) {
// We are in inset locking mode.
bv->owner()->message(inset_hit->editMessage());
- if (isHighlyEditableInset(inset_hit)) {
- // Highly editable inset, like math
- UpdatableInset * inset = (UpdatableInset *) inset_hit;
- FuncRequest cmd1(bv, LFUN_MOUSE_RELEASE, x, y, cmd.button());
- inset->localDispatch(cmd1);
- } else {
- FuncRequest cmd1(bv, LFUN_MOUSE_RELEASE, x, y, cmd.button());
- inset_hit->localDispatch(cmd1);
- // IMO this is a gross hack! Insets should be changed so that
- // they call the actions they have to do with the insetButtonRel.
- // function and not in the edit(). This should be changed
- // (Jug 20020329)
-#ifdef WITH_WARNINGS
-#warning Please remove donot call inset->edit() here (Jug 20020812)
-#endif
- inset_hit->edit(bv, x, y, cmd.button());
- }
- break;
+ FuncRequest cmd1(bv, LFUN_MOUSE_RELEASE, x, y, cmd.button());
+ inset_hit->localDispatch(cmd1);
}
break;
if (lyxrc.auto_region_delete) {
if (selection.set()) {
- cutSelection(bv, false, false);
- update(bv);
+ cutSelection(false, false);
+ update();
}
bv->haveSelection(false);
}
bv->owner()->getIntl().getTransManager().
TranslateAndInsert(*cit, this);
- update(bv);
+ update();
selection.cursor = cursor;
moveCursorUpdate(bv, false);
case LFUN_HTMLURL: {
InsetCommandParams p("htmlurl");
- string const data = InsetCommandMailer::params2string(p);
+ string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
break;
}
case LFUN_URL: {
InsetCommandParams p("url");
- string const data = InsetCommandMailer::params2string(p);
+ string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
break;
}
case LFUN_INSET_WIDE_FLOAT:
case LFUN_INSET_WRAP:
case LFUN_TABULAR_INSERT:
+ case LFUN_ENVIRONMENT_INSERT:
// Open the inset, and move the current selection
// inside it.
doInsertInset(this, cmd, true, true);
break;
- case LFUN_INSERT_URL:
- case LFUN_INSET_EXTERNAL:
case LFUN_INDEX_INSERT:
// Just open the inset
doInsertInset(this, cmd, true, false);
case LFUN_INDEX_PRINT:
case LFUN_PARENTINSERT:
case LFUN_TOC_INSERT:
+ case LFUN_HFILL:
// do nothing fancy
doInsertInset(this, cmd, false, false);
break;
projects / lyx.git / blobdiff