#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), gui_(0)
+ last_inset_(0), bookmark_edit_position_(0), gui_(0)
{}
///
*/
Inset * last_inset_;
+ // cache for id of the paragraph which was edited the last time
+ int bookmark_edit_position_;
+
mutable TextMetricsCache text_metrics_;
/// Whom to notify.
/// Cache for Find Next
FuncRequest search_request_cache_;
+
+ ///
+ map<string, Inset *> edited_insets_;
};
d->scrollbarParameters_.position = 0;
// The reference is the top position so we remove one page.
- d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
+ if (lyxrc.scroll_below_document)
+ d->scrollbarParameters_.max -= minVisiblePart();
+ else
+ d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
}
// 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
}
+void BufferView::bookmarkEditPosition()
+{
+ // Don't eat cpu time for each keystroke
+ if (d->cursor_.paragraph().id() == d->bookmark_edit_position_)
+ return;
+ saveBookmark(0);
+ d->bookmark_edit_position_ = d->cursor_.paragraph().id();
+}
+
+
void BufferView::saveBookmark(unsigned int idx)
{
- // tenatively save bookmark, id and pos will be used to
+ // tentatively save bookmark, id and pos will be used to
// acturately locate a bookmark in a 'live' lyx session.
// pit and pos will be updated with bottom level pit/pos
// when lyx exits.
// 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;
}
}
+void BufferView::recenter()
+{
+ showCursor(d->cursor_, true);
+}
+
+
void BufferView::showCursor()
{
- showCursor(d->cursor_);
+ showCursor(d->cursor_, false);
}
-void BufferView::showCursor(DocIterator const & dit)
+void BufferView::showCursor(DocIterator const & dit, bool recenter)
+{
+ if (scrollToCursor(dit, recenter))
+ buffer_.changed();
+}
+
+
+void BufferView::scrollToCursor()
+{
+ scrollToCursor(d->cursor_, false);
+}
+
+
+bool BufferView::scrollToCursor(DocIterator const & dit, bool recenter)
{
// We are not properly started yet, delay until resizing is
// done.
if (height_ == 0)
- return;
+ return false;
LYXERR(Debug::SCROLLING, "recentering!");
Dimension const & row_dim =
pm.getRow(cs.pos(), dit.boundary()).dimension();
int scrolled = 0;
- if (ypos - row_dim.ascent() < 0)
+ if (recenter)
+ scrolled = scroll(ypos - height_/2);
+ else if (ypos - row_dim.ascent() < 0)
scrolled = scrollUp(- ypos + row_dim.ascent());
else if (ypos + row_dim.descent() > height_)
- scrolled = scrollDown(ypos - height_ + row_dim.descent());
+ scrolled = scrollDown(ypos - height_ + defaultRowHeight() );
+
// else, nothing to do, the cursor is already visible so we just return.
if (scrolled != 0) {
updateMetrics();
- buffer_.changed();
+ return true;
}
- return;
+ return false;
}
// fix inline completion position
Dimension const & row_dim =
pm.getRow(cs.pos(), dit.boundary()).dimension();
- if (d->anchor_pit_ == 0)
+ if (recenter)
+ d->anchor_ypos_ = height_/2;
+ else if (d->anchor_pit_ == 0)
d->anchor_ypos_ = offset + pm.ascent();
else if (d->anchor_pit_ == max_pit)
d->anchor_ypos_ = height_ - offset - row_dim.descent();
+ else if (offset > height_)
+ d->anchor_ypos_ = height_ - offset - defaultRowHeight();
else
- d->anchor_ypos_ = defaultRowHeight() * 2 - offset - row_dim.descent();
+ d->anchor_ypos_ = defaultRowHeight() * 2;
updateMetrics();
- buffer_.changed();
+ return true;
}
-FuncStatus BufferView::getStatus(FuncRequest const & cmd)
+void BufferView::updateLayout(DocumentClass const * const oldlayout)
+{
+ message(_("Converting document to new document class..."));
+
+ StableDocIterator backcur(d->cursor_);
+ ErrorList & el = buffer_.errorList("Class Switch");
+ cap::switchBetweenClasses(
+ oldlayout, buffer_.params().documentClassPtr(),
+ static_cast<InsetText &>(buffer_.inset()), el);
+
+ setCursor(backcur.asDocIterator(&buffer_));
+
+ buffer_.errors("Class Switch");
+ buffer_.updateLabels();
+}
+
+/** 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)
{
- FuncStatus flag;
+ 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 is 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;
// FIXME: Actually, these LFUNS should be moved to Text
flag.setEnabled(cur.inTexted());
break;
+
case LFUN_FONT_STATE:
case LFUN_LABEL_INSERT:
case LFUN_INFO_INSERT:
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_MARK_ON:
case LFUN_MARK_TOGGLE:
case LFUN_SCREEN_RECENTER:
+ 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());
+ // FIXME: Test if current WorkArea is the search WorkArea
+ flag.setEnabled(buffer().isInternal() && !cur.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_TOGGLE:
case LFUN_NEXT_INSET_MODIFY: {
// this is the real function we want to invoke
FuncRequest tmpcmd = cmd;
- tmpcmd.action = (cmd.action == LFUN_NEXT_INSET_TOGGLE)
- ? LFUN_INSET_TOGGLE : LFUN_INSET_MODIFY;
+ 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();
case LFUN_CHANGES_MERGE:
case LFUN_CHANGE_NEXT:
+ case LFUN_CHANGE_PREVIOUS:
case LFUN_ALL_CHANGES_ACCEPT:
case LFUN_ALL_CHANGES_REJECT:
// TODO: context-sensitive enabling of LFUNs
flag.setEnabled(cur.inset().allowParagraphCustomization(cur.idx()));
break;
- case LFUN_INSET_SETTINGS: {
- InsetCode code = cur.inset().lyxCode();
- if (cmd.getArg(0) == insetName(code)) {
- flag.setEnabled(true);
- break;
- }
- bool enable = false;
- InsetCode next_code = cur.nextInset()
- ? cur.nextInset()->lyxCode() : NO_CODE;
- //FIXME: remove these special cases:
- switch (next_code) {
- case TABULAR_CODE:
- case ERT_CODE:
- case FLOAT_CODE:
- case WRAP_CODE:
- case NOTE_CODE:
- case BRANCH_CODE:
- case BOX_CODE:
- case LISTINGS_CODE:
- enable = (cmd.argument().empty() ||
- cmd.getArg(0) == insetName(next_code));
- break;
- default:
- break;
- }
- flag.setEnabled(enable);
- break;
- }
-
case LFUN_DIALOG_SHOW_NEW_INSET:
- flag.setEnabled(cur.inset().lyxCode() != ERT_CODE &&
- cur.inset().lyxCode() != LISTINGS_CODE);
- if (cur.inset().lyxCode() == CAPTION_CODE) {
- FuncStatus flag;
- if (cur.inset().getStatus(cur, cmd, flag))
- return flag;
- }
+ // 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);
+ // FIXME we should consider passthru paragraphs too.
+ flag.setEnabled(!cur.inset().getLayout().isPassThru());
break;
- case LFUN_BRANCH_ACTIVATE:
- case LFUN_BRANCH_DEACTIVATE: {
- bool enable = false;
- docstring const branchName = cmd.argument();
- if (!branchName.empty())
- enable = buffer_.params().branchlist().find(branchName);
- flag.setEnabled(enable);
+ 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);
+ return false;
}
- return flag;
+ return true;
+}
+
+
+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;
}
<< " 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 false;
+
+ // 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"));
+ }
+ updateLayout(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.
+ processUpdateFlags(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();
+ updateLayout(oldClass);
+ processUpdateFlags(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();
+ updateLayout(oldClass);
+ processUpdateFlags(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();
+ updateLayout(oldDocClass);
+ processUpdateFlags(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();
+ updateLayout(oldClass);
+ processUpdateFlags(Update::Force | Update::FitCursor);
+ break;
+ }
+
case LFUN_UNDO:
cur.message(_("Undo"));
cur.clearSelection();
docstring label = cmd.argument();
if (label.empty()) {
InsetRef * inset =
- getInsetByCode<InsetRef>(d->cursor_, REF_CODE);
+ getInsetByCode<InsetRef>(cur, REF_CODE);
if (inset) {
label = inset->getParam("reference");
// persistent=false: use temp_bookmark
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
processUpdateFlags(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);
+ break;
case LFUN_CHANGES_MERGE:
- if (findNextChange(this)) {
+ if (findNextChange(this) || findPreviousChange(this)) {
processUpdateFlags(Update::Force | Update::FitCursor);
showDialog("changes");
}
case LFUN_ALL_CHANGES_ACCEPT:
// select complete document
- d->cursor_.reset(buffer_.inset());
- d->cursor_.selHandle(true);
- buffer_.text().cursorBottom(d->cursor_);
+ cur.reset();
+ cur.selHandle(true);
+ buffer_.text().cursorBottom(cur);
// accept everything in a single step to support atomic undo
- buffer_.text().acceptOrRejectChanges(d->cursor_, Text::ACCEPT);
+ 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);
break;
case LFUN_ALL_CHANGES_REJECT:
// select complete document
- d->cursor_.reset(buffer_.inset());
- d->cursor_.selHandle(true);
- buffer_.text().cursorBottom(d->cursor_);
+ 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(d->cursor_, Text::REJECT);
+ 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);
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())
case LFUN_MARK_OFF:
cur.clearSelection();
- cur.resetAnchor();
cur.message(from_utf8(N_("Mark off")));
break;
case LFUN_MARK_ON:
cur.clearSelection();
cur.setMark(true);
- cur.resetAnchor();
cur.message(from_utf8(N_("Mark on")));
break;
case LFUN_MARK_TOGGLE:
- cur.clearSelection();
+ cur.setSelection(false);
if (cur.mark()) {
cur.setMark(false);
cur.message(from_utf8(N_("Mark removed")));
cur.resetAnchor();
break;
- case LFUN_SCREEN_RECENTER:
+ case LFUN_SCREEN_SHOW_CURSOR:
showCursor();
break;
+
+ case LFUN_SCREEN_RECENTER:
+ recenter();
+ break;
case LFUN_BIBTEX_DATABASE_ADD: {
- Cursor tmpcur = d->cursor_;
+ Cursor tmpcur = cur;
findInset(tmpcur, BIBTEX_CODE, false);
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
BIBTEX_CODE);
}
case LFUN_BIBTEX_DATABASE_DEL: {
- Cursor tmpcur = d->cursor_;
+ Cursor tmpcur = cur;
findInset(tmpcur, BIBTEX_CODE, false);
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
BIBTEX_CODE);
// 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);
processUpdateFlags(Update::SinglePar | Update::FitCursor);
break;
}
- case LFUN_NEXT_INSET_TOGGLE: {
- // create the the real function we want to invoke
- FuncRequest tmpcmd = cmd;
- tmpcmd.action = LFUN_INSET_TOGGLE;
- // if there is an inset at cursor, see whether it
- // wants to toggle.
- Inset * inset = cur.nextInset();
- if (inset) {
- if (inset->isActive()) {
- Cursor tmpcur = cur;
- tmpcur.pushBackward(*inset);
- inset->dispatch(tmpcur, tmpcmd);
- if (tmpcur.result().dispatched())
- cur.dispatched();
- } else
- inset->dispatch(cur, tmpcmd);
- }
- // if it did not work, try the underlying inset.
- if (!inset || !cur.result().dispatched())
- cur.dispatch(tmpcmd);
-
- if (!cur.result().dispatched())
- // 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
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_);
- cur.reset(buffer_.inset());
+ Cursor old = cur;
+ bool const in_texted = cur.inTexted();
+ cur.reset();
updateMetrics();
buffer_.changed();
- d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
+ 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);
break;
}
break;
}
- case LFUN_BRANCH_ACTIVATE:
- case LFUN_BRANCH_DEACTIVATE:
- buffer_.dispatch(cmd);
- processUpdateFlags(Update::Force);
- break;
-
// This could be rewriten using some command like forall <insetname> <command>
// once the insets refactoring is done.
case LFUN_NOTES_MUTATE: {
break;
}
+ 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;
+
+ 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);
+ }
+ 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);
+ processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ break;
+ }
+
default:
- return false;
+ dispatched = false;
+ break;
}
- return true;
+ buffer_.undo().endUndoGroup();
+ return dispatched;
}
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;
}
+int BufferView::minVisiblePart()
+{
+ return 2 * defaultRowHeight();
+}
+
+
int BufferView::scroll(int y)
{
if (y > 0)
{
Text * text = &buffer_.text();
TextMetrics & tm = d->text_metrics_[text];
- int ymax = height_ + offset;
+ int const ymax = height_ + offset;
while (true) {
pair<pit_type, ParagraphMetrics const *> last = tm.last();
int bottom_pos = last.second->position() + last.second->descent();
+ if (lyxrc.scroll_below_document)
+ bottom_pos += height_ - minVisiblePart();
if (last.first + 1 == int(text->paragraphs().size())) {
if (bottom_pos <= height_)
return 0;
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();
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);
// 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)
}
+void BufferView::cursorPosAndHeight(Point & p, int & h) const
+{
+ Cursor const & cur = cursor();
+ Font const font = cur.getFont();
+ frontend::FontMetrics const & fm = theFontMetrics(font);
+ int const asc = fm.maxAscent();
+ int const des = fm.maxDescent();
+ h = asc + des;
+ p = getPos(cur, cur.boundary());
+ p.y_ -= asc;
+}
+
+
+bool BufferView::cursorInView(Point const & p, int h) const
+{
+ Cursor const & cur = cursor();
+ // does the cursor touch the screen ?
+ if (p.y_ + h < 0 || p.y_ >= workHeight() || !paragraphVisible(cur))
+ return false;
+ return true;
+}
+
+
void BufferView::draw(frontend::Painter & pain)
{
if (height_ == 0 || width_ == 0)
// 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();
return true;
if (a.empty() || b.empty())
return false;
+ if (a.depth() != b.depth())
+ return false;
return &a.innerParagraph() == &b.innerParagraph();
}
projects / lyx.git / blobdiff