*
* ====================================================== */
-#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 "support/types.h"
+
+#include <fstream>
+#include <algorithm>
+
extern BufferList bufferlist;
+using lyx::pos_type;
+
using std::pair;
using std::endl;
using std::ifstream;
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 a = false;
-
- while (par) {
- // 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);
+ Paragraph * cur_par = tmpcursor.par();
+ pos_type cur_pos = tmpcursor.pos();
+
+ bool found = false;
+
+ ParIterator it = buffer()->par_iterator_begin();
+ ParIterator end = buffer()->par_iterator_end();
+ for (; it != end; ++it) {
+ Paragraph * par = *it;
+ bool removed = false;
+
+ text->setCursor(this, par, 0);
+
+ 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);
+ if (cur_par == par) {
+ if (cur_pos > pos)
+ --cur_pos;
+ }
+ } else {
+ ++pit;
+ }
+ }
+ if (removed) {
+ found = true;
+ text->redoParagraph(this);
}
- par = par->next();
}
- // avoid forbidden cursor positions caused by error removing
- if (tmpcursor.pos() > tmpcursor.par()->size())
- tmpcursor.pos(tmpcursor.par()->size());
-
- text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
+ text->setCursorIntern(this, cur_par, cur_pos);
- return a;
+ return found;
}
// Save the cursor position
LyXCursor cursor = text->cursor;
- for (TeXErrors::Errors::const_iterator cit = terr.begin();
- cit != terr.end();
- ++cit) {
+ 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;
beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
if (!textUndo(this))
- owner()->message(_("No forther undo information"));
+ 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()->message(_("Redo not yet supported in math mode"));
return;
- }
+ }
+#endif
if (available()) {
owner()->message(_("Redo"));
{
if (available()) {
text->copyEnvironmentType();
- // clear the selection, even if mark_set
- toggleSelection();
- text->clearSelection();
- 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();
- update(text, BufferView::SELECT|BufferView::FITCUR);
owner()->message(_("Copy"));
}
}
return string();
}
- return text->selectNextWord(this, value);
+ return text->selectNextWordToSpellcheck(this, value);
}
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());
+ theLockingInset(static_cast<UpdatableInset *>(*it));
+ 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 (available() && theLockingInset()) {
+ 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) ==
- Paragraph::META_INSET) &&
+ cursor.par()->isInset(cursor.pos() - 1) &&
(cursor.par()->getInset(cursor.pos() - 1) ==
locking_inset))
text->setCursor(this, cursor,
int BufferView::unlockInset(UpdatableInset * inset)
{
+ if (!inset)
+ return 0;
if (inset && theLockingInset() == inset) {
inset->insetUnlock(this);
theLockingInset(0);
+ // make sure we update the combo !
+ owner()->setLayout(getLyXText()->cursor.par()->getLayout());
finishUndo();
return 0;
} else if (inset && theLockingInset() &&
theLockingInset()->unlockInsetInInset(this, inset)) {
+ // owner inset has updated the layout combo
finishUndo();
return 0;
}
bool BufferView::ChangeInsets(Inset::Code code,
string const & from, string const & to)
{
- bool flag = false;
+ bool need_update = false;
LyXCursor cursor = text->cursor;
LyXCursor tmpcursor = cursor;
cursor.par(tmpcursor.par());
for (ParIterator it = buffer()->par_iterator_begin();
it != end; ++it) {
Paragraph * par = *it;
- bool flag2 = false;
+ 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;
-#warning Fix me
+ 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, cursor.par(), cursor.pos());
- return flag;
+ return need_update;
}
projects / lyx.git / blobdiff