#include "undo.h"
#include "vspace.h"
+#include "insets/insetbibtex.h"
#include "insets/insetref.h"
#include "insets/insettext.h"
#include "support/types.h"
#include <boost/bind.hpp>
+#include <boost/current_function.hpp>
#include <functional>
#include <vector>
boost::signals::connection lostcon;
-/// Get next inset of this class from current cursor position
+/// Return an inset of this class if it exists at the current cursor position
template <class T>
T * getInsetByCode(LCursor & cur, InsetBase::Code code)
{
// Fall through to new load. (Asger)
}
- Buffer * b;
+ Buffer * b = 0;
if (found) {
b = bufferlist.newBuffer(s);
lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
<< "[ b = " << b << "]" << endl;
- if (buffer_)
+ if (buffer_) {
disconnectBuffer();
+ // Save the actual cursor position and anchor inside the
+ // buffer so that it can be restored in case we rechange
+ // to this buffer later on.
+ buffer_->saveCursor(cursor_.selectionBegin(),
+ cursor_.selectionEnd());
+ }
// If we are closing current buffer, switch to the first in
// buffer list.
lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
<< "Buffer addr: " << buffer_ << endl;
connectBuffer(*buffer_);
-
cursor_.push(buffer_->inset());
cursor_.resetAnchor();
buffer_->text().init(bv_);
buffer_->text().setCurrentFont(cursor_);
+ if (buffer_->getCursor().size() > 0 &&
+ buffer_->getAnchor().size() > 0)
+ {
+ cursor_.setCursor(buffer_->getAnchor().asDocIterator(&(buffer_->inset())));
+ cursor_.resetAnchor();
+ cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
+ cursor_.setSelection();
+ }
// Buffer-dependent dialogs should be updated or
// hidden. This should go here because some dialogs (eg ToC)
owner_->updateWindowTitle();
// This is done after the layout combox has been populated
- if (buffer_)
- owner_->setLayout(cursor_.paragraph().layout()->name());
+ if (buffer_) {
+ size_t i = cursor_.depth() - 1;
+ // we know we'll eventually find a paragraph
+ while (true) {
+ CursorSlice const & slice = cursor_[i];
+ if (!slice.inset().inMathed()) {
+ LyXLayout_ptr const layout = slice.paragraph().layout();
+ owner_->setLayout(layout->name());
+ break;
+ }
+ BOOST_ASSERT(i>0);
+ --i;
+ }
+ }
if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
// It would be better to fix the scrollbar to understand
// values in [0..1] and divide everything by wh
- int const wh = workarea().workHeight() / 4;
- int const h = t.getPar(anchor_ref_).height();
- workarea().setScrollbarParams(t.paragraphs().size() * wh, anchor_ref_ * wh + int(offset_ref_ * wh / float(h)), int (wh * defaultRowHeight() / float(h)));
+
+ // estimated average paragraph height:
+ int const wh = workarea().workHeight() / 4;
+ int h = t.getPar(anchor_ref_).height();
+ // Normalize anchor/offset (MV):
+ while (offset_ref_ > h) {
+ anchor_ref_++;
+ offset_ref_ -= h;
+ h = t.getPar(anchor_ref_).height();
+ }
+
+ // The "+ 2" makes inoculates doc bottom display against
+ // unrealistic wh values (docs with very large paragraphs) (MV)
+ workarea().setScrollbarParams((t.paragraphs().size() + 2) * wh,
+ anchor_ref_ * wh + int(offset_ref_ * wh / float(h)),
+ int(wh * defaultRowHeight() / float(h)));
// workarea().setScrollbarParams(t.paragraphs().size(), anchor_ref_, 1);
}
cur.clearSelection();
break;
case bv_funcs::CUR_INSIDE:
- int const y = bv_funcs::getPos(cur).y_;
+ int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
int const newy = min(last, max(y, first));
if (y != newy) {
cur.reset(buffer_->inset());
* of the cursor. Note we cannot do this inside
* dispatch() itself, because that's called recursively.
*/
- if (available()) {
- cursor_timeout.restart();
+ if (available())
screen().showCursor(*bv_);
- }
}
LyXFont const font = cursor_.getFont();
int const asc = font_metrics::maxAscent(font);
int const des = font_metrics::maxDescent(font);
- Point p = bv_funcs::getPos(cursor_);
+ Point const p = bv_funcs::getPos(cursor_, cursor_.boundary());
if (p.y_ - asc >= 0 && p.y_ + des < workarea().workHeight())
return false;
}
}
-void BufferView::Pimpl::update(bool fitcursor, bool forceupdate)
+void BufferView::Pimpl::update(Update::flags flags)
{
- lyxerr << BOOST_CURRENT_FUNCTION
- << "[fitcursor = " << fitcursor << ','
- << " forceupdate = " << forceupdate
- << "] buffer: " << buffer_ << endl;
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << "[fitcursor = " << (flags & Update::FitCursor)
+ << ", forceupdate = " << (flags & Update::Force)
+ << ", singlepar = " << (flags & Update::SinglePar)
+ << "] buffer: " << buffer_ << endl;
// Check needed to survive LyX startup
if (buffer_) {
// Update macro store
buffer_->buildMacros();
- // First drawing step
CoordCache backup;
std::swap(theCoords, backup);
+
+ // This, together with doneUpdating(), verifies (using
+ // asserts) that screen redraw is not called from
+ // within itself.
theCoords.startUpdating();
- ViewMetricsInfo vi = metrics();
+ // First drawing step
+ ViewMetricsInfo vi = metrics(flags & Update::SinglePar);
+ bool forceupdate(flags & Update::Force);
- if (fitcursor && fitCursor()) {
+ if ((flags & Update::FitCursor) && fitCursor()) {
forceupdate = true;
vi = metrics();
}
// Second drawing step
screen().redraw(*bv_, vi);
} else {
- // Abort updating of the coord cache - just restore the old one
+ // Abort updating of the coord
+ // cache - just restore the old one
std::swap(theCoords, backup);
}
} else
// have finished but are waiting to communicate this fact
// to the rest of LyX.
ForkedcallsController & fcc = ForkedcallsController::get();
- if (fcc.processesCompleted())
- fcc.handleCompletedProcesses();
+ fcc.handleCompletedProcesses();
}
cursor_timeout.restart();
bot.text()->redoParagraph(pit);
Paragraph const & par = bot.text()->paragraphs()[pit];
anchor_ref_ = pit;
- offset_ref_ = bv_funcs::coordOffset(cursor_).y_ + par.ascent()
- - workarea().workHeight() / 2;
+ offset_ref_ = bv_funcs::coordOffset(cursor_, cursor_.boundary()).y_
+ + par.ascent() - workarea().workHeight() / 2;
}
// We cannot allow undos beyond the freeze point
buffer_->undostack().clear();
} else {
- update();
- bv_->text()->setCursor(cursor_, 0, 0);
-#ifdef WITH_WARNINGS
-#warning changes FIXME
-#endif
+ cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
bool const found = lyx::find::findNextChange(bv_);
if (found) {
+ // We reset the cursor to the start of the
+ // document, since the Changes Dialog is going
+ // to search for the next change anyway.
+ cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
owner_->getDialogs().show("changes");
return;
}
bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0)
{
- lyxerr << BOOST_CURRENT_FUNCTION
- << "[ cmd0 " << cmd0 << "]" << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION << "[ cmd0 " << cmd0 << "]" << endl;
// This is only called for mouse related events including
// LFUN_FILE_OPEN generated by drag-and-drop.
// Build temporary cursor.
cmd.y = min(max(cmd.y,-1), workarea().workHeight());
InsetBase * inset = bv_->text()->editXY(cur, cmd.x, cmd.y);
- lyxerr << BOOST_CURRENT_FUNCTION
- << " * hit inset at tip: " << inset << endl;
- lyxerr << BOOST_CURRENT_FUNCTION
- << " * created temp cursor:" << cur << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION
+ // << " * hit inset at tip: " << inset << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION
+ // << " * created temp cursor:" << cur << endl;
// Put anchor at the same position.
cur.resetAnchor();
if (cur.result().dispatched()) {
// Redraw if requested or necessary.
- update(cur.result().update(), cur.result().update());
+ if (cur.result().update())
+ update(Update::FitCursor | Update::Force);
+ else
+ update();
}
// See workAreaKeyPress
case LFUN_FONT_STATE:
case LFUN_INSERT_LABEL:
case LFUN_BOOKMARK_SAVE:
- case LFUN_REF_GOTO:
case LFUN_GOTO_PARAGRAPH:
case LFUN_GOTOERROR:
case LFUN_GOTONOTE:
case LFUN_MARK_ON:
case LFUN_SETMARK:
case LFUN_CENTER:
+ case LFUN_BIBDB_ADD:
+ case LFUN_BIBDB_DEL:
case LFUN_WORDS_COUNT:
flag.enabled(true);
break;
+ case LFUN_LABEL_GOTO: {
+ flag.enabled(!cmd.argument.empty()
+ || getInsetByCode<InsetRef>(cursor_, InsetBase::REF_CODE));
+ break;
+ }
+
case LFUN_BOOKMARK_GOTO:
flag.enabled(isSavedPosition(convert<unsigned int>(cmd.argument)));
break;
restorePosition(convert<unsigned int>(cmd.argument));
break;
- case LFUN_REF_GOTO: {
+ case LFUN_LABEL_GOTO: {
string label = cmd.argument;
if (label.empty()) {
InsetRef * inset =
center();
break;
+ case LFUN_BIBDB_ADD: {
+ LCursor tmpcur = cursor_;
+ bv_funcs::findInset(tmpcur, InsetBase::BIBTEX_CODE, false);
+ InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
+ InsetBase::BIBTEX_CODE);
+ if (inset)
+ inset->addDatabase(cmd.argument);
+ break;
+ }
+
+ case LFUN_BIBDB_DEL: {
+ LCursor tmpcur = cursor_;
+ bv_funcs::findInset(tmpcur, InsetBase::BIBTEX_CODE, false);
+ InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
+ InsetBase::BIBTEX_CODE);
+ if (inset)
+ inset->delDatabase(cmd.argument);
+ break;
+ }
+
case LFUN_WORDS_COUNT: {
DocIterator from, to;
if (cur.selection()) {
}
-ViewMetricsInfo BufferView::Pimpl::metrics()
+ViewMetricsInfo BufferView::Pimpl::metrics(bool singlepar)
{
// Remove old position cache
theCoords.clear();
int pit2 = pit;
size_t const npit = text->paragraphs().size();
- lyxerr << BOOST_CURRENT_FUNCTION
- << " npit: " << npit
- << " pit1: " << pit1
- << " pit2: " << pit2
- << endl;
+ // Rebreak anchor paragraph. In Single Paragraph mode, rebreak only
+ // the (main text, not inset!) paragraph containing the cursor.
+ // (if this paragraph contains insets etc., rebreaking will
+ // recursively descend)
+ if (!singlepar || pit == cursor_.bottom().pit())
+ text->redoParagraph(pit);
+ int y0 = text->getPar(pit).ascent() - offset_ref_;
- // Rebreak anchor par
- text->redoParagraph(pit);
- int y0 = text->getPar(pit1).ascent() - offset_ref_;
-
- // Redo paragraphs above cursor if necessary
+ // Redo paragraphs above anchor if necessary; again, in Single Par
+ // mode, only if we encounter the (main text) one having the cursor.
int y1 = y0;
while (y1 > 0 && pit1 > 0) {
y1 -= text->getPar(pit1).ascent();
--pit1;
- text->redoParagraph(pit1);
+ if (!singlepar || pit1 == cursor_.bottom().pit())
+ text->redoParagraph(pit1);
y1 -= text->getPar(pit1).descent();
}
anchor_ref_ = 0;
}
- // Redo paragraphs below cursor if necessary
+ // Redo paragraphs below the anchor if necessary. Single par mode:
+ // only the one containing the cursor if encountered.
int y2 = y0;
while (y2 < bv.workHeight() && pit2 < int(npit) - 1) {
y2 += text->getPar(pit2).descent();
++pit2;
- text->redoParagraph(pit2);
+ if (!singlepar || pit2 == cursor_.bottom().pit())
+ text->redoParagraph(pit2);
y2 += text->getPar(pit2).ascent();
}
for (lyx::pit_type pit = pit1; pit <= pit2; ++pit) {
y += text->getPar(pit).ascent();
theCoords.parPos()[text][pit] = Point(0, y);
+ if (singlepar && pit == cursor_.bottom().pit()) {
+ // In Single Paragraph mode, collect here the
+ // y1 and y2 of the (one) paragraph the cursor is in
+ y1 = y - text->getPar(pit).ascent();
+ y2 = y + text->getPar(pit).descent();
+ }
y += text->getPar(pit).descent();
}
- lyxerr << BOOST_CURRENT_FUNCTION
- << " y1: " << y1
- << " y2: " << y2
- << endl;
-
- return ViewMetricsInfo(pit1, pit2, y1, y2);
+ if (singlepar) {
+ // collect cursor paragraph iter bounds
+ pit1 = cursor_.bottom().pit();
+ pit2 = cursor_.bottom().pit();
+ }
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << " y1: " << y1
+ << " y2: " << y2
+ << " pit1: " << pit1
+ << " pit2: " << pit2
+ << " npit: " << npit
+ << " singlepar: " << singlepar
+ << endl;
+
+ return ViewMetricsInfo(pit1, pit2, y1, y2, singlepar);
}
projects / lyx.git / blobdiff