#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferparams.h"
+#include "coordcache.h"
#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include "graphics/Previews.h"
+#include "support/filefilterlist.h"
#include "support/filetools.h"
#include "support/forkedcontr.h"
-#include "support/globbing.h"
#include "support/path_defines.h"
#include "support/tostr.h"
#include "support/types.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
BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner,
- int xpos, int ypos, int width, int height)
+ int width, int height)
: bv_(&bv), owner_(owner), buffer_(0), cursor_timeout(400),
using_xterm_cursor(false), cursor_(bv)
{
xsel_cache_.set = false;
- workarea_.reset(WorkAreaFactory::create(xpos, ypos, width, height));
+ workarea_.reset(WorkAreaFactory::create(*owner_, width, height));
screen_.reset(LyXScreenFactory::create(workarea()));
// Setup the signals
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;
cursor_.push(buffer_->inset());
cursor_.resetAnchor();
buffer_->text().init(bv_);
+ buffer_->text().setCurrentFont(cursor_);
// If we don't have a text object for this, we make one
//if (bv_->text() == 0)
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
owner_->getDialogs().updateBufferDependent(true);
- owner_->setLayout(bv_->text()->getPar(0).layout()->name());
- } 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();
updateScrollbar();
owner_->updateMenubar();
- owner_->updateToolbar();
+ owner_->updateToolbars();
owner_->updateLayoutChoice();
owner_->updateWindowTitle();
+ // This is done after the layout combox has been populated
+ if (buffer_)
+ owner_->setLayout(cursor_.paragraph().layout()->name());
+
if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
}
bool BufferView::Pimpl::fitCursor()
{
// to get the correct y cursor info
- lyxerr << "BufferView::fitCursor" << std::endl;
- lyx::par_type const pit = bv_->cursor().bottom().par();
+ lyxerr[Debug::DEBUG] << "BufferView::fitCursor" << std::endl;
+ lyx::pit_type const pit = bv_->cursor().bottom().pit();
bv_->text()->redoParagraph(pit);
refreshPar(*bv_, *bv_->text(), pit);
void BufferView::Pimpl::redoCurrentBuffer()
{
- lyxerr[Debug::INFO] << "BufferView::redoCurrentBuffer" << endl;
+ lyxerr[Debug::DEBUG] << "BufferView::redoCurrentBuffer" << endl;
if (buffer_ && bv_->text()) {
resizeCurrentBuffer();
updateScrollbar();
void BufferView::Pimpl::resizeCurrentBuffer()
{
- lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
+ lyxerr[Debug::DEBUG] << "resizeCurrentBuffer" << endl;
owner_->busy(true);
owner_->message(_("Formatting document..."));
void BufferView::Pimpl::updateScrollbar()
{
if (!bv_->text()) {
- lyxerr[Debug::GUI] << "no text in updateScrollbar" << endl;
- lyxerr << "no text in updateScrollbar" << endl;
+ lyxerr[Debug::DEBUG] << "no text in updateScrollbar" << endl;
workarea().setScrollbarParams(0, 0, 0);
return;
}
buffer_->buildMacros();
// update all 'visible' paragraphs
- lyx::par_type beg, end;
+ lyx::pit_type beg, end;
getParsInRange(buffer_->paragraphs(),
top_y(), top_y() + workarea().workHeight(),
beg, end);
// and the scrollbar
updateScrollbar();
}
+
+ // remove old position cache
+ theCoords.clear();
+
+ // The real, big redraw.
screen().redraw(*bv_);
+
bv_->owner()->view_state_changed();
}
if (!cur.selection())
return Change(Change::UNCHANGED);
- return text->getPar(cur.selBegin().par()).
+ return text->getPar(cur.selBegin().pit()).
lookupChangeFull(cur.selBegin().pos());
}
}
-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().pit());
+ 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)'
- DispatchResult res;
+ // cur.bv().cursor() = cur; (or similar)
if (inset)
inset->dispatch(cur, cmd);
// Now dispatch to the temporary cursor. If the real cursor should
// be modified, the inset's dispatch has to do so explicitly.
- if (!res.dispatched())
- res = cur.dispatch(cmd);
+ if (!cur.result().dispatched())
+ cur.dispatch(cmd);
- if (res.dispatched()) {
+ if (cur.result().dispatched()) {
// Redraw if requested or necessary.
- if (fitCursor() || res.update())
+ if (fitCursor() || cur.result().update())
update();
}
// skip these when selecting
if (cmd.action != LFUN_MOUSE_MOTION) {
owner_->updateLayoutChoice();
- owner_->updateToolbar();
+ owner_->updateToolbars();
}
// slight hack: this is only called currently when we
case LFUN_MARK_ON:
case LFUN_SETMARK:
case LFUN_CENTER:
+ case LFUN_BEGINNINGBUF:
+ case LFUN_ENDBUF:
case LFUN_BEGINNINGBUFSEL:
case LFUN_ENDBUFSEL:
flag.enabled(true);
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);