]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView.C
Point fix, earlier forgotten
[lyx.git] / src / BufferView.C
index f5e0dcae38f8600f6625b23eb5df8d479c745256..b8ee1de146b91b3e58607a1b6743a021f195de47 100644 (file)
@@ -1,10 +1,15 @@
 /**
  * \file BufferView.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author unknown
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Alfredo Braustein
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.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 "support/LAssert.h"
 
 #include <fstream>
 
 extern BufferList bufferlist;
 
 using lyx::pos_type;
+using namespace lyx::support;
 
 using std::pair;
 using std::endl;
@@ -103,6 +109,12 @@ void BufferView::buffer(Buffer * b)
 }
 
 
+bool BufferView::newFile(string const & fn, string const & tn, bool named)
+{
+       return pimpl_->newFile(fn, tn, named);
+}
+
+
 bool BufferView::loadLyXFile(string const & fn, bool tl)
 {
        return pimpl_->loadLyXFile(fn, tl);
@@ -119,15 +131,8 @@ void BufferView::reload()
 
 void BufferView::resize()
 {
-       if (pimpl_->buffer_) {
+       if (pimpl_->buffer_)
                pimpl_->resizeCurrentBuffer();
-       }
-}
-
-
-void BufferView::repaint()
-{
-       pimpl_->repaint();
 }
 
 
@@ -197,18 +202,6 @@ bool BufferView::isSavedPosition(unsigned int i)
 }
 
 
-void BufferView::update(LyXText * text, UpdateCodes f)
-{
-       pimpl_->update(text, f);
-}
-
-
-void BufferView::update(UpdateCodes f)
-{
-       pimpl_->update(f);
-}
-
-
 void BufferView::switchKeyMap()
 {
        pimpl_->switchKeyMap();
@@ -227,21 +220,21 @@ int BufferView::workWidth() const
 }
 
 
-void BufferView::toggleSelection(bool b)
+void BufferView::center()
 {
-       pimpl_->toggleSelection(b);
+       pimpl_->center();
 }
 
 
-void BufferView::toggleToggle()
+int BufferView::top_y() const
 {
-       pimpl_->toggleToggle();
+       return pimpl_->top_y();
 }
 
 
-void BufferView::center()
+void BufferView::top_y(int y)
 {
-       pimpl_->center();
+       pimpl_->top_y(y);
 }
 
 
@@ -257,14 +250,6 @@ void BufferView::stuffClipboard(string const & stuff) const
 }
 
 
-BufferView::UpdateCodes operator|(BufferView::UpdateCodes uc1,
-                                 BufferView::UpdateCodes uc2)
-{
-       return static_cast<BufferView::UpdateCodes>
-               (static_cast<int>(uc1) | static_cast<int>(uc2));
-}
-
-
 bool BufferView::dispatch(FuncRequest const & ev)
 {
        return pimpl_->dispatch(ev);
@@ -287,49 +272,15 @@ bool BufferView::insertLyXFile(string const & filen)
        //
        // Moved from lyx_cb.C (Lgb)
 {
-       if (filen.empty())
-               return false;
+       Assert(!filen.empty());
 
        string const fname = MakeAbsPath(filen);
 
-       // check if file exist
-       FileInfo const fi(fname);
-
-       if (!fi.readable()) {
-               string const file = MakeDisplayPath(fname, 50);
-               string const text =
-                       bformat(_("The specified document\n%1$s\ncould not be read."), file);
-               Alert::error(_("Could not read document"), text);
-               return false;
-       }
-
        beforeChange(text);
 
-       ifstream ifs(fname.c_str());
-       if (!ifs) {
-               string const file = MakeDisplayPath(fname, 50);
-               string const text =
-                       bformat(_("Could not open the specified document %1$s\n"), file);
-               Alert::error(_("Could not open file"), text);
-               return false;
-       }
-
-       int const c = ifs.peek();
-
-       LyXLex lex(0, 0);
-       lex.setStream(ifs);
+       text->breakParagraph(buffer()->paragraphs);
 
-       bool res = true;
-
-       if (c == '#') {
-               // FIXME: huh ? No we won't !
-               lyxerr[Debug::INFO] << "Will insert file with header" << endl;
-               res = buffer()->readFile(lex, fname, ParagraphList::iterator(text->cursor.par()));
-       } else {
-               lyxerr[Debug::INFO] << "Will insert file without header"
-                                   << endl;
-               res = buffer()->readBody(lex, ParagraphList::iterator(text->cursor.par()));
-       }
+       bool res = buffer()->readFile(fname, text->cursor.par());
 
        resize();
        return res;
@@ -341,6 +292,7 @@ void BufferView::showErrorList(string const & action) const
        if (getErrorList().size()) {
                string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName());
                owner()->getDialogs().show("errorlist", title);
+               pimpl_->errorlist_.clear();
        }
 }
 
@@ -349,7 +301,6 @@ ErrorList const &
 BufferView::getErrorList() const
 {
        return pimpl_->errorlist_;
-       pimpl_->errorlist_.clear();
 }
 
 
@@ -372,7 +323,7 @@ void BufferView::setCursorFromRow(int row)
 }
 
 
-bool BufferView::insertInset(Inset * inset, string const & lout)
+bool BufferView::insertInset(InsetOld * inset, string const & lout)
 {
        return pimpl_->insertInset(inset, lout);
 }
@@ -384,12 +335,11 @@ void BufferView::gotoLabel(string const & label)
             it != buffer()->inset_iterator_end(); ++it) {
                vector<string> labels;
                it->getLabelList(labels);
-               if (find(labels.begin(),labels.end(),label)
-                    != labels.end()) {
+               if (find(labels.begin(),labels.end(),label) != labels.end()) {
                        beforeChange(text);
                        text->setCursor(it.getPar(), it.getPos());
                        text->selection.cursor = text->cursor;
-                       update(text, BufferView::SELECT);
+                       update();
                        return;
                }
        }
@@ -403,11 +353,9 @@ void BufferView::undo()
 
        owner()->message(_("Undo"));
        beforeChange(text);
-       update(text, BufferView::SELECT);
        if (!textUndo(this))
                owner()->message(_("No further undo information"));
-       else
-               update(text, BufferView::SELECT);
+       update();
        switchKeyMap();
 }
 
@@ -419,11 +367,9 @@ void BufferView::redo()
 
        owner()->message(_("Redo"));
        beforeChange(text);
-       update(text, BufferView::SELECT);
        if (!textRedo(this))
                owner()->message(_("No further redo information"));
-       else
-               update(text, BufferView::SELECT);
+       update();
        switchKeyMap();
 }
 
@@ -449,8 +395,7 @@ void BufferView::selectLastWord()
        beforeChange(text);
        text->selection.cursor = cur;
        text->selectSelectedWord();
-       toggleSelection(false);
-       update(text, BufferView::SELECT);
+       update();
 }
 
 
@@ -461,7 +406,7 @@ void BufferView::endOfSpellCheck()
        beforeChange(text);
        text->selectSelectedWord();
        text->clearSelection();
-       update(text, BufferView::SELECT);
+       update();
 }
 
 
@@ -471,29 +416,18 @@ void BufferView::replaceWord(string const & replacestring)
                return;
 
        LyXText * tt = getLyXText();
-       update(tt, BufferView::SELECT);
-
-       // clear the selection (if there is any)
-       toggleSelection(false);
-       update(tt, BufferView::SELECT);
 
-       // clear the selection (if there is any)
-       toggleSelection(false);
        tt->replaceSelectionWithString(replacestring);
-
        tt->setSelectionRange(replacestring.length());
 
        // Go back so that replacement string is also spellchecked
-       for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
+       for (string::size_type i = 0; i < replacestring.length() + 1; ++i)
                tt->cursorLeft(this);
-       }
-       update(tt, BufferView::SELECT);
 
        // FIXME: should be done through LFUN
        buffer()->markDirty();
-       fitCursor();
+       update();
 }
-// End of spellchecker stuff
 
 
 bool BufferView::lockInset(UpdatableInset * inset)
@@ -509,7 +443,7 @@ bool BufferView::lockInset(UpdatableInset * inset)
                if (text->cursor.pos() < text->cursor.par()->size()
                    && text->cursor.par()->getChar(text->cursor.pos()) ==
                    Paragraph::META_INSET) {
-                       Inset * in = text->cursor.par()->getInset(text->cursor.pos());
+                       InsetOld * in = text->cursor.par()->getInset(text->cursor.pos());
                        if (inset == in) {
                                theLockingInset(inset);
                                return true;
@@ -545,7 +479,7 @@ bool BufferView::lockInset(UpdatableInset * inset)
 bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
        if (theLockingInset() && available()) {
-               y += text->cursor.iy() + theLockingInset()->insetInInsetY();
+               y += text->cursor.y() + theLockingInset()->insetInInsetY();
                if (screen().fitManualCursor(this, text, x, y, asc, desc)) {
                        updateScrollbar();
                        return true;
@@ -586,23 +520,13 @@ int BufferView::unlockInset(UpdatableInset * inset)
 }
 
 
-void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
-{
-       if (!theLockingInset())
-               return; // shouldn't happen
-       if (kind == Undo::EDIT) // in this case insets would not be stored!
-               kind = Undo::FINISH;
-       setUndo(this, kind, text->cursor.par());
-}
-
-
-void BufferView::updateInset(Inset * inset)
+void BufferView::updateInset(InsetOld const * inset)
 {
        pimpl_->updateInset(inset);
 }
 
 
-bool BufferView::ChangeInsets(Inset::Code code,
+bool BufferView::ChangeInsets(InsetOld::Code code,
                              string const & from, string const & to)
 {
        bool need_update = false;
@@ -634,9 +558,7 @@ bool BufferView::ChangeInsets(Inset::Code code,
                        // How to set the cursor corretly when it.size()>1 ??
                        if (it.size() == 1) {
                                text->setCursorIntern(it.pit(), 0);
-                               text->redoParagraphs(text->cursor,
-                                                    boost::next(text->cursor.par()));
-                               text->fullRebreak();
+                               text->redoParagraph(text->cursor.par());
                        }
                }
        }
@@ -654,22 +576,7 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
        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)
-{
-       typedef pair<string, string> StringPair;
-
-       vector<StringPair> keys;
-       buffer()->fillWithBibKeys(keys);
-       if (count_if(keys.begin(), keys.end(),
-                    lyx::equal_1st_in_pair<StringPair>(from))
-           > 1)
-               return false;
-
-       return ChangeInsets(Inset::CITE_CODE, from, to);
+       return ChangeInsets(InsetOld::REF_CODE, from, to);
 }
 
 
@@ -699,25 +606,11 @@ LyXText * BufferView::getLyXText() const
 }
 
 
-LyXText * BufferView::getParentText(Inset * inset) const
-{
-       if (inset->owner()) {
-               LyXText * txt = inset->getLyXText(this);
-               inset = inset->owner();
-               while (inset && inset->getLyXText(this) == txt)
-                       inset = inset->owner();
-               if (inset)
-                       return inset->getLyXText(this);
-       }
-       return text;
-}
-
-
-Language const * BufferView::getParentLanguage(Inset * inset) const
+Language const * BufferView::getParentLanguage(InsetOld * inset) const
 {
-       LyXText * text = getParentText(inset);
-       return text->cursor.par()->getFontSettings(buffer()->params,
-                                                  text->cursor.pos()).language();
+       Paragraph const & par = ownerPar(*buffer(), inset);
+       return par.getFontSettings(buffer()->params,
+                                  par.getPositionOfInset(inset)).language();
 }