anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 15:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make LFUN_QUOTE work for InsetText.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1502 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-02-14 10:11:22 +00:00
parent a30e709a3b
commit 16a7d8015e
17 changed files with 108 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferView.C
View File

@ -211,9 +211,9 @@ bool BufferView::available() const
} }
void BufferView::beforeChange() void BufferView::beforeChange(LyXText * text)
{ {
pimpl_->beforeChange(); pimpl_->beforeChange(text);
} }

2
src/BufferView.h
View File

@ -92,7 +92,7 @@ public:
/// ///
LyXView * owner() const; LyXView * owner() const;
/// ///
void beforeChange(); void beforeChange(LyXText *);
/// ///
void savePosition(unsigned int i); void savePosition(unsigned int i);
/// ///

24
src/BufferView2.C
View File

@ -67,7 +67,7 @@ bool BufferView::insertLyXFile(string const & filen)
return false; return false;
} }
beforeChange(); beforeChange(text);
ifstream ifs(fname.c_str()); ifstream ifs(fname.c_str());
if (!ifs) { if (!ifs) {
@ -217,7 +217,7 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
text->SetCursorParUndo(buffer()); text->SetCursorParUndo(buffer());
text->FreezeUndo(); text->FreezeUndo();
beforeChange(); beforeChange(text);
if (!lout.empty()) { if (!lout.empty()) {
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
text->BreakParagraph(this); text->BreakParagraph(this);
@ -266,7 +266,7 @@ bool BufferView::insertInset(Inset * inset, string const & lout,
// Open and lock an updatable inset // Open and lock an updatable inset
bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind) bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
{ {
beforeChange(); beforeChange(text);
text->FinishUndo(); text->FinishUndo();
if (!insertInset(new_inset)) { if (!insertInset(new_inset)) {
delete new_inset; delete new_inset;
@ -293,7 +293,7 @@ bool BufferView::gotoLabel(string const & label)
vector<string> labels = (*it)->getLabelList(); vector<string> labels = (*it)->getLabelList();
if (find(labels.begin(),labels.end(),label) if (find(labels.begin(),labels.end(),label)
!= labels.end()) { != labels.end()) {
beforeChange(); beforeChange(text);
text->SetCursor(this, it.getPar(), it.getPos()); text->SetCursor(this, it.getPar(), it.getPos());
text->sel_cursor = text->cursor; text->sel_cursor = text->cursor;
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
@ -325,7 +325,7 @@ void BufferView::allFloats(char flag, char figmar)
&& cursor.par()->footnotekind != LyXParagraph::ALGORITHM))) && cursor.par()->footnotekind != LyXParagraph::ALGORITHM)))
toggleFloat(); toggleFloat();
else else
beforeChange(); beforeChange(text);
LyXCursor tmpcursor = cursor; LyXCursor tmpcursor = cursor;
cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos())); cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos()));
@ -408,7 +408,7 @@ void BufferView::openStuff()
if (available()) { if (available()) {
owner()->getMiniBuffer()->Set(_("Open/Close...")); owner()->getMiniBuffer()->Set(_("Open/Close..."));
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
text->OpenStuff(this); text->OpenStuff(this);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
@ -422,7 +422,7 @@ void BufferView::toggleFloat()
if (available()) { if (available()) {
owner()->getMiniBuffer()->Set(_("Open/Close...")); owner()->getMiniBuffer()->Set(_("Open/Close..."));
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
text->ToggleFootnote(this); text->ToggleFootnote(this);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
@ -436,7 +436,7 @@ void BufferView::menuUndo()
if (available()) { if (available()) {
owner()->getMiniBuffer()->Set(_("Undo")); owner()->getMiniBuffer()->Set(_("Undo"));
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
if (!text->TextUndo(this)) if (!text->TextUndo(this))
owner()->getMiniBuffer()->Set(_("No further undo information")); owner()->getMiniBuffer()->Set(_("No further undo information"));
@ -457,7 +457,7 @@ void BufferView::menuRedo()
if (available()) { if (available()) {
owner()->getMiniBuffer()->Set(_("Redo")); owner()->getMiniBuffer()->Set(_("Redo"));
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
if (!text->TextRedo(this)) if (!text->TextRedo(this))
owner()->getMiniBuffer()->Set(_("No further redo information")); owner()->getMiniBuffer()->Set(_("No further redo information"));
@ -627,7 +627,7 @@ void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
if (!available()) return; if (!available()) return;
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
string contents; string contents;
@ -695,7 +695,7 @@ void BufferView::selectLastWord()
if (!available()) return; if (!available()) return;
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
text->SelectSelectedWord(this); text->SelectSelectedWord(this);
toggleSelection(false); toggleSelection(false);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
@ -707,7 +707,7 @@ void BufferView::endOfSpellCheck()
if (!available()) return; if (!available()) return;
hideCursor(); hideCursor();
beforeChange(); beforeChange(text);
text->SelectSelectedWord(this); text->SelectSelectedWord(this);
text->ClearSelection(); text->ClearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);

21
src/BufferView_pimpl.C
View File

@ -295,7 +295,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
bv_->text->SetCursor(bv_, selstartpar, selstartpos); bv_->text->SetCursor(bv_, selstartpar, selstartpos);
bv_->text->sel_cursor = bv_->text->cursor; bv_->text->sel_cursor = bv_->text->cursor;
bv_->text->SetCursor(bv_, selendpar, selendpos); bv_->text->SetCursor(bv_, selendpar, selendpos);
bv_->text->SetSelection(); bv_->text->SetSelection(bv_);
bv_->text->SetCursor(bv_, par, pos); bv_->text->SetCursor(bv_, par, pos);
} else { } else {
bv_->text->SetCursor(bv_, par, pos); bv_->text->SetCursor(bv_, par, pos);
@ -522,7 +522,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
if (!bv_->text->selection) if (!bv_->text->selection)
update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
bv_->text->SetSelection(); bv_->text->SetSelection(bv_);
screen_->ToggleToggle(bv_->text, bv_); screen_->ToggleToggle(bv_->text, bv_);
fitCursor(bv_->text); fitCursor(bv_->text);
screen_->ShowCursor(bv_->text, bv_); screen_->ShowCursor(bv_->text, bv_);
@ -674,7 +674,7 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
text->CursorHome(bv_); text->CursorHome(bv_);
text->sel_cursor = text->cursor; text->sel_cursor = text->cursor;
text->CursorEnd(bv_); text->CursorEnd(bv_);
text->SetSelection(); text->SetSelection(bv_);
screen_->ToggleSelection(text, bv_, false); screen_->ToggleSelection(text, bv_, false);
/* This will fit the cursor on the screen /* This will fit the cursor on the screen
* if necessary */ * if necessary */
@ -1029,9 +1029,10 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
text->FullRebreak(bv_); text->FullRebreak(bv_);
if (text->inset_owner) if (text->inset_owner) {
text->inset_owner->SetUpdateStatus(bv_, InsetText::CURSOR_PAR);
bv_->updateInset(text->inset_owner, true); bv_->updateInset(text->inset_owner, true);
else } else
update(); update();
if ((f & FITCUR)) { if ((f & FITCUR)) {
@ -1141,10 +1142,10 @@ bool BufferView::Pimpl::available() const
} }
void BufferView::Pimpl::beforeChange() void BufferView::Pimpl::beforeChange(LyXText * text)
{ {
toggleSelection(); toggleSelection();
bv_->text->ClearSelection(); text->ClearSelection();
} }
@ -1167,7 +1168,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
string fname = saved_positions[i].filename; string fname = saved_positions[i].filename;
beforeChange(); beforeChange(bv_->text);
if (fname != buffer_->fileName()) { if (fname != buffer_->fileName()) {
Buffer * b = bufferlist.exists(fname) ? Buffer * b = bufferlist.exists(fname) ?
@ -1299,7 +1300,7 @@ void BufferView::Pimpl::toggleToggle()
void BufferView::Pimpl::center() void BufferView::Pimpl::center()
{ {
beforeChange(); beforeChange(bv_->text);
if (bv_->text->cursor.y() > static_cast<int>((workarea_->height() / 2))) { if (bv_->text->cursor.y() > static_cast<int>((workarea_->height() / 2))) {
screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_->height() / 2); screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_->height() / 2);
} else { } else {
@ -1315,7 +1316,7 @@ void BufferView::Pimpl::pasteClipboard(bool asPara)
if (!buffer_) return; if (!buffer_) return;
screen_->HideCursor(); screen_->HideCursor();
bv_->beforeChange(); beforeChange(bv_->text);
string const clip(workarea_->getClipboard()); string const clip(workarea_->getClipboard());

2
src/BufferView_pimpl.h
View File

@ -84,7 +84,7 @@ struct BufferView::Pimpl : public Object {
/// ///
bool available() const; bool available() const;
/// ///
void beforeChange(); void beforeChange(LyXText *);
/// ///
void savePosition(unsigned int i); void savePosition(unsigned int i);
/// ///

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2001-02-14 Juergen Vigna <jug@sad.it>
* lyxfunc.C (Dispatch): make LFUN_QUOTE work for InsetText.
* BufferView_pimpl.C (update): set updatestatus of inset if needed.
* text2.C (SetSelection): added a BufferView * parameter
2001-02-13 Juergen Vigna <jug@sad.it> 2001-02-13 Juergen Vigna <jug@sad.it>
* lyxfunc.C (Dispatch): fixed protected blank problem. * lyxfunc.C (Dispatch): fixed protected blank problem.

2
src/bufferview_funcs.C
View File

@ -108,7 +108,7 @@ void Melt(BufferView * bv)
bv->owner()->getMiniBuffer()->Set(_("Melt")); bv->owner()->getMiniBuffer()->Set(_("Melt"));
bv->hideCursor(); bv->hideCursor();
bv->beforeChange(); bv->beforeChange(bv->text);
bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR); bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
bv->text->MeltFootnoteEnvironment(bv); bv->text->MeltFootnoteEnvironment(bv);
bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2001-02-14 Juergen Vigna <jug@sad.it>
* insettext.C (SetUpdateStatus): added a BufferView * parameter.
2001-02-13 Juergen Vigna <jug@sad.it> 2001-02-13 Juergen Vigna <jug@sad.it>
* insettext.C (InsertInset): don't move left (is this right?) * insettext.C (InsertInset): don't move left (is this right?)

16
src/insets/insettext.C
View File

@ -450,8 +450,10 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit)
TEXT_TO_INSET_OFFSET; TEXT_TO_INSET_OFFSET;
} }
void InsetText::SetUpdateStatus(UpdateCodes what) void InsetText::SetUpdateStatus(BufferView * bv, UpdateCodes what)
{ {
if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH)
need_update = FULL;
if (what > need_update) if (what > need_update)
need_update = what; need_update = what;
} }
@ -718,7 +720,7 @@ void InsetText::InsetMotionNotify(BufferView * bv, int x, int y, int state)
HideInsetCursor(bv); HideInsetCursor(bv);
TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset, TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
y+insetAscent); y+insetAscent);
TEXT(bv)->SetSelection(); TEXT(bv)->SetSelection(bv);
if (TEXT(bv)->toggle_cursor.par()!=TEXT(bv)->toggle_end_cursor.par() || if (TEXT(bv)->toggle_cursor.par()!=TEXT(bv)->toggle_end_cursor.par() ||
TEXT(bv)->toggle_cursor.pos()!=TEXT(bv)->toggle_end_cursor.pos()) TEXT(bv)->toggle_cursor.pos()!=TEXT(bv)->toggle_end_cursor.pos())
UpdateLocal(bv, SELECTION, false); UpdateLocal(bv, SELECTION, false);
@ -841,7 +843,7 @@ InsetText::LocalDispatch(BufferView * bv,
case LFUN_RIGHTSEL: case LFUN_RIGHTSEL:
bv->text->FinishUndo(); bv->text->FinishUndo();
moveRight(bv, false, true); moveRight(bv, false, true);
TEXT(bv)->SetSelection(); TEXT(bv)->SetSelection(bv);
UpdateLocal(bv, SELECTION, false); UpdateLocal(bv, SELECTION, false);
break; break;
case LFUN_RIGHT: case LFUN_RIGHT:
@ -853,7 +855,7 @@ InsetText::LocalDispatch(BufferView * bv,
case LFUN_LEFTSEL: case LFUN_LEFTSEL:
bv->text->FinishUndo(); bv->text->FinishUndo();
moveLeft(bv, false, true); moveLeft(bv, false, true);
TEXT(bv)->SetSelection(); TEXT(bv)->SetSelection(bv);
UpdateLocal(bv, SELECTION, false); UpdateLocal(bv, SELECTION, false);
break; break;
case LFUN_LEFT: case LFUN_LEFT:
@ -865,7 +867,7 @@ InsetText::LocalDispatch(BufferView * bv,
case LFUN_DOWNSEL: case LFUN_DOWNSEL:
bv->text->FinishUndo(); bv->text->FinishUndo();
moveDown(bv); moveDown(bv);
TEXT(bv)->SetSelection(); TEXT(bv)->SetSelection(bv);
UpdateLocal(bv, SELECTION, false); UpdateLocal(bv, SELECTION, false);
break; break;
case LFUN_DOWN: case LFUN_DOWN:
@ -878,7 +880,7 @@ InsetText::LocalDispatch(BufferView * bv,
case LFUN_UPSEL: case LFUN_UPSEL:
bv->text->FinishUndo(); bv->text->FinishUndo();
moveUp(bv); moveUp(bv);
TEXT(bv)->SetSelection(); TEXT(bv)->SetSelection(bv);
UpdateLocal(bv, SELECTION, false); UpdateLocal(bv, SELECTION, false);
break; break;
case LFUN_UP: case LFUN_UP:
@ -1658,7 +1660,7 @@ void InsetText::resizeLyXText(BufferView * bv) const
selstartboundary); selstartboundary);
TEXT(bv)->sel_cursor = TEXT(bv)->cursor; TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
TEXT(bv)->SetCursor(bv, selendpar, selendpos, true, selendboundary); TEXT(bv)->SetCursor(bv, selendpar, selendpos, true, selendboundary);
TEXT(bv)->SetSelection(); TEXT(bv)->SetSelection(bv);
TEXT(bv)->SetCursor(bv, lpar, pos); TEXT(bv)->SetCursor(bv, lpar, pos);
} else { } else {
TEXT(bv)->SetCursor(bv, lpar, pos, true, boundary); TEXT(bv)->SetCursor(bv, lpar, pos, true, boundary);

2
src/insets/insettext.h
View File

@ -99,7 +99,7 @@ public:
/// ///
void update(BufferView *, LyXFont const &, bool =false); void update(BufferView *, LyXFont const &, bool =false);
/// ///
void SetUpdateStatus(UpdateCodes); void SetUpdateStatus(BufferView *, UpdateCodes);
/// ///
string const EditMessage() const; string const EditMessage() const;
/// ///

4
src/lyx_cb.C
View File

@ -505,7 +505,7 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
bv->hideCursor(); bv->hideCursor();
// clear the selection // clear the selection
bv->beforeChange(); bv->beforeChange(bv->text);
if (!asParagraph) if (!asParagraph)
bv->text->InsertStringA(bv, tmpstr); bv->text->InsertStringA(bv, tmpstr);
else else
@ -879,7 +879,7 @@ void FigureApplyCB(FL_OBJECT *, long)
current_view->hideCursor(); current_view->hideCursor();
current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR); current_view->update(current_view->text, BufferView::SELECT|BufferView::FITCUR);
current_view->beforeChange(); current_view->beforeChange(current_view->text);
current_view->text->SetCursorParUndo(current_view->buffer()); current_view->text->SetCursorParUndo(current_view->buffer());
current_view->text->FreezeUndo(); current_view->text->FreezeUndo();

2
src/lyxfr1.C
View File

@ -82,7 +82,7 @@ void SetSelectionOverLenChars(BufferView * bv, int len)
bv->text->sel_cursor = bv->text->cursor; bv->text->sel_cursor = bv->text->cursor;
for (int i = 0; i < len; ++i) for (int i = 0; i < len; ++i)
bv->text->CursorRight(bv); bv->text->CursorRight(bv);
bv->text->SetSelection(); bv->text->SetSelection(bv);
} }

70
src/lyxfunc.C
View File

@ -137,7 +137,7 @@ inline
void LyXFunc::moveCursorUpdate(LyXText * text, bool selecting) void LyXFunc::moveCursorUpdate(LyXText * text, bool selecting)
{ {
if (selecting || text->mark_set) { if (selecting || text->mark_set) {
text->SetSelection(); text->SetSelection(owner->view());
if (text->bv_owner) if (text->bv_owner)
owner->view()->toggleToggle(); owner->view()->toggleToggle();
} }
@ -1472,7 +1472,7 @@ string const LyXFunc::Dispatch(int ac,
LyXText * tmptext = owner->view()->text; LyXText * tmptext = owner->view()->text;
bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params); bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params);
if (!tmptext->mark_set) if (!tmptext->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
if (is_rtl) if (is_rtl)
tmptext->CursorLeft(owner->view(), false); tmptext->CursorLeft(owner->view(), false);
@ -1508,7 +1508,8 @@ string const LyXFunc::Dispatch(int ac,
// it simpler? (Lgb) // it simpler? (Lgb)
LyXText * txt = owner->view()->text; LyXText * txt = owner->view()->text;
bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params); bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params);
if (!txt->mark_set) owner->view()->beforeChange(); if (!txt->mark_set)
owner->view()->beforeChange(txt);
owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
LyXCursor cur = txt->cursor; LyXCursor cur = txt->cursor;
if (!is_rtl) if (!is_rtl)
@ -1545,7 +1546,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_UP: case LFUN_UP:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::UPDATE); owner->view()->update(owner->view()->text, BufferView::UPDATE);
owner->view()->text->CursorUp(owner->view()); owner->view()->text->CursorUp(owner->view());
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1555,7 +1556,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_DOWN: case LFUN_DOWN:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::UPDATE); owner->view()->update(owner->view()->text, BufferView::UPDATE);
owner->view()->text->CursorDown(owner->view()); owner->view()->text->CursorDown(owner->view());
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1565,7 +1566,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_UP_PARAGRAPH: case LFUN_UP_PARAGRAPH:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::UPDATE); owner->view()->update(owner->view()->text, BufferView::UPDATE);
owner->view()->text->CursorUpParagraph(owner->view()); owner->view()->text->CursorUpParagraph(owner->view());
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1575,7 +1576,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_DOWN_PARAGRAPH: case LFUN_DOWN_PARAGRAPH:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::UPDATE); owner->view()->update(owner->view()->text, BufferView::UPDATE);
owner->view()->text->CursorDownParagraph(owner->view()); owner->view()->text->CursorDownParagraph(owner->view());
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1585,7 +1586,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_PRIOR: case LFUN_PRIOR:
if (!text->mark_set) if (!text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::UPDATE); owner->view()->update(owner->view()->text, BufferView::UPDATE);
owner->view()->cursorPrevious(text); owner->view()->cursorPrevious(text);
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1600,7 +1601,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_NEXT: case LFUN_NEXT:
if (!text->mark_set) if (!text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::UPDATE); owner->view()->update(owner->view()->text, BufferView::UPDATE);
owner->view()->cursorNext(text); owner->view()->cursorNext(text);
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1615,7 +1616,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_HOME: case LFUN_HOME:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
owner->view()->text->CursorHome(owner->view()); owner->view()->text->CursorHome(owner->view());
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
@ -1625,7 +1626,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_END: case LFUN_END:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR); BufferView::SELECT|BufferView::FITCUR);
owner->view()->text->CursorEnd(owner->view()); owner->view()->text->CursorEnd(owner->view());
@ -1637,7 +1638,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_SHIFT_TAB: case LFUN_SHIFT_TAB:
case LFUN_TAB: case LFUN_TAB:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR); BufferView::SELECT|BufferView::FITCUR);
owner->view()->text->CursorTab(owner->view()); owner->view()->text->CursorTab(owner->view());
@ -1648,7 +1649,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_WORDRIGHT: case LFUN_WORDRIGHT:
if (!text->mark_set) if (!text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(text);
owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
text->CursorLeftOneWord(owner->view()); text->CursorLeftOneWord(owner->view());
@ -1665,7 +1666,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_WORDLEFT: case LFUN_WORDLEFT:
if (!text->mark_set) if (!text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(text);
owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
text->CursorRightOneWord(owner->view()); text->CursorRightOneWord(owner->view());
@ -1682,7 +1683,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_BEGINNINGBUF: case LFUN_BEGINNINGBUF:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR); BufferView::SELECT|BufferView::FITCUR);
owner->view()->text->CursorTop(owner->view()); owner->view()->text->CursorTop(owner->view());
@ -1693,7 +1694,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_ENDBUF: case LFUN_ENDBUF:
if (!owner->view()->text->mark_set) if (!owner->view()->text->mark_set)
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR); BufferView::SELECT|BufferView::FITCUR);
owner->view()->text->CursorBottom(owner->view()); owner->view()->text->CursorBottom(owner->view());
@ -1770,7 +1771,7 @@ string const LyXFunc::Dispatch(int ac,
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
#if 0 #if 0
if (text->inset_owner) { if (text->inset_owner) {
text->SetSelection(); text->SetSelection(owner->view());
owner->view()->updateInset(text->inset_owner, false); owner->view()->updateInset(text->inset_owner, false);
} else } else
#endif #endif
@ -1797,7 +1798,7 @@ string const LyXFunc::Dispatch(int ac,
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
#if 0 #if 0
if (text->inset_owner) { if (text->inset_owner) {
text->SetSelection(); text->SetSelection(owner->view());
owner->view()->updateInset(text->inset_owner, false); owner->view()->updateInset(text->inset_owner, false);
} else } else
#endif #endif
@ -1811,7 +1812,7 @@ string const LyXFunc::Dispatch(int ac,
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
#if 0 #if 0
if (text->inset_owner) { if (text->inset_owner) {
text->SetSelection(); text->SetSelection(owner->view());
owner->view()->updateInset(text->inset_owner, false); owner->view()->updateInset(text->inset_owner, false);
} else } else
#endif #endif
@ -1828,7 +1829,7 @@ string const LyXFunc::Dispatch(int ac,
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
#if 0 #if 0
if (text->inset_owner) { if (text->inset_owner) {
text->SetSelection(); text->SetSelection(owner->view());
owner->view()->updateInset(text->inset_owner, false); owner->view()->updateInset(text->inset_owner, false);
} else } else
#endif #endif
@ -1845,7 +1846,7 @@ string const LyXFunc::Dispatch(int ac,
owner->view()->text->FinishUndo(); owner->view()->text->FinishUndo();
#if 0 #if 0
if (text->inset_owner) { if (text->inset_owner) {
text->SetSelection(); text->SetSelection(owner->view());
owner->view()->updateInset(text->inset_owner, false); owner->view()->updateInset(text->inset_owner, false);
} else } else
#endif #endif
@ -1876,7 +1877,7 @@ string const LyXFunc::Dispatch(int ac,
// --- text changing commands ------------------------ // --- text changing commands ------------------------
case LFUN_BREAKLINE: case LFUN_BREAKLINE:
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE); owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@ -1901,11 +1902,11 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_SETMARK: case LFUN_SETMARK:
if (text->mark_set) { if (text->mark_set) {
owner->view()->beforeChange(); owner->view()->beforeChange(text);
owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
setMessage(N_("Mark removed")); setMessage(N_("Mark removed"));
} else { } else {
owner->view()->beforeChange(); owner->view()->beforeChange(text);
text->mark_set = 1; text->mark_set = 1;
owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
setMessage(N_("Mark set")); setMessage(N_("Mark set"));
@ -2022,7 +2023,7 @@ string const LyXFunc::Dispatch(int ac,
/* -------> Set mark off. */ /* -------> Set mark off. */
case LFUN_MARK_OFF: case LFUN_MARK_OFF:
owner->view()->beforeChange(); owner->view()->beforeChange(text);
owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
text->sel_cursor = text->cursor; text->sel_cursor = text->cursor;
setMessage(N_("Mark off")); setMessage(N_("Mark off"));
@ -2034,7 +2035,7 @@ string const LyXFunc::Dispatch(int ac,
/* -------> Set mark on. */ /* -------> Set mark on. */
case LFUN_MARK_ON: case LFUN_MARK_ON:
owner->view()->beforeChange(); owner->view()->beforeChange(text);
text->mark_set = 1; text->mark_set = 1;
owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR); owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
text->sel_cursor = text->cursor; text->sel_cursor = text->cursor;
@ -2101,7 +2102,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_BREAKPARAGRAPH: case LFUN_BREAKPARAGRAPH:
{ {
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->text->BreakParagraph(owner->view(), 0); owner->view()->text->BreakParagraph(owner->view(), 0);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@ -2114,7 +2115,7 @@ string const LyXFunc::Dispatch(int ac,
case LFUN_BREAKPARAGRAPHKEEPLAYOUT: case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
{ {
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
owner->view()->text->BreakParagraph(owner->view(), 1); owner->view()->text->BreakParagraph(owner->view(), 1);
owner->view()->update(owner->view()->text, owner->view()->update(owner->view()->text,
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@ -2133,7 +2134,7 @@ string const LyXFunc::Dispatch(int ac,
LyXCursor cursor = owner->view()->text->cursor; LyXCursor cursor = owner->view()->text->cursor;
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
if (cursor.pos() == 0) { if (cursor.pos() == 0) {
if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) { if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) {
owner->view()->text->SetParagraph owner->view()->text->SetParagraph
@ -2208,11 +2209,10 @@ string const LyXFunc::Dispatch(int ac,
break; break;
case LFUN_QUOTE: case LFUN_QUOTE:
owner->view()->beforeChange(); owner->view()->beforeChange(text);
owner->view()->text->InsertChar(owner->view(), '\"'); // This " matches the single quote in the code text->InsertChar(owner->view(), '\"'); // This " matches the single quote in the code
owner->view()->update(owner->view()->text, owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); moveCursorUpdate(text, false);
moveCursorUpdate(owner->view()->text, false);
break; break;
case LFUN_HTMLURL: case LFUN_HTMLURL:
@ -3057,7 +3057,7 @@ string const LyXFunc::Dispatch(int ac,
} }
} }
owner->view()->beforeChange(); owner->view()->beforeChange(owner->view()->text);
LyXFont const old_font(owner->view()->text->real_current_font); LyXFont const old_font(owner->view()->text->real_current_font);
for (string::size_type i = 0; for (string::size_type i = 0;
i < argument.length(); ++i) { i < argument.length(); ++i) {

2
src/lyxtext.h
View File

@ -231,7 +231,7 @@ public:
LyXCursor toggle_end_cursor; LyXCursor toggle_end_cursor;
/// need the selection cursor: /// need the selection cursor:
void SetSelection(); void SetSelection(BufferView *);
/// ///
void ClearSelection() const; void ClearSelection() const;
/// ///

4
src/mathed/math_symbols.C
View File

@ -340,7 +340,7 @@ bool math_insert_greek(BufferView * bv, char c)
if (!bv->theLockingInset() || bv->theLockingInset()->IsTextInset()) { if (!bv->theLockingInset() || bv->theLockingInset()->IsTextInset()) {
int greek_kb_flag_save = greek_kb_flag; int greek_kb_flag_save = greek_kb_flag;
InsetFormula * new_inset = new InsetFormula(); InsetFormula * new_inset = new InsetFormula();
bv->beforeChange(); bv->beforeChange(bv->text);
if (!bv->insertInset(new_inset)) { if (!bv->insertInset(new_inset)) {
delete new_inset; delete new_inset;
return false; return false;
@ -370,7 +370,7 @@ void math_insert_symbol(BufferView * bv, string const & s)
if (bv->available()) { if (bv->available()) {
if (!bv->theLockingInset() || bv->theLockingInset()->IsTextInset()) { if (!bv->theLockingInset() || bv->theLockingInset()->IsTextInset()) {
InsetFormula * new_inset = new InsetFormula(); InsetFormula * new_inset = new InsetFormula();
bv->beforeChange(); bv->beforeChange(bv->text);
if (!bv->insertInset(new_inset)) { if (!bv->insertInset(new_inset)) {
delete new_inset; delete new_inset;
return; return;

10
src/text.C
View File

@ -2412,7 +2412,7 @@ void LyXText::SelectWord(BufferView * bview)
SetCursor(bview, cursor.par(), cursor.pos() ); SetCursor(bview, cursor.par(), cursor.pos() );
// finally set the selection // finally set the selection
SetSelection(); SetSelection(bview);
} }
@ -2523,7 +2523,7 @@ void LyXText::SelectSelectedWord(BufferView * bview)
SetCursor(bview, cursor.par(), cursor.pos()); SetCursor(bview, cursor.par(), cursor.pos());
// finally set the selection // finally set the selection
SetSelection(); SetSelection(bview);
} }
@ -2540,7 +2540,7 @@ void LyXText::DeleteWordForward(BufferView * bview)
SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
sel_cursor = cursor; sel_cursor = cursor;
cursor = tmpcursor; cursor = tmpcursor;
SetSelection(); SetSelection(bview);
/* -----> Great, CutSelection() gets rid of multiple spaces. */ /* -----> Great, CutSelection() gets rid of multiple spaces. */
CutSelection(bview); CutSelection(bview);
@ -2561,7 +2561,7 @@ void LyXText::DeleteWordBackward(BufferView * bview)
SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
sel_cursor = cursor; sel_cursor = cursor;
cursor = tmpcursor; cursor = tmpcursor;
SetSelection(); SetSelection(bview);
CutSelection(bview); CutSelection(bview);
} }
} }
@ -2583,7 +2583,7 @@ void LyXText::DeleteLineForward(BufferView * bview)
SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
sel_cursor = cursor; sel_cursor = cursor;
cursor = tmpcursor; cursor = tmpcursor;
SetSelection(); SetSelection(bview);
// What is this test for ??? (JMarc) // What is this test for ??? (JMarc)
if (!selection) { if (!selection) {
DeleteWordForward(bview); DeleteWordForward(bview);

24
src/text2.C
View File

@ -658,7 +658,7 @@ void LyXText::SetLayout(BufferView * bview, LyXTextClass::size_type layout)
false); false);
UpdateCounters(bview, cursor.row()); UpdateCounters(bview, cursor.row());
ClearSelection(); ClearSelection();
SetSelection(); SetSelection(bview);
SetCursor(bview, tmpcursor.par(), tmpcursor.pos(), true); SetCursor(bview, tmpcursor.par(), tmpcursor.pos(), true);
} }
@ -776,7 +776,7 @@ void LyXText::IncDepth(BufferView * bview)
SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos());
UpdateCounters(bview, cursor.row()); UpdateCounters(bview, cursor.row());
ClearSelection(); ClearSelection();
SetSelection(); SetSelection(bview);
SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
} }
@ -853,7 +853,7 @@ void LyXText::DecDepth(BufferView * bview)
SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos());
UpdateCounters(bview, cursor.row()); UpdateCounters(bview, cursor.row());
ClearSelection(); ClearSelection();
SetSelection(); SetSelection(bview);
SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
} }
@ -935,7 +935,7 @@ void LyXText::SetFont(BufferView * bview, LyXFont const & font, bool toggleall)
sel_cursor = cursor; sel_cursor = cursor;
SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos());
ClearSelection(); ClearSelection();
SetSelection(); SetSelection(bview);
SetCursor(bview, tmpcursor.par(), tmpcursor.pos(), true, SetCursor(bview, tmpcursor.par(), tmpcursor.pos(), true,
tmpcursor.boundary()); tmpcursor.boundary());
} }
@ -1117,7 +1117,7 @@ bool LyXText::FullRebreak(BufferView * bview)
* They also delete the corresponding row */ * They also delete the corresponding row */
// need the selection cursor: // need the selection cursor:
void LyXText::SetSelection() void LyXText::SetSelection(BufferView * bview)
{ {
const bool lsel = selection; const bool lsel = selection;
@ -1168,7 +1168,7 @@ void LyXText::SetSelection()
selection = false; selection = false;
if (inset_owner && (selection || lsel)) if (inset_owner && (selection || lsel))
inset_owner->SetUpdateStatus(InsetText::SELECTION); inset_owner->SetUpdateStatus(bview, InsetText::SELECTION);
} }
@ -1304,7 +1304,7 @@ void LyXText::ToggleFree(BufferView * bview,
sel_cursor = cursor; sel_cursor = cursor;
} }
if (inset_owner) if (inset_owner)
inset_owner->SetUpdateStatus(InsetText::CURSOR_PAR); inset_owner->SetUpdateStatus(bview, InsetText::CURSOR_PAR);
} }
@ -1524,7 +1524,7 @@ void LyXText::SetParagraph(BufferView * bview,
SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos()); SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos());
sel_cursor = cursor; sel_cursor = cursor;
SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos());
SetSelection(); SetSelection(bview);
SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
if (inset_owner) if (inset_owner)
bview->updateInset(inset_owner, true); bview->updateInset(inset_owner, true);
@ -1614,7 +1614,7 @@ void LyXText::SetParagraphExtraOpt(BufferView * bview, int type,
SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos()); SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos());
sel_cursor = cursor; sel_cursor = cursor;
SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos());
SetSelection(); SetSelection(bview);
SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
} }
@ -2373,7 +2373,7 @@ void LyXText::PasteSelection(BufferView * bview)
sel_cursor = cursor; sel_cursor = cursor;
SetCursor(bview, actpar, pos); SetCursor(bview, actpar, pos);
SetSelection(); SetSelection(bview);
UpdateCounters(bview, cursor.row()); UpdateCounters(bview, cursor.row());
} }
@ -2411,7 +2411,7 @@ void LyXText::SetSelectionOverString(BufferView * bview, string const & str)
sel_cursor = cursor; sel_cursor = cursor;
for (int i = 0; str[i]; ++i) for (int i = 0; str[i]; ++i)
CursorRight(bview); CursorRight(bview);
SetSelection(); SetSelection(bview);
} }
@ -2572,7 +2572,7 @@ void LyXText::InsertStringA(BufferView * bview, string const & str)
SetCursor(bview, cursor.par(), cursor.pos()); SetCursor(bview, cursor.par(), cursor.pos());
sel_cursor = cursor; sel_cursor = cursor;
SetCursor(bview, par, pos); SetCursor(bview, par, pos);
SetSelection(); SetSelection(bview);
} }