#include "frontends/Alert.h"
#include "frontends/FileDialog.h"
#include "frontends/FontMetrics.h"
-#include "frontends/Selection.h"
#include "graphics/Previews.h"
void BufferView::setBuffer(Buffer * b)
{
- lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
<< "[ b = " << b << "]" << endl;
if (buffer_) {
// to this buffer later on.
buffer_->saveCursor(cursor_.selectionBegin(),
cursor_.selectionEnd());
+ // update bookmark pit of the current buffer before switch
+ for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i) {
+ BookmarksSection::Bookmark const & bm = LyX::ref().session().bookmarks().bookmark(i);
+ if (buffer()->fileName() != bm.filename.absFilename())
+ continue;
+ // if par_id or pit has been changed, reset par_pit and par_id
+ // see http://bugzilla.lyx.org/show_bug.cgi?id=3092
+ pit_type new_pit;
+ int new_id;
+ boost::tie(new_pit, new_id) = moveToPosition(bm.par_pit, bm.par_id, bm.par_pos);
+ if (bm.par_pit != new_pit || bm.par_id != new_id)
+ const_cast<BookmarksSection::Bookmark &>(bm).setPos(new_pit, new_id);
+ }
// current buffer is going to be switched-off, save cursor pos
LyX::ref().session().lastFilePos().save(FileName(buffer_->fileName()),
boost::tie(cursor_.pit(), cursor_.pos()) );
// If we are closing current buffer, switch to the first in
// buffer list.
if (!b) {
- lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
<< " No Buffer!" << endl;
// We are closing the buffer, use the first buffer as current
buffer_ = theBufferList().first();
offset_ref_ = 0;
if (buffer_) {
- lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
<< "Buffer addr: " << buffer_ << endl;
cursor_.push(buffer_->inset());
cursor_.resetAnchor();
cursor_.resetAnchor();
cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
cursor_.setSelection();
- theSelection().haveSelection(cursor_.selection());
+ // do not set selection to the new buffer because we
+ // only paste recent selection.
}
}
pit_type pit;
pos_type pos;
boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(filename);
- // if successfully move to pit (returned par_id is not zero), update metrics
+ // if successfully move to pit (returned par_id is not zero), update metrics and reset font
if (moveToPosition(pit, 0, pos).get<1>()) {
if (fitCursor())
updateMetrics(false);
+ buffer_->text().setCurrentFont(cursor_);
}
}
}
-void BufferView::reload()
-{
- if (theBufferList().close(buffer_, false))
- loadLyXFile(FileName(buffer_->fileName()));
-}
-
-
void BufferView::resize()
{
if (!buffer_)
return;
- lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << endl;
+ LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION << endl;
updateMetrics(false);
switchKeyMap();
last_inset_ = 0;
// This is close to a hot-path.
if (lyxerr.debugging(Debug::DEBUG)) {
- lyxerr[Debug::DEBUG]
+ LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< "[fitcursor = " << (flags & Update::FitCursor)
<< ", forceupdate = " << (flags & Update::Force)
return false;
if (lyxerr.debugging(Debug::WORKAREA)) {
- lyxerr[Debug::WORKAREA] << "BufferView::update" << std::endl;
+ LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
}
// Update macro store
// Case when no explicit update is requested.
if (!flags) {
// no need to redraw anything.
+ metrics_info_.update_strategy = NoScreenUpdate;
return false;
}
- if (flags == Update::FitCursor) {
+ if (flags == Update::Decoration) {
+ metrics_info_.update_strategy = DecorationUpdate;
+ return true;
+ }
+
+ if (flags == Update::FitCursor
+ || flags == (Update::Decoration | Update::FitCursor)) {
bool const fit_cursor = fitCursor();
- if (fit_cursor)
- updateMetrics(false);
// tell the frontend to update the screen if needed.
- return fit_cursor;
+ if (fit_cursor) {
+ updateMetrics(false);
+ return true;
+ }
+ if (flags & Update::Decoration) {
+ metrics_info_.update_strategy = DecorationUpdate;
+ return true;
+ }
+ // no screen update is needed.
+ metrics_info_.update_strategy = NoScreenUpdate;
+ return false;
}
bool full_metrics = flags & Update::Force;
void BufferView::updateScrollbar()
{
if (!buffer_) {
- lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION
<< " no text in updateScrollbar" << endl;
scrollbarParameters_.reset();
return;
}
if (lyxerr.debugging(Debug::GUI)) {
- lyxerr[Debug::GUI]
+ LYXERR(Debug::GUI)
<< BOOST_CURRENT_FUNCTION
<< " Updating scrollbar: height: " << t.paragraphs().size()
<< " curr par: " << cursor_.bottom().pit()
void BufferView::scrollDocView(int value)
{
- lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION
<< "[ value = " << value << "]" << endl;
if (!buffer_)
void BufferView::setCursorFromScrollbar()
{
+ if (!buffer_)
+ return;
+
LyXText & t = buffer_->text();
int const height = 2 * defaultRowHeight();
switch (st) {
case bv_funcs::CUR_ABOVE:
+ // We reset the cursor because bv_funcs::status() does not
+ // work when the cursor is within mathed.
+ cur.reset(buffer_->inset());
t.setCursorFromCoordinates(cur, 0, first);
cur.clearSelection();
break;
case bv_funcs::CUR_BELOW:
+ // We reset the cursor because bv_funcs::status() does not
+ // work when the cursor is within mathed.
+ cur.reset(buffer_->inset());
t.setCursorFromCoordinates(cur, 0, last);
cur.clearSelection();
break;
}
-void BufferView::saveBookmark(bool persistent)
+void BufferView::saveBookmark(unsigned int idx)
{
LyX::ref().session().bookmarks().save(
FileName(buffer_->fileName()),
cursor_.pit(),
cursor_.paragraph().id(),
cursor_.pos(),
- persistent
+ idx
);
- if (persistent)
+ if (idx)
// emit message signal.
message(_("Save bookmark"));
}
if (!lyxrc.rtl_support)
return;
- if (getLyXText()->real_current_font.isRightToLeft()) {
+ if (cursor_.innerText()->real_current_font.isRightToLeft()) {
if (intl_->keymap == Intl::PRIMARY)
intl_->keyMapSec();
} else {
flag.setOnOff(buffer_->params().trackChanges);
break;
- case LFUN_CHANGES_OUTPUT: {
- OutputParams runparams;
- LaTeXFeatures features(*buffer_, buffer_->params(), runparams);
- flag.enabled(buffer_ && features.isAvailable("dvipost"));
+ case LFUN_CHANGES_OUTPUT:
+ flag.enabled(buffer_ && LaTeXFeatures::isAvailable("dvipost"));
flag.setOnOff(buffer_->params().outputChanges);
break;
- }
case LFUN_CHANGES_MERGE:
case LFUN_CHANGE_NEXT:
}
-bool BufferView::dispatch(FuncRequest const & cmd)
+Update::flags BufferView::dispatch(FuncRequest const & cmd)
{
//lyxerr << BOOST_CURRENT_FUNCTION
// << [ cmd = " << cmd << "]" << endl;
// Make sure that the cached BufferView is correct.
- lyxerr[Debug::ACTION] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION
<< " action[" << cmd.action << ']'
<< " arg[" << to_utf8(cmd.argument()) << ']'
<< " x[" << cmd.x << ']'
<< " button[" << cmd.button() << ']'
<< endl;
+ // FIXME: this should not be possible.
+ if (!buffer_)
+ return Update::None;
+
LCursor & cur = cursor_;
+ // Default Update flags.
+ Update::flags updateFlags = Update::Force | Update::FitCursor;
switch (cmd.action) {
case LFUN_UNDO:
- if (buffer_) {
- cur.message(_("Undo"));
- cur.clearSelection();
- if (!textUndo(*this))
- cur.message(_("No further undo information"));
- update();
- switchKeyMap();
+ cur.message(_("Undo"));
+ cur.clearSelection();
+ if (!textUndo(*this)) {
+ cur.message(_("No further undo information"));
+ updateFlags = Update::None;
}
+ switchKeyMap();
break;
case LFUN_REDO:
- if (buffer_) {
- cur.message(_("Redo"));
- cur.clearSelection();
- if (!textRedo(*this))
- cur.message(_("No further redo information"));
- update();
- switchKeyMap();
+ cur.message(_("Redo"));
+ cur.clearSelection();
+ if (!textRedo(*this)) {
+ cur.message(_("No further redo information"));
+ updateFlags = Update::None;
}
+ switchKeyMap();
break;
case LFUN_FILE_INSERT:
if (inset) {
label = inset->getParam("reference");
// persistent=false: use temp_bookmark
- saveBookmark(false);
+ saveBookmark(0);
}
}
for (Buffer * b = buffer_; i == 0 || b != buffer_; b = theBufferList().next(b)) {
ParIterator par = b->getParFromID(id);
if (par == b->par_iterator_end()) {
- lyxerr[Debug::INFO]
+ LYXERR(Debug::INFO)
<< "No matching paragraph found! ["
<< id << "]." << endl;
} else {
- lyxerr[Debug::INFO]
+ LYXERR(Debug::INFO)
<< "Paragraph " << par->id()
<< " found in buffer `"
<< b->fileName() << "'." << endl;
if (b == buffer_) {
// Set the cursor
setCursor(makeDocIterator(par, 0));
- update();
switchKeyMap();
} else {
// Switch to other buffer view and resend cmd
theLyXFunc().dispatch(FuncRequest(
LFUN_BUFFER_SWITCH, b->fileName()));
theLyXFunc().dispatch(cmd);
+ updateFlags = Update::None;
}
break;
}
buffer_->params().trackChanges = !buffer_->params().trackChanges;
break;
- case LFUN_CHANGES_OUTPUT: {
+ case LFUN_CHANGES_OUTPUT:
buffer_->params().outputChanges = !buffer_->params().outputChanges;
break;
- }
case LFUN_CHANGE_NEXT:
findNextChange(this);
showDialog("changes");
break;
- case LFUN_ALL_CHANGES_ACCEPT: {
+ case LFUN_ALL_CHANGES_ACCEPT:
+ // select complete document
cursor_.reset(buffer_->inset());
-#ifdef WITH_WARNINGS
-#warning FIXME changes
-#endif
- while (findNextChange(this))
- getLyXText()->acceptChange(cursor_);
- update();
+ cursor_.selHandle(true);
+ buffer_->text().cursorBottom(cursor_);
+ // accept everything in a single step to support atomic undo
+ buffer_->text().acceptOrRejectChanges(cursor_, LyXText::ACCEPT);
break;
- }
- case LFUN_ALL_CHANGES_REJECT: {
+ case LFUN_ALL_CHANGES_REJECT:
+ // select complete document
cursor_.reset(buffer_->inset());
-#ifdef WITH_WARNINGS
-#warning FIXME changes
-#endif
- while (findNextChange(this))
- getLyXText()->rejectChange(cursor_);
+ cursor_.selHandle(true);
+ buffer_->text().cursorBottom(cursor_);
+ // reject everything in a single step to support atomic undo
+ // Note: reject does not work recursively; the user may have to repeat the operation
+ buffer_->text().acceptOrRejectChanges(cursor_, LyXText::REJECT);
break;
- }
case LFUN_WORD_FIND:
find(this, cmd);
}
default:
- return false;
+ updateFlags = Update::None;
}
- return true;
+ return updateFlags;
}
{
if (buffer_) {
cursor_.clearSelection();
+ // Clear the selection buffer. Otherwise a subsequent
+ // middle-mouse-button paste would use the selection buffer,
+ // not the more current external selection.
+ cap::clearSelection();
xsel_cache_.set = false;
// The buffer did not really change, but this causes the
// redraw we need because we cleared the selection above.
}
+InsetBase const * BufferView::getCoveringInset(LyXText const & text, int x, int y)
+{
+ pit_type pit = text.getPitNearY(*this, y);
+ BOOST_ASSERT(pit != -1);
+ Paragraph const & par = text.getPar(pit);
+
+ LYXERR(Debug::DEBUG)
+ << BOOST_CURRENT_FUNCTION
+ << ": x: " << x
+ << " y: " << y
+ << " pit: " << pit
+ << endl;
+ InsetList::const_iterator iit = par.insetlist.begin();
+ InsetList::const_iterator iend = par.insetlist.end();
+ for (; iit != iend; ++iit) {
+ InsetBase * const inset = iit->inset;
+ if (inset->covers(*this, x, y)) {
+ if (!inset->descendable())
+ // No need to go further down if the inset is not
+ // descendable.
+ return inset;
+
+ size_t cell_number = inset->nargs();
+ // Check all the inner cell.
+ for (size_t i = 0; i != cell_number; ++i) {
+ LyXText const * inner_text = inset->getText(i);
+ if (inner_text) {
+ // Try deeper.
+ InsetBase const * inset_deeper =
+ getCoveringInset(*inner_text, x, y);
+ if (inset_deeper)
+ return inset_deeper;
+ }
+ }
+
+ LYXERR(Debug::DEBUG)
+ << BOOST_CURRENT_FUNCTION
+ << ": Hit inset: " << inset << endl;
+ return inset;
+ }
+ }
+ LYXERR(Debug::DEBUG)
+ << BOOST_CURRENT_FUNCTION
+ << ": No inset hit. " << endl;
+ return 0;
+}
+
+
bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
{
//lyxerr << BOOST_CURRENT_FUNCTION << "[ cmd0 " << cmd0 << "]" << endl;
// Either the inset under the cursor or the
// surrounding LyXText will handle this event.
- // Build temporary cursor.
+ // make sure we stay within the screen...
cmd.y = min(max(cmd.y, -1), height_);
- InsetBase * inset = buffer_->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;
-
- // NOTE: editXY returns the top level inset of nested insets. If you happen
- // to move from a text (inset=0) to a text inside an inset (e.g. an opened
- // footnote inset, again inset=0), that inset will not be redrawn.
+
if (cmd.action == LFUN_MOUSE_MOTION && cmd.button() == mouse_button::none) {
- bool need_redraw = false;
- if (inset != last_inset_) {
- if (last_inset_)
- need_redraw |= last_inset_->setMouseHover(false);
- if (inset)
- need_redraw |= inset->setMouseHover(true);
- last_inset_ = inset;
- }
+ // Get inset under mouse, if there is one.
+ InsetBase const * covering_inset =
+ getCoveringInset(buffer_->text(), cmd.x, cmd.y);
+ if (covering_inset == last_inset_)
+ // Same inset, no need to do anything...
+ return false;
+
+ bool need_redraw = false;
+ // const_cast because of setMouseHover().
+ InsetBase * inset = const_cast<InsetBase *>(covering_inset);
+ if (last_inset_)
+ // Remove the hint on the last hovered inset (if any).
+ need_redraw |= last_inset_->setMouseHover(false);
+ if (inset)
+ // Highlighted the newly hovered inset (if any).
+ need_redraw |= inset->setMouseHover(true);
+ last_inset_ = inset;
// if last metrics update was in singlepar mode, WorkArea::redraw() will
// not expose the button for redraw. We adjust here the metrics dimension
// to enable a full redraw.
// FIXME: It is possible to redraw only the area around the button!
- if (need_redraw && metrics_info_.singlepar) {
+ if (need_redraw
+ && metrics_info_.update_strategy == SingleParUpdate) {
// FIXME: It should be possible to redraw only the area around
// the button by doing this:
//
// This should be changed if it is further utilized.
return need_redraw;
}
+
+ // Build temporary cursor.
+ InsetBase * inset = buffer_->text().editXY(cur, cmd.x, cmd.y);
// Put anchor at the same position.
cur.resetAnchor();
}
-LyXText * BufferView::getLyXText()
-{
- LyXText * text = cursor_.innerText();
- BOOST_ASSERT(text);
- return text;
-}
-
-
-LyXText const * BufferView::getLyXText() const
-{
- LyXText const * text = cursor_.innerText();
- BOOST_ASSERT(text);
- return text;
-}
-
-
TextMetrics const & BufferView::textMetrics(LyXText const * t) const
{
return const_cast<BufferView *>(this)->textMetrics(t);
if (!changed)
return false;
+ updateLabels(*buffer_);
+
updateMetrics(false);
buffer_->changed();
return true;
if (!badcursor && cursor_.inTexted())
checkDepm(cur, cursor_);
- cursor_ = cur;
+ // if the cursor was in an empty script inset and the new
+ // position is in the nucleus of the inset, notifyCursorLeaves
+ // will kill the script inset itself. So we check all the
+ // elements of the cursor to make sure that they are correct.
+ // For an example, see bug 2933:
+ // http://bugzilla.lyx.org/show_bug.cgi?id=2933
+ // The code below could maybe be moved to a DocIterator method.
+ //lyxerr << "cur before " << cur <<std::endl;
+ DocIterator dit(cur.inset());
+ dit.push_back(cur.bottom());
+ size_t i = 1;
+ while (i < cur.depth() && dit.nextInset() == &cur[i].inset()) {
+ dit.push_back(cur[i]);
+ ++i;
+ }
+ //lyxerr << "5 cur after" << dit <<std::endl;
+
+ cursor_.setCursor(dit);
cursor_.clearSelection();
- // remember new position.
- cursor_.setTargetX();
finishUndo();
return update;
}
cursor_.setSelection(cursor_, -length);
} else
cursor_.setSelection(cursor_, length);
- theSelection().haveSelection(cursor_.selection());
+ cap::saveSelection(cursor_);
}
}
pit2 = cursor_.bottom().pit();
}
- lyxerr[Debug::DEBUG]
+ LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< " y1: " << y1
<< " y2: " << y2
<< "size: " << size
<< endl;
- metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
+ metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2,
+ singlepar? SingleParUpdate: FullScreenUpdate, size);
if (lyxerr.debugging(Debug::WORKAREA)) {
- lyxerr[Debug::WORKAREA] << "BufferView::updateMetrics" << endl;
+ LYXERR(Debug::WORKAREA) << "BufferView::updateMetrics" << endl;
coord_cache_.dump();
}
}