fp.pit = d->cursor_.bottom().pit();
fp.pos = d->cursor_.bottom().pos();
theSession().lastFilePos().save(buffer_.fileName(), fp);
+
+ if (d->last_inset_)
+ d->last_inset_->setMouseHover(this, false);
delete d;
}
theFontMetrics(d->cursor_.getFont().fontInfo());
int const asc = fm.maxAscent();
int const des = fm.maxDescent();
- Point const p = getPos(d->cursor_, d->cursor_.boundary());
+ Point const p = getPos(d->cursor_);
if (p.y_ - asc >= 0 && p.y_ + des < height_)
return false;
}
newy = last;
break;
case CUR_INSIDE:
- int const y = getPos(oldcur, oldcur.boundary()).y_;
+ int const y = getPos(oldcur).y_;
newy = min(last, max(y, first));
if (y == newy)
return;
// FIXME: This does not work within mathed!
CursorStatus BufferView::cursorStatus(DocIterator const & dit) const
{
- Point const p = getPos(dit, dit.boundary());
+ Point const p = getPos(dit);
if (p.y_ < 0)
return CUR_ABOVE;
if (p.y_ > workHeight())
LASSERT(!pm.rows().empty(), /**/);
// FIXME: smooth scrolling doesn't work in mathed.
CursorSlice const & cs = dit.innerTextSlice();
- int offset = coordOffset(dit, dit.boundary()).y_;
+ int offset = coordOffset(dit).y_;
int ypos = pm.position() + offset;
Dimension const & row_dim =
pm.getRow(cs.pos(), dit.boundary()).dimension();
int scrolled = 0;
if (recenter)
scrolled = scroll(ypos - height_/2);
+
+ // If the top part of the row falls of the screen, we scroll
+ // up to align the top of the row with the top of the screen.
else if (ypos - row_dim.ascent() < 0)
- scrolled = scrollUp(- ypos + row_dim.ascent());
- else if (ypos + row_dim.descent() > height_)
- scrolled = scrollDown(ypos - height_ + defaultRowHeight() );
+ scrolled = scrollUp(-ypos + row_dim.ascent());
+
+ // If the bottom of the row falls of the screen, we scroll down.
+ // However, we have to be careful not to scroll that much that
+ // the top falls of the screen.
+ else if (ypos + row_dim.descent() > height_) {
+ int ynew = height_ - row_dim.descent();
+ if (ynew < row_dim.ascent())
+ ynew = row_dim.ascent();
+ int const scroll = ypos - ynew;
+ scrolled = scrollDown(scroll);
+ }
// else, nothing to do, the cursor is already visible so we just return.
return scrolled != 0;
tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- int offset = coordOffset(dit, dit.boundary()).y_;
+ int offset = coordOffset(dit).y_;
d->anchor_pit_ = bot_pit;
CursorSlice const & cs = dit.innerTextSlice();
case LFUN_FONT_STATE:
case LFUN_LABEL_INSERT:
case LFUN_INFO_INSERT:
- case LFUN_INSET_EDIT:
case LFUN_PARAGRAPH_GOTO:
case LFUN_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
flag.setEnabled(true);
break;
- case LFUN_LABEL_COPY_AS_REF: {
- // if there is an inset at cursor, see whether it
- // handles the lfun
- Inset * inset = cur.nextInset();
- if (!inset || !inset->getStatus(cur, cmd, flag))
- flag.setEnabled(false);
- break;
- }
-
case LFUN_LABEL_GOTO: {
flag.setEnabled(!cmd.argument().empty()
|| getInsetByCode<InsetRef>(cur, REF_CODE));
flag.setOnOff(buffer_.params().compressed);
break;
}
-
+
+ case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC: {
+ flag.setOnOff(buffer_.params().output_sync);
+ break;
+ }
+
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN:
case LFUN_SCROLL:
Inset * inset = editedInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
- FuncStatus fs;
- if (!inset->getStatus(cur, fr, fs)) {
+ if (!inset->getStatus(cur, fr, flag)) {
// Every inset is supposed to handle this
LASSERT(false, break);
}
- flag |= fs;
} else {
FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
- flag |= lyx::getStatus(fr);
+ flag = lyx::getStatus(fr);
}
break;
}
default:
- flag.setEnabled(false);
return false;
}
break;
}
- case LFUN_INSET_EDIT: {
- FuncRequest fr(cmd);
- // if there is an inset at cursor, see whether it
- // can be modified.
- Inset * inset = cur.nextInset();
- if (inset)
- inset->dispatch(cur, fr);
- // if it did not work, try the underlying inset.
- if (!inset || !cur.result().dispatched())
- cur.dispatch(cmd);
-
- // FIXME I'm adding the last break to solve a crash,
- // but that is obviously not right.
- if (!cur.result().dispatched())
- // It did not work too; no action needed.
- break;
- break;
- }
-
case LFUN_PARAGRAPH_GOTO: {
int const id = convert<int>(cmd.getArg(0));
int const pos = convert<int>(cmd.getArg(1));
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_LABEL_COPY_AS_REF: {
- // if there is an inset at cursor, try to copy it
- Inset * inset = &cur.inset();
- if (!inset || !inset->asInsetMath())
- inset = cur.nextInset();
- if (inset) {
- FuncRequest tmpcmd = cmd;
- inset->dispatch(cur, tmpcmd);
- }
- if (!cur.result().dispatched())
- // It did not work too; no action needed.
- break;
- cur.clearSelection();
- dr.update(Update::SinglePar | Update::FitCursor);
+ case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC:
+ buffer_.params().output_sync = !buffer_.params().output_sync;
break;
- }
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN: {
- Point p = getPos(cur, cur.boundary());
+ Point p = getPos(cur);
// This code has been commented out to enable to scroll down a
// document, even if there are large insets in it (see bug #5465).
/*if (p.y_ < 0 || p.y_ > height_) {
// The cursor is off-screen so recenter before proceeding.
showCursor();
- p = getPos(cur, cur.boundary());
+ p = getPos(cur);
}*/
int const scrolled = scroll(act == LFUN_SCREEN_UP
? -height_ : height_);
cur.finishUndo();
break;
}
- int y = getPos(cur, cur.boundary()).y_;
+ int y = getPos(cur).y_;
int const ymin = y - height_ + defaultRowHeight();
while (y > ymin && cur.up())
- y = getPos(cur, cur.boundary()).y_;
+ y = getPos(cur).y_;
cur.finishUndo();
dr.update(Update::SinglePar | Update::FitCursor);
cur.finishUndo();
break;
}
- int y = getPos(cur, cur.boundary()).y_;
+ int y = getPos(cur).y_;
int const ymax = y + height_ - defaultRowHeight();
while (y < ymax && cur.down())
- y = getPos(cur, cur.boundary()).y_;
+ y = getPos(cur).y_;
cur.finishUndo();
dr.update(Update::SinglePar | Update::FitCursor);
LYXERR(Debug::SELECTION, "requestSelection: xsel_cache.set: " << d->xsel_cache_.set);
if (!d->xsel_cache_.set ||
cur.top() != d->xsel_cache_.cursor ||
- cur.anchor_.top() != d->xsel_cache_.anchor)
+ cur.realAnchor().top() != d->xsel_cache_.anchor)
{
d->xsel_cache_.cursor = cur.top();
- d->xsel_cache_.anchor = cur.anchor_.top();
+ d->xsel_cache_.anchor = cur.realAnchor().top();
d->xsel_cache_.set = cur.selection();
return cur.selectionAsString(false);
}
return;
bool need_redraw = false;
- if (d->last_inset_)
+ if (d->last_inset_) {
// Remove the hint on the last hovered inset (if any).
- need_redraw |= d->last_inset_->setMouseHover(false);
+ need_redraw |= d->last_inset_->setMouseHover(this, false);
+ d->last_inset_ = 0;
+ }
// const_cast because of setMouseHover().
Inset * inset = const_cast<Inset *>(covering_inset);
- if (inset)
- // Highlight the newly hovered inset (if any).
- need_redraw |= inset->setMouseHover(true);
+ if (inset && inset->setMouseHover(this, true)) {
+ need_redraw = true;
+ // Only the insets that accept the hover state, do
+ // clear the last_inset_, so only set the last_inset_
+ // member if the hovered setting is accepted.
+ d->last_inset_ = inset;
+ }
- d->last_inset_ = inset;
-
if (need_redraw) {
LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
<< d->mouse_position_cache_.x_ << ", "
}
+void BufferView::clearLastInset(Inset * inset) const
+{
+ if (d->last_inset_ != inset) {
+ LYXERR0("Wrong last_inset!");
+ LASSERT(false, /**/);
+ }
+ d->last_inset_ = 0;
+}
+
+
void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
{
//lyxerr << "[ cmd0 " << cmd0 << "]" << endl;
d->cursor_.fixIfBroken();
// FIXME: shift-mouse selection doesn't work well across insets.
- bool do_selection = select && &d->cursor_.anchor().inset() == &cur.inset();
+ bool do_selection = select && &d->cursor_.normalAnchor().inset() == &cur.inset();
// do the dEPM magic if needed
// FIXME: (1) move this to InsetText::notifyCursorLeaves?
// Get absolute path of file and add ".lyx"
// to the filename if necessary
- FileName filename = fileSearch(string(), fname.absFilename(), "lyx");
+ FileName filename = fileSearch(string(), fname.absFileName(), "lyx");
- docstring const disp_fn = makeDisplayPath(filename.absFilename());
+ docstring const disp_fn = makeDisplayPath(filename.absFileName());
// emit message signal.
message(bformat(_("Inserting document %1$s..."), disp_fn));
}
-Point BufferView::coordOffset(DocIterator const & dit, bool boundary) const
+Point BufferView::coordOffset(DocIterator const & dit) const
{
int x = 0;
int y = 0;
int yy = 0;
// get relative position inside sl.inset()
- sl.inset().cursorPos(*this, sl, boundary && (i + 1 == dit.depth()), xx, yy);
+ sl.inset().cursorPos(*this, sl, dit.boundary() && (i + 1 == dit.depth()), xx, yy);
// Make relative position inside of the edited inset relative to sl.inset()
x += xx;
// In case of an RTL inset, the edited inset will be positioned to the left
// of xx:yy
if (sl.text()) {
- bool boundary_i = boundary && i + 1 == dit.depth();
+ bool boundary_i = dit.boundary() && i + 1 == dit.depth();
bool rtl = textMetrics(sl.text()).isRTL(sl, boundary_i);
if (rtl)
x -= lastw;
size_t rend;
if (sl.pos() > 0 && dit.depth() == 1) {
int pos = sl.pos();
- if (pos && boundary)
+ if (pos && dit.boundary())
--pos;
-// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << endl;
+// lyxerr << "coordOffset: boundary:" << dit.boundary() << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << endl;
rend = pm.pos2row(pos);
} else
rend = pm.pos2row(sl.pos());
TextMetrics const & bottom_tm = textMetrics(dit.bottom().text());
// Make relative position from the nested inset now bufferview absolute.
- int xx = bottom_tm.cursorX(dit.bottom(), boundary && dit.depth() == 1);
+ int xx = bottom_tm.cursorX(dit.bottom(), dit.boundary() && dit.depth() == 1);
x += xx;
// In the RTL case place the nested inset at the left of the cursor in
// the outer paragraph
- bool boundary_1 = boundary && 1 == dit.depth();
+ bool boundary_1 = dit.boundary() && 1 == dit.depth();
bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
if (rtl)
x -= lastw;
}
-Point BufferView::getPos(DocIterator const & dit, bool boundary) const
+Point BufferView::getPos(DocIterator const & dit) const
{
if (!paragraphVisible(dit))
return Point(-1, -1);
CursorSlice const & bot = dit.bottom();
TextMetrics const & tm = textMetrics(bot.text());
- Point p = coordOffset(dit, boundary); // offset from outer paragraph
+ // offset from outer paragraph
+ Point p = coordOffset(dit);
p.y_ += tm.parMetrics(bot.pit()).position();
return p;
}
int const asc = fm.maxAscent();
int const des = fm.maxDescent();
h = asc + des;
- p = getPos(cur, cur.boundary());
+ p = getPos(cur);
p.y_ -= asc;
}
{
if (!fname.isReadableFile()) {
docstring const error = from_ascii(strerror(errno));
- docstring const file = makeDisplayPath(fname.absFilename(), 50);
+ docstring const file = makeDisplayPath(fname.absFileName(), 50);
docstring const text =
bformat(_("Could not read the specified document\n"
"%1$s\ndue to the error: %2$s"), file, error);
}
if (!fname.isReadableFile()) {
- docstring const file = makeDisplayPath(fname.absFilename(), 50);
+ docstring const file = makeDisplayPath(fname.absFileName(), 50);
docstring const text =
bformat(_("%1$s\n is not readable."), file);
Alert::error(_("Could not open file"), text);
// set update flags
if (changed) {
- if (singlePar && !(cur.disp_.update() & Update::Force))
- cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ if (singlePar && !(cur.result().update() & Update::Force))
+ cur.updateFlags(cur.result().update() | Update::SinglePar);
else
- cur.updateFlags(cur.disp_.update() | Update::Force);
+ cur.updateFlags(cur.result().update() | Update::Force);
}
}