* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Alfredo Braustein
+ * \author Alfredo Braunstein
* \author Lars Gullik Bjønnes
* \author John Levon
* \author André Pönitz
#include <config.h>
#include "BufferView.h"
+
#include "buffer.h"
#include "bufferlist.h"
#include "BufferView_pimpl.h"
#include "gettext.h"
#include "iterators.h"
#include "language.h"
+#include "lyxlayout.h"
#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
-#include "undo_funcs.h"
+#include "texrow.h"
+#include "undo.h"
#include "WordLangTuple.h"
#include "frontends/Alert.h"
#include "insets/updatableinset.h"
#include "support/filetools.h"
-#include "support/LAssert.h"
#include "support/lyxalgo.h" // lyx_count
+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,
int width, int height)
- : pimpl_(new Pimpl(this, owner, xpos, ypos, width, height))
+ : pimpl_(new Pimpl(this, owner, xpos, ypos, width, height)),
+ x_target_(0)
{
text = 0;
}
//
// 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;
void BufferView::showErrorList(string const & action) const
{
if (getErrorList().size()) {
- string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName());
+ string const title = bformat(_("LyX: %1$s errors (%2$s)"),
+ action, buffer()->fileName());
owner()->getDialogs().show("errorlist", title);
pimpl_->errorlist_.clear();
}
}
-ErrorList const &
-BufferView::getErrorList() const
+ErrorList const & BufferView::getErrorList() const
{
return pimpl_->errorlist_;
}
int tmpid = -1;
int tmppos = -1;
- buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
+ buffer()->texrow().getIdFromRow(row, tmpid, tmppos);
- ParagraphList::iterator texrowpar;
-
- 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;
}
-// these functions are for the spellchecker
-WordLangTuple const BufferView::nextWord(float & value)
-{
- if (!available()) {
- value = 1;
- return WordLangTuple();
- }
-
- return text->selectNextWordToSpellcheck(value);
-}
-
-
-void BufferView::selectLastWord()
-{
- if (!available())
- return;
-
- LyXCursor cur = text->selection.cursor;
- beforeChange(text);
- text->selection.cursor = cur;
- text->selectSelectedWord();
- update();
-}
-
-
-void BufferView::endOfSpellCheck()
-{
- if (!available()) return;
-
- beforeChange(text);
- text->selectSelectedWord();
- text->clearSelection();
- update();
-}
-
-
void BufferView::replaceWord(string const & replacestring)
{
if (!available())
return;
- LyXText * tt = getLyXText();
+ LyXText * text = getLyXText();
- tt->replaceSelectionWithString(replacestring);
- tt->setSelectionRange(replacestring.length());
+ text->replaceSelectionWithString(replacestring);
+ text->setSelectionRange(replacestring.length());
// Go back so that replacement string is also spellchecked
for (string::size_type i = 0; i < replacestring.length() + 1; ++i)
- tt->cursorLeft(this);
+ text->cursorLeft(this);
// FIXME: should be done through LFUN
buffer()->markDirty();
{
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));
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();
}
{
return pimpl_->workarea().workHeight();
}
+
+
+void BufferView::x_target(int x)
+{
+ x_target_ = x;
+}
+
+
+int BufferView::x_target() const
+{
+ return x_target_;
+}
projects / lyx.git / blobdiff