#include "support/types.h"
#include <boost/bind.hpp>
+#include <boost/current_function.hpp>
#include <functional>
+#include <vector>
using lyx::pos_type;
using std::max;
using std::string;
using std::mem_fun_ref;
+using std::vector;
extern BufferList bufferlist;
return inset;
}
-
} // anon namespace
* 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_);
- }
}
}
-void BufferView::Pimpl::update(bool fitcursor, bool forceupdate)
+void BufferView::Pimpl::update(Update::flags flags)
{
lyxerr << BOOST_CURRENT_FUNCTION
- << "[fitcursor = " << fitcursor << ','
- << " forceupdate = " << forceupdate
+ << "[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();
+ // First drawing step
ViewMetricsInfo vi = metrics();
+ bool forceupdate(flags & Update::Force);
- if (fitcursor && fitCursor()) {
+ if ((flags & Update::FitCursor) && fitCursor()) {
forceupdate = true;
- vi = metrics();
+ vi = metrics(flags & Update::SinglePar);
}
if (forceupdate) {
// 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();
if (par == buffer_->par_iterator_end())
return;
- bv_->text()->setCursor(cursor_, par.pit(),
- min(par->size(), saved_positions[i].par_pos));
+ bv_->setCursor(makeDocIterator(par, min(par->size(), saved_positions[i].par_pos)));
if (i > 0)
owner_->message(bformat(_("Moved to bookmark %1$d"), i));
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_REFERENCE_GOTO:
case LFUN_WORD_FIND:
case LFUN_WORD_REPLACE:
case LFUN_MARK_OFF:
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 =
}
// Set the cursor
- bv_->setCursor(par, 0);
+ bv_->setCursor(makeDocIterator(par, 0));
update();
switchKeyMap();
break;
}
+ case LFUN_GOTOERROR:
+ bv_funcs::gotoInset(bv_, InsetBase::ERROR_CODE, false);
+ break;
+
+ case LFUN_GOTONOTE:
+ bv_funcs::gotoInset(bv_, InsetBase::NOTE_CODE, false);
+ break;
+
+ case LFUN_REFERENCE_GOTO: {
+ vector<InsetBase_code> tmp;
+ tmp.push_back(InsetBase::LABEL_CODE);
+ tmp.push_back(InsetBase::REF_CODE);
+ bv_funcs::gotoInset(bv_, tmp, true);
+ break;
+ }
+
case LFUN_TRACK_CHANGES:
trackChanges();
break;
}
-ViewMetricsInfo BufferView::Pimpl::metrics()
+ViewMetricsInfo BufferView::Pimpl::metrics(bool singlepar)
{
// Remove old position cache
theCoords.clear();
// Redo paragraphs above cursor if necessary
int y1 = y0;
- while (y1 > 0 && pit1 > 0) {
+ while (!singlepar && y1 > 0 && pit1 > 0) {
y1 -= text->getPar(pit1).ascent();
--pit1;
text->redoParagraph(pit1);
// Redo paragraphs below cursor if necessary
int y2 = y0;
- lyxerr << "y2 (1): " << y2 << endl;
- while (y2 < bv.workHeight() && pit2 < int(npit) - 1) {
+ while (!singlepar && y2 < bv.workHeight() && pit2 < int(npit) - 1) {
y2 += text->getPar(pit2).descent();
- lyxerr << "y2 (2): " << y2 << endl;
++pit2;
text->redoParagraph(pit2);
y2 += text->getPar(pit2).ascent();
- lyxerr << "y2 (3): " << y2 << endl;
}
// Take care of descent of last line
y2 += text->getPar(pit2).descent();
- lyxerr << "text->getPar(pit2).descent(): " << text->getPar(pit2).descent() << endl;
- lyxerr << "y2 (4): " << y2 << endl;
// The coordinates of all these paragraphs are correct, cache them
int y = y1;
<< " y2: " << y2
<< endl;
- return ViewMetricsInfo(pit1, pit2, y1, y2);
+ return ViewMetricsInfo(pit1, pit2, y1, y2, singlepar);
}