void BufferView::setBuffer(Buffer * b)
{
- lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
<< "[ b = " << b << "]" << endl;
if (buffer_) {
// 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();
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_);
}
}
if (!buffer_)
return;
- lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << endl;
+ LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION << endl;
updateMetrics(false);
switchKeyMap();
// causes screen update(), I reset last_inset_ to avoid such a problem.
last_inset_ = 0;
// This is close to a hot-path.
- if (lyxerr.debugging(Debug::DEBUG)) {
- lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << "[fitcursor = " << (flags & Update::FitCursor)
- << ", forceupdate = " << (flags & Update::Force)
- << ", singlepar = " << (flags & Update::SinglePar)
- << "] 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_)
return false;
- if (lyxerr.debugging(Debug::WORKAREA)) {
- lyxerr[Debug::WORKAREA] << "BufferView::update" << std::endl;
- }
+ LYXERR(Debug::WORKAREA) << "BufferView::update" << std::endl;
// Update macro store
buffer_->buildMacros();
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;
offset_ref_ = 0;
}
- if (lyxerr.debugging(Debug::GUI)) {
- lyxerr[Debug::GUI]
- << BOOST_CURRENT_FUNCTION
- << " Updating scrollbar: height: " << t.paragraphs().size()
- << " curr par: " << cursor_.bottom().pit()
- << " default height " << defaultRowHeight() << endl;
- }
+ LYXERR(Debug::GUI)
+ << BOOST_CURRENT_FUNCTION
+ << " Updating scrollbar: height: " << t.paragraphs().size()
+ << " curr par: " << cursor_.bottom().pit()
+ << " default height " << defaultRowHeight() << endl;
// It would be better to fix the scrollbar to understand
// values in [0..1] and divide everything by wh
void BufferView::scrollDocView(int value)
{
- lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION
<< "[ value = " << value << "]" << endl;
if (!buffer_)
}
-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"));
}
flag.setOnOff(buffer_->params().trackChanges);
break;
- case LFUN_CHANGES_OUTPUT: {
- OutputParams runparams;
+ case LFUN_CHANGES_OUTPUT:
flag.enabled(buffer_ && LaTeXFeatures::isAvailable("dvipost"));
flag.setOnOff(buffer_->params().outputChanges);
break;
- }
case LFUN_CHANGES_MERGE:
case LFUN_CHANGE_NEXT:
// << [ 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 << ']'
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;
}
+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
// 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();
// Has the cursor just left the inset?
bool badcursor = false;
- if (&cursor_.inset() != &cur.inset())
+ bool leftinset = (&cursor_.inset() != &cur.inset());
+ if (leftinset)
badcursor = cursor_.inset().notifyCursorLeaves(cursor_);
// do the dEPM magic if needed
- // FIXME: move this to InsetText::notifyCursorLeaves?
- bool update = false;
+ // FIXME: (1) move this to InsetText::notifyCursorLeaves?
+ // FIXME: (2) if we had a working InsetText::notifyCursorLeaves,
+ // the leftinset bool would not be necessary (badcursor instead).
+ bool update = leftinset;
if (!badcursor && cursor_.inTexted())
- checkDepm(cur, cursor_);
+ update |= checkDepm(cur, cursor_);
// if the cursor was in an empty script inset and the new
// position is in the nucleus of the inset, notifyCursorLeaves
pit2 = cursor_.bottom().pit();
}
- lyxerr[Debug::DEBUG]
+ LYXERR(Debug::DEBUG)
<< BOOST_CURRENT_FUNCTION
<< " y1: " << y1
<< " y2: " << 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();
}
}
FileDialog fileDlg(_("Select LyX document to insert"),
LFUN_FILE_INSERT,
make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support(), "examples"))));
+ make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support().absFilename(), "examples"))));
FileDialog::Result result =
fileDlg.open(from_utf8(initpath),
projects / lyx.git / blobdiff