#include <config.h>
#include "BufferView.h"
-#include "BufferView_pimpl.h"
-#include "LaTeX.h"
-#include "ParagraphParameters.h"
-#include "WordLangTuple.h"
#include "buffer.h"
#include "bufferlist.h"
-#include "debug.h"
-#include "gettext.h"
-#include "errorlist.h"
+#include "BufferView_pimpl.h"
#include "funcrequest.h"
+#include "gettext.h"
#include "iterators.h"
#include "language.h"
-#include "lyxcursor.h"
-#include "lyxlex.h"
+#include "lyxlayout.h"
#include "lyxtext.h"
-#include "undo_funcs.h"
-#include "changes.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
+#include "texrow.h"
+#include "undo_funcs.h"
+#include "WordLangTuple.h"
#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
-#include "frontends/WorkArea.h"
#include "frontends/screen.h"
+#include "frontends/WorkArea.h"
#include "insets/insetcommand.h" // ChangeRefs
#include "insets/updatableinset.h"
-#include "support/FileInfo.h"
#include "support/filetools.h"
-#include "support/types.h"
#include "support/lyxalgo.h" // lyx_count
-#include "support/LAssert.h"
-#include <fstream>
+using lyx::support::bformat;
+using lyx::support::MakeAbsPath;
-extern BufferList bufferlist;
+using std::find;
+using std::string;
+using std::vector;
-using lyx::pos_type;
-using namespace lyx::support;
-using std::pair;
-using std::endl;
-using std::ifstream;
-using std::vector;
-using std::find;
-using std::count_if;
+extern BufferList bufferlist;
BufferView::BufferView(LyXView * owner, int xpos, int ypos,
//
// Moved from lyx_cb.C (Lgb)
{
- Assert(!filen.empty());
+ BOOST_ASSERT(!filen.empty());
string const fname = MakeAbsPath(filen);
beforeChange(text);
- text->breakParagraph(buffer()->paragraphs);
+ text->breakParagraph(buffer()->paragraphs());
- bool res = buffer()->readFile(fname, text->cursor.par());
+ bool res = buffer()->readFile(fname, text->cursorPar());
resize();
return res;
int tmpid = -1;
int tmppos = -1;
- buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
-
- ParagraphList::iterator texrowpar;
+ buffer()->texrow().getIdFromRow(row, tmpid, tmppos);
- if (tmpid == -1) {
- texrowpar = text->ownerParagraphs().begin();
- tmppos = 0;
- } else {
- texrowpar = buffer()->getParFromID(tmpid).pit();
- }
- text->setCursor(texrowpar, tmppos);
+ if (tmpid == -1)
+ text->setCursor(0, 0);
+ else
+ text->setCursor(buffer()->getParFromID(tmpid).pit(), tmppos);
}
for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
it != buffer()->inset_iterator_end(); ++it) {
vector<string> labels;
- it->getLabelList(labels);
+ it->getLabelList(*buffer(), labels);
if (find(labels.begin(),labels.end(),label) != labels.end()) {
beforeChange(text);
- text->setCursor(it.getPar(), it.getPos());
+ text->setCursor(
+ std::distance(text->ownerParagraphs().begin(), it.getPar()),
+ it.getPos());
text->selection.cursor = text->cursor;
update();
return;
{
if (!inset)
return false;
+
// don't relock if we're already locked
if (theLockingInset() == inset)
return true;
- if (!theLockingInset()) {
- // first check if it's the inset under the cursor we want lock
- // should be most of the time
- if (text->cursor.pos() < text->cursor.par()->size()
- && text->cursor.par()->getChar(text->cursor.pos()) ==
- Paragraph::META_INSET) {
- InsetOld * in = text->cursor.par()->getInset(text->cursor.pos());
- if (inset == in) {
+
+ if (theLockingInset())
+ return theLockingInset()->lockInsetInInset(this, inset);
+
+ // first check if it's the inset under the cursor we want lock
+ // should be most of the time
+ if (text->cursor.pos() < text->cursorPar()->size()
+ && text->cursorPar()->getChar(text->cursor.pos()) ==
+ Paragraph::META_INSET) {
+ if (inset == text->cursorPar()->getInset(text->cursor.pos())) {
+ theLockingInset(inset);
+ return true;
+ }
+ }
+
+ // then do a deep look at the inset and lock the right one
+ ParagraphList::iterator pit = buffer()->paragraphs().begin();
+ ParagraphList::iterator pend = buffer()->paragraphs().end();
+ for (int par = 0; pit != pend; ++pit, ++par) {
+ InsetList::iterator it = pit->insetlist.begin();
+ InsetList::iterator end = pit->insetlist.end();
+ for (; it != end; ++it) {
+ if (it->inset == inset) {
+ text->setCursorIntern(par, it->pos);
theLockingInset(inset);
return true;
}
}
- // Then do a deep look of the inset and lock the right one
- int const id = inset->id();
- ParagraphList::iterator pit = buffer()->paragraphs.begin();
- ParagraphList::iterator pend = buffer()->paragraphs.end();
- for (; pit != pend; ++pit) {
- InsetList::iterator it = pit->insetlist.begin();
- InsetList::iterator end = pit->insetlist.end();
- for (; it != end; ++it) {
- if (it->inset == inset) {
- text->setCursorIntern(pit, it->pos);
- theLockingInset(inset);
- return true;
- }
- if (it->inset->getInsetFromID(id)) {
- text->setCursorIntern(pit, it->pos);
- FuncRequest cmd(this, LFUN_INSET_EDIT, "left");
- it->inset->localDispatch(cmd);
- return theLockingInset()->lockInsetInInset(this, inset);
- }
- }
- }
- return false;
}
- return theLockingInset()->lockInsetInInset(this, inset);
+ return false;
}
inset->insetUnlock(this);
theLockingInset(0);
// make sure we update the combo !
- owner()->setLayout(getLyXText()->cursor.par()->layout()->name());
+ owner()->setLayout(getLyXText()->cursorPar()->layout()->name());
// Tell the paragraph dialog that we changed paragraph
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
finishUndo();
return 0;
- } else if (inset && theLockingInset() &&
+ }
+ if (inset && theLockingInset() &&
theLockingInset()->unlockInsetInInset(this, inset)) {
// Tell the paragraph dialog that we changed paragraph
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
}
-bool BufferView::ChangeInsets(InsetOld::Code code,
- string const & from, string const & to)
-{
- bool need_update = false;
- LyXCursor cursor = text->cursor;
- LyXCursor tmpcursor = cursor;
- cursor.par(tmpcursor.par());
- cursor.pos(tmpcursor.pos());
-
- ParIterator end = buffer()->par_iterator_end();
- for (ParIterator it = buffer()->par_iterator_begin();
- it != end; ++it) {
- bool changed_inset = false;
- for (InsetList::iterator it2 = it->insetlist.begin();
- it2 != it->insetlist.end(); ++it2) {
- if (it2->inset->lyxCode() == code) {
- InsetCommand * inset = static_cast<InsetCommand *>(it2->inset);
- if (inset->getContents() == from) {
- inset->setContents(to);
- changed_inset = true;
- }
- }
- }
- 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(it.pit(), 0);
- text->redoParagraph(text->cursor.par());
- }
- }
- }
- text->setCursorIntern(cursor.par(), cursor.pos());
- return need_update;
-}
-
-
bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
{
// Check if the label 'from' appears more than once
if (lyx::count(labels.begin(), labels.end(), from) > 1)
return false;
- return ChangeInsets(InsetOld::REF_CODE, from, to);
+ return pimpl_->ChangeInsets(InsetOld::REF_CODE, from, to);
}
Language const * BufferView::getParentLanguage(InsetOld * inset) const
{
Paragraph const & par = ownerPar(*buffer(), inset);
- return par.getFontSettings(buffer()->params,
+ return par.getFontSettings(buffer()->params(),
par.getPositionOfInset(inset)).language();
}
Encoding const * BufferView::getEncoding() const
{
- LyXText * t = getLyXText();
- if (!t)
+ LyXText * text = getLyXText();
+ if (!text)
return 0;
- LyXCursor const & c = t->cursor;
- LyXFont const font = c.par()->getFont(buffer()->params, c.pos(),
- outerFont(c.par(), t->ownerParagraphs()));
- return font.language()->encoding();
+ return text->cursorPar()->getFont(
+ buffer()->params(),
+ text->cursor.pos(),
+ outerFont(text->cursorPar(), text->ownerParagraphs())
+ ).language()->encoding();
}
projects / lyx.git / blobdiff