#include "BufferView_pimpl.h"
#include "bufferlist.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferview_funcs.h"
#include "lfuns.h"
#include "debug.h"
#include "gettext.h"
#include "intl.h"
#include "iterators.h"
+#include "Lsstream.h"
#include "lyx_cb.h" // added for Dispatch functions
#include "lyx_main.h"
#include "lyxfind.h"
#include "lyxtext.h"
#include "lyxrc.h"
#include "lyxrow.h"
+#include "lastfiles.h"
#include "paragraph.h"
#include "ParagraphParameters.h"
#include "TextCache.h"
#include "graphics/Previews.h"
#include "support/LAssert.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
#include "support/filetools.h"
#include <boost/bind.hpp>
#include <boost/signals/connection.hpp>
-#include "support/BoostFormat.h"
#include <unistd.h>
#include <sys/wait.h>
using std::min;
using lyx::pos_type;
+using namespace bv_funcs;
extern BufferList bufferlist;
}
+void BufferView::Pimpl::addError(ErrorItem const & ei)
+{
+ errorlist_.push_back(ei);
+
+}
+
+
+bool BufferView::Pimpl::loadLyXFile(string const & filename, bool tolastfiles)
+{
+ // get absolute path of file and add ".lyx" to the filename if
+ // necessary
+ string s = FileSearch(string(), filename, "lyx");
+ if (s.empty()) {
+ s = filename;
+ }
+
+ // file already open?
+ if (bufferlist.exists(s)) {
+ string const file = MakeDisplayPath(s, 20);
+ string text = bformat(_("The document %1$s is already "
+ "loaded.\n\nDo you want to revert "
+ "to the saved version?"), file);
+ int const ret = Alert::prompt(_("Revert to saved document?"),
+ text, 0, 1, _("&Revert"), _("&Switch to document"));
+
+ if (ret != 0) {
+ buffer(bufferlist.getBuffer(s));
+ return true;
+ } else {
+ // FIXME: should be LFUN_REVERT
+ if (!bufferlist.close(bufferlist.getBuffer(s), false))
+ return false;
+ // Fall through to new load. (Asger)
+ }
+ }
+ Buffer * b = bufferlist.newBuffer(s);
+
+ //attach to the error signal in the buffer
+ b->parseError.connect(boost::bind(&BufferView::Pimpl::addError,
+ this, _1));
+
+ bool loaded = ::loadLyXFile(b, s);
+
+ if (! loaded) {
+ bufferlist.release(b);
+ string text = bformat(_("The document %1$s does "
+ "not yet exist.\n\n"
+ "Do you want to create "
+ "a new document?"), s);
+ int const ret = Alert::prompt(_("Create new document?"),
+ text, 0, 1, _("&Create"), _("Cancel"));
+
+ if (ret == 0)
+ b = newFile(s, string(), true);
+ else
+ return false;
+
+ }
+
+ buffer(b);
+
+ if (tolastfiles)
+ lastfiles->newFile(b->fileName());
+
+ if (loaded)
+ bv_->showErrorList(_("Parse"));
+
+ return true;
+}
+
WorkArea & BufferView::Pimpl::workarea() const
{
return *workarea_.get();
}
// FIXME: needed when ?
- bv_->text->top_y(screen().topCursorVisible(bv_->text->cursor, bv_->text->top_y()));
+ bv_->text->top_y(screen().topCursorVisible(bv_->text));
- // Similarly, buffer-dependent dialogs should be updated or
+ // Buffer-dependent dialogs should be updated or
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
owner_->getDialogs().updateBufferDependent(true);
owner_->updateLayoutChoice();
owner_->updateWindowTitle();
+ if (buffer_) {
+ // Don't forget to update the Layout
+ string const layoutname =
+ bv_->text->cursor.par()->layout()->name();
+ owner_->setLayout(layoutname);
+ }
+
if (grfx::Previews::activated() && buffer_)
grfx::Previews::get().generateBufferPreviews(*buffer_);
}
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
- // We need to always update, in case we did a
+ // We need to always update, in case we did a
// paste and we stayed anchored to a row, but
// the actual height of the doc changed ...
updateScrollbar();
{
lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
- Paragraph * par = 0;
- Paragraph * selstartpar = 0;
- Paragraph * selendpar = 0;
+ ParagraphList::iterator par;
+ ParagraphList::iterator selstartpar;
+ ParagraphList::iterator selendpar;
UpdatableInset * the_locking_inset = 0;
pos_type pos = 0;
mark_set = bv_->text->selection.mark();
the_locking_inset = bv_->theLockingInset();
buffer_->resizeInsets(bv_);
- // I don't think the delete and new are necessary here we just could
- // call only init! (Jug 20020419)
+ // I don't think the delete and new are necessary here we
+ // just could call only init! (Jug 20020419)
delete bv_->text;
bv_->text = new LyXText(bv_);
bv_->text->init(bv_);
bv_->text->init(bv_);
//buffer_->resizeInsets(bv_);
}
+
+ par = bv_->text->ownerParagraphs().end();
+ selstartpar = bv_->text->ownerParagraphs().end();
+ selendpar = bv_->text->ownerParagraphs().end();
}
- if (par) {
+ if (par != bv_->text->ownerParagraphs().end()) {
bv_->text->selection.set(true);
// At this point just to avoid the Delete-Empty-Paragraph-
// Mechanism when setting the cursor.
bv_->theLockingInset(the_locking_inset);
}
- bv_->text->top_y(screen().topCursorVisible(bv_->text->cursor, bv_->text->top_y()));
+ bv_->text->top_y(screen().topCursorVisible(bv_->text));
switchKeyMap();
owner_->busy(false);
+ // reset the "Formatting..." message
+ owner_->clearMessage();
+
updateScrollbar();
return 0;
if (!buffer_)
return;
+ screen().hideCursor();
+
screen().draw(bv_->text, bv_, value);
if (!lyxrc.cursor_follows_scrollbar)
key_modifier::state state)
{
bv_->owner()->getLyXFunc().processKeySym(key, state);
+
+ /* This is perhaps a bit of a hack. When we move
+ * around, or type, it's nice to be able to see
+ * the cursor immediately after the keypress. So
+ * we reset the toggle timeout and force the visibility
+ * of the cursor. Note we cannot do this inside
+ * dispatch() itself, because that's called recursively.
+ */
+ if (available()) {
+ cursor_timeout.restart();
+ screen().showCursor(*bv_);
+ }
}
void BufferView::Pimpl::selectionLost()
{
if (available()) {
- hideCursor();
+ screen().hideCursor();
toggleSelection();
bv_->getLyXText()->clearSelection();
- showCursor();
bv_->text->xsel_cache.set(false);
}
}
text->selection.cursor = text->cursor;
}
- text->fullRebreak();
+ text->partialRebreak();
if (text->inset_owner) {
text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
text->selection.cursor = text->cursor;
}
- text->fullRebreak();
+ text->partialRebreak();
if (text->inset_owner) {
text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
return;
}
- if (!bv_->theLockingInset()) {
- screen().cursorToggle(bv_);
- } else {
- bv_->theLockingInset()->toggleInsetCursor(bv_);
- }
+ screen().toggleCursor(*bv_);
cursor_timeout.restart();
}
saved_positions[i] = Position(buffer_->fileName(),
bv_->text->cursor.par()->id(),
bv_->text->cursor.pos());
- if (i > 0) {
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Saved bookmark %1$d")) % i;
-#else
- str << _("Saved bookmark ") << i;
-#endif
- owner_->message(STRCONV(str.str()));
- }
+ if (i > 0)
+ owner_->message(bformat(_("Saved bookmark %1$s"), tostr(i)));
}
beforeChange(bv_->text);
if (fname != buffer_->fileName()) {
- Buffer * b = bufferlist.exists(fname) ?
- bufferlist.getBuffer(fname) :
- bufferlist.loadLyXFile(fname); // don't ask, just load it
- if (b != 0) buffer(b);
+ Buffer * b;
+ if (bufferlist.exists(fname))
+ b = bufferlist.getBuffer(fname);
+ else {
+ b = bufferlist.newBuffer(fname);
+ ::loadLyXFile(b, fname); // don't ask, just load it
+ }
+ if (b != 0)
+ buffer(b);
}
- Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
- if (!par)
+ ParIterator par = buffer_->getParFromID(saved_positions[i].par_id);
+ if (par == buffer_->par_iterator_end())
return;
- bv_->text->setCursor(par,
+ bv_->text->setCursor(par.pit(),
min(par->size(), saved_positions[i].par_pos));
update(BufferView::SELECT);
- if (i > 0) {
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Moved to bookmark %1$d")) % i;
-#else
- str << _("Moved to bookmark ") << i;
-#endif
- owner_->message(STRCONV(str.str()));
- }
+ if (i > 0)
+ owner_->message(bformat(_("Moved to bookmark %1$s"), tostr(i)));
}
}
-void BufferView::Pimpl::showCursor()
-{
- if (bv_->theLockingInset())
- bv_->theLockingInset()->showInsetCursor(bv_);
- else
- screen().showCursor(bv_->text, bv_);
-}
-
-
-void BufferView::Pimpl::hideCursor()
-{
- if (!bv_->theLockingInset())
- screen().hideCursor();
-}
-
-
void BufferView::Pimpl::toggleSelection(bool b)
{
if (bv_->theLockingInset())
// necessary
filename = FileSearch(string(), filename, "lyx");
- string const disp_fn(MakeDisplayPath(filename));
-
- ostringstream s1;
-#if USE_BOOST_FORMAT
- s1 << boost::format(_("Inserting document %1$s...")) % disp_fn;
-#else
- s1 << _("Inserting document ") << disp_fn << _("...");
-#endif
- owner_->message(STRCONV(s1.str()));
+ string const disp_fn = MakeDisplayPath(filename);
+ owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
bool const res = bv_->insertLyXFile(filename);
- if (res) {
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Document %1$s inserted.")) % disp_fn;
-#else
- str << _("Document ") << disp_fn << _(" inserted.");
-#endif
- owner_->message(STRCONV(str.str()));
- } else {
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Could not insert document %1$s")) % disp_fn;
-#else
- str << _("Could not insert document ") << disp_fn;
-#endif
- owner_->message(STRCONV(str.str()));
- }
+ if (res)
+ owner_->message(bformat(_("Document %1$s inserted."), disp_fn));
+ else
+ owner_->message(bformat(_("Could not insert document %1$s"), disp_fn));
}
if (!tracking) {
ParIterator const end = buf->par_iterator_end();
- for (ParIterator it = buf->par_iterator_begin(); it != end; ++it) {
- (*it)->trackChanges();
- }
+ for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
+ it->trackChanges();
buf->params.tracking_changes = true;
// we cannot allow undos beyond the freeze point
buf->undostack.clear();
} else {
update(BufferView::SELECT);
- bv_->text->setCursor(&(*buf->paragraphs.begin()), 0);
+ bv_->text->setCursor(buf->paragraphs.begin(), 0);
#warning changes FIXME
//moveCursorUpdate(false);
}
ParIterator const end = buf->par_iterator_end();
- for (ParIterator it = buf->par_iterator_begin(); it != end; ++it) {
- (*it)->untrackChanges();
- }
+ for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
+ it->untrackChanges();
buf->params.tracking_changes = false;
}
if (!available())
return false;
+ screen().hideCursor();
+
bool const res = dispatch(ev_in);
+ // see workAreaKeyPress
+ cursor_timeout.restart();
+ screen().showCursor(*bv_);
+
+ // FIXME: we should skip these when selecting
bv_->owner()->updateLayoutChoice();
+ bv_->owner()->updateToolbar();
bv_->fitCursor();
+ // slight hack: this is only called currently when
+ // we clicked somewhere, so we force through the display
+ // of the new status here.
+ bv_->owner()->clearMessage();
+
return res;
}
// a tabular-inset
break;
- case LFUN_LAYOUT_COPY:
- bv_->copyEnvironment();
- break;
-
- case LFUN_LAYOUT_PASTE:
- bv_->pasteEnvironment();
- switchKeyMap();
- break;
-
case LFUN_FILE_INSERT:
MenuInsertLyXFile(ev.argument);
break;
}
}
break;
-
+
case LFUN_FLOAT_LIST:
if (tclass.floats().typeExist(ev.argument)) {
Inset * inset = new InsetFloatList(ev.argument);
break;
case LFUN_LAYOUT_PARAGRAPH: {
- Paragraph const * par = bv_->getLyXText()->cursor.par();
+ Paragraph const * par = &*bv_->getLyXText()->cursor.par();
if (!par)
break;
}
case LFUN_PARAGRAPH_UPDATE: {
- Paragraph const * par = bv_->getLyXText()->cursor.par();
+ if (!bv_->owner()->getDialogs().visible("paragraph"))
+ break;
+ Paragraph const * par = &*bv_->getLyXText()->cursor.par();
if (!par)
break;
case LFUN_ACCEPT_ALL_CHANGES: {
update(BufferView::SELECT);
- bv_->text->setCursor(&(*bv_->buffer()->paragraphs.begin()), 0);
+ bv_->text->setCursor(bv_->buffer()->paragraphs.begin(), 0);
#warning FIXME changes
//moveCursorUpdate(false);
case LFUN_REJECT_ALL_CHANGES: {
update(BufferView::SELECT);
- bv_->text->setCursor(&(*bv_->buffer()->paragraphs.begin()), 0);
+ bv_->text->setCursor(bv_->buffer()->paragraphs.begin(), 0);
#warning FIXME changes
//moveCursorUpdate(false);
Inset * tl_inset = inset;
while (tl_inset->owner())
tl_inset = tl_inset->owner();
- hideCursor();
if (tl_inset == inset) {
update(BufferView::UPDATE);
if (bv_->text->updateInset(inset)) {
projects / lyx.git / blobdiff