-// -*- C++ -*-
/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#include <fstream>
-#include <algorithm>
-
#include "BufferView.h"
#include "buffer.h"
#include "lyxcursor.h"
#include "lyxtext.h"
-#include "insets/inseterror.h"
-#include "insets/insetinfo.h"
-#include "insets/insetspecialchar.h"
#include "LyXView.h"
-#include "minibuffer.h"
#include "bufferlist.h"
-#include "support/FileInfo.h"
#include "lyxscreen.h"
-#include "support/filetools.h"
-#include "lyx_gui_misc.h"
#include "LaTeX.h"
#include "BufferView_pimpl.h"
+#include "language.h"
+#include "gettext.h"
+#include "undo_funcs.h"
+#include "debug.h"
+#include "iterators.h"
+
+#include "frontends/Alert.h"
+
#include "insets/insetcommand.h" //ChangeRefs
+#include "insets/inseterror.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
#include "support/lyxfunctional.h" //equal_1st_in_pair
+#include "support/types.h"
+#include "support/lyxalgo.h" // lyx_count
+
+#include <fstream>
extern BufferList bufferlist;
+using lyx::pos_type;
+
using std::pair;
using std::endl;
using std::ifstream;
using std::vector;
using std::find;
-using std::count;
using std::count_if;
+
// Inserts a file into current document
bool BufferView::insertLyXFile(string const & filen)
//
FileInfo const fi(fname);
if (!fi.readable()) {
- WriteAlert(_("Error!"),
+ Alert::alert(_("Error!"),
_("Specified file is unreadable: "),
MakeDisplayPath(fname, 50));
return false;
}
-
- beforeChange();
+
+ beforeChange(text);
ifstream ifs(fname.c_str());
if (!ifs) {
- WriteAlert(_("Error!"),
+ Alert::alert(_("Error!"),
_("Cannot open specified file: "),
MakeDisplayPath(fname, 50));
return false;
}
-
- char const c = ifs.peek();
-
+
+ int const c = ifs.peek();
+
LyXLex lex(0, 0);
lex.setStream(ifs);
bool res = true;
if (c == '#') {
- lyxerr.debug() << "Will insert file with header" << endl;
+ lyxerr[Debug::INFO] << "Will insert file with header" << endl;
res = buffer()->readFile(lex, text->cursor.par());
} else {
- lyxerr.debug() << "Will insert file without header" << endl;
+ lyxerr[Debug::INFO] << "Will insert file without header"
+ << endl;
res = buffer()->readLyXformat2(lex, text->cursor.par());
}
bool BufferView::removeAutoInsets()
{
- LyXParagraph * par = buffer()->paragraph;
-
- LyXCursor tmpcursor = text->cursor;
- LyXCursor cursor;
+ // keep track of which pos and par the cursor was on
+ Paragraph * cursor_par = text->cursor.par();
+ Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0;
+ Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0;
+ pos_type cursor_pos = text->cursor.pos();
+
+ bool found = false;
+
+ // Trap the deletion of the paragraph the cursor is in.
+ // Iterate until we find a paragraph that won't be immediately deleted.
+ // In reality this should mean we only execute the body of the while
+ // loop once at most. However for safety we iterate rather than just
+ // make this an if () conditional.
+ while ((cursor_par_prev || cursor_par_next)
+ && text->setCursor(this,
+ cursor_par_prev ? cursor_par_prev : cursor_par_next,
+ 0)) {
+ // We just removed cursor_par so have to fix the "cursor"
+ if (cursor_par_prev) {
+ // '.' = cursor_par
+ // a -> a.
+ // .
+ cursor_par = cursor_par_prev;
+ cursor_pos = cursor_par->size();
+ } else {
+ // . -> .a
+ // a
+ cursor_par = cursor_par_next;
+ cursor_pos = 0;
+ }
+ cursor_par_prev = cursor_par->previous();
+ cursor_par_next = cursor_par->next();
+ }
+
+ // Iterate through the paragraphs removing autoDelete insets as we go.
+ // If the paragraph ends up empty after all the autoDelete insets are
+ // removed that paragraph will be removed by the next setCursor() call.
+ ParIterator it = buffer()->par_iterator_begin();
+ ParIterator end = buffer()->par_iterator_end();
+ for (; it != end; ++it) {
+ Paragraph * par = *it;
+ Paragraph * par_prev = par ? par->previous() : 0;
+ bool removed = false;
+
+ if (text->setCursor(this, par, 0)
+ && cursor_par == par_prev) {
+ // The previous setCursor line was deleted and that
+ // was the cursor_par line. This can only happen if an
+ // error box was the sole item on cursor_par.
+ // It is possible for cursor_par_prev to be stray if
+ // the line it pointed to only had a error box on it
+ // so we have to set it to a known correct value.
+ // This is often the same value it already had.
+ cursor_par_prev = par->previous();
+ if (cursor_par_prev) {
+ // '|' = par, '.' = cursor_par, 'E' = error box
+ // First step below may occur before while{}
+ // a |a a a a.
+ // E -> .E -> |.E -> . -> |b
+ // . b b |b
+ // b
+ cursor_par = cursor_par_prev;
+ cursor_pos = cursor_par_prev->size();
+ cursor_par_prev = cursor_par->previous();
+ // cursor_par_next remains the same
+ } else if (cursor_par_next) {
+ // First step below may occur before while{}
+ // .
+ // E -> |.E -> |. -> . -> .|a
+ // a a a |a
+ cursor_par = cursor_par_next;
+ cursor_pos = 0;
+ // cursor_par_prev remains unset
+ cursor_par_next = cursor_par->next();
+ } else {
+ // I can't find a way to trigger this
+ // so it should be unreachable code
+ // unless the buffer is corrupted.
+ lyxerr << "BufferView::removeAutoInsets() is bad\n";
+ }
+ }
- bool a = false;
- while (par) {
- // this has to be done before the delete
-#ifndef NEW_INSETS
- if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
-#endif
- text->SetCursor(this, cursor, par, 0);
- if (par->AutoDeleteInsets()){
- a = true;
-#ifndef NEW_INSETS
- if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
-#endif
- text->RedoParagraphs(this, cursor,
- cursor.par()->Next());
- text->FullRebreak(this);
-#ifndef NEW_INSETS
+ Paragraph::inset_iterator pit = par->inset_iterator_begin();
+ Paragraph::inset_iterator pend = par->inset_iterator_end();
+ while (pit != pend) {
+ if (pit->autoDelete()) {
+ removed = true;
+ pos_type const pos = pit.getPos();
+
+ par->erase(pos);
+ // We just invalidated par's inset iterators so
+ // we get the next valid iterator position
+ pit = par->InsetIterator(pos);
+ // and ensure we have a valid end iterator.
+ pend = par->inset_iterator_end();
+
+ if (cursor_par == par) {
+ // update the saved cursor position
+ if (cursor_pos > pos)
+ --cursor_pos;
+ }
+ } else {
+ ++pit;
}
-#endif
}
- par = par->next;
+ if (removed) {
+ found = true;
+ text->redoParagraph(this);
+ }
+ }
+
+ // It is possible that the last line is empty if it was cursor_par
+ // and/or only had an error inset on it. So we set the cursor to the
+ // start of the doc to force its removal and ensure a valid saved cursor
+ if (text->setCursor(this, text->ownerParagraph(), 0)
+ && 0 == cursor_par_next) {
+ cursor_par = cursor_par_prev;
+ cursor_pos = cursor_par->size();
+ } else if (cursor_pos > cursor_par->size()) {
+ // Some C-Enter lines were removed by the setCursor call which
+ // then invalidated cursor_pos. It could still be "wrong" because
+ // the cursor may appear to have jumped but since we collapsed
+ // some C-Enter lines this should be a reasonable compromise.
+ cursor_pos = cursor_par->size();
}
- // avoid forbidden cursor positions caused by error removing
- if (tmpcursor.pos() > tmpcursor.par()->Last())
- tmpcursor.pos(tmpcursor.par()->Last());
- text->SetCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
- return a;
+ // restore the original cursor in its corrected location.
+ text->setCursorIntern(this, cursor_par, cursor_pos);
+
+ return found;
}
// Save the cursor position
LyXCursor cursor = text->cursor;
-#ifndef NEW_INSETS
- // This is drastic, but it's the only fix, I could find. (Asger)
- allFloats(1, 0);
- allFloats(1, 1);
-#endif
-
- for (TeXErrors::Errors::const_iterator cit = terr.begin();
- cit != terr.end();
- ++cit) {
- string const desctext((*cit).error_desc);
- string const errortext((*cit).error_text);
+ TeXErrors::Errors::const_iterator cit = terr.begin();
+ TeXErrors::Errors::const_iterator end = terr.end();
+ for (; cit != end; ++cit) {
+ string const desctext(cit->error_desc);
+ string const errortext(cit->error_text);
string const msgtxt = desctext + '\n' + errortext;
- int const errorrow = (*cit).error_in_line;
+ int const errorrow = cit->error_in_line;
// Insert error string for row number
- int tmpid = -1;
+ int tmpid = -1;
int tmppos = -1;
if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) {
buffer()->texrow.increasePos(tmpid, tmppos);
}
-
- LyXParagraph * texrowpar = 0;
+
+ Paragraph * texrowpar = 0;
if (tmpid == -1) {
- texrowpar = text->FirstParagraph();
+ texrowpar = text->ownerParagraph();
tmppos = 0;
} else {
- texrowpar = text->GetParFromID(tmpid);
+ texrowpar = buffer()->getParFromID(tmpid);
}
if (texrowpar == 0)
continue;
InsetError * new_inset = new InsetError(msgtxt);
- text->SetCursorIntern(this, texrowpar, tmppos);
- text->InsertInset(this, new_inset);
- text->FullRebreak(this);
+ text->setCursorIntern(this, texrowpar, tmppos);
+ text->insertInset(this, new_inset);
+ text->fullRebreak(this);
}
// Restore the cursor position
- text->SetCursorIntern(this, cursor.par(), cursor.pos());
+ text->setCursorIntern(this, cursor.par(), cursor.pos());
}
void BufferView::setCursorFromRow(int row)
{
- int tmpid = -1;
+ int tmpid = -1;
int tmppos = -1;
buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
- LyXParagraph * texrowpar;
+ Paragraph * texrowpar;
if (tmpid == -1) {
- texrowpar = text->FirstParagraph();
+ texrowpar = text->ownerParagraph();
tmppos = 0;
} else {
- texrowpar = text->GetParFromID(tmpid);
+ texrowpar = buffer()->getParFromID(tmpid);
}
- text->SetCursor(this, texrowpar, tmppos);
+ text->setCursor(this, texrowpar, tmppos);
}
-bool BufferView::insertInset(Inset * inset, string const & lout,
- bool /*no_table*/)
+bool BufferView::insertInset(Inset * inset, string const & lout)
{
- // if we are in a locking inset we should try to insert the
- // inset there otherwise this is a illegal function now
- if (theLockingInset()) {
- if (theLockingInset()->InsertInsetAllowed(inset))
- return theLockingInset()->InsertInset(this, inset);
- return false;
- }
-
- // not quite sure if we want this...
- text->SetCursorParUndo(buffer());
- text->FreezeUndo();
-
- beforeChange();
- if (!lout.empty()) {
- update(text, BufferView::SELECT|BufferView::FITCUR);
- text->BreakParagraph(this);
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- if (text->cursor.par()->Last()) {
- text->CursorLeft(this);
-
- text->BreakParagraph(this);
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-
- pair<bool, LyXTextClass::size_type> lres =
- textclasslist.NumberOfLayout(buffer()->params
- .textclass, lout);
- LyXTextClass::size_type lay;
- if (lres.first != false) {
- // layout found
- lay = lres.second;
- } else {
- // layout not fount using default "Standard" (0)
- lay = 0;
- }
-
- text->SetLayout(this, lay);
-
- text->SetParagraph(this, 0, 0,
- 0, 0,
- VSpace(VSpace::NONE), VSpace(VSpace::NONE),
- LYX_ALIGN_LAYOUT,
- string(),
- 0);
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- text->current_font.setLatex(LyXFont::OFF);
- }
-
- text->InsertInset(this, inset);
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- text->UnFreezeUndo();
- return true;
+ return pimpl_->insertInset(inset, lout);
}
-// Open and lock an updatable inset
-bool BufferView::open_new_inset(UpdatableInset * new_inset, bool behind)
-{
- beforeChange();
- text->FinishUndo();
- if (!insertInset(new_inset)) {
- delete new_inset;
- return false;
- }
- if (behind) {
- LyXFont & font = getLyXText()->real_current_font;
- new_inset->Edit(this, new_inset->width(this, font), 0, 0);
- } else
- new_inset->Edit(this, 0, 0, 0);
- return true;
-}
-
/* This is also a buffer property (ale) */
// Not so sure about that. a goto Label function can not be buffer local, just
// think how this will work in a multiwindo/buffer environment, all the
vector<string> labels = (*it)->getLabelList();
if (find(labels.begin(),labels.end(),label)
!= labels.end()) {
- beforeChange();
- text->SetCursor(this, it.getPar(), it.getPos());
- text->sel_cursor = text->cursor;
+ beforeChange(text);
+ text->setCursor(this, it.getPar(), it.getPos());
+ text->selection.cursor = text->cursor;
update(text, BufferView::SELECT|BufferView::FITCUR);
return true;
}
}
-#ifndef NEW_INSETS
-void BufferView::allFloats(char flag, char figmar)
-{
- if (!available()) return;
-
- LyXCursor cursor = text->cursor;
-
- if (!flag
- && cursor.par()->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && ((figmar
- && cursor.par()->footnotekind != LyXParagraph::FOOTNOTE
- && cursor.par()->footnotekind != LyXParagraph::MARGIN
- )
- || (!figmar
- && cursor.par()->footnotekind != LyXParagraph::FIG
- && cursor.par()->footnotekind != LyXParagraph::TAB
- && cursor.par()->footnotekind != LyXParagraph::WIDE_FIG
- && cursor.par()->footnotekind != LyXParagraph::WIDE_TAB
- && cursor.par()->footnotekind != LyXParagraph::ALGORITHM)))
- toggleFloat();
- else
- beforeChange();
-
- LyXCursor tmpcursor = cursor;
- cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos()));
- cursor.pos(tmpcursor.par()->PositionInParFromPos(tmpcursor.pos()));
-
- LyXParagraph *par = buffer()->paragraph;
- while (par) {
- if (flag) {
- if (par->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE
- && ((figmar
- && par->footnotekind != LyXParagraph::FOOTNOTE
- && par->footnotekind != LyXParagraph::MARGIN)
- || (!figmar
- && par->footnotekind != LyXParagraph::FIG
- && par->footnotekind != LyXParagraph::TAB
- && par->footnotekind != LyXParagraph::WIDE_FIG
- && par->footnotekind != LyXParagraph::WIDE_TAB
- && par->footnotekind != LyXParagraph::ALGORITHM
- )
- )
- ) {
- if (par->previous
- && par->previous->footnoteflag !=
- LyXParagraph::CLOSED_FOOTNOTE){ /* should be */
- text->SetCursorIntern(this,
- par->previous,
- 0);
- text->OpenFootnote(this);
- }
- }
- } else {
- if (par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE
- && (
- (figmar
- &&
- par->footnotekind != LyXParagraph::FOOTNOTE
- &&
- par->footnotekind != LyXParagraph::MARGIN
- )
- ||
- (!figmar
- &&
- par->footnotekind != LyXParagraph::FIG
- &&
- par->footnotekind != LyXParagraph::TAB
- &&
- par->footnotekind != LyXParagraph::WIDE_FIG
- &&
- par->footnotekind != LyXParagraph::WIDE_TAB
- &&
- par->footnotekind != LyXParagraph::ALGORITHM
- )
- )
- ) {
- text->SetCursorIntern(this, par, 0);
- text->CloseFootnote(this);
- }
- }
- par = par->next;
- }
-
- text->SetCursorIntern(this, cursor.par(), cursor.pos());
- redraw();
- fitCursor(text);
-}
-#endif
-
-
-void BufferView::insertNote()
-{
- InsetInfo * new_inset = new InsetInfo();
- insertInset(new_inset);
- new_inset->Edit(this, 0, 0, 0);
-}
-
-
-#ifndef NEW_INSETS
-void BufferView::openStuff()
-{
- if (available()) {
- owner()->getMiniBuffer()->Set(_("Open/Close..."));
- hideCursor();
- beforeChange();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- text->OpenStuff(this);
- update(text, BufferView::SELECT|BufferView::FITCUR);
- setState();
- }
-}
-
-
-void BufferView::toggleFloat()
-{
- if (available()) {
- owner()->getMiniBuffer()->Set(_("Open/Close..."));
- hideCursor();
- beforeChange();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- text->ToggleFootnote(this);
- update(text, BufferView::SELECT|BufferView::FITCUR);
- setState();
- }
-}
-#endif
-
void BufferView::menuUndo()
{
if (available()) {
- owner()->getMiniBuffer()->Set(_("Undo"));
+ owner()->message(_("Undo"));
hideCursor();
- beforeChange();
+ beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
- if (!text->TextUndo(this))
- owner()->getMiniBuffer()->Set(_("No further undo information"));
+ if (!textUndo(this))
+ owner()->message(_("No further undo information"));
else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
setState();
void BufferView::menuRedo()
{
+#if 0 // this should not be here (Jug 20011206)
if (theLockingInset()) {
- owner()->getMiniBuffer()->Set(_("Redo not yet supported in math mode"));
+ owner()->message(_("Redo not yet supported in math mode"));
return;
- }
-
- if (available()) {
- owner()->getMiniBuffer()->Set(_("Redo"));
- hideCursor();
- beforeChange();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- if (!text->TextRedo(this))
- owner()->getMiniBuffer()->Set(_("No further redo information"));
- else
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- setState();
- }
-}
-
-
-void BufferView::hyphenationPoint()
-{
- if (available()) {
- hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
- insertInset(new_inset);
}
-}
-
-
-void BufferView::ldots()
-{
- if (available()) {
- hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::LDOTS);
- insertInset(new_inset);
- }
-}
-
-
-void BufferView::endOfSentenceDot()
-{
- if (available()) {
- hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
- insertInset(new_inset);
- }
-}
-
-
-void BufferView::menuSeparator()
-{
- if (available()) {
- hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
- insertInset(new_inset);
- }
-}
-
+#endif
-void BufferView::newline()
-{
if (available()) {
+ owner()->message(_("Redo"));
hideCursor();
+ beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
- text->InsertChar(this, LyXParagraph::META_NEWLINE);
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-}
-
-
-void BufferView::protectedBlank(LyXText * lt)
-{
- if (available()) {
- hideCursor();
- update(lt, BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
- if (!insertInset(new_inset))
- delete new_inset;
+ if (!textRedo(this))
+ owner()->message(_("No further redo information"));
else
- updateInset(new_inset, true);
+ update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ setState();
}
}
-void BufferView::hfill()
-{
- if (available()) {
- hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- text->InsertChar(this, LyXParagraph::META_HFILL);
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- }
-}
-
void BufferView::copyEnvironment()
{
if (available()) {
text->copyEnvironmentType();
- // clear the selection, even if mark_set
- toggleSelection();
- text->ClearSelection();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- owner()->getMiniBuffer()->Set(_("Paragraph environment type copied"));
+ owner()->message(_("Paragraph environment type copied"));
}
}
{
if (available()) {
text->pasteEnvironmentType(this);
- owner()->getMiniBuffer()->Set(_("Paragraph environment type set"));
+ owner()->message(_("Paragraph environment type set"));
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
}
void BufferView::copy()
{
if (available()) {
- text->CopySelection(this);
- // clear the selection, even if mark_set
- toggleSelection();
- text->ClearSelection();
- update(text, BufferView::SELECT|BufferView::FITCUR);
- owner()->getMiniBuffer()->Set(_("Copy"));
+ getLyXText()->copySelection(this);
+ owner()->message(_("Copy"));
}
}
-void BufferView::cut()
+
+void BufferView::cut(bool realcut)
{
if (available()) {
hideCursor();
update(text, BufferView::SELECT|BufferView::FITCUR);
- text->CutSelection(this);
+ text->cutSelection(this, true, realcut);
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- owner()->getMiniBuffer()->Set(_("Cut"));
+ owner()->message(_("Cut"));
}
}
void BufferView::paste()
{
- if (!available()) return;
-
- owner()->getMiniBuffer()->Set(_("Paste"));
+ if (!available())
+ return;
+
+ owner()->message(_("Paste"));
+
hideCursor();
// clear the selection
toggleSelection();
- text->ClearSelection();
+ text->clearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR);
-
+
// paste
- text->PasteSelection(this);
+ text->pasteSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
- // clear the selection
+// why fake a selection only I think it should be a real one and not only
+// a painted one (Jug 20020318).
+#if 0
+ // clear the selection
toggleSelection();
- text->ClearSelection();
- update(text, BufferView::SELECT|BufferView::FITCUR);
-}
-
-
-void BufferView::gotoInset(std::vector<Inset::Code> const & codes,
- bool same_content)
-{
- if (!available()) return;
-
- hideCursor();
- beforeChange();
- update(text, BufferView::SELECT|BufferView::FITCUR);
-
- string contents;
- if (same_content &&
- text->cursor.par()->GetChar(text->cursor.pos()) == LyXParagraph::META_INSET) {
- Inset const * inset = text->cursor.par()->GetInset(text->cursor.pos());
- if (find(codes.begin(), codes.end(), inset->LyxCode())
- != codes.end())
- contents =
- static_cast<InsetCommand const *>(inset)->getContents();
- }
-
- if (!text->GotoNextInset(this, codes, contents)) {
- if (text->cursor.pos()
- || text->cursor.par() != text->FirstParagraph()) {
- LyXCursor tmp = text->cursor;
- text->cursor.par(text->FirstParagraph());
- text->cursor.pos(0);
- if (!text->GotoNextInset(this, codes, contents)) {
- text->cursor = tmp;
- owner()->getMiniBuffer()->Set(_("No more insets"));
- }
- } else {
- owner()->getMiniBuffer()->Set(_("No more insets"));
- }
- }
+ text->clearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR);
- text->sel_cursor = text->cursor;
-}
-
-
-void BufferView::gotoInset(Inset::Code code, bool same_content)
-{
- gotoInset(vector<Inset::Code>(1, code), same_content);
-}
-
-
-void BufferView::insertCorrectQuote()
-{
- char c;
-
- if (text->cursor.pos())
- c = text->cursor.par()->GetChar(text->cursor.pos() - 1);
- else
- c = ' ';
-
- insertInset(new InsetQuotes(c, buffer()->params));
+#endif
}
-/* these functions are for the spellchecker */
+/* these functions are for the spellchecker */
string const BufferView::nextWord(float & value)
{
if (!available()) {
return string();
}
- return text->SelectNextWord(this, value);
+ return text->selectNextWordToSpellcheck(this, value);
}
-
+
void BufferView::selectLastWord()
{
if (!available()) return;
-
+
+ LyXCursor cur = text->selection.cursor;
hideCursor();
- beforeChange();
- text->SelectSelectedWord(this);
+ beforeChange(text);
+ text->selection.cursor = cur;
+ text->selectSelectedWord(this);
toggleSelection(false);
update(text, BufferView::SELECT|BufferView::FITCUR);
}
void BufferView::endOfSpellCheck()
{
if (!available()) return;
-
+
hideCursor();
- beforeChange();
- text->SelectSelectedWord(this);
- text->ClearSelection();
+ beforeChange(text);
+ text->selectSelectedWord(this);
+ text->clearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR);
}
{
if (!available()) return;
+ LyXText * tt = getLyXText();
hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
-
- /* clear the selection (if there is any) */
+ update(tt, BufferView::SELECT|BufferView::FITCUR);
+
+ /* clear the selection (if there is any) */
toggleSelection(false);
- update(text, BufferView::SELECT|BufferView::FITCUR);
-
- /* clear the selection (if there is any) */
+ update(tt, BufferView::SELECT|BufferView::FITCUR);
+
+ /* clear the selection (if there is any) */
toggleSelection(false);
- text->ReplaceSelectionWithString(this, replacestring);
-
- text->SetSelectionOverString(this, replacestring);
+ tt->replaceSelectionWithString(this, replacestring);
+
+ tt->setSelectionOverString(this, replacestring);
// Go back so that replacement string is also spellchecked
for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
- text->CursorLeft(this);
+ tt->cursorLeft(this);
}
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
// End of spellchecker stuff
bool BufferView::lockInset(UpdatableInset * inset)
{
- if (!theLockingInset() && inset) {
- theLockingInset(inset);
+ if (!inset)
+ return false;
+ // don't relock if we're already locked
+ if (theLockingInset() == inset)
return true;
- } else if (inset) {
- return theLockingInset()->LockInsetInInset(this, inset);
+ if (!theLockingInset()) {
+ // first check if it's the inset under the cursor we want lock
+ // should be most of the time
+ char const c = text->cursor.par()->getChar(text->cursor.pos());
+ if (c == Paragraph::META_INSET) {
+ Inset * in = text->cursor.par()->getInset(text->cursor.pos());
+ if (inset == in) {
+ theLockingInset(inset);
+ return true;
+ }
+ }
+ // Then do a deep look of the inset and lock the right one
+ Paragraph * par = buffer()->paragraph;
+ int const id = inset->id();
+ while(par) {
+ Paragraph::inset_iterator it =
+ par->inset_iterator_begin();
+ Paragraph::inset_iterator const end =
+ par->inset_iterator_end();
+ for (; it != end; ++it) {
+ if ((*it) == inset) {
+ text->setCursorIntern(this, par, it.getPos());
+ theLockingInset(inset);
+ return true;
+ }
+ if ((*it)->getInsetFromID(id)) {
+ text->setCursorIntern(this, par, it.getPos());
+ (*it)->edit(this);
+ return theLockingInset()->lockInsetInInset(this, inset);
+ }
+ }
+ par = par->next();
+ }
+ return false;
}
- return false;
+ return theLockingInset()->lockInsetInInset(this, inset);
}
void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
{
- if (theLockingInset() && available()) {
+ if (available() && theLockingInset() && !theLockingInset()->nodraw()) {
LyXCursor cursor = text->cursor;
+ Inset * locking_inset = theLockingInset()->getLockingInset();
+
if ((cursor.pos() - 1 >= 0) &&
- (cursor.par()->GetChar(cursor.pos() - 1) ==
- LyXParagraph::META_INSET) &&
- (cursor.par()->GetInset(cursor.pos() - 1) ==
- theLockingInset()->GetLockingInset()))
- text->SetCursor(this, cursor,
+ cursor.par()->isInset(cursor.pos() - 1) &&
+ (cursor.par()->getInset(cursor.pos() - 1) ==
+ locking_inset))
+ text->setCursor(this, cursor,
cursor.par(), cursor.pos() - 1);
LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
LyXText * txt = getLyXText();
- if (theLockingInset()->GetLockingInset()->LyxCode() ==
- Inset::TEXT_CODE &&
+ if (locking_inset->isTextInset() &&
+ locking_inset->lyxCode() != Inset::ERT_CODE &&
(txt->real_current_font.language() !=
buffer()->params.language
|| txt->real_current_font.isVisibleRightToLeft()
shape = (txt->real_current_font.isVisibleRightToLeft())
? LyXScreen::REVERSED_L_SHAPE
: LyXScreen::L_SHAPE;
- y += cursor.y() + theLockingInset()->InsetInInsetY();
- pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
+ y += cursor.y() + theLockingInset()->insetInInsetY();
+ pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
shape);
}
}
void BufferView::hideLockedInsetCursor()
{
if (theLockingInset() && available()) {
- pimpl_->screen_->HideCursor();
+ pimpl_->screen_->hideCursor();
}
}
void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
{
if (theLockingInset() && available()) {
- y += text->cursor.y() + theLockingInset()->InsetInInsetY();
- if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
+ y += text->cursor.y() + theLockingInset()->insetInInsetY();
+ if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
updateScrollbar();
}
}
int BufferView::unlockInset(UpdatableInset * inset)
{
+ if (!inset)
+ return 0;
if (inset && theLockingInset() == inset) {
- inset->InsetUnlock(this);
+ inset->insetUnlock(this);
theLockingInset(0);
- text->FinishUndo();
+ // make sure we update the combo !
+ owner()->setLayout(getLyXText()->cursor.par()->layout());
+ finishUndo();
return 0;
} else if (inset && theLockingInset() &&
- theLockingInset()->UnlockInsetInInset(this, inset)) {
- text->FinishUndo();
+ theLockingInset()->unlockInsetInInset(this, inset)) {
+ // owner inset has updated the layout combo
+ finishUndo();
return 0;
}
return bufferlist.unlockInset(inset);
return; // shouldn't happen
if (kind == Undo::EDIT) // in this case insets would not be stored!
kind = Undo::FINISH;
- text->SetUndo(buffer(), kind,
-#ifndef NEW_INSETS
- text->cursor.par()->
- ParFromPos(text->cursor.pos())->previous,
- text->cursor.par()->
- ParFromPos(text->cursor.pos())->next
-#else
- text->cursor.par()->previous,
- text->cursor.par()->next
-#endif
- );
+ setUndo(this, kind,
+ text->cursor.par(),
+ text->cursor.par()->next());
}
void BufferView::updateInset(Inset * inset, bool mark_dirty)
{
- if (!inset)
- return;
-
- // first check for locking insets
- if (theLockingInset()) {
- if (theLockingInset() == inset) {
- if (text->UpdateInset(this, inset)) {
- update();
- if (mark_dirty) {
- if (buffer()->isLyxClean())
- owner()->getMiniBuffer()->
- setTimer(4);
- buffer()->markDirty();
- }
- updateScrollbar();
- return;
- }
- } else if (theLockingInset()->UpdateInsetInInset(this,inset)) {
- if (text->UpdateInset(this, theLockingInset())) {
- update();
- if (mark_dirty){
- if (buffer()->isLyxClean())
- owner()->getMiniBuffer()->
- setTimer(4);
- buffer()->markDirty();
- }
- updateScrollbar();
- return;
- }
- }
- }
-
- // then check the current buffer
- if (available()) {
- hideCursor();
- update(text, BufferView::UPDATE);
- if (text->UpdateInset(this, inset)) {
- if (mark_dirty)
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- else
- update(text, SELECT);
- return;
- }
- }
+ pimpl_->updateInset(inset, mark_dirty);
}
-bool BufferView::ChangeInsets(Inset::Code code, string const & from, string const & to)
+bool BufferView::ChangeInsets(Inset::Code code,
+ string const & from, string const & to)
{
- bool flag = false;
- LyXParagraph * par = buffer()->paragraph;
+ bool need_update = false;
LyXCursor cursor = text->cursor;
LyXCursor tmpcursor = cursor;
-#ifndef NEW_INSETS
- cursor.par(tmpcursor.par()->ParFromPos(tmpcursor.pos()));
- cursor.pos(tmpcursor.par()->PositionInParFromPos(tmpcursor.pos()));
-#else
cursor.par(tmpcursor.par());
cursor.pos(tmpcursor.pos());
-#endif
- while (par) {
- bool flag2 = false;
- for (LyXParagraph::inset_iterator it = par->inset_iterator_begin();
- it != par->inset_iterator_end(); ++it) {
- if ((*it)->LyxCode() == code) {
- InsetCommand * inset = static_cast<InsetCommand *>(*it);
+ ParIterator end = buffer()->par_iterator_end();
+ for (ParIterator it = buffer()->par_iterator_begin();
+ it != end; ++it) {
+ Paragraph * par = *it;
+ bool changed_inset = false;
+ for (Paragraph::inset_iterator it2 = par->inset_iterator_begin();
+ it2 != par->inset_iterator_end(); ++it2) {
+ if ((*it2)->lyxCode() == code) {
+ InsetCommand * inset = static_cast<InsetCommand *>(*it2);
if (inset->getContents() == from) {
inset->setContents(to);
- flag2 = true;
+ changed_inset = true;
}
}
}
- if (flag2) {
- flag = true;
-#ifndef NEW_INSETS
- if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
-#endif
- // this is possible now, since SetCursor takes
- // care about footnotes
- text->SetCursorIntern(this, par, 0);
- text->RedoParagraphs(this, text->cursor,
- text->cursor.par()->Next());
- text->FullRebreak(this);
-#ifndef NEW_INSETS
+ if (changed_inset) {
+ need_update = true;
+
+ // FIXME
+
+ // The test it.size()==1 was needed to prevent crashes.
+ // How to set the cursor corretly when it.size()>1 ??
+ if (it.size() == 1) {
+ text->setCursorIntern(this, par, 0);
+ text->redoParagraphs(this, text->cursor,
+ text->cursor.par()->next());
+ text->fullRebreak(this);
}
-#endif
}
- par = par->next;
}
- text->SetCursorIntern(this, cursor.par(), cursor.pos());
- return flag;
+ text->setCursorIntern(this, cursor.par(), cursor.pos());
+ return need_update;
}
{
// Check if the label 'from' appears more than once
vector<string> labels = buffer()->getLabelList();
- if (count(labels.begin(), labels.end(), from) > 1)
+
+ if (lyx::count(labels.begin(), labels.end(), from) > 1)
return false;
return ChangeInsets(Inset::REF_CODE, from, to);
}
-bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to)
+bool BufferView::ChangeCitationsIfUnique(string const & from,
+ string const & to)
{
+ typedef pair<string, string> StringPair;
- vector<pair<string,string> > keys = buffer()->getBibkeyList();
- if (count_if(keys.begin(), keys.end(),
- equal_1st_in_pair<string,string>(from))
+ vector<StringPair> keys = buffer()->getBibkeyList();
+ if (count_if(keys.begin(), keys.end(),
+ lyx::equal_1st_in_pair<StringPair>(from))
> 1)
return false;
return ChangeInsets(Inset::CITE_CODE, from, to);
}
+
UpdatableInset * BufferView::theLockingInset() const
{
// If NULL is not allowed we should put an Assert here. (Lgb)
void BufferView::theLockingInset(UpdatableInset * inset)
{
- text->the_locking_inset = inset;
+ text->the_locking_inset = inset;
}
LyXText * BufferView::getLyXText() const
{
if (theLockingInset()) {
- LyXText * txt = theLockingInset()->getLyXText(this);
+ LyXText * txt = theLockingInset()->getLyXText(this, true);
if (txt)
return txt;
}
return text;
}
+
Language const * BufferView::getParentLanguage(Inset * inset) const
{
LyXText * text = getParentText(inset);
- return text->cursor.par()->GetFontSettings(buffer()->params,
+ return text->cursor.par()->getFontSettings(buffer()->params,
text->cursor.pos()).language();
}
projects / lyx.git / blobdiff