while (tmpdit) {
Inset const * inset = tmpdit.nextInset();
if (inset) {
- bool const valid_code = std::find(codes.begin(), codes.end(),
+ bool const valid_code = std::find(codes.begin(), codes.end(),
inset->lyxCode()) != codes.end();
InsetCommand const * ic = inset->asInsetCommand();
bool const same_or_no_contents = contents.empty()
|| (ic && (ic->getFirstNonOptParam() == contents));
-
+
if (valid_code && same_or_no_contents) {
dit = tmpdit;
return true;
Private(BufferView & bv): wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0),
inlineCompletionUniqueChars_(0),
- last_inset_(0), clickable_inset_(false),
+ last_inset_(0), clickable_inset_(false),
mouse_position_cache_(),
bookmark_edit_position_(-1), gui_(0)
{}
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);
+ d->last_inset_->setMouseHover(this, false);
delete d;
}
d->scrollbarParameters_.page_step = height_;
Text & t = buffer_.text();
- TextMetrics & tm = d->text_metrics_[&t];
+ TextMetrics & tm = d->text_metrics_[&t];
LYXERR(Debug::GUI, " Updating scrollbar: height: "
<< t.paragraphs().size()
case CUR_INSIDE:
int const y = getPos(oldcur).y_;
newy = min(last, max(y, first));
- if (y == newy)
+ if (y == newy)
return;
}
// We reset the cursor because cursorStatus() does not
// the bookmark.
if (bottom_pit < int(buffer_.paragraphs().size())) {
dit = doc_iterator_begin(&buffer_);
-
+
dit.pit() = bottom_pit;
dit.pos() = min(bottom_pos, dit.paragraph().size());
success = true;
void BufferView::translateAndInsert(char_type c, Text * t, Cursor & cur)
{
- if (lyxrc.rtl_support) {
- if (d->cursor_.real_current_font.isRightToLeft()) {
- if (d->intl_.keymap == Intl::PRIMARY)
- d->intl_.keyMapSec();
- } else {
- if (d->intl_.keymap == Intl::SECONDARY)
- d->intl_.keyMapPrim();
- }
+ if (d->cursor_.real_current_font.isRightToLeft()) {
+ if (d->intl_.keymap == Intl::PRIMARY)
+ d->intl_.keyMapSec();
+ } else {
+ if (d->intl_.keymap == Intl::SECONDARY)
+ d->intl_.keyMapPrim();
}
d->intl_.getTransManager().translateAndInsert(c, t, cur);
void BufferView::updateDocumentClass(DocumentClassConstPtr olddc)
{
message(_("Converting document to new document class..."));
-
+
StableDocIterator backcur(d->cursor_);
ErrorList & el = buffer_.errorList("Class Switch");
cap::switchBetweenClasses(
case LFUN_KEYMAP_PRIMARY:
case LFUN_KEYMAP_SECONDARY:
case LFUN_KEYMAP_TOGGLE:
+ case LFUN_INSET_SELECT_ALL:
flag.setEnabled(true);
break;
case LFUN_CHANGES_TRACK:
flag.setEnabled(true);
- flag.setOnOff(buffer_.params().trackChanges);
+ flag.setOnOff(buffer_.params().track_changes);
break;
case LFUN_CHANGES_OUTPUT:
flag.setEnabled(true);
- flag.setOnOff(buffer_.params().outputChanges);
+ flag.setOnOff(buffer_.params().output_changes);
break;
case LFUN_CHANGES_MERGE:
Cursor & cur = d->cursor_;
// Don't dispatch function that does not apply to internal buffers.
- if (buffer_.isInternal()
+ if (buffer_.isInternal()
&& lyxaction.funcHasFlag(cmd.action(), LyXAction::NoInternal))
return;
<< (unknown_tokens == 1 ? "" : "s"));
}
updateDocumentClass(olddc);
-
+
// We are most certainly here because of a change in the document
// It is then better to make sure that all dialogs are in sync with
// current document settings.
dr.forceBufferUpdate();
break;
}
-
+
case LFUN_LAYOUT_MODULES_CLEAR: {
cur.recordUndoFullDocument();
buffer_.params().clearLayoutModules();
case LFUN_LAYOUT_MODULE_ADD: {
BufferParams const & params = buffer_.params();
if (!params.layoutModuleCanBeAdded(argument)) {
- LYXERR0("Module `" << argument <<
+ LYXERR0("Module `" << argument <<
"' cannot be added due to failed requirements or "
"conflicts with installed modules.");
break;
}
case LFUN_TEXTCLASS_APPLY: {
- // since this shortcircuits, the second call is made only if
+ // since this shortcircuits, the second call is made only if
// the first fails
- bool const success =
+ bool const success =
LayoutFileList::get().load(argument, buffer_.temppath()) ||
LayoutFileList::get().load(argument, buffer_.filePath());
if (!success) {
}
case LFUN_TEXTCLASS_LOAD: {
- // since this shortcircuits, the second call is made only if
+ // since this shortcircuits, the second call is made only if
// the first fails
- bool const success =
+ bool const success =
LayoutFileList::get().load(argument, buffer_.temppath()) ||
LayoutFileList::get().load(argument, buffer_.filePath());
- if (!success) {
+ if (!success) {
docstring s = bformat(_("The document class `%1$s' "
"could not be loaded."), from_utf8(argument));
frontend::Alert::error(_("Could not load class"), s);
}
break;
}
-
+
case LFUN_PARAGRAPH_GOTO: {
int const id = convert<int>(cmd.getArg(0));
int const pos = convert<int>(cmd.getArg(1));
}
case LFUN_CHANGES_TRACK:
- buffer_.params().trackChanges = !buffer_.params().trackChanges;
+ buffer_.params().track_changes = !buffer_.params().track_changes;
break;
case LFUN_CHANGES_OUTPUT:
- buffer_.params().outputChanges = !buffer_.params().outputChanges;
- if (buffer_.params().outputChanges) {
+ buffer_.params().output_changes = !buffer_.params().output_changes;
+ if (buffer_.params().output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
LaTeXFeatures::isAvailable("xcolor");
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
dr.screenUpdate(Update::Force | Update::FitCursor);
break;
-
+
case LFUN_CHANGE_PREVIOUS:
findPreviousChange(this);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
case LFUN_SCREEN_SHOW_CURSOR:
showCursor();
break;
-
+
case LFUN_SCREEN_RECENTER:
recenter();
break;
if (inset->delDatabase(cmd.argument())) {
buffer_.invalidateBibfileCache();
dr.forceBufferUpdate();
- }
+ }
}
break;
}
updateHoveredInset();
d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_,
- true, act == LFUN_SCREEN_UP);
+ true, act == LFUN_SCREEN_UP);
//FIXME: what to do with cur.x_target()?
bool update = in_texted && cur.bv().checkDepm(cur, old);
cur.finishUndo();
if (update || cur.mark())
- dr.screenUpdate(Update::Force | Update::FitCursor);
+ dr.screenUpdate(Update::Force | Update::FitCursor);
if (update)
dr.forceBufferUpdate();
break;
}
+ case LFUN_INSET_SELECT_ALL:
+ if (cur.depth() > 1
+ && cur.selBegin().at_begin()
+ && cur.selEnd().at_end()) {
+ // All the contents of the inset if selected.
+ // Select the inset from outside.
+ cur.pop();
+ cur.resetAnchor();
+ cur.setSelection(true);
+ cur.posForward();
+ } else if (cur.selBegin().idx() != cur.selEnd().idx()
+ || (cur.depth() > 1
+ && cur.selBegin().at_cell_begin()
+ && cur.selEnd().at_cell_end())) {
+ // At least one complete cell is selected.
+ // Select all cells
+ cur.idx() = 0;
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.setSelection(true);
+ cur.idx() = cur.lastidx();
+ cur.pos() = cur.lastpos();
+ } else {
+ // select current cell
+ cur.pit() = 0;
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.setSelection(true);
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
+ }
+ dr.screenUpdate(Update::Force);
+ break;
+
+
// This would be in Buffer class if only Cursor did not
// require a bufferview
case LFUN_INSET_FORALL: {
if (decodeInsetParam(name, data, buffer_))
lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, name + " " + data));
else
- lyxerr << "Inset type '" << name <<
+ lyxerr << "Inset type '" << name <<
"' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << endl;
break;
}
need_redraw |= d->last_inset_->setMouseHover(this, false);
d->last_inset_ = 0;
}
-
+
if (covering_inset && covering_inset->setMouseHover(this, true)) {
need_redraw = true;
- // Only the insets that accept the hover state, do
+ // 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_ = covering_inset;
if (need_redraw) {
LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
- << d->mouse_position_cache_.x_ << ", "
+ << d->mouse_position_cache_.x_ << ", "
<< d->mouse_position_cache_.y_ << ")");
-
+
d->update_strategy_ = DecorationUpdate;
// This event (moving without mouse click) is not passed further.
if (badcursor)
cursor().fixIfBroken();
}
-
+
// Do we have a selection?
theSelection().haveSelection(cursor().selection());
// we need to make sure that the row and position
// we got back are valid, because the buffer may well
// have changed since we last generated the LaTeX.
- DocIterator const dit = buffer_.getParFromID(tmpid);
+ DocIterator dit = buffer_.getParFromID(tmpid);
if (dit == doc_iterator_end(&buffer_))
posvalid = false;
- else {
+ else if (dit.depth() > 1) {
+ // We are in an inset.
+ pos_type lastpos = dit.lastpos();
+ dit.pos() = tmppos > lastpos ? lastpos : tmppos;
+ setCursor(dit);
+ recenter();
+ return;
+ } else {
newpit = dit.pit();
// now have to check pos.
newpos = tmppos;
return false;
d->cursor_ = cur;
-
- // we would rather not do this here, but it needs to be done before
+
+ // we would rather not do this here, but it needs to be done before
// the changed() signal is sent.
buffer_.updateBuffer();
d->cursor_.fixIfBroken();
// FIXME: shift-mouse selection doesn't work well across insets.
- bool const do_selection =
+ bool const do_selection =
select && &d->cursor_.normalAnchor().inset() == &cur.inset();
// do the dEPM magic if needed
// (if this paragraph contains insets etc., rebreaking will
// recursively descend)
tm.redoParagraph(bottom_pit);
- ParagraphMetrics const & pm = tm.parMetrics(bottom_pit);
+ ParagraphMetrics const & pm = tm.parMetrics(bottom_pit);
if (pm.height() != old_height)
// Paragraph height has changed so we cannot proceed to
// the singlePar optimisation.
// make sure inline completion pointer is ok
if (d->inlineCompletionPos_.fixIfBroken())
d->inlineCompletionPos_ = DocIterator();
-
+
if (d->anchor_pit_ >= npit)
// The anchor pit must have been deleted...
d->anchor_pit_ = npit - 1;
// Rebreak anchor paragraph.
tm.redoParagraph(d->anchor_pit_);
ParagraphMetrics & anchor_pm = tm.par_metrics_[d->anchor_pit_];
-
+
// position anchor
if (d->anchor_pit_ == 0) {
int scrollRange = d->scrollbarParameters_.max - d->scrollbarParameters_.min;
-
+
// Complete buffer visible? Then it's easy.
if (scrollRange == 0)
d->anchor_ypos_ = anchor_pm.ascent();
-
+
// FIXME: Some clever handling needed to show
// the _first_ paragraph up to the top if the cursor is
// in the first line.
- }
+ }
anchor_pm.setPosition(d->anchor_ypos_);
LYXERR(Debug::PAINTING, "metrics: "
CursorSlice const & sl = dit[i];
int xx = 0;
int yy = 0;
-
+
// get relative position inside sl.inset()
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;
y += yy;
-
+
// In case of an RTL inset, the edited inset will be positioned to the left
// of xx:yy
if (sl.text()) {
Dimension const dim = sl.inset().dimension(*this);
lastw = dim.wid;
}
-
+
//lyxerr << "Cursor::getPos, i: "
// << i << " x: " << xx << " y: " << y << endl;
}
for (size_t rit = 0; rit != rend; ++rit)
y += pm.rows()[rit].height();
y += pm.rows()[rend].ascent();
-
+
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(), dit.boundary() && dit.depth() == 1);
x += xx;
-
- // In the RTL case place the nested inset at the left of the cursor in
+
+ // In the RTL case place the nested inset at the left of the cursor in
// the outer paragraph
bool boundary_1 = dit.boundary() && 1 == dit.depth();
bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
if (rtl)
x -= lastw;
-
+
return Point(x, y);
}
TextMetrics const & tm = textMetrics(bot.text());
// offset from outer paragraph
- Point p = coordOffset(dit);
+ Point p = coordOffset(dit);
p.y_ += tm.parMetrics(bot.pit()).position();
return p;
}
// and possibly grey out below
pair<pit_type, ParagraphMetrics const *> lastpm = tm.last();
int const y2 = lastpm.second->position() + lastpm.second->descent();
-
+
if (y2 < height_) {
- Color color = buffer().isInternal()
+ Color color = buffer().isInternal()
? Color_background : Color_bottomarea;
pain.fillRectangle(0, y2, width_, height_ - y2, color);
}
}
-void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos,
+void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos,
docstring const & completion, size_t uniqueChars)
{
uniqueChars = min(completion.size(), uniqueChars);
bool singlePar = true;
d->inlineCompletion_ = completion;
d->inlineCompletionUniqueChars_ = min(completion.size(), uniqueChars);
-
+
//lyxerr << "setInlineCompletion pos=" << pos << " completion=" << completion << " uniqueChars=" << uniqueChars << std::endl;
-
+
// at new position?
DocIterator const & old = d->inlineCompletionPos_;
if (old != pos) {
}
d->inlineCompletionPos_ = pos;
}
-
+
// set update flags
if (changed) {
if (singlePar && !(cur.result().screenUpdate() & Update::Force))
bool BufferView::clickableInset() const
-{
- return d->clickable_inset_;
+{
+ return d->clickable_inset_;
}
} // namespace lyx
projects / lyx.git / blobdiff