#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferparams.h"
+#include "coordcache.h"
#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include <boost/bind.hpp>
+#include <functional>
+
using lyx::pos_type;
using lyx::support::AddPath;
using lyx::support::ForkedcallsController;
using lyx::support::IsDirWriteable;
using lyx::support::MakeDisplayPath;
+using lyx::support::MakeAbsPath;
using lyx::support::strToUnsignedInt;
using lyx::support::system_lyxdir;
using std::make_pair;
using std::min;
using std::string;
+using std::mem_fun_ref;
extern BufferList bufferlist;
boost::signals::connection lostcon;
+/// Get next inset of this class from current cursor position
+template <class T>
+T * getInsetByCode(LCursor & cur, InsetBase::Code code)
+{
+ T * inset = 0;
+ DocIterator it = cur;
+ if (it.nextInset() &&
+ it.nextInset()->lyxCode() == code) {
+ inset = static_cast<T*>(it.nextInset());
+ }
+ return inset;
+}
+
+
} // anon namespace
if (buffer_)
disconnectBuffer();
- // set current buffer
- buffer_ = b;
+ // if we are closing current buffer, switch to the first in
+ // buffer list.
+ if (!b) {
+ lyxerr[Debug::INFO] << " No Buffer!" << endl;
+ // we are closing the buffer, use the first buffer as current
+ buffer_ = bufferlist.first();
+ owner_->getDialogs().hideBufferDependent();
+ } else {
+ // set current buffer
+ buffer_ = b;
+ }
// reset old cursor
top_y_ = 0;
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
owner_->getDialogs().updateBufferDependent(true);
- } else {
- lyxerr[Debug::INFO] << " No Buffer!" << endl;
- // we are closing the buffer, use the first buffer as current
- buffer_ = bufferlist.first();
- owner_->getDialogs().hideBufferDependent();
}
update();
// and the scrollbar
updateScrollbar();
}
+
+ // remove old position cache
+ theCoords.clear();
+
+ // The real, big redraw.
screen().redraw(*bv_);
+
bv_->owner()->view_state_changed();
}
}
-InsetBase * BufferView::Pimpl::getInsetByCode(InsetBase::Code code)
-{
-#ifdef WITH_WARNINGS
-#warning Does not work for mathed. (Still true?)
-#endif
- // Ok, this is a little bit too brute force but it
- // should work for now. Better infrastructure is coming. (Lgb)
- LCursor & cur = bv_->cursor();
- DocIterator it = cur;
- for (it.forwardInset(); it; it.forwardInset()) {
- BOOST_ASSERT(it.nextInset());
- if (it.nextInset()->lyxCode() == code)
- return it.nextInset();
- }
- return 0;
-}
-
-
void BufferView::Pimpl::MenuInsertLyXFile(string const & filenm)
{
string filename = filenm;
string const disp_fn = MakeDisplayPath(filename);
owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
- if (bv_->insertLyXFile(filename))
- owner_->message(bformat(_("Document %1$s inserted."),
- disp_fn));
- else
- owner_->message(bformat(_("Could not insert document %1$s"),
- disp_fn));
+
+ bv_->cursor().clearSelection();
+ bv_->text()->breakParagraph(bv_->cursor());
+
+ BOOST_ASSERT(bv_->cursor().inTexted());
+
+ string const fname = MakeAbsPath(filename);
+ bool const res = bv_->buffer()->readFile(fname, bv_->cursor().par());
+ bv_->resize();
+
+ string s = res ? _("Document %1$s inserted.")
+ : _("Could not insert document %1$s");
+ owner_->message(bformat(s, disp_fn));
}
bool const tracking = buf->params().tracking_changes;
if (!tracking) {
- ParIterator const end = buf->par_iterator_end();
- for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
- it->trackChanges();
+ for_each(buf->par_iterator_begin(),
+ buf->par_iterator_end(),
+ bind(&Paragraph::trackChanges, _1, Change::UNCHANGED));
buf->params().tracking_changes = true;
// we cannot allow undos beyond the freeze point
return;
}
- ParIterator const end = buf->par_iterator_end();
- for (ParIterator it = buf->par_iterator_begin(); it != end; ++it)
- it->untrackChanges();
+ for_each(buf->par_iterator_begin(),
+ buf->par_iterator_end(),
+ mem_fun_ref(&Paragraph::untrackChanges));
+
buf->params().tracking_changes = false;
}
bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0)
{
- //lyxerr << "BufferView::Pimpl::workAreaDispatch: request: "
- // << cmd << std::endl;
+ lyxerr << "BufferView::Pimpl::workAreaDispatch: request: "
+ << cmd0 << std::endl;
// this is only called for mouse related events including
// LFUN_FILE_OPEN generated by drag-and-drop.
FuncRequest cmd = cmd0;
// Build temporary cursor.
InsetBase * inset = bv_->text()->editXY(cur, cmd.x, cmd.y);
- lyxerr << "hit inset at tip: " << inset << endl;
- lyxerr << "created temp cursor:\n" << cur << endl;
+ lyxerr << " * created temp cursor: " << inset << endl;
+ lyxerr << " * hit inset at tip: " << inset << endl;
+ lyxerr << " * created temp cursor:" << cur << endl;
// Put anchor at the same position.
cur.resetAnchor();
// Try to dispatch to an non-editable inset near this position
// via the temp cursor. If the inset wishes to change the real
// cursor it has to do so explicitly by using
- // cur.bv().cursor() = cur; (or similar)'
+ // cur.bv().cursor() = cur; (or similar)
if (inset)
inset->dispatch(cur, cmd);
string label = cmd.argument;
if (label.empty()) {
InsetRef * inset =
- static_cast<InsetRef*>(getInsetByCode(InsetBase::REF_CODE));
+ getInsetByCode<InsetRef>(bv_->cursor(),
+ InsetBase::REF_CODE);
if (inset) {
label = inset->getContents();
savePosition(0);