#include "BufferView.h"
+#include "BranchList.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferList.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "DispatchResult.h"
-#include "EmbeddedFiles.h"
#include "ErrorList.h"
#include "factory.h"
#include "FloatList.h"
#include "TextClass.h"
#include "TextMetrics.h"
#include "TexRow.h"
+#include "TocBackend.h"
#include "VSpace.h"
#include "WordLangTuple.h"
#include "insets/InsetBibtex.h"
#include "insets/InsetCommand.h" // ChangeRefs
+#include "insets/InsetExternal.h"
+#include "insets/InsetGraphics.h"
#include "insets/InsetRef.h"
#include "insets/InsetText.h"
{
Private(BufferView & bv): wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0),
+ inlineCompletionUniqueChars_(0),
last_inset_(0), gui_(0)
{}
vector<int> par_height_;
///
- DocIterator inlineCompletionPos;
+ DocIterator inlineCompletionPos_;
///
- docstring inlineCompletion;
+ docstring inlineCompletion_;
///
- size_t inlineCompletionUniqueChars;
+ size_t inlineCompletionUniqueChars_;
/// keyboard mapping object.
Intl intl_;
/** Not owned, so don't delete.
*/
frontend::GuiBufferViewDelegate * gui_;
+
+ /// Cache for Find Next
+ FuncRequest search_request_cache_;
};
}
+bool BufferView::isTopScreen() const
+{
+ return d->scrollbarParameters_.position == d->scrollbarParameters_.min;
+}
+
+
+bool BufferView::isBottomScreen() const
+{
+ return d->scrollbarParameters_.position == d->scrollbarParameters_.max;
+}
+
+
Intl & BufferView::getIntl()
{
return d->intl_;
if (covering_inset)
return covering_inset->contextMenu(*this, x, y);
- // FIXME: Do something more elaborate here.
- return from_ascii("edit");
+ return buffer_.inset().contextMenu(*this, x, y);
}
else if (bot_pit == tm.last().first + 1)
tm.newParMetricsDown();
- if (tm.has(bot_pit)) {
+ if (tm.contains(bot_pit)) {
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- BOOST_ASSERT(!pm.rows().empty());
+ LASSERT(!pm.rows().empty(), /**/);
// FIXME: smooth scrolling doesn't work in mathed.
CursorSlice const & cs = dit.innerTextSlice();
int offset = coordOffset(dit, dit.boundary()).y_;
}
// fix inline completion position
- if (d->inlineCompletionPos.fixIfBroken())
- d->inlineCompletionPos = DocIterator();
+ if (d->inlineCompletionPos_.fixIfBroken())
+ d->inlineCompletionPos_ = DocIterator();
tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
switch (cmd.action) {
case LFUN_UNDO:
- flag.enabled(buffer_.undo().hasUndoStack());
+ flag.setEnabled(buffer_.undo().hasUndoStack());
break;
case LFUN_REDO:
- flag.enabled(buffer_.undo().hasRedoStack());
+ flag.setEnabled(buffer_.undo().hasRedoStack());
break;
case LFUN_FILE_INSERT:
case LFUN_FILE_INSERT_PLAINTEXT_PARA:
case LFUN_FILE_INSERT_PLAINTEXT:
case LFUN_BOOKMARK_SAVE:
// FIXME: Actually, these LFUNS should be moved to Text
- flag.enabled(cur.inTexted());
+ flag.setEnabled(cur.inTexted());
break;
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:
case LFUN_BIBTEX_DATABASE_ADD:
case LFUN_BIBTEX_DATABASE_DEL:
case LFUN_STATISTICS:
- case LFUN_NEXT_INSET_TOGGLE:
- flag.enabled(true);
+ flag.setEnabled(true);
+ 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;
+ // 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.enabled(!cmd.argument().empty()
+ flag.setEnabled(!cmd.argument().empty()
|| getInsetByCode<InsetRef>(cur, REF_CODE));
break;
}
case LFUN_CHANGES_TRACK:
- flag.enabled(true);
+ flag.setEnabled(true);
flag.setOnOff(buffer_.params().trackChanges);
break;
case LFUN_CHANGES_OUTPUT:
- flag.enabled(true);
+ flag.setEnabled(true);
flag.setOnOff(buffer_.params().outputChanges);
break;
// In principle, these command should only be enabled if there
// is a change in the document. However, without proper
// optimizations, this will inevitably result in poor performance.
- flag.enabled(true);
+ flag.setEnabled(true);
break;
case LFUN_BUFFER_TOGGLE_COMPRESSION: {
break;
}
- case LFUN_BUFFER_TOGGLE_EMBEDDING: {
- flag.setOnOff(buffer_.params().embedded);
- break;
- }
-
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN:
case LFUN_SCROLL:
- flag.enabled(true);
- break;
-
- // FIXME: LFUN_SCREEN_DOWN_SELECT should be removed from
- // everywhere else before this can enabled:
case LFUN_SCREEN_UP_SELECT:
case LFUN_SCREEN_DOWN_SELECT:
- flag.enabled(false);
+ flag.setEnabled(true);
break;
case LFUN_LAYOUT_TABULAR:
- flag.enabled(cur.innerInsetOfType(TABULAR_CODE));
+ flag.setEnabled(cur.innerInsetOfType(TABULAR_CODE));
break;
case LFUN_LAYOUT:
+ flag.setEnabled(!cur.inset().forceEmptyLayout(cur.idx()));
+ break;
+
case LFUN_LAYOUT_PARAGRAPH:
- flag.enabled(cur.inset().allowParagraphCustomization(cur.idx()));
+ 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;
- switch (code) {
+ InsetCode next_code = cur.nextInset()
+ ? cur.nextInset()->lyxCode() : NO_CODE;
+ //FIXME: remove these special cases:
+ switch (next_code) {
case TABULAR_CODE:
- enable = cmd.argument() == "tabular";
- break;
case ERT_CODE:
- enable = cmd.argument() == "ert";
- break;
case FLOAT_CODE:
- enable = cmd.argument() == "float";
- break;
case WRAP_CODE:
- enable = cmd.argument() == "wrap";
- break;
case NOTE_CODE:
- enable = cmd.argument() == "note";
- break;
case BRANCH_CODE:
- enable = cmd.argument() == "branch";
- break;
case BOX_CODE:
- enable = cmd.argument() == "box";
- break;
case LISTINGS_CODE:
- enable = cmd.argument() == "listings";
+ enable = (cmd.argument().empty() ||
+ cmd.getArg(0) == insetName(next_code));
break;
default:
break;
}
- flag.enabled(enable);
+ flag.setEnabled(enable);
break;
}
case LFUN_DIALOG_SHOW_NEW_INSET:
- flag.enabled(cur.inset().lyxCode() != ERT_CODE &&
+ flag.setEnabled(cur.inset().lyxCode() != ERT_CODE &&
cur.inset().lyxCode() != LISTINGS_CODE);
if (cur.inset().lyxCode() == CAPTION_CODE) {
FuncStatus flag;
}
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);
+ break;
+ }
+
default:
- flag.enabled(false);
+ flag.setEnabled(false);
}
return flag;
gotoLabel(label);
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);
+
+ if (!cur.result().dispatched())
+ // It did not work too; no action needed.
+ break;
+ }
case LFUN_PARAGRAPH_GOTO: {
- int const id = convert<int>(to_utf8(cmd.argument()));
+ int const id = convert<int>(cmd.getArg(0));
+ int const pos = convert<int>(cmd.getArg(1));
int i = 0;
for (Buffer * b = &buffer_; i == 0 || b != &buffer_;
b = theBufferList().next(b)) {
if (b == &buffer_) {
// Set the cursor
+ dit.pos() = pos;
setCursor(dit);
processUpdateFlags(Update::Force | Update::FitCursor);
} else {
buffer_.text().acceptOrRejectChanges(d->cursor_, Text::REJECT);
break;
- case LFUN_WORD_FIND:
- if (find(this, cmd))
+ case LFUN_WORD_FIND: {
+ FuncRequest req = cmd;
+ if (cmd.argument().empty() && !d->search_request_cache_.argument().empty())
+ req = d->search_request_cache_;
+ if (find(this, req))
showCursor();
else
message(_("String not found!"));
+ d->search_request_cache_ = req;
break;
+ }
case LFUN_WORD_REPLACE: {
bool has_deleted = false;
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
BIBTEX_CODE);
if (inset) {
- if (inset->addDatabase(to_utf8(cmd.argument())))
+ if (inset->addDatabase(cmd.argument()))
buffer_.updateBibfilesCache();
}
break;
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
BIBTEX_CODE);
if (inset) {
- if (inset->delDatabase(to_utf8(cmd.argument())))
+ if (inset->delDatabase(cmd.argument()))
buffer_.updateBibfilesCache();
}
break;
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_BUFFER_TOGGLE_EMBEDDING: {
- // turn embedding on/off
- try {
- buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_);
- } catch (ExceptionMessage const & message) {
- Alert::error(message.title_, message.details_);
- }
- break;
- }
-
case LFUN_NEXT_INSET_TOGGLE: {
- // this is the real function we want to invoke
- FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.origin);
+ // 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();
Cursor tmpcur = cur;
tmpcur.pushBackward(*inset);
inset->dispatch(tmpcur, tmpcmd);
- if (tmpcur.result().dispatched()) {
+ if (tmpcur.result().dispatched())
cur.dispatched();
- }
- } else if (inset->editable() == Inset::IS_EDITABLE) {
- inset->edit(cur, true);
- }
+ } else
+ inset->dispatch(cur, tmpcmd);
}
// if it did not work, try the underlying inset.
- if (!cur.result().dispatched())
+ if (!inset || !cur.result().dispatched())
cur.dispatch(tmpcmd);
if (!cur.result().dispatched())
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)
+ 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::Force | Update::FitCursor);
+ break;
+ }
+
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN: {
Point p = getPos(cur, cur.boundary());
lfunScroll(cmd);
break;
- case LFUN_SCREEN_UP_SELECT:
- case LFUN_SCREEN_DOWN_SELECT: {
- // Those two are not ready yet for consumption.
- return false;
-
+ case LFUN_SCREEN_UP_SELECT: {
cur.selHandle(true);
- size_t initial_depth = cur.depth();
- Point const p = getPos(cur, cur.boundary());
- scroll(cmd.action == LFUN_SCREEN_UP_SELECT? - height_ : height_);
- // FIXME: We need to verify if the cursor stayed within an inset...
- //cur.reset(buffer_.inset());
- d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
+ if (isTopScreen()) {
+ lyx::dispatch(FuncRequest(LFUN_BUFFER_BEGIN_SELECT));
+ cur.finishUndo();
+ break;
+ }
+ int y = getPos(cur, cur.boundary()).y_;
+ int const ymin = y - height_ + defaultRowHeight();
+ while (y > ymin && cur.up())
+ y = getPos(cur, cur.boundary()).y_;
+
cur.finishUndo();
- while (cur.depth() > initial_depth) {
- cur.forwardInset();
+ processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ break;
+ }
+
+ case LFUN_SCREEN_DOWN_SELECT: {
+ cur.selHandle(true);
+ if (isBottomScreen()) {
+ lyx::dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
+ cur.finishUndo();
+ break;
}
- // FIXME: we need to do a redraw again because of the selection
- // But no screen update is needed.
- d->update_strategy_ = NoScreenUpdate;
- buffer_.changed();
+ int y = getPos(cur, cur.boundary()).y_;
+ int const ymax = y + height_ - defaultRowHeight();
+ while (y < ymax && cur.down())
+ y = getPos(cur, cur.boundary()).y_;
+
+ cur.finishUndo();
+ processUpdateFlags(Update::SinglePar | Update::FitCursor);
break;
}
+ case LFUN_BRANCH_ACTIVATE:
+ case LFUN_BRANCH_DEACTIVATE:
+ buffer_.dispatch(cmd);
+ processUpdateFlags(Update::Force);
+ break;
+
default:
return false;
}
// Now dispatch to the temporary cursor. If the real cursor should
// be modified, the inset's dispatch has to do so explicitly.
- if (!cur.result().dispatched())
+ if (!inset || !cur.result().dispatched())
cur.dispatch(cmd);
// Notify left insets
{
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;
+ (scroll_type == "line") ? d->scrollbarParameters_.single_step
+ : (scroll_type == "page") ? d->scrollbarParameters_.page_step : 0;
if (scroll_step == 0)
return;
string const scroll_quantity = cmd.getArg(1);
void BufferView::gotoLabel(docstring const & label)
{
- for (InsetIterator it = inset_iterator_begin(buffer_.inset()); it; ++it) {
- vector<docstring> labels;
- it->getLabelList(buffer_, labels);
- if (std::find(labels.begin(), labels.end(), label) != labels.end()) {
- setCursor(it);
- showCursor();
- return;
- }
+ Toc & toc = buffer().tocBackend().toc("label");
+ TocIterator toc_it = toc.begin();
+ TocIterator end = toc.end();
+ for (; toc_it != end; ++toc_it) {
+ if (label == toc_it->str())
+ dispatch(toc_it->action());
}
+ //FIXME: We could do a bit more searching thanks to this:
+ //InsetLabel const * inset = buffer_.insetLabel(label);
}
bool BufferView::mouseSetCursor(Cursor & cur, bool select)
{
- BOOST_ASSERT(&cur.bv() == this);
+ LASSERT(&cur.bv() == this, /**/);
if (!select)
// this event will clear selection so we save selection for
int old_height = tm.parMetrics(bottom_pit).height();
// make sure inline completion pointer is ok
- if (d->inlineCompletionPos.fixIfBroken())
- d->inlineCompletionPos = DocIterator();
+ if (d->inlineCompletionPos_.fixIfBroken())
+ d->inlineCompletionPos_ = DocIterator();
// In Single Paragraph mode, rebreak only
// the (main text, not inset!) paragraph containing the cursor.
TextMetrics & tm = textMetrics(&buftext);
// make sure inline completion pointer is ok
- if (d->inlineCompletionPos.fixIfBroken())
- d->inlineCompletionPos = DocIterator();
+ 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_];
void BufferView::insertLyXFile(FileName const & fname)
{
- BOOST_ASSERT(d->cursor_.inTexted());
+ LASSERT(d->cursor_.inTexted(), /**/);
// Get absolute path of file and add ".lyx"
// to the filename if necessary
el = buf.errorList("Parse");
buffer_.undo().recordUndo(d->cursor_);
cap::pasteParagraphList(d->cursor_, buf.paragraphs(),
- buf.params().getTextClassPtr(), el);
+ buf.params().documentClassPtr(), el);
res = _("Document %1$s inserted.");
} else {
res = _("Could not insert document %1$s");
CursorSlice const & sl = dit[0];
TextMetrics const & tm = textMetrics(sl.text());
ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
- BOOST_ASSERT(!pm.rows().empty());
+ LASSERT(!pm.rows().empty(), /**/);
y -= pm.rows()[0].ascent();
#if 1
// FIXME: document this mess
{
CursorSlice const & bot = dit.bottom();
TextMetrics const & tm = textMetrics(bot.text());
- if (!tm.has(bot.pit()))
+ if (!tm.contains(bot.pit()))
return Point(-1, -1);
Point p = coordOffset(dit, boundary); // offset from outer paragraph
docstring const & BufferView::inlineCompletion() const
{
- return d->inlineCompletion;
+ return d->inlineCompletion_;
}
size_t const & BufferView::inlineCompletionUniqueChars() const
{
- return d->inlineCompletionUniqueChars;
+ return d->inlineCompletionUniqueChars_;
}
DocIterator const & BufferView::inlineCompletionPos() const
{
- return d->inlineCompletionPos;
+ return d->inlineCompletionPos_;
}
docstring const & completion, size_t uniqueChars)
{
uniqueChars = min(completion.size(), uniqueChars);
- bool changed = d->inlineCompletion != completion
- || d->inlineCompletionUniqueChars != uniqueChars;
+ bool changed = d->inlineCompletion_ != completion
+ || d->inlineCompletionUniqueChars_ != uniqueChars;
bool singlePar = true;
- d->inlineCompletion = completion;
- d->inlineCompletionUniqueChars = min(completion.size(), uniqueChars);
+ 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;
+ DocIterator const & old = d->inlineCompletionPos_;
if (old != pos) {
//lyxerr << "inlineCompletionPos changed" << std::endl;
// old or pos are in another paragraph?
singlePar = false;
//lyxerr << "different paragraph" << std::endl;
}
- d->inlineCompletionPos = pos;
+ d->inlineCompletionPos_ = pos;
}
// set update flags
if (changed) {
- //lyxerr << "inlineCompletion changed" << std::endl;
-
- Update::flags flags
- = cur.disp_.update() | Update::Force;
- if (singlePar && !(flags | Update::SinglePar))
- flags = flags | Update::SinglePar;
- cur.updateFlags(flags);
+ if (singlePar && !(cur.disp_.update() & Update::Force))
+ cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ else
+ cur.updateFlags(cur.disp_.update() | Update::Force);
}
}