#include "InsetIterator.h"
#include "Language.h"
#include "LaTeXFeatures.h"
+#include "LayoutFile.h"
+#include "Lexer.h"
#include "LyX.h"
+#include "LyXAction.h"
#include "lyxfind.h"
-#include "LyXFunc.h"
#include "Layout.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "Session.h"
#include <fstream>
#include <functional>
#include <iterator>
+#include <sstream>
#include <vector>
using namespace std;
Private(BufferView & bv): wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0),
inlineCompletionUniqueChars_(0),
- last_inset_(0), bookmark_edit_position_(0), gui_(0)
+ last_inset_(0), mouse_position_cache_(),
+ bookmark_edit_position_(0), gui_(0)
{}
///
*/
Inset * last_inset_;
+ /// position of the mouse at the time of the last mouse move
+ /// This is used to update the hovering status of inset in
+ /// cases where the buffer is scrolled, but the mouse didn't move.
+ Point mouse_position_cache_;
+
// cache for id of the paragraph which was edited the last time
int bookmark_edit_position_;
/// Cache for Find Next
FuncRequest search_request_cache_;
+
+ ///
+ map<string, Inset *> edited_insets_;
};
void BufferView::processUpdateFlags(Update::flags flags)
{
- // last_inset_ points to the last visited inset. This pointer may become
- // invalid because of keyboard editing. Since all such operations
- // causes screen update(), I reset last_inset_ to avoid such a problem.
- d->last_inset_ = 0;
// This is close to a hot-path.
LYXERR(Debug::DEBUG, "BufferView::processUpdateFlags()"
<< "[fitcursor = " << (flags & Update::FitCursor)
if (flags == Update::Decoration) {
d->update_strategy_ = DecorationUpdate;
- buffer_.changed();
+ buffer_.changed(false);
return;
}
}
if (flags & Update::Decoration) {
d->update_strategy_ = DecorationUpdate;
- buffer_.changed();
+ buffer_.changed(false);
return;
}
// no screen update is needed.
if (!(flags & Update::FitCursor)) {
// Nothing to do anymore. Trigger a redraw and return
- buffer_.changed();
+ buffer_.changed(false);
return;
}
// updateMetrics() does not update paragraph position
// This is done at draw() time. So we need a redraw!
- buffer_.changed();
+ buffer_.changed(false);
if (fitCursor()) {
// The cursor is off screen so ensure it is visible.
// refresh it:
showCursor();
}
+
+ updateHoveredInset();
}
// If the offset is less than 2 screen height, prefer to scroll instead.
if (abs(offset) <= 2 * height_) {
d->anchor_ypos_ -= offset;
- updateMetrics();
- buffer_.changed();
+ buffer_.changed(true);
+ updateHoveredInset();
return;
}
// We reset the cursor because cursorStatus() does not
// work when the cursor is within mathed.
Cursor cur(*this);
- cur.reset(buffer_.inset());
+ cur.reset();
tm.setCursorFromCoordinates(cur, 0, newy);
// update the bufferview cursor and notify insets
// acturately locate a bookmark in a 'live' lyx session.
// pit and pos will be updated with bottom level pit/pos
// when lyx exits.
- theSession().bookmarks().save(
- buffer_.fileName(),
- d->cursor_.bottom().pit(),
- d->cursor_.bottom().pos(),
- d->cursor_.paragraph().id(),
- d->cursor_.pos(),
- idx
- );
- if (idx)
- // emit message signal.
- message(_("Save bookmark"));
+ if (!buffer_.isInternal()) {
+ theSession().bookmarks().save(
+ buffer_.fileName(),
+ d->cursor_.bottom().pit(),
+ d->cursor_.bottom().pos(),
+ d->cursor_.paragraph().id(),
+ d->cursor_.pos(),
+ idx
+ );
+ if (idx)
+ // emit message signal.
+ message(_("Save bookmark"));
+ }
}
// insets.
size_t const n = dit.depth();
for (size_t i = 0; i < n; ++i)
- if (dit[i].inset().editable() != Inset::HIGHLY_EDITABLE) {
+ if (!dit[i].inset().editable()) {
dit.resize(i);
break;
}
// To center the screen on this new position we need the
// paragraph position which is computed at draw() time.
// So we need a redraw!
- buffer_.changed();
+ buffer_.changed(false);
if (fitCursor())
showCursor();
}
void BufferView::showCursor(DocIterator const & dit, bool recenter)
{
- if (scrollToCursor(dit, recenter))
- buffer_.changed();
+ if (scrollToCursor(dit, recenter)) {
+ buffer_.changed(true);
+ updateHoveredInset();
+ }
}
void BufferView::scrollToCursor()
{
- scrollToCursor(d->cursor_, false);
+ if (scrollToCursor(d->cursor_, false)) {
+ buffer_.changed(true);
+ updateHoveredInset();
+ }
}
scrolled = scrollDown(ypos - height_ + defaultRowHeight() );
// else, nothing to do, the cursor is already visible so we just return.
- if (scrolled != 0) {
- updateMetrics();
- return true;
- }
- return false;
+ return scrolled != 0;
}
// fix inline completion position
else
d->anchor_ypos_ = defaultRowHeight() * 2;
- updateMetrics();
return true;
}
+void BufferView::updateDocumentClass(DocumentClass const * const olddc)
+{
+ message(_("Converting document to new document class..."));
+
+ StableDocIterator backcur(d->cursor_);
+ ErrorList & el = buffer_.errorList("Class Switch");
+ cap::switchBetweenClasses(
+ olddc, buffer_.params().documentClassPtr(),
+ static_cast<InsetText &>(buffer_.inset()), el);
+
+ setCursor(backcur.asDocIterator(&buffer_));
+
+ buffer_.errors("Class Switch");
+ buffer_.updateBuffer();
+}
+
+/** Return the change status at cursor position, taking in account the
+ * status at each level of the document iterator (a table in a deleted
+ * footnote is deleted).
+ * When \param outer is true, the top slice is not looked at.
+ */
+static Change::Type lookupChangeType(DocIterator const & dit, bool outer = false)
+{
+ size_t const depth = dit.depth() - (outer ? 1 : 0);
+
+ for (size_t i = 0 ; i < depth ; ++i) {
+ CursorSlice const & slice = dit[i];
+ if (!slice.inset().inMathed()
+ && slice.pos() < slice.paragraph().size()) {
+ Change::Type const ch = slice.paragraph().lookupChange(slice.pos()).type;
+ if (ch != Change::UNCHANGED)
+ return ch;
+ }
+ }
+ return Change::UNCHANGED;
+}
+
+
bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
{
+ // Can we use a readonly buffer?
+ if (buffer_.isReadonly()
+ && !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
+ && !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
+ flag.message(from_utf8(N_("Document is read-only")));
+ flag.setEnabled(false);
+ return true;
+ }
+ // Are we in a DELETED change-tracking region?
+ if (lookupChangeType(d->cursor_, true) == Change::DELETED
+ && !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
+ && !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
+ flag.message(from_utf8(N_("This portion of the document is deleted.")));
+ flag.setEnabled(false);
+ return true;
+ }
+
Cursor & cur = d->cursor_;
+ if (cur.getStatus(cmd, flag))
+ return true;
+
switch (cmd.action) {
+ // FIXME: This is a bit problematic because we don't check if this is
+ // a document BufferView or not for these LFUNs. We probably have to
+ // dispatch both to currentBufferView() and, if that fails,
+ // to documentBufferView(); same as we do know for current Buffer and
+ // document Buffer. Ideally those LFUN should go to Buffer as they*
+ // operate on the full Buffer and the cursor is only needed either for
+ // an Undo record or to restore a cursor position. But we don't know
+ // how to do that inside Buffer of course.
+ case LFUN_BUFFER_PARAMS_APPLY:
+ case LFUN_LAYOUT_MODULES_CLEAR:
+ case LFUN_LAYOUT_MODULE_ADD:
+ case LFUN_LAYOUT_RELOAD:
+ case LFUN_TEXTCLASS_APPLY:
+ case LFUN_TEXTCLASS_LOAD:
+ flag.setEnabled(!buffer_.isReadonly());
+ break;
+
case LFUN_UNDO:
flag.setEnabled(buffer_.undo().hasUndoStack());
break;
case LFUN_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
case LFUN_WORD_FIND:
+ case LFUN_WORD_FIND_FORWARD:
+ case LFUN_WORD_FIND_BACKWARD:
case LFUN_WORD_FINDADV:
case LFUN_WORD_REPLACE:
case LFUN_MARK_OFF:
case LFUN_SCREEN_SHOW_CURSOR:
case LFUN_BIBTEX_DATABASE_ADD:
case LFUN_BIBTEX_DATABASE_DEL:
- case LFUN_NOTES_MUTATE:
- case LFUN_ALL_INSETS_TOGGLE:
case LFUN_STATISTICS:
+ case LFUN_BRANCH_ADD_INSERT:
+ case LFUN_KEYMAP_OFF:
+ case LFUN_KEYMAP_PRIMARY:
+ case LFUN_KEYMAP_SECONDARY:
+ case LFUN_KEYMAP_TOGGLE:
flag.setEnabled(true);
break;
- // @todo Test if current WorkArea is the search WorkArea
- case LFUN_REGEXP_MODE:
- flag.setEnabled(! this->cursor().inRegexped());
- break;
-
- case LFUN_COPY_LABEL_AS_REF: {
+ case LFUN_LABEL_COPY_AS_REF: {
// if there is an inset at cursor, see whether it
// handles the lfun
Inset * inset = cur.nextInset();
break;
}
- case LFUN_NEXT_INSET_MODIFY: {
- // this is the real function we want to invoke
- FuncRequest tmpcmd = cmd;
- tmpcmd.action = LFUN_INSET_MODIFY;
- // if there is an inset at cursor, see whether it
- // handles the lfun, other start from scratch
- Inset * inset = cur.nextInset();
- if (!inset || !inset->getStatus(cur, tmpcmd, flag))
- flag = lyx::getStatus(tmpcmd);
- break;
- }
-
case LFUN_LABEL_GOTO: {
flag.setEnabled(!cmd.argument().empty()
|| getInsetByCode<InsetRef>(cur, REF_CODE));
case LFUN_SCROLL:
case LFUN_SCREEN_UP_SELECT:
case LFUN_SCREEN_DOWN_SELECT:
+ case LFUN_INSET_FORALL:
flag.setEnabled(true);
break;
break;
case LFUN_DIALOG_SHOW_NEW_INSET:
+ // FIXME: this is wrong, but I do not understand the
+ // intent (JMarc)
if (cur.inset().lyxCode() == CAPTION_CODE)
return cur.inset().getStatus(cur, cmd, flag);
- flag.setEnabled(cur.inset().lyxCode() != ERT_CODE &&
- cur.inset().lyxCode() != LISTINGS_CODE);
+ // FIXME we should consider passthru paragraphs too.
+ flag.setEnabled(!cur.inset().getLayout().isPassThru());
+ break;
+
+ case LFUN_CITATION_INSERT: {
+ FuncRequest fr(LFUN_INSET_INSERT, "citation");
+ // FIXME: This could turn in a recursive hell.
+ // Shouldn't we use Buffer::getStatus() instead?
+ flag.setEnabled(lyx::getStatus(fr).enabled());
+ break;
+ }
+ case LFUN_INSET_APPLY: {
+ string const name = cmd.getArg(0);
+ Inset * inset = editedInset(name);
+ if (inset) {
+ FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
+ FuncStatus fs;
+ if (!inset->getStatus(cur, fr, fs)) {
+ // Every inset is supposed to handle this
+ LASSERT(false, break);
+ }
+ flag |= fs;
+ } else {
+ FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
+ flag |= lyx::getStatus(fr);
+ }
break;
+ }
default:
flag.setEnabled(false);
}
-bool BufferView::dispatch(FuncRequest const & cmd)
+Inset * BufferView::editedInset(string const & name) const
+{
+ map<string, Inset *>::const_iterator it = d->edited_insets_.find(name);
+ return it == d->edited_insets_.end() ? 0 : it->second;
+}
+
+
+void BufferView::editInset(string const & name, Inset * inset)
+{
+ d->edited_insets_[name] = inset;
+}
+
+
+void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
//lyxerr << [ cmd = " << cmd << "]" << endl;
<< " y[" << cmd.y << ']'
<< " button[" << cmd.button() << ']');
+ string const argument = to_utf8(cmd.argument());
Cursor & cur = d->cursor_;
+ // Don't dispatch function that does not apply to internal buffers.
+ if (buffer_.isInternal()
+ && lyxaction.funcHasFlag(cmd.action, LyXAction::NoInternal))
+ return;
+
+ // We'll set this back to false if need be.
+ bool dispatched = true;
+ buffer_.undo().beginUndoGroup();
+
switch (cmd.action) {
+ case LFUN_BUFFER_PARAMS_APPLY: {
+ DocumentClass const * const oldClass = buffer_.params().documentClassPtr();
+ cur.recordUndoFullDocument();
+ istringstream ss(to_utf8(cmd.argument()));
+ Lexer lex;
+ lex.setStream(ss);
+ int const unknown_tokens = buffer_.readHeader(lex);
+ if (unknown_tokens != 0) {
+ LYXERR0("Warning in LFUN_BUFFER_PARAMS_APPLY!\n"
+ << unknown_tokens << " unknown token"
+ << (unknown_tokens == 1 ? "" : "s"));
+ }
+ updateDocumentClass(oldClass);
+
+ // 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.update(Update::Force | Update::FitCursor);
+ break;
+ }
+
+ case LFUN_LAYOUT_MODULES_CLEAR: {
+ DocumentClass const * const oldClass =
+ buffer_.params().documentClassPtr();
+ cur.recordUndoFullDocument();
+ buffer_.params().clearLayoutModules();
+ buffer_.params().makeDocumentClass();
+ updateDocumentClass(oldClass);
+ dr.update(Update::Force | Update::FitCursor);
+ break;
+ }
+
+ case LFUN_LAYOUT_MODULE_ADD: {
+ BufferParams const & params = buffer_.params();
+ if (!params.moduleCanBeAdded(argument)) {
+ LYXERR0("Module `" << argument <<
+ "' cannot be added due to failed requirements or "
+ "conflicts with installed modules.");
+ break;
+ }
+ DocumentClass const * const oldClass = params.documentClassPtr();
+ cur.recordUndoFullDocument();
+ buffer_.params().addLayoutModule(argument);
+ buffer_.params().makeDocumentClass();
+ updateDocumentClass(oldClass);
+ dr.update(Update::Force | Update::FitCursor);
+ break;
+ }
+
+ case LFUN_TEXTCLASS_APPLY: {
+ if (!LayoutFileList::get().load(argument, buffer_.temppath()) &&
+ !LayoutFileList::get().load(argument, buffer_.filePath()))
+ break;
+
+ LayoutFile const * old_layout = buffer_.params().baseClass();
+ LayoutFile const * new_layout = &(LayoutFileList::get()[argument]);
+
+ if (old_layout == new_layout)
+ // nothing to do
+ break;
+
+ //Save the old, possibly modular, layout for use in conversion.
+ DocumentClass const * const oldDocClass =
+ buffer_.params().documentClassPtr();
+ cur.recordUndoFullDocument();
+ buffer_.params().setBaseClass(argument);
+ buffer_.params().makeDocumentClass();
+ updateDocumentClass(oldDocClass);
+ dr.update(Update::Force | Update::FitCursor);
+ break;
+ }
+
+ case LFUN_TEXTCLASS_LOAD:
+ LayoutFileList::get().load(argument, buffer_.temppath()) ||
+ LayoutFileList::get().load(argument, buffer_.filePath());
+ break;
+
+ case LFUN_LAYOUT_RELOAD: {
+ DocumentClass const * const oldClass = buffer_.params().documentClassPtr();
+ LayoutFileIndex bc = buffer_.params().baseClassID();
+ LayoutFileList::get().reset(bc);
+ buffer_.params().setBaseClass(bc);
+ buffer_.params().makeDocumentClass();
+ updateDocumentClass(oldClass);
+ dr.update(Update::Force | Update::FitCursor);
+ break;
+ }
+
case LFUN_UNDO:
- cur.message(_("Undo"));
+ dr.setMessage(_("Undo"));
cur.clearSelection();
if (!cur.textUndo())
- cur.message(_("No further undo information"));
+ dr.setMessage(_("No further undo information"));
else
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_REDO:
- cur.message(_("Redo"));
+ dr.setMessage(_("Redo"));
cur.clearSelection();
if (!cur.textRedo())
- cur.message(_("No further redo information"));
+ dr.setMessage(_("No further redo information"));
else
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_FONT_STATE:
- cur.message(cur.currentState());
+ dr.setMessage(cur.currentState());
break;
case LFUN_BOOKMARK_SAVE:
// Set the cursor
dit.pos() = pos;
setCursor(dit);
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
} else {
// Switch to other buffer view and resend cmd
- theLyXFunc().dispatch(FuncRequest(
+ lyx::dispatch(FuncRequest(
LFUN_BUFFER_SWITCH, b->absFileName()));
- theLyXFunc().dispatch(cmd);
+ lyx::dispatch(cmd);
}
break;
}
case LFUN_CHANGE_NEXT:
findNextChange(this);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(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:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_CHANGES_MERGE:
if (findNextChange(this) || findPreviousChange(this)) {
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
showDialog("changes");
}
break;
case LFUN_ALL_CHANGES_ACCEPT:
// select complete document
- cur.reset(buffer_.inset());
+ cur.reset();
cur.selHandle(true);
buffer_.text().cursorBottom(cur);
// accept everything in a single step to support atomic undo
buffer_.text().acceptOrRejectChanges(cur, Text::ACCEPT);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_ALL_CHANGES_REJECT:
// select complete document
- cur.reset(buffer_.inset());
+ cur.reset();
cur.selHandle(true);
buffer_.text().cursorBottom(cur);
// 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(cur, Text::REJECT);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
+ break;
+
+ case LFUN_WORD_FIND_FORWARD:
+ case LFUN_WORD_FIND_BACKWARD: {
+ static docstring last_search;
+ docstring searched_string;
+
+ if (!cmd.argument().empty()) {
+ last_search = cmd.argument();
+ searched_string = cmd.argument();
+ } else {
+ searched_string = last_search;
+ }
+
+ if (searched_string.empty())
+ break;
+
+ bool const fw = cmd.action == LFUN_WORD_FIND_FORWARD;
+ docstring const data =
+ find2string(searched_string, true, false, fw);
+ find(this, FuncRequest(LFUN_WORD_FIND, data));
break;
+ }
case LFUN_WORD_FIND: {
FuncRequest req = cmd;
if (cmd.argument().empty() && !d->search_request_cache_.argument().empty())
req = d->search_request_cache_;
if (req.argument().empty()) {
- theLyXFunc().dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
break;
}
if (find(this, req))
DocIterator end = cur.selectionEnd();
if (beg.pit() == end.pit()) {
for (pos_type p = beg.pos() ; p < end.pos() ; ++p) {
- if (cur.paragraph().isDeleted(p))
+ if (!cur.inMathed()
+ && cur.paragraph().isDeleted(p))
has_deleted = true;
}
}
break;
}
- case LFUN_WORD_FINDADV:
- findAdv(this, cmd);
+ case LFUN_WORD_FINDADV: {
+ FindAndReplaceOptions opt;
+ istringstream iss(to_utf8(cmd.argument()));
+ iss >> opt;
+ if (findAdv(this, opt))
+ cur.dispatched();
+ else
+ cur.undispatched();
break;
+ }
case LFUN_MARK_OFF:
cur.clearSelection();
- cur.message(from_utf8(N_("Mark off")));
+ dr.setMessage(from_utf8(N_("Mark off")));
break;
case LFUN_MARK_ON:
cur.clearSelection();
cur.setMark(true);
- cur.message(from_utf8(N_("Mark on")));
+ dr.setMessage(from_utf8(N_("Mark on")));
break;
case LFUN_MARK_TOGGLE:
cur.setSelection(false);
if (cur.mark()) {
cur.setMark(false);
- cur.message(from_utf8(N_("Mark removed")));
+ dr.setMessage(from_utf8(N_("Mark removed")));
} else {
cur.setMark(true);
- cur.message(from_utf8(N_("Mark set")));
+ dr.setMessage(from_utf8(N_("Mark set")));
}
cur.resetAnchor();
break;
// turn compression on/off
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_COPY_LABEL_AS_REF: {
+
+ case LFUN_LABEL_COPY_AS_REF: {
// if there is an inset at cursor, try to copy it
- Inset * inset = cur.nextInset();
+ Inset * inset = &cur.inset();
+ if (!inset || !inset->asInsetMath())
+ inset = cur.nextInset();
if (inset) {
FuncRequest tmpcmd = cmd;
inset->dispatch(cur, tmpcmd);
// It did not work too; no action needed.
break;
cur.clearSelection();
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
- break;
- }
- case LFUN_NEXT_INSET_MODIFY: {
- // create the the real function we want to invoke
- FuncRequest tmpcmd = cmd;
- tmpcmd.action = LFUN_INSET_MODIFY;
- // if there is an inset at cursor, see whether it
- // can be modified.
- Inset * inset = cur.nextInset();
- if (inset) {
- cur.recordUndo();
- inset->dispatch(cur, tmpcmd);
- }
- // if it did not work, try the underlying inset.
- if (!inset || !cur.result().dispatched()) {
- cur.recordUndo();
- cur.dispatch(tmpcmd);
- }
-
- if (!cur.result().dispatched())
- // It did not work too; no action needed.
- break;
- cur.clearSelection();
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN: {
Point p = getPos(cur, cur.boundary());
- if (p.y_ < 0 || p.y_ > height_) {
+ // 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());
- }
+ }*/
int const scrolled = scroll(cmd.action == LFUN_SCREEN_UP
- ? - height_ : height_);
- if (cmd.action == LFUN_SCREEN_UP && scrolled > - height_)
+ ? -height_ : height_);
+ if (cmd.action == LFUN_SCREEN_UP && scrolled > -height_)
p = Point(0, 0);
if (cmd.action == LFUN_SCREEN_DOWN && scrolled < height_)
p = Point(width_, height_);
Cursor old = cur;
bool const in_texted = cur.inTexted();
- cur.reset(buffer_.inset());
- updateMetrics();
- buffer_.changed();
- d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
+ cur.reset();
+ buffer_.changed(true);
+ updateHoveredInset();
+
+ d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_,
+ true, cmd.action == LFUN_SCREEN_UP);
//FIXME: what to do with cur.x_target()?
bool update = in_texted && cur.bv().checkDepm(cur, old);
cur.finishUndo();
if (update)
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
y = getPos(cur, cur.boundary()).y_;
cur.finishUndo();
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
y = getPos(cur, cur.boundary()).y_;
cur.finishUndo();
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
- // This could be rewriten using some command like forall <insetname> <command>
- // once the insets refactoring is done.
- case LFUN_NOTES_MUTATE: {
- if (cmd.argument().empty())
- break;
- if (mutateNotes(cur, cmd.getArg(0), cmd.getArg(1))) {
- processUpdateFlags(Update::Force);
+ // This would be in Buffer class if only Cursor did not
+ // require a bufferview
+ case LFUN_INSET_FORALL: {
+ docstring const name = from_utf8(cmd.getArg(0));
+ string const commandstr = cmd.getLongArg(1);
+ FuncRequest const fr = lyxaction.lookupFunc(commandstr);
+
+ // an arbitrary number to limit number of iterations
+ const int max_iter = 10000;
+ int iterations = 0;
+ Cursor & cur = d->cursor_;
+ Cursor const savecur = cur;
+ cur.reset();
+ if (!cur.nextInset())
+ cur.forwardInset();
+ cur.beginUndoGroup();
+ while(cur && iterations < max_iter) {
+ Inset * ins = cur.nextInset();
+ if (!ins)
+ break;
+ docstring insname = ins->name();
+ while (!insname.empty()) {
+ if (insname == name || name == from_utf8("*")) {
+ cur.recordUndo();
+ lyx::dispatch(fr, dr);
+ ++iterations;
+ break;
+ }
+ size_t const i = insname.rfind(':');
+ if (i == string::npos)
+ break;
+ insname = insname.substr(0, i);
+ }
+ cur.forwardInset();
}
+ cur.endUndoGroup();
+ cur = savecur;
+ cur.fixIfBroken();
+ dr.update(Update::Force);
+
+ if (iterations >= max_iter) {
+ dr.setError(true);
+ dr.setMessage(bformat(_("`inset-forall' interrupted because number of actions is larger than %1$d"), max_iter));
+ } else
+ dr.setMessage(bformat(_("Applied \"%1$s\" to %2$d insets"), from_utf8(commandstr), iterations));
break;
}
- case LFUN_ALL_INSETS_TOGGLE: {
- string action;
- string const name = split(to_utf8(cmd.argument()), action, ' ');
- InsetCode const inset_code = insetCode(name);
- FuncRequest fr(LFUN_INSET_TOGGLE, action);
+ case LFUN_BRANCH_ADD_INSERT: {
+ docstring branch_name = from_utf8(cmd.getArg(0));
+ if (branch_name.empty())
+ if (!Alert::askForText(branch_name, _("Branch name")) ||
+ branch_name.empty())
+ break;
- Inset & inset = cur.buffer()->inset();
- InsetIterator it = inset_iterator_begin(inset);
- InsetIterator const end = inset_iterator_end(inset);
- for (; it != end; ++it) {
- if (it->asInsetCollapsable()
- && (inset_code == NO_CODE
- || inset_code == it->lyxCode())) {
- Cursor tmpcur = cur;
- tmpcur.pushBackward(*it);
- it->dispatch(tmpcur, fr);
- }
+ DispatchResult drtmp;
+ buffer_.dispatch(FuncRequest(LFUN_BRANCH_ADD, branch_name), drtmp);
+ if (drtmp.error()) {
+ Alert::warning(_("Branch already exists"), drtmp.message());
+ break;
+ }
+ lyx::dispatch(FuncRequest(LFUN_BRANCH_INSERT, branch_name));
+ break;
+ }
+
+ case LFUN_KEYMAP_OFF:
+ getIntl().keyMapOn(false);
+ break;
+
+ case LFUN_KEYMAP_PRIMARY:
+ getIntl().keyMapPrim();
+ break;
+
+ case LFUN_KEYMAP_SECONDARY:
+ getIntl().keyMapSec();
+ break;
+
+ case LFUN_KEYMAP_TOGGLE:
+ getIntl().toggleKeyMap();
+ break;
+
+ case LFUN_DIALOG_SHOW_NEW_INSET: {
+ string const name = cmd.getArg(0);
+ string data = trim(to_utf8(cmd.argument()).substr(name.size()));
+ if (decodeInsetParam(name, data, buffer_))
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, name + " " + data));
+ else
+ lyxerr << "Inset type '" << name <<
+ "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << endl;
+ break;
+ }
+
+ case LFUN_CITATION_INSERT: {
+ if (argument.empty()) {
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW_NEW_INSET, "citation"));
+ break;
+ }
+ // we can have one optional argument, delimited by '|'
+ // citation-insert <key>|<text_before>
+ // this should be enhanced to also support text_after
+ // and citation style
+ string arg = argument;
+ string opt1;
+ if (contains(argument, "|")) {
+ arg = token(argument, '|', 0);
+ opt1 = token(argument, '|', 1);
}
- processUpdateFlags(Update::Force | Update::FitCursor);
+ InsetCommandParams icp(CITE_CODE);
+ icp["key"] = from_utf8(arg);
+ if (!opt1.empty())
+ icp["before"] = from_utf8(opt1);
+ string icstr = InsetCommand::params2string("citation", icp);
+ FuncRequest fr(LFUN_INSET_INSERT, icstr);
+ lyx::dispatch(fr);
+ break;
+ }
+
+ case LFUN_INSET_APPLY: {
+ string const name = cmd.getArg(0);
+ Inset * inset = editedInset(name);
+ if (!inset) {
+ FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
+ lyx::dispatch(fr);
+ break;
+ }
+ // put cursor in front of inset.
+ if (!setCursorFromInset(inset)) {
+ LASSERT(false, break);
+ }
+ cur.recordUndo();
+ FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
+ inset->dispatch(cur, fr);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
default:
- return false;
+ dispatched = false;
+ break;
}
- return true;
+ buffer_.undo().endUndoGroup();
+ dr.dispatched(dispatched);
+ return;
}
d->xsel_cache_.set = false;
// The buffer did not really change, but this causes the
// redraw we need because we cleared the selection above.
- buffer_.changed();
+ buffer_.changed(false);
}
if (!inset)
return 0;
- if (!inset->descendable())
+ if (!inset->descendable(*this))
// No need to go further down if the inset is not
// descendable.
return inset;
}
+void BufferView::updateHoveredInset() const
+{
+ // Get inset under mouse, if there is one.
+ Inset const * covering_inset = getCoveringInset(buffer_.text(),
+ d->mouse_position_cache_.x_, d->mouse_position_cache_.y_);
+ if (covering_inset == d->last_inset_)
+ // Same inset, no need to do anything...
+ return;
+
+ bool need_redraw = false;
+ if (d->last_inset_)
+ // Remove the hint on the last hovered inset (if any).
+ need_redraw |= d->last_inset_->setMouseHover(false);
+
+ // 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);
+
+ d->last_inset_ = inset;
+
+ if (need_redraw) {
+ LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
+ << d->mouse_position_cache_.x_ << ", "
+ << d->mouse_position_cache_.y_ << ")");
+
+ d->update_strategy_ = DecorationUpdate;
+
+ // This event (moving without mouse click) is not passed further.
+ // This should be changed if it is further utilized.
+ buffer_.changed(false);
+ }
+}
+
+
void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
{
//lyxerr << "[ cmd0 " << cmd0 << "]" << endl;
// make sure we stay within the screen...
cmd.y = min(max(cmd.y, -1), height_);
- if (cmd.action == LFUN_MOUSE_MOTION && cmd.button() == mouse_button::none) {
-
- // Get inset under mouse, if there is one.
- Inset const * covering_inset =
- getCoveringInset(buffer_.text(), cmd.x, cmd.y);
- if (covering_inset == d->last_inset_)
- // Same inset, no need to do anything...
- return;
-
- bool need_redraw = false;
- // const_cast because of setMouseHover().
- Inset * inset = const_cast<Inset *>(covering_inset);
- if (d->last_inset_)
- // Remove the hint on the last hovered inset (if any).
- need_redraw |= d->last_inset_->setMouseHover(false);
- if (inset)
- // Highlighted the newly hovered inset (if any).
- need_redraw |= inset->setMouseHover(true);
- d->last_inset_ = inset;
- if (!need_redraw)
- return;
-
- LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
- << cmd.x << ", " << cmd.y << ")");
-
- d->update_strategy_ = DecorationUpdate;
+ d->mouse_position_cache_.x_ = cmd.x;
+ d->mouse_position_cache_.y_ = cmd.y;
- // This event (moving without mouse click) is not passed further.
- // This should be changed if it is further utilized.
- buffer_.changed();
+ if (cmd.action == LFUN_MOUSE_MOTION && cmd.button() == mouse_button::none) {
+ updateHoveredInset();
return;
}
void BufferView::lfunScroll(FuncRequest const & cmd)
{
string const scroll_type = cmd.getArg(0);
- int const scroll_step =
- (scroll_type == "line") ? d->scrollbarParameters_.single_step
- : (scroll_type == "page") ? d->scrollbarParameters_.page_step : 0;
- if (scroll_step == 0)
+ int scroll_step = 0;
+ if (scroll_type == "line")
+ scroll_step = d->scrollbarParameters_.single_step;
+ else if (scroll_type == "page")
+ scroll_step = d->scrollbarParameters_.page_step;
+ else
return;
string const scroll_quantity = cmd.getArg(1);
if (scroll_quantity == "up")
if (scroll_value)
scroll(scroll_step * scroll_value);
}
- updateMetrics();
- buffer_.changed();
+ buffer_.changed(true);
+ updateHoveredInset();
}
buffer_.texrow().getIdFromRow(row, tmpid, tmppos);
- d->cursor_.reset(buffer_.inset());
+ d->cursor_.reset();
if (tmpid == -1)
buffer_.text().setCursor(d->cursor_, 0, 0);
else
buffer_.text().setCursor(d->cursor_, buffer_.getParFromID(tmpid).pit(), tmppos);
+ recenter();
}
// Inset is not at cursor position. Find it in the document.
Cursor cur(*this);
- cur.reset(buffer().inset());
+ cur.reset();
while (cur && cur.nextInset() != inset)
cur.forwardInset();
TocIterator end = toc.end();
for (; toc_it != end; ++toc_it) {
if (label == toc_it->str()) {
- dispatch(toc_it->action());
+ lyx::dispatch(toc_it->action());
return;
}
}
void BufferView::setCursor(DocIterator const & dit)
{
+ d->cursor_.reset();
size_t const n = dit.depth();
for (size_t i = 0; i < n; ++i)
dit[i].inset().edit(d->cursor_, true);
d->cursor_ = cur;
- buffer_.updateLabels();
-
- updateMetrics();
- buffer_.changed();
+ buffer_.updateBuffer();
+ buffer_.changed(true);
return true;
}
// persistent selection
cap::saveSelection(cursor());
+ d->cursor_.macroModeClose();
+
// Has the cursor just left the inset?
bool leftinset = (&d->cursor_.inset() != &cur.inset());
if (leftinset)
if (!do_selection && d->cursor_.inTexted())
update |= checkDepm(cur, d->cursor_);
+ if (!do_selection)
+ d->cursor_.resetAnchor();
d->cursor_.setCursor(cur);
d->cursor_.boundary(cur.boundary());
if (do_selection)
res = _("Could not insert document %1$s");
}
- updateMetrics();
- buffer_.changed();
+ buffer_.changed(true);
// emit message signal.
message(bformat(res, disp_fn));
buffer_.errors("Parse");
// 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_)
- pain.fillRectangle(0, y2, width_, height_ - y2, Color_bottomarea);
+
+ if (y2 < height_) {
+ Color color = buffer().isInternal()
+ ? Color_background : Color_bottomarea;
+ pain.fillRectangle(0, y2, width_, height_ - y2, color);
+ }
break;
}
LYXERR(Debug::PAINTING, "\n\t\t*** END DRAWING ***");
cap::replaceSelection(cur);
buffer_.undo().recordUndo(cur);
if (asParagraph)
- cur.innerText()->insertStringAsParagraphs(cur, tmpstr);
+ cur.innerText()->insertStringAsParagraphs(cur, tmpstr, cur.current_font);
else
- cur.innerText()->insertStringAsLines(cur, tmpstr);
+ cur.innerText()->insertStringAsLines(cur, tmpstr, cur.current_font);
- updateMetrics();
- buffer_.changed();
+ buffer_.changed(true);
}
projects / lyx.git / blobdiff