#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
lyxerr[Debug::GUI]
<< BOOST_CURRENT_FUNCTION
<< " Updating scrollbar: height: " << t.paragraphs().size()
- << " curr par: " << bv_->cursor().bottom().pit()
+ << " curr par: " << cursor_.bottom().pit()
<< " default height " << defaultRowHeight() << endl;
// It would be better to fix the scrollbar to understand
int const height = 2 * defaultRowHeight();
int const first = height;
int const last = workarea().workHeight() - height;
- LCursor & cur = bv_->cursor();
+ LCursor & cur = cursor_;
bv_funcs::CurStatus st = bv_funcs::status(bv_, cur);
int const y = bv_funcs::getPos(cur).y_;
int const newy = min(last, max(y, first));
if (y != newy) {
- cur.reset(bv_->buffer()->inset());
+ cur.reset(buffer_->inset());
t.setCursorFromCoordinates(cur, 0, newy);
}
}
}
-void BufferView::Pimpl::scroll(int lines)
+void BufferView::Pimpl::scroll(int /*lines*/)
{
// if (!buffer_)
// return;
void BufferView::Pimpl::workAreaKeyPress(LyXKeySymPtr key,
key_modifier::state state)
{
- bv_->owner()->getLyXFunc().processKeySym(key, state);
+ owner_->getLyXFunc().processKeySym(key, state);
/* This is perhaps a bit of a hack. When we move
* around, or type, it's nice to be able to see
* 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_);
- }
}
if (!available())
return;
- LCursor & cur = bv_->cursor();
+ LCursor & cur = cursor_;
if (!cur.selection()) {
xsel_cache_.set = false;
}
if (!xsel_cache_.set ||
- cur.back() != xsel_cache_.cursor ||
- cur.anchor_.back() != xsel_cache_.anchor)
+ cur.top() != xsel_cache_.cursor ||
+ cur.anchor_.top() != xsel_cache_.anchor)
{
- xsel_cache_.cursor = cur.back();
- xsel_cache_.anchor = cur.anchor_.back();
+ xsel_cache_.cursor = cur.top();
+ xsel_cache_.anchor = cur.anchor_.top();
xsel_cache_.set = cur.selection();
sel = cur.selectionAsString(false);
if (!sel.empty())
{
if (available()) {
screen().hideCursor();
- bv_->cursor().clearSelection();
+ cursor_.clearSelection();
xsel_cache_.set = false;
}
}
bool BufferView::Pimpl::fitCursor()
{
- if (bv_funcs::status(bv_, bv_->cursor()) == bv_funcs::CUR_INSIDE) {
- LyXFont const font = bv_->cursor().getFont();
+ if (bv_funcs::status(bv_, cursor_) == bv_funcs::CUR_INSIDE) {
+ LyXFont const font = cursor_.getFont();
int const asc = font_metrics::maxAscent(font);
int const des = font_metrics::maxDescent(font);
- Point p = bv_funcs::getPos(bv_->cursor());
- if (p.y_ - asc >= 0 && p.y_ + des < bv_->workHeight())
+ Point p = bv_funcs::getPos(cursor_);
+ if (p.y_ - asc >= 0 && p.y_ + des < workarea().workHeight())
return false;
}
- bv_->center();
+ center();
return true;
}
-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
// And the scrollbar
updateScrollbar();
- bv_->owner()->view_state_changed();
+ owner_->view_state_changed();
}
// 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();
Change const BufferView::Pimpl::getCurrentChange()
{
- if (!bv_->buffer()->params().tracking_changes)
+ if (!buffer_->params().tracking_changes)
return Change(Change::UNCHANGED);
LyXText * text = bv_->getLyXText();
- LCursor & cur = bv_->cursor();
+ LCursor & cur = cursor_;
if (!cur.selection())
return Change(Change::UNCHANGED);
{
if (i >= saved_positions_num)
return;
- BOOST_ASSERT(bv_->cursor().inTexted());
+ BOOST_ASSERT(cursor_.inTexted());
saved_positions[i] = Position(buffer_->fileName(),
- bv_->cursor().paragraph().id(),
- bv_->cursor().pos());
+ cursor_.paragraph().id(),
+ cursor_.pos());
if (i > 0)
owner_->message(bformat(_("Saved bookmark %1$d"), i));
}
string const fname = saved_positions[i].filename;
- bv_->cursor().clearSelection();
+ cursor_.clearSelection();
if (fname != buffer_->fileName()) {
Buffer * b = 0;
if (par == buffer_->par_iterator_end())
return;
- bv_->text()->setCursor(bv_->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));
void BufferView::Pimpl::center()
{
- CursorSlice & bot = bv_->cursor().bottom();
+ CursorSlice & bot = cursor_.bottom();
lyx::pit_type const pit = bot.pit();
bot.text()->redoParagraph(pit);
Paragraph const & par = bot.text()->paragraphs()[pit];
anchor_ref_ = pit;
- offset_ref_ = bv_funcs::coordOffset(bv_->cursor()).y_ + par.ascent()
+ offset_ref_ = bv_funcs::coordOffset(cursor_).y_ + par.ascent()
- workarea().workHeight() / 2;
}
string const disp_fn = MakeDisplayPath(filename);
owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
- bv_->cursor().clearSelection();
- bv_->getLyXText()->breakParagraph(bv_->cursor());
+ cursor_.clearSelection();
+ bv_->getLyXText()->breakParagraph(cursor_);
- BOOST_ASSERT(bv_->cursor().inTexted());
+ BOOST_ASSERT(cursor_.inTexted());
string const fname = MakeAbsPath(filename);
- bool const res = bv_->buffer()->readFile(fname, bv_->cursor().pit());
- bv_->resize();
+ bool const res = buffer_->readFile(fname, cursor_.pit());
+ resizeCurrentBuffer();
string s = res ? _("Document %1$s inserted.")
: _("Could not insert document %1$s");
void BufferView::Pimpl::trackChanges()
{
- Buffer * buf = bv_->buffer();
- bool const tracking = buf->params().tracking_changes;
+ bool const tracking = buffer_->params().tracking_changes;
if (!tracking) {
- for_each(buf->par_iterator_begin(),
- buf->par_iterator_end(),
+ for_each(buffer_->par_iterator_begin(),
+ buffer_->par_iterator_end(),
bind(&Paragraph::trackChanges, _1, Change::UNCHANGED));
- buf->params().tracking_changes = true;
+ buffer_->params().tracking_changes = true;
// We cannot allow undos beyond the freeze point
- buf->undostack().clear();
+ buffer_->undostack().clear();
} else {
update();
- bv_->text()->setCursor(bv_->cursor(), 0, 0);
+ bv_->text()->setCursor(cursor_, 0, 0);
#ifdef WITH_WARNINGS
#warning changes FIXME
#endif
return;
}
- for_each(buf->par_iterator_begin(),
- buf->par_iterator_end(),
+ for_each(buffer_->par_iterator_begin(),
+ buffer_->par_iterator_end(),
mem_fun_ref(&Paragraph::untrackChanges));
- buf->params().tracking_changes = false;
+ buffer_->params().tracking_changes = false;
}
- buf->redostack().clear();
+ buffer_->redostack().clear();
}
return true;
}
- if (!bv_->buffer())
+ if (!buffer_)
return false;
LCursor cur(*bv_);
- cur.push(bv_->buffer()->inset());
- cur.selection() = bv_->cursor().selection();
+ cur.push(buffer_->inset());
+ cur.selection() = cursor_.selection();
// Doesn't go through lyxfunc, so we need to update
// the layout choice etc. ourselves
// surrounding LyXText will handle this event.
// Build temporary cursor.
- cmd.y = min(max(cmd.y,-1), bv_->workHeight());
+ 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;
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
FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd)
{
- Buffer * buf = bv_->buffer();
-
FuncStatus flag;
switch (cmd.action) {
case LFUN_UNDO:
- flag.enabled(!buf->undostack().empty());
+ flag.enabled(!buffer_->undostack().empty());
break;
case LFUN_REDO:
- flag.enabled(!buf->redostack().empty());
+ flag.enabled(!buffer_->redostack().empty());
break;
case LFUN_FILE_INSERT:
case LFUN_FILE_INSERT_ASCII_PARA:
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(bv_->isSavedPosition(convert<unsigned int>(cmd.argument)));
+ flag.enabled(isSavedPosition(convert<unsigned int>(cmd.argument)));
break;
case LFUN_TRACK_CHANGES:
flag.enabled(true);
- flag.setOnOff(buf->params().tracking_changes);
+ flag.setOnOff(buffer_->params().tracking_changes);
break;
case LFUN_OUTPUT_CHANGES: {
- LaTeXFeatures features(*buf, buf->params(), false);
- flag.enabled(buf && buf->params().tracking_changes
+ LaTeXFeatures features(*buffer_, buffer_->params(), false);
+ flag.enabled(buffer_ && buffer_->params().tracking_changes
&& features.isAvailable("dvipost"));
- flag.setOnOff(buf->params().output_changes);
+ flag.setOnOff(buffer_->params().output_changes);
break;
}
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);
+ flag.enabled(buffer_ && buffer_->params().tracking_changes);
break;
default:
flag.enabled(false);
<< " button[" << cmd.button() << ']'
<< endl;
- LCursor & cur = bv_->cursor();
+ LCursor & cur = cursor_;
switch (cmd.action) {
restorePosition(convert<unsigned int>(cmd.argument));
break;
- case LFUN_REF_GOTO: {
+ case LFUN_LABEL_GOTO: {
string label = cmd.argument;
if (label.empty()) {
InsetRef * inset =
- getInsetByCode<InsetRef>(bv_->cursor(),
+ getInsetByCode<InsetRef>(cursor_,
InsetBase::REF_CODE);
if (inset) {
label = inset->getContents();
break;
}
+ case LFUN_GOTO_PARAGRAPH: {
+ int const id = convert<int>(cmd.argument);
+ ParIterator par = buffer_->getParFromID(id);
+ if (par == buffer_->par_iterator_end()) {
+ lyxerr[Debug::INFO] << "No matching paragraph found! ["
+ << id << ']' << endl;
+ break;
+ } else {
+ lyxerr[Debug::INFO] << "Paragraph " << par->id()
+ << " found." << endl;
+ }
+
+ // Set the cursor
+ 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;
case LFUN_OUTPUT_CHANGES: {
- Buffer * buf = bv_->buffer();
- bool const state = buf->params().output_changes;
- buf->params().output_changes = !state;
+ bool const state = buffer_->params().output_changes;
+ buffer_->params().output_changes = !state;
break;
}
break;
case LFUN_ACCEPT_ALL_CHANGES: {
- bv_->cursor().reset(bv_->buffer()->inset());
+ cursor_.reset(buffer_->inset());
#ifdef WITH_WARNINGS
#warning FIXME changes
#endif
while (lyx::find::findNextChange(bv_))
- bv_->getLyXText()->acceptChange(bv_->cursor());
+ bv_->getLyXText()->acceptChange(cursor_);
update();
break;
}
case LFUN_REJECT_ALL_CHANGES: {
- bv_->cursor().reset(bv_->buffer()->inset());
+ cursor_.reset(buffer_->inset());
#ifdef WITH_WARNINGS
#warning FIXME changes
#endif
while (lyx::find::findNextChange(bv_))
- bv_->getLyXText()->rejectChange(bv_->cursor());
+ bv_->getLyXText()->rejectChange(cursor_);
break;
}
break;
case LFUN_CENTER:
- bv_->center();
+ center();
break;
case LFUN_WORDS_COUNT: {
from = cur.selectionBegin();
to = cur.selectionEnd();
} else {
- from = doc_iterator_begin(bv_->buffer()->inset());
- to = doc_iterator_end(bv_->buffer()->inset());
+ from = doc_iterator_begin(buffer_->inset());
+ to = doc_iterator_end(buffer_->inset());
}
int const count = countWords(from, to);
string message;
}
-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;
- while (y2 < bv.workHeight() && pit2 < int(npit) - 1) {
+ while (!singlepar && y2 < bv.workHeight() && pit2 < int(npit) - 1) {
y2 += text->getPar(pit2).descent();
++pit2;
text->redoParagraph(pit2);
<< " y2: " << y2
<< endl;
- return ViewMetricsInfo(pit1, pit2, y1, y2);
+ return ViewMetricsInfo(pit1, pit2, y1, y2, singlepar);
}