#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 "insets/insetref.h"
+#include "insets/insettext.h"
#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
#include "graphics/Previews.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>
using lyx::support::bformat;
using lyx::support::FileFilterList;
using lyx::support::FileSearch;
+using lyx::support::ForkedcallsController;
using lyx::support::IsDirWriteable;
using lyx::support::MakeDisplayPath;
using lyx::support::strToUnsignedInt;
disconnectBuffer();
errorConnection_ =
- buf.error.connect(boost::bind(&BufferView::Pimpl::addError, this, _1));
+ buf.error.connect(
+ boost::bind(&BufferView::Pimpl::addError, this, _1));
+
messageConnection_ =
- buf.message.connect(boost::bind(&LyXView::message, owner_, _1));
+ buf.message.connect(
+ boost::bind(&LyXView::message, owner_, _1));
+
busyConnection_ =
- buf.busy.connect(boost::bind(&LyXView::busy, owner_, _1));
+ buf.busy.connect(
+ boost::bind(&LyXView::busy, owner_, _1));
+
titleConnection_ =
- buf.updateTitles.connect(boost::bind(&LyXView::updateWindowTitle, owner_));
+ buf.updateTitles.connect(
+ boost::bind(&LyXView::updateWindowTitle, owner_));
+
timerConnection_ =
- buf.resetAutosaveTimers.connect(boost::bind(&LyXView::resetAutosaveTimer, owner_));
+ buf.resetAutosaveTimers.connect(
+ boost::bind(&LyXView::resetAutosaveTimer, owner_));
+
readonlyConnection_ =
- buf.readonly.connect(boost::bind(&BufferView::Pimpl::showReadonly, this, _1));
+ buf.readonly.connect(
+ boost::bind(&BufferView::Pimpl::showReadonly, this, _1));
+
closingConnection_ =
- buf.closing.connect(boost::bind(&BufferView::Pimpl::buffer, this, (Buffer *)0));
+ buf.closing.connect(
+ boost::bind(&BufferView::Pimpl::setBuffer, this, (Buffer *)0));
}
}
-bool BufferView::Pimpl::newFile(string const & filename,
- string const & tname,
- bool isNamed)
+void BufferView::Pimpl::newFile(string const & filename, string const & tname,
+ bool isNamed)
{
- Buffer * b = ::newFile(filename, tname, isNamed);
- buffer(b);
- return true;
+ setBuffer(::newFile(filename, tname, isNamed));
}
text, 0, 1, _("&Revert"), _("&Switch to document"));
if (ret != 0) {
- buffer(bufferlist.getBuffer(s));
+ setBuffer(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)
}
+ // FIXME: should be LFUN_REVERT
+ if (!bufferlist.close(bufferlist.getBuffer(s), false))
+ return false;
+ // Fall through to new load. (Asger)
}
Buffer * b;
return false;
}
- buffer(b);
+ setBuffer(b);
bv_->showErrorList(_("Parse"));
if (tolastfiles)
}
-void BufferView::Pimpl::buffer(Buffer * b)
+void BufferView::Pimpl::setBuffer(Buffer * b)
{
lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
<< b << ')' << endl;
- if (buffer_) {
+ if (buffer_)
disconnectBuffer();
- //delete bv_->text();
- //bv_->setText(0);
- }
-
- // reset old cursor
- cursor_.reset();
// set current buffer
buffer_ = b;
+ // reset old cursor
top_y_ = 0;
+ cursor_ = LCursor(*bv_);
// if we're quitting lyx, don't bother updating stuff
if (quitting)
return;
- // if we are closing the buffer, use the first buffer as current
- if (!buffer_)
- buffer_ = bufferlist.first();
-
if (buffer_) {
lyxerr[Debug::INFO] << "Buffer addr: " << buffer_ << endl;
connectBuffer(*buffer_);
+ cursor_.push(buffer_->inset());
+ cursor_.resetAnchor();
buffer_->text().init(bv_);
// If we don't have a text object for this, we make one
- if (bv_->text() == 0)
- resizeCurrentBuffer();
+ //if (bv_->text() == 0)
+ // resizeCurrentBuffer();
// 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_->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();
}
owner_->updateLayoutChoice();
owner_->updateWindowTitle();
- // Don't forget to update the Layout
- if (buffer_)
- owner_->setLayout(bv_->text()->getPar(0)->layout()->name());
-
- if (lyx::graphics::Previews::activated() && buffer_)
+ if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
}
bool BufferView::Pimpl::fitCursor()
{
- if (screen().fitCursor(bv_)) {
- updateScrollbar();
- return true;
- }
- return false;
+ // to get the correct y cursor info
+ lyxerr << "BufferView::fitCursor" << std::endl;
+ lyx::par_type const pit = bv_->cursor().bottom().par();
+ bv_->text()->redoParagraph(pit);
+ refreshPar(*bv_, *bv_->text(), pit);
+
+ if (!screen().fitCursor(bv_))
+ return false;
+ updateScrollbar();
+ return true;
}
void BufferView::Pimpl::resizeCurrentBuffer()
{
lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
-
- int par = -1;
- int selstartpar = -1;
- int selendpar = -1;
-
- pos_type pos = 0;
- pos_type selstartpos = 0;
- pos_type selendpos = 0;
- bool sel = false;
- bool mark_set = false;
-
owner_->busy(true);
-
owner_->message(_("Formatting document..."));
LyXText * text = bv_->text();
- lyxerr << "### resizeCurrentBuffer: text " << text << endl;
if (!text)
return;
- LCursor & cur = bv_->cursor();
- par = cur.par();
- pos = cur.pos();
- selstartpar = cur.selBegin().par();
- selstartpos = cur.selBegin().pos();
- selendpar = cur.selEnd().par();
- selendpos = cur.selEnd().pos();
- sel = cur.selection();
- mark_set = cur.mark();
text->init(bv_);
update();
-
- if (par != -1) {
- cur.selection() = true;
- // At this point just to avoid the Delete-Empty-Paragraph-
- // Mechanism when setting the cursor.
- cur.mark() = mark_set;
- if (sel) {
- text->setCursor(cur, selstartpar, selstartpos);
- cur.resetAnchor();
- text->setCursor(cur, selendpar, selendpos);
- cur.setSelection();
- text->setCursor(cur, par, pos);
- } else {
- text->setCursor(cur, par, pos);
- cur.resetAnchor();
- cur.selection() = false;
- }
- }
-
fitCursor();
switchKeyMap();
{
if (!bv_->text()) {
lyxerr[Debug::GUI] << "no text in updateScrollbar" << endl;
+ lyxerr << "no text in updateScrollbar" << endl;
workarea().setScrollbarParams(0, 0, 0);
return;
}
LyXText const & t = *bv_->text();
- lyxerr[Debug::GUI] << "Updating scrollbar: h" << t.height()
- << ", top_y()" << top_y() << ", default height "
- << defaultRowHeight() << endl;
+ lyxerr[Debug::GUI]
+ << "Updating scrollbar: height: " << t.height()
+ << " top_y: " << top_y()
+ << " default height " << defaultRowHeight() << endl;
workarea().setScrollbarParams(t.height(), top_y(), defaultRowHeight());
}
int const first = top_y() + height;
int const last = top_y() + workarea().workHeight() - height;
- bv_->cursor().reset();
+ bv_->cursor().reset(bv_->buffer()->inset());
LyXText * text = bv_->text();
- CursorSlice & cur = bv_->cursor().cursor_.front();
- int y = text->cursorY(cur);
+ int y = text->cursorY(bv_->cursor().front());
if (y < first)
- text->setCursorFromCoordinates(bv_->cursor(), 0, first);
- else if (y > last)
- text->setCursorFromCoordinates(bv_->cursor(), 0, last);
+ y = first;
+ if (y > last)
+ y = last;
+ text->setCursorFromCoordinates(bv_->cursor(), 0, y);
owner_->updateLayoutChoice();
}
}
if (!xsel_cache_.set ||
- cur.cursor_.back() != xsel_cache_.cursor ||
+ cur.back() != xsel_cache_.cursor ||
cur.anchor_.back() != xsel_cache_.anchor)
{
- xsel_cache_.cursor = cur.cursor_.back();
+ xsel_cache_.cursor = cur.back();
xsel_cache_.anchor = cur.anchor_.back();
xsel_cache_.set = cur.selection();
sel = cur.selectionAsString(false);
if (!sel.empty())
workarea().putClipboard(sel);
- }
+ }
}
void BufferView::Pimpl::update()
{
- //lyxerr << "BufferView::update()" << endl;
+ //lyxerr << "BufferView::Pimpl::update(), buffer: " << buffer_ << endl;
// fix cursor coordinate cache in case something went wrong
// check needed to survive LyX startup
- if (bv_->getLyXText()) {
+ if (buffer_) {
+ // update macro store
+ buffer_->buildMacros();
+
// update all 'visible' paragraphs
- ParagraphList::iterator beg;
- ParagraphList::iterator end;
+ lyx::par_type beg, end;
getParsInRange(buffer_->paragraphs(),
top_y(), top_y() + workarea().workHeight(),
beg, end);
bv_->text()->redoParagraphs(beg, end);
+
+ // and the scrollbar
updateScrollbar();
}
screen().redraw(*bv_);
+ bv_->owner()->view_state_changed();
}
// Callback for cursor timer
void BufferView::Pimpl::cursorToggle()
{
- if (!buffer_) {
- cursor_timeout.restart();
- return;
+ if (buffer_) {
+ screen().toggleCursor(*bv_);
+
+ // Use this opportunity to deal with any child processes that
+ // have finished but are waiting to communicate this fact
+ // to the rest of LyX.
+ ForkedcallsController & fcc = ForkedcallsController::get();
+ if (fcc.processesCompleted())
+ fcc.handleCompletedProcesses();
}
- screen().toggleCursor(*bv_);
cursor_timeout.restart();
}
if (!cur.selection())
return Change(Change::UNCHANGED);
- return text->getPar(cur.selBegin())
- ->lookupChangeFull(cur.selBegin().pos());
+ return text->getPar(cur.selBegin().par()).
+ lookupChangeFull(cur.selBegin().pos());
}
{
if (i >= saved_positions_num)
return;
+ BOOST_ASSERT(bv_->cursor().inTexted());
saved_positions[i] = Position(buffer_->fileName(),
- bv_->text()->cursorPar()->id(),
- bv_->text()->cursor().pos());
+ bv_->cursor().paragraph().id(),
+ bv_->cursor().pos());
if (i > 0)
owner_->message(bformat(_("Saved bookmark %1$s"), tostr(i)));
}
::loadLyXFile(b, fname); // don't ask, just load it
}
if (b)
- buffer(b);
+ setBuffer(b);
}
ParIterator par = buffer_->getParFromID(saved_positions[i].par_id);
if (par == buffer_->par_iterator_end())
return;
- bv_->text()->setCursor(
- bv_->cursor(),
- bv_->text()->parOffset(par.pit()),
+ bv_->text()->setCursor(bv_->cursor(), par.pit(),
min(par->size(), saved_positions[i].par_pos));
if (i > 0)
bv_->cursor().clearSelection();
int const half_height = workarea().workHeight() / 2;
- int new_y = text->cursorY(bv_->cursor().cursor_.front()) - half_height;
+ int new_y = text->cursorY(bv_->cursor().front()) - half_height;
if (new_y < 0)
new_y = 0;
InsetBase * BufferView::Pimpl::getInsetByCode(InsetBase::Code code)
{
-#warning Does not work for mathed
+#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)
-
- 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();
- ParagraphList::iterator pit = bv_->getLyXText()->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);
- }
+ DocIterator it = cur;
+ for (it.forwardInset(); it; it.forwardInset()) {
+ BOOST_ASSERT(it.nextInset());
+ if (it.nextInset()->lyxCode() == code)
+ return it.nextInset();
}
return 0;
}
} 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");
bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0)
{
- //
- // this is only called for mouse related events (including
- // LFUN_FILE_OPEN generated by drag-and-drop)
- //
+ //lyxerr << "BufferView::Pimpl::workAreaDispatch: request: "
+ // << cmd << std::endl;
+ // this is only called for mouse related events including
+ // LFUN_FILE_OPEN generated by drag-and-drop.
FuncRequest cmd = cmd0;
- cmd.y += bv_->top_y();
- //lyxerr << "*** workAreaDispatch: request: " << cmd << std::endl;
- LCursor cur(*bv_);
- cur.selection() = bv_->cursor().selection();
- switch (cmd.action) {
-#if 0
- case LFUN_MOUSE_MOTION: {
- if (!available())
- return false;
- FuncRequest cmd1 = cmd;
- InsetBase * inset = cur.inset();
- DispatchResult res;
- if (inset) {
- res = inset->dispatch(cur, cmd);
- } else {
- res = bv_->text()->dispatch(cur, cmd);
- }
-
- if (fitCursor() || res.update()) {
- update();
- cur.updatePos();
- }
+ // handle drag&drop
+ if (cmd.action == LFUN_FILE_OPEN) {
+ owner_->dispatch(cmd);
return true;
}
-#else
- case LFUN_MOUSE_MOTION:
-#endif
- case LFUN_MOUSE_PRESS:
- case LFUN_MOUSE_RELEASE:
- case LFUN_MOUSE_DOUBLE:
- case LFUN_MOUSE_TRIPLE: {
- // We pass those directly to the Bufferview, since
- // otherwise selection handling breaks down
+ cmd.y += bv_->top_y();
+ if (!bv_->buffer())
+ return false;
+
+ LCursor cur(*bv_);
+ cur.push(bv_->buffer()->inset());
+ cur.selection() = bv_->cursor().selection();
- // Doesn't go through lyxfunc, so we need to update
- // the layout choice etc. ourselves
+ // Doesn't go through lyxfunc, so we need to update
+ // the layout choice etc. ourselves
- // e.g. Qt mouse press when no buffer
- if (!available())
- return false;
+ // e.g. Qt mouse press when no buffer
+ if (!available())
+ return false;
- screen().hideCursor();
+ screen().hideCursor();
- // either the inset under the cursor or the
- // surrounding LyXText will handle this event.
+ // Either the inset under the cursor or the
+ // surrounding LyXText will handle this event.
- // built temporary path to inset
- InsetBase * inset = bv_->text()->editXY(cur, cmd.x, cmd.y);
- lyxerr << "hit inset at tip: " << inset << endl;
- lyxerr << "created temp cursor:\n" << cur << endl;
+ // 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;
- // Try to dispatch to an non-editable inset near this position
- DispatchResult res;
- if (inset)
- inset->dispatch(cur, cmd);
+ // Put anchor at the same position.
+ cur.resetAnchor();
- // Dispatch to the temp cursor.
- // An inset (or LyXText) can assign this to bv->cursor()
- // if it wishes to do so.
- if (!res.dispatched())
- res = cur.dispatch(cmd);
+ // 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;
+ 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 (res.dispatched()) {
+ // Redraw if requested or necessary.
if (fitCursor() || res.update())
update();
+ }
- // see workAreaKeyPress
- cursor_timeout.restart();
- screen().showCursor(*bv_);
-
- // skip these when selecting
- if (cmd.action != LFUN_MOUSE_MOTION) {
- owner_->updateLayoutChoice();
- owner_->updateToolbar();
- }
+ // see workAreaKeyPress
+ cursor_timeout.restart();
+ screen().showCursor(*bv_);
- // slight hack: this is only called currently when we
- // clicked somewhere, so we force through the display
- // of the new status here.
- owner_->clearMessage();
- return true;
+ // skip these when selecting
+ if (cmd.action != LFUN_MOUSE_MOTION) {
+ owner_->updateLayoutChoice();
+ owner_->updateToolbar();
}
- case LFUN_FILE_OPEN:
- owner_->dispatch(cmd);
- return true;
+ // slight hack: this is only called currently when we
+ // clicked somewhere, so we force through the display
+ // of the new status here.
+ owner_->clearMessage();
+ return true;
+}
+
+
+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_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:
- BOOST_ASSERT(false);
+ flag.enabled(false);
}
- return true;
+
+ return flag;
}
+
bool BufferView::Pimpl::dispatch(FuncRequest const & cmd)
{
- //lyxerr << "*** BufferView::Pimpl: request: " << cmd << std::endl;
+ //lyxerr << "BufferView::Pimpl::dispatch cmd: " << cmd << std::endl;
// Make sure that the cached BufferView is correct.
lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch:"
<< " action[" << cmd.action << ']'
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;
break;
case LFUN_ACCEPT_ALL_CHANGES: {
- bv_->cursor().reset();
+ 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_->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;
case LFUN_SETMARK:
cur.clearSelection();
if (cur.mark()) {
+ cur.mark() = false;
cur.message(N_("Mark removed"));
} else {
cur.mark() = true;
cur.message(N_("Mark set"));
}
cur.resetAnchor();
- update();
- break;
-
- case LFUN_UNKNOWN_ACTION:
- cur.errorMessage(N_("Unknown function!"));
break;
case LFUN_CENTER:
bv_->center();
break;
+ case LFUN_BEGINNINGBUFSEL:
+ bv_->cursor().reset(bv_->buffer()->inset());
+ if (!cur.selection())
+ cur.resetAnchor();
+ bv_->text()->cursorTop(cur);
+ finishUndo();
+ break;
+
+ case LFUN_ENDBUFSEL:
+ bv_->cursor().reset(bv_->buffer()->inset());
+ if (!cur.selection())
+ cur.resetAnchor();
+ bv_->text()->cursorBottom(cur);
+ finishUndo();
+ break;
+
default:
return false;
}
projects / lyx.git / blobdiff