*
* ====================================================== */
-#include <fstream>
-#include <algorithm>
-
#include <config.h>
#include "BufferView.h"
#include "buffer.h"
#include "lyxcursor.h"
#include "lyxtext.h"
-#include "insets/inseterror.h"
#include "LyXView.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 "insets/insetcommand.h" //ChangeRefs
-#include "support/lyxfunctional.h" //equal_1st_in_pair
#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 <fstream>
+#include <algorithm>
extern BufferList bufferlist;
FileInfo const fi(fname);
if (!fi.readable()) {
- WriteAlert(_("Error!"),
+ Alert::alert(_("Error!"),
_("Specified file is unreadable: "),
MakeDisplayPath(fname, 50));
return false;
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 BufferView::removeAutoInsets()
{
- Paragraph * par = buffer()->paragraph;
-
LyXCursor tmpcursor = text->cursor;
LyXCursor cursor;
+ bool found = false;
- bool a = false;
-
- while (par) {
+ ParIterator end = buffer()->par_iterator_end();
+ for (ParIterator it = buffer()->par_iterator_begin();
+ it != end; ++it) {
+ Paragraph * par = *it;
// this has to be done before the delete
- text->setCursor(this, cursor, par, 0);
- if (par->autoDeleteInsets()){
- a = true;
- text->redoParagraphs(this, cursor,
- cursor.par()->next());
- text->fullRebreak(this);
+ if (par->autoDeleteInsets()) {
+ found = true;
+#ifdef WITH_WARNINGS
+#warning FIXME
+#endif
+ // The test it.size()==1 was needed to prevent crashes.
+ if (it.size() == 1) {
+ text->setCursor(this, cursor, par, 0);
+ text->redoParagraphs(this, cursor,
+ cursor.par()->next());
+ text->fullRebreak(this);
+ }
}
- par = par->next();
}
// avoid forbidden cursor positions caused by error removing
text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
- return a;
+ return found;
}
for (TeXErrors::Errors::const_iterator cit = terr.begin();
cit != terr.end();
++cit) {
- string const desctext((*cit).error_desc);
- string const errortext((*cit).error_text);
+ 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;
texrowpar = text->firstParagraph();
tmppos = 0;
} else {
- texrowpar = text->getParFromID(tmpid);
+ texrowpar = buffer()->getParFromID(tmpid);
}
if (texrowpar == 0)
texrowpar = text->firstParagraph();
tmppos = 0;
} else {
- texrowpar = text->getParFromID(tmpid);
+ texrowpar = buffer()->getParFromID(tmpid);
}
text->setCursor(this, texrowpar, tmppos);
}
hideCursor();
beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
- if (!text->textUndo(this))
- owner()->message(_("No forther undo information"));
+ if (!textUndo(this))
+ owner()->message(_("No further undo information"));
else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
setState();
hideCursor();
beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
- if (!text->textRedo(this))
+ if (!textRedo(this))
owner()->message(_("No further redo information"));
else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
{
if (available()) {
text->copyEnvironmentType();
- // clear the selection, even if mark_set
- toggleSelection();
- text->clearSelection(this);
- update(text, BufferView::SELECT|BufferView::FITCUR);
owner()->message(_("Paragraph environment type copied"));
}
}
{
if (available()) {
text->copySelection(this);
- // clear the selection, even if mark_set
- toggleSelection();
- text->clearSelection(this);
- update(text, BufferView::SELECT|BufferView::FITCUR);
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()->message(_("Cut"));
}
hideCursor();
// clear the selection
toggleSelection();
- text->clearSelection(this);
+ text->clearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR);
// paste
// clear the selection
toggleSelection();
- text->clearSelection(this);
+ text->clearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR);
}
-
-
-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));
-}
-
-
/* these functions are for the spellchecker */
string const BufferView::nextWord(float & value)
{
return string();
}
- return text->selectNextWord(this, value);
+ return text->selectNextWordToSpellcheck(this, value);
}
{
if (!available()) return;
+ LyXCursor cur = text->selection.cursor;
hideCursor();
beforeChange(text);
+ text->selection.cursor = cur;
text->selectSelectedWord(this);
toggleSelection(false);
update(text, BufferView::SELECT|BufferView::FITCUR);
hideCursor();
beforeChange(text);
text->selectSelectedWord(this);
- text->clearSelection(this);
+ text->clearSelection();
update(text, BufferView::SELECT|BufferView::FITCUR);
}
{
if (!available()) return;
+ LyXText * tt = getLyXText();
hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
+ update(tt, BufferView::SELECT|BufferView::FITCUR);
/* clear the selection (if there is any) */
toggleSelection(false);
- update(text, BufferView::SELECT|BufferView::FITCUR);
+ update(tt, BufferView::SELECT|BufferView::FITCUR);
/* clear the selection (if there is any) */
toggleSelection(false);
- text->replaceSelectionWithString(this, replacestring);
+ tt->replaceSelectionWithString(this, replacestring);
- text->setSelectionOverString(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)
{
+ // don't relock if we're already locked
+ if (theLockingInset() == inset)
+ return true;
if (!theLockingInset() && inset) {
theLockingInset(inset);
return true;
void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
{
- if (theLockingInset() && available()) {
+ if (available() && theLockingInset()) {
LyXCursor cursor = text->cursor;
+ Inset * locking_inset = theLockingInset()->getLockingInset();
+
if ((cursor.pos() - 1 >= 0) &&
- (cursor.par()->getChar(cursor.pos() - 1) ==
- Paragraph::META_INSET) &&
+ cursor.par()->isInset(cursor.pos() - 1) &&
(cursor.par()->getInset(cursor.pos() - 1) ==
- theLockingInset()->getLockingInset()))
+ locking_inset))
text->setCursor(this, cursor,
- cursor.par(), cursor.pos() - 1);
+ 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()
? LyXScreen::REVERSED_L_SHAPE
: LyXScreen::L_SHAPE;
y += cursor.y() + theLockingInset()->insetInInsetY();
- pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
+ pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
shape);
}
}
void BufferView::hideLockedInsetCursor()
{
if (theLockingInset() && available()) {
- pimpl_->screen_->HideCursor();
+ pimpl_->screen_->hideCursor();
}
}
{
if (theLockingInset() && available()) {
y += text->cursor.y() + theLockingInset()->insetInInsetY();
- if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
+ if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
updateScrollbar();
}
}
if (inset && theLockingInset() == inset) {
inset->insetUnlock(this);
theLockingInset(0);
- text->finishUndo();
+ // make sure we update the combo !
+ owner()->setLayout(getLyXText()->cursor.par()->getLayout());
+ finishUndo();
return 0;
} else if (inset && theLockingInset() &&
theLockingInset()->unlockInsetInInset(this, inset)) {
- text->finishUndo();
+ // 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,
- text->cursor.par()->previous(),
- text->cursor.par()->next());
+ setUndo(this, kind,
+ text->cursor.par(),
+ text->cursor.par()->next());
}
bool BufferView::ChangeInsets(Inset::Code code,
string const & from, string const & to)
{
- bool flag = false;
- Paragraph * par = buffer()->paragraph;
+ bool need_update = false;
LyXCursor cursor = text->cursor;
LyXCursor tmpcursor = cursor;
cursor.par(tmpcursor.par());
cursor.pos(tmpcursor.pos());
- while (par) {
- bool flag2 = false;
- for (Paragraph::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;
- // 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);
+ if (changed_inset) {
+ need_update = true;
+#ifdef WITH_WARNINGS
+#warning FIXME
+#endif
+ // 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);
+ }
}
- par = par->next();
}
text->setCursorIntern(this, cursor.par(), cursor.pos());
- return flag;
+ return need_update;
}
projects / lyx.git / blobdiff