#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferparams.h"
+#include "coordcache.h"
#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include "factory.h"
#include "FloatList.h"
#include "funcrequest.h"
+#include "FuncStatus.h"
#include "gettext.h"
#include "intl.h"
-#include "iterators.h"
+#include "insetiterator.h"
#include "lyx_cb.h" // added for Dispatch functions
#include "lyx_main.h"
#include "lyxfind.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
+#include "pariterator.h"
+#include "rowpainter.h"
#include "undo.h"
#include "vspace.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();
- if (lyx::graphics::Previews::activated() && buffer_)
+ // 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[Debug::DEBUG] << "BufferView::fitCursor" << std::endl;
+ lyx::pit_type const pit = bv_->cursor().bottom().pit();
+ bv_->text()->redoParagraph(pit);
+ refreshPar(*bv_, *bv_->text(), pit);
+
if (!screen().fitCursor(bv_))
return false;
updateScrollbar();
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..."));
text->init(bv_);
update();
- bv_->cursor().updatePos();
fitCursor();
switchKeyMap();
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;
}
// check needed to survive LyX startup
if (buffer_) {
+ // update macro store
+ 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);
bv_->text()->redoParagraphs(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*/)
-{
-#warning Does not work for mathed
- // Ok, this is a little bit too brute force but it
- // should work for now. Better infrastructure is coming. (Lgb)
-
-#warning FIXME
-#if 0
- Buffer * buf = bv_->buffer();
- Buffer::inset_iterator beg = buf->inset_iterator_begin();
- Buffer::inset_iterator end = buf->inset_iterator_end();
-
- bool cursor_par_seen = false;
-
- LCursor & cur = bv_->cursor();
- LyXText * = bv_->getLyXText();
- ParagraphList::iterator pit = text->getPar(cur.par());
-
- for (; beg != end; ++beg) {
- if (beg.getPar() == pit)
- cursor_par_seen = true;
- if (cursor_par_seen) {
- if (beg.getPar() == pit && beg.getPos() >= cur.pos())
- break;
- if (beg.getPar() != pit)
- break;
- }
- }
- if (beg != end) {
- // Now find the first inset that matches code.
- for (; beg != end; ++beg) {
- if (beg->lyxCode() == code)
- return &(*beg);
- }
- }
-#endif
- 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
} else {
update();
bv_->text()->setCursor(bv_->cursor(), 0, 0);
+#ifdef WITH_WARNINGS
#warning changes FIXME
+#endif
bool found = lyx::find::findNextChange(bv_);
if (found) {
owner_->getDialogs().show("changes");
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: "
+ << cmd0 << std::endl;
// this is only called for mouse related events including
// LFUN_FILE_OPEN generated by drag-and-drop.
FuncRequest cmd = cmd0;
- // handle drag&deop
+ // handle drag&drop
if (cmd.action == LFUN_FILE_OPEN) {
owner_->dispatch(cmd);
return true;
}
cmd.y += bv_->top_y();
- //lyxerr << "*** workAreaDispatch: request: " << cmd << std::endl;
+ if (!bv_->buffer())
+ return false;
+
LCursor cur(*bv_);
cur.push(bv_->buffer()->inset());
- cur.resetAnchor();
cur.selection() = bv_->cursor().selection();
// Doesn't go through lyxfunc, so we need to update
screen().hideCursor();
- // either the inset under the cursor or the
+ // Either the inset under the cursor or the
// surrounding LyXText will handle this event.
- // built temporary path to inset
+ // 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
+ // 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 real cursor. Any change to the cursor
- // is immediate.
- if (!res.dispatched())
- res = cur.dispatch(cmd);
-
- // If the request was dispatched the temp cursor should have been
- // in a way to be used as new 'real' cursor.
- if (res.dispatched())
- bv_->cursor() = cur;
+ // Now dispatch to the temporary cursor. If the real cursor should
+ // be modified, the inset's dispatch has to do so explicitly.
+ if (!cur.result().dispatched())
+ cur.dispatch(cmd);
- // Redraw if requested or necessary.
- if (res.update())
- update();
- if (fitCursor())
- update();
+ if (cur.result().dispatched()) {
+ // Redraw if requested or necessary.
+ if (fitCursor() || cur.result().update())
+ update();
+ }
// see workAreaKeyPress
cursor_timeout.restart();
// 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
}
+FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd)
+{
+ Buffer * buf = bv_->buffer();
+
+ FuncStatus flag;
+
+ switch (cmd.action) {
+
+ case LFUN_UNDO:
+ flag.enabled(!buf->undostack().empty());
+ break;
+ case LFUN_REDO:
+ flag.enabled(!buf->redostack().empty());
+ break;
+ case LFUN_FILE_INSERT:
+ case LFUN_FILE_INSERT_ASCII_PARA:
+ case LFUN_FILE_INSERT_ASCII:
+ case LFUN_FONT_STATE:
+ case LFUN_INSERT_LABEL:
+ case LFUN_BOOKMARK_SAVE:
+ case LFUN_REF_GOTO:
+ case LFUN_WORD_FIND:
+ case LFUN_WORD_REPLACE:
+ case LFUN_MARK_OFF:
+ 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);
+ break;
+ case LFUN_BOOKMARK_GOTO:
+ flag.enabled(bv_->isSavedPosition(strToUnsignedInt(cmd.argument)));
+ break;
+ case LFUN_TRACK_CHANGES:
+ flag.enabled(true);
+ flag.setOnOff(buf->params().tracking_changes);
+ break;
+
+ case LFUN_MERGE_CHANGES:
+ case LFUN_ACCEPT_CHANGE: // what about these two
+ case LFUN_REJECT_CHANGE: // what about these two
+ case LFUN_ACCEPT_ALL_CHANGES:
+ case LFUN_REJECT_ALL_CHANGES:
+ flag.enabled(buf && buf->params().tracking_changes);
+ break;
+ default:
+ flag.enabled(false);
+ }
+
+ return flag;
+}
+
+
+
bool BufferView::Pimpl::dispatch(FuncRequest const & cmd)
{
//lyxerr << "BufferView::Pimpl::dispatch cmd: " << cmd << std::endl;
cur.message(cur.currentState());
break;
- case LFUN_INSERT_LABEL: {
- // Try and generate a valid label
- string const contents = cmd.argument.empty() ?
- cur.getPossibleLabel() : cmd.argument;
- InsetCommandParams icp("label", contents);
- string data = InsetCommandMailer::params2string("label", icp);
- owner_->getDialogs().show("label", data, 0);
- break;
- }
-
case LFUN_BOOKMARK_SAVE:
savePosition(strToUnsignedInt(cmd.argument));
break;
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);
case LFUN_ACCEPT_ALL_CHANGES: {
bv_->cursor().reset(bv_->buffer()->inset());
+#ifdef WITH_WARNINGS
#warning FIXME changes
+#endif
while (lyx::find::findNextChange(bv_))
bv_->getLyXText()->acceptChange(bv_->cursor());
update();
case LFUN_REJECT_ALL_CHANGES: {
bv_->cursor().reset(bv_->buffer()->inset());
+#ifdef WITH_WARNINGS
#warning FIXME changes
+#endif
while (lyx::find::findNextChange(bv_))
bv_->getLyXText()->rejectChange(bv_->cursor());
- update();
break;
}
case LFUN_MARK_OFF:
cur.clearSelection();
- update();
cur.resetAnchor();
cur.message(N_("Mark off"));
break;
case LFUN_MARK_ON:
cur.clearSelection();
cur.mark() = true;
- update();
cur.resetAnchor();
cur.message(N_("Mark on"));
break;
cur.message(N_("Mark set"));
}
cur.resetAnchor();
- update();
- break;
-
- case LFUN_UNKNOWN_ACTION:
- cur.errorMessage(N_("Unknown function!"));
break;
case LFUN_CENTER:
projects / lyx.git / blobdiff