#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"
#include "frontends/alert.h"
+#include "frontends/Application.h"
#include "frontends/Delegates.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "support/convert.h"
#include "support/debug.h"
-#include "support/FileFilterList.h"
+#include "support/ExceptionMessage.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
while (tmpdit) {
Inset const * inset = tmpdit.nextInset();
if (inset
- && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
+ && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
&& (contents.empty() ||
static_cast<InsetCommand const *>(inset)->getFirstNonOptParam() == contents)) {
dit = tmpdit;
if (same_content) {
Inset const * inset = tmpdit.nextInset();
if (inset
- && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
+ && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
contents = static_cast<InsetCommand const *>(inset)->getFirstNonOptParam();
}
}
tmpcur.clearSelection();
bv->setCursor(tmpcur);
+ bv->showCursor();
}
/// A map from a Text to the associated text metrics
-typedef std::map<Text const *, TextMetrics> TextMetricsCache;
+typedef map<Text const *, TextMetrics> TextMetricsCache;
enum ScreenUpdateStrategy {
NoScreenUpdate,
struct BufferView::Private
{
Private(BufferView & bv): wh_(0), cursor_(bv),
- anchor_ref_(0), offset_ref_(0), need_centering_(false),
+ anchor_pit_(0), anchor_ypos_(0),
last_inset_(0), gui_(0)
{}
///
Cursor cursor_;
///
- pit_type anchor_ref_;
+ pit_type anchor_pit_;
///
- int offset_ref_;
+ int anchor_ypos_;
///
- bool need_centering_;
+ vector<int> par_height_;
+
+ ///
+ DocIterator inlineCompletionPos;
+ ///
+ docstring inlineCompletion;
+ ///
+ size_t inlineCompletionUniqueChars;
/// keyboard mapping object.
Intl intl_;
BufferView::BufferView(Buffer & buf)
- : width_(0), height_(0), buffer_(buf), d(new Private(*this))
+ : width_(0), height_(0), full_screen_(false), buffer_(buf), d(new Private(*this))
{
d->xsel_cache_.set = false;
d->intl_.initKeyMapper(lyxrc.use_kbmap);
}
+int BufferView::rightMargin() const
+{
+ // The additional test for the case the outliner is opened.
+ if (!full_screen_ ||
+ !lyxrc.full_screen_limit ||
+ width_ < lyxrc.full_screen_width + 20)
+ return 10;
+
+ return (width_ - lyxrc.full_screen_width) / 2;
+}
+
+
+int BufferView::leftMargin() const
+{
+ return rightMargin();
+}
+
+
+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 (p.y_ - asc >= 0 && p.y_ + des < height_)
return false;
}
- center();
return true;
}
<< ", singlepar = " << (flags & Update::SinglePar)
<< "] buffer: " << &buffer_);
- // Update macro store
- if (!(cursor().inMathed() && cursor().inMacroMode()))
- buffer_.updateMacros();
+ buffer_.updateMacros();
// Now do the first drawing step if needed. This consists on updating
// the CoordCache in updateMetrics().
if (flags == Update::FitCursor
|| flags == (Update::Decoration | Update::FitCursor)) {
- bool const fit_cursor = fitCursor();
// tell the frontend to update the screen if needed.
- if (fit_cursor) {
- updateMetrics();
- buffer_.changed();
+ if (fitCursor()) {
+ showCursor();
return;
}
if (flags & Update::Decoration) {
return;
}
- bool const full_metrics = flags & Update::Force;
+ bool const full_metrics = flags & Update::Force || !singleParUpdate();
- if (full_metrics || !singleParUpdate())
+ if (full_metrics)
// We have to update the full screen metrics.
updateMetrics();
if (!(flags & Update::FitCursor)) {
+ // Nothing to do anymore. Trigger a redraw and return
buffer_.changed();
return;
}
- //FIXME: updateMetrics() does not update paragraph position
+ // updateMetrics() does not update paragraph position
// This is done at draw() time. So we need a redraw!
buffer_.changed();
- if (!fitCursor())
- // The screen has already been updated thanks to the
- // 'buffer_.changed()' call three line above. So no need
- // to redraw again.
- return;
- // The screen has been recentered around the cursor position so
- // refresh it:
- updateMetrics();
- buffer_.changed();
+ if (fitCursor()) {
+ // The cursor is off screen so ensure it is visible.
+ // refresh it:
+ showCursor();
+ }
}
void BufferView::updateScrollbar()
{
- Text & t = buffer_.text();
- TextMetrics & tm = d->text_metrics_[&t];
+ if (height_ == 0)
+ return;
- int const parsize = int(t.paragraphs().size() - 1);
- if (d->anchor_ref_ > parsize) {
- d->anchor_ref_ = parsize;
- d->offset_ref_ = 0;
- }
+ // We prefer fixed size line scrolling.
+ d->scrollbarParameters_.single_step = defaultRowHeight();
+ // We prefer full screen page scrolling.
+ d->scrollbarParameters_.page_step = height_;
+
+ Text & t = buffer_.text();
+ TextMetrics & tm = d->text_metrics_[&t];
LYXERR(Debug::GUI, " Updating scrollbar: height: "
<< t.paragraphs().size()
<< " curr par: " << d->cursor_.bottom().pit()
<< " default height " << defaultRowHeight());
- // It would be better to fix the scrollbar to understand
- // values in [0..1] and divide everything by wh
-
- // estimated average paragraph height:
- if (d->wh_ == 0)
- d->wh_ = height_ / 4;
-
- int h = tm.parMetrics(d->anchor_ref_).height();
-
- // Normalize anchor/offset (MV):
- while (d->offset_ref_ > h && d->anchor_ref_ < parsize) {
- d->anchor_ref_++;
- d->offset_ref_ -= h;
- h = tm.parMetrics(d->anchor_ref_).height();
+ size_t const parsize = t.paragraphs().size();
+ if (d->par_height_.size() != parsize) {
+ d->par_height_.clear();
+ // FIXME: We assume a default paragraph height of 2 rows. This
+ // should probably be pondered with the screen width.
+ d->par_height_.resize(parsize, defaultRowHeight() * 2);
}
+
// Look at paragraph heights on-screen
- int sumh = 0;
- int nh = 0;
- for (pit_type pit = d->anchor_ref_; pit <= parsize; ++pit) {
- if (sumh > height_)
- break;
- int const h2 = tm.parMetrics(pit).height();
- sumh += h2;
- nh++;
+ pair<pit_type, ParagraphMetrics const *> first = tm.first();
+ pair<pit_type, ParagraphMetrics const *> last = tm.last();
+ for (pit_type pit = first.first; pit <= last.first; ++pit) {
+ d->par_height_[pit] = tm.parMetrics(pit).height();
+ LYXERR(Debug::SCROLLING, "storing height for pit " << pit << " : "
+ << d->par_height_[pit]);
+ }
+
+ int top_pos = first.second->position() - first.second->ascent();
+ int bottom_pos = last.second->position() + last.second->descent();
+ bool first_visible = first.first == 0 && top_pos >= 0;
+ bool last_visible = last.first + 1 == int(parsize) && bottom_pos <= height_;
+ if (first_visible && last_visible) {
+ d->scrollbarParameters_.min = 0;
+ d->scrollbarParameters_.max = 0;
+ return;
}
- BOOST_ASSERT(nh);
- int const hav = sumh / nh;
- // More realistic average paragraph height
- if (hav > d->wh_)
- d->wh_ = hav;
+ d->scrollbarParameters_.min = top_pos;
+ for (size_t i = 0; i != size_t(first.first); ++i)
+ d->scrollbarParameters_.min -= d->par_height_[i];
+ d->scrollbarParameters_.max = bottom_pos;
+ for (size_t i = last.first + 1; i != parsize; ++i)
+ d->scrollbarParameters_.max += d->par_height_[i];
- BOOST_ASSERT(h);
- d->scrollbarParameters_.height = (parsize + 1) * d->wh_;
- d->scrollbarParameters_.position = d->anchor_ref_ * d->wh_ + int(d->offset_ref_ * d->wh_ / float(h));
- d->scrollbarParameters_.lineScrollHeight = int(d->wh_ * defaultRowHeight() / float(h));
+ d->scrollbarParameters_.position = 0;
+ // The reference is the top position so we remove one page.
+ d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
}
}
+docstring BufferView::toolTip(int x, int y) const
+{
+ // Get inset under mouse, if there is one.
+ Inset const * covering_inset = getCoveringInset(buffer_.text(), x, y);
+ if (!covering_inset)
+ // No inset, no tooltip...
+ return docstring();
+ return covering_inset->toolTip(*this, x, y);
+}
+
+
+docstring BufferView::contextMenu(int x, int y) const
+{
+ // Get inset under mouse, if there is one.
+ Inset const * covering_inset = getCoveringInset(buffer_.text(), x, y);
+ if (covering_inset)
+ return covering_inset->contextMenu(*this, x, y);
+
+ return buffer_.inset().contextMenu(*this, x, y);
+}
+
+
void BufferView::scrollDocView(int value)
{
- LYXERR(Debug::GUI, "[ value = " << value << "]");
+ int const offset = value - d->scrollbarParameters_.position;
+ // If the offset is less than 2 screen height, prefer to scroll instead.
+ if (abs(offset) <= 2 * height_) {
+ scroll(offset);
+ return;
+ }
- Text & t = buffer_.text();
- TextMetrics & tm = d->text_metrics_[&t];
+ // cut off at the top
+ if (value <= d->scrollbarParameters_.min) {
+ DocIterator dit = doc_iterator_begin(buffer_.inset());
+ showCursor(dit);
+ LYXERR(Debug::SCROLLING, "scroll to top");
+ return;
+ }
- float const bar = value / float(d->wh_ * t.paragraphs().size());
+ // cut off at the bottom
+ if (value >= d->scrollbarParameters_.max) {
+ DocIterator dit = doc_iterator_end(buffer_.inset());
+ dit.backwardPos();
+ showCursor(dit);
+ LYXERR(Debug::SCROLLING, "scroll to bottom");
+ return;
+ }
- d->anchor_ref_ = int(bar * t.paragraphs().size());
- if (d->anchor_ref_ > int(t.paragraphs().size()) - 1)
- d->anchor_ref_ = int(t.paragraphs().size()) - 1;
+ // find paragraph at target position
+ int par_pos = d->scrollbarParameters_.min;
+ pit_type i = 0;
+ for (; i != int(d->par_height_.size()); ++i) {
+ par_pos += d->par_height_[i];
+ if (par_pos >= value)
+ break;
+ }
- tm.redoParagraph(d->anchor_ref_);
- int const h = tm.parMetrics(d->anchor_ref_).height();
- d->offset_ref_ = int((bar * t.paragraphs().size() - d->anchor_ref_) * h);
- updateMetrics();
- buffer_.changed();
+ if (par_pos < value) {
+ // It seems we didn't find the correct pit so stay on the safe side and
+ // scroll to bottom.
+ LYXERR0("scrolling position not found!");
+ scrollDocView(d->scrollbarParameters_.max);
+ return;
+ }
+
+ DocIterator dit = doc_iterator_begin(buffer_.inset());
+ dit.pit() = i;
+ LYXERR(Debug::SCROLLING, "value = " << value << " -> scroll to pit " << i);
+ showCursor(dit);
}
+// FIXME: this method is not working well.
void BufferView::setCursorFromScrollbar()
{
TextMetrics & tm = d->text_metrics_[&buffer_.text()];
int top_id, pos_type top_pos)
{
bool success = false;
- DocIterator doc_it;
+ DocIterator dit;
d->cursor_.clearSelection();
// This is the case for a 'live' bookmark when unique paragraph ID
// is used to track bookmarks.
if (top_id > 0) {
- ParIterator par = buffer_.getParFromID(top_id);
- if (par != buffer_.par_iterator_end()) {
- doc_it = makeDocIterator(par, min(par->size(), top_pos));
+ dit = buffer_.getParFromID(top_id);
+ if (!dit.atEnd()) {
+ dit.pos() = min(dit.paragraph().size(), top_pos);
// Some slices of the iterator may not be
// reachable (e.g. closed collapsable inset)
// so the dociterator may need to be
// shortened. Otherwise, setCursor may crash
// lyx when the cursor can not be set to these
// insets.
- size_t const n = doc_it.depth();
+ size_t const n = dit.depth();
for (size_t i = 0; i < n; ++i)
- if (doc_it[i].inset().editable() != Inset::HIGHLY_EDITABLE) {
- doc_it.resize(i);
+ if (dit[i].inset().editable() != Inset::HIGHLY_EDITABLE) {
+ dit.resize(i);
break;
}
success = true;
// restoration is inaccurate. If a bookmark was within an inset,
// it will be restored to the left of the outmost inset that contains
// the bookmark.
- if (static_cast<size_t>(bottom_pit) < buffer_.paragraphs().size()) {
- doc_it = doc_iterator_begin(buffer_.inset());
- doc_it.pit() = bottom_pit;
- doc_it.pos() = min(bottom_pos, doc_it.paragraph().size());
+ if (bottom_pit < int(buffer_.paragraphs().size())) {
+ dit = doc_iterator_begin(buffer_.inset());
+
+ dit.pit() = bottom_pit;
+ dit.pos() = min(bottom_pos, dit.paragraph().size());
success = true;
}
if (success) {
// Note: only bottom (document) level pit is set.
- setCursor(doc_it);
+ setCursor(dit);
// set the current font.
d->cursor_.setCurrentFont();
// To center the screen on this new position we need the
// So we need a redraw!
buffer_.changed();
if (fitCursor())
- // We need another redraw because of the screen recentering.
- buffer_.changed();
+ showCursor();
}
return success;
}
-void BufferView::updateOffsetRef()
+void BufferView::showCursor()
{
- // No need to update d->offset_ref_ in this case.
- if (!d->need_centering_)
- return;
+ showCursor(d->cursor_);
+}
+
+void BufferView::showCursor(DocIterator const & dit)
+{
// We are not properly started yet, delay until resizing is
// done.
if (height_ == 0)
return;
- CursorSlice & bot = d->cursor_.bottom();
+ LYXERR(Debug::SCROLLING, "recentering!");
+
+ CursorSlice const & bot = dit.bottom();
TextMetrics & tm = d->text_metrics_[bot.text()];
- ParagraphMetrics const & pm = tm.parMetrics(bot.pit());
- int y = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
- d->offset_ref_ = y + pm.ascent() - height_ / 2;
- d->need_centering_ = false;
-}
+ pos_type const max_pit = pos_type(bot.text()->paragraphs().size() - 1);
+ int bot_pit = bot.pit();
+ if (bot_pit > max_pit) {
+ // FIXME: Why does this happen?
+ LYXERR0("bottom pit is greater that max pit: "
+ << bot_pit << " > " << max_pit);
+ bot_pit = max_pit;
+ }
+ if (bot_pit == tm.first().first - 1)
+ tm.newParMetricsUp();
+ else if (bot_pit == tm.last().first + 1)
+ tm.newParMetricsDown();
-void BufferView::center()
-{
- d->anchor_ref_ = d->cursor_.bottom().pit();
- d->need_centering_ = true;
+ if (tm.contains(bot_pit)) {
+ ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
+ BOOST_ASSERT(!pm.rows().empty());
+ // FIXME: smooth scrolling doesn't work in mathed.
+ CursorSlice const & cs = dit.innerTextSlice();
+ int offset = coordOffset(dit, dit.boundary()).y_;
+ int ypos = pm.position() + offset;
+ Dimension const & row_dim =
+ pm.getRow(cs.pos(), dit.boundary()).dimension();
+ if (ypos - row_dim.ascent() < 0)
+ scrollUp(- ypos + row_dim.ascent());
+ else if (ypos + row_dim.descent() > height_)
+ scrollDown(ypos - height_ + row_dim.descent());
+ // else, nothing to do, the cursor is already visible so we just return.
+ return;
+ }
+
+ // fix inline completion position
+ if (d->inlineCompletionPos.fixIfBroken())
+ d->inlineCompletionPos = DocIterator();
+
+ tm.redoParagraph(bot_pit);
+ ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
+ int offset = coordOffset(dit, dit.boundary()).y_;
+
+ d->anchor_pit_ = bot_pit;
+ CursorSlice const & cs = dit.innerTextSlice();
+ Dimension const & row_dim =
+ pm.getRow(cs.pos(), dit.boundary()).dimension();
+
+ 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
+ d->anchor_ypos_ = defaultRowHeight() * 2 - offset - row_dim.descent();
+
+ updateMetrics();
+ buffer_.changed();
}
case LFUN_FONT_STATE:
case LFUN_LABEL_INSERT:
case LFUN_INFO_INSERT:
+ case LFUN_EXTERNAL_EDIT:
+ case LFUN_GRAPHICS_EDIT:
case LFUN_PARAGRAPH_GOTO:
case LFUN_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
case LFUN_SCREEN_RECENTER:
case LFUN_BIBTEX_DATABASE_ADD:
case LFUN_BIBTEX_DATABASE_DEL:
- case LFUN_WORDS_COUNT:
- case LFUN_NEXT_INSET_TOGGLE:
+ case LFUN_STATISTICS:
flag.enabled(true);
break;
+ case LFUN_NEXT_INSET_TOGGLE: {
+ // this is the real function we want to invoke
+ FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.argument());
+ // if there is an inset at cursor, see whether it
+ // can be modified.
+ Inset * inset = cur.nextInset();
+ if (inset) {
+ inset->getStatus(cur, tmpcmd, flag);
+ return flag;
+ break;
+ }
+ // if it did not work, try the underlying inset.
+ if (!inset || !cur.result().dispatched())
+ getStatus(tmpcmd);
+
+ if (!cur.result().dispatched())
+ // else disable
+ flag.enabled(false);
+ break;
+ }
+
+ case LFUN_NEXT_INSET_MODIFY: {
+ // this is the real function we want to invoke
+ FuncRequest tmpcmd = FuncRequest(LFUN_INSET_MODIFY, cmd.argument());
+ // if there is an inset at cursor, see whether it
+ // can be modified.
+ Inset * inset = cur.nextInset();
+ if (inset) {
+ inset->getStatus(cur, tmpcmd, flag);
+ return flag;
+ break;
+ }
+ // if it did not work, try the underlying inset.
+ if (!inset || !cur.result().dispatched())
+ getStatus(tmpcmd);
+
+ if (!cur.result().dispatched())
+ // else disable
+ flag.enabled(false);
+ break;
+ }
+
case LFUN_LABEL_GOTO: {
flag.enabled(!cmd.argument().empty()
|| getInsetByCode<InsetRef>(cur, REF_CODE));
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN:
- flag.enabled(true);
- break;
-
- // FIXME: LFUN_SCREEN_DOWN_SELECT should be removed from
- // everywhere else before this can enabled:
+ case LFUN_SCROLL:
case LFUN_SCREEN_UP_SELECT:
case LFUN_SCREEN_DOWN_SELECT:
- flag.enabled(false);
+ flag.enabled(true);
break;
case LFUN_LAYOUT_TABULAR:
break;
case LFUN_LAYOUT:
+ flag.enabled(!cur.inset().forceEmptyLayout(cur.idx()));
+ break;
+
case LFUN_LAYOUT_PARAGRAPH:
- flag.enabled(cur.inset().forceDefaultParagraphs(cur.idx()));
+ flag.enabled(cur.inset().allowParagraphCustomization(cur.idx()));
break;
case LFUN_INSET_SETTINGS: {
InsetCode code = cur.inset().lyxCode();
+ if (cur.nextInset())
+ code = cur.nextInset()->lyxCode();
bool enable = false;
switch (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(code));
break;
default:
break;
}
-Update::flags BufferView::dispatch(FuncRequest const & cmd)
+bool BufferView::dispatch(FuncRequest const & cmd)
{
//lyxerr << [ cmd = " << cmd << "]" << endl;
<< " button[" << cmd.button() << ']');
Cursor & cur = d->cursor_;
- // Default Update flags.
- Update::flags updateFlags = Update::Force | Update::FitCursor;
switch (cmd.action) {
case LFUN_UNDO:
cur.message(_("Undo"));
cur.clearSelection();
- if (!cur.textUndo()) {
+ if (!cur.textUndo())
cur.message(_("No further undo information"));
- updateFlags = Update::None;
- }
+ else
+ processUpdateFlags(Update::Force | Update::FitCursor);
break;
case LFUN_REDO:
cur.message(_("Redo"));
cur.clearSelection();
- if (!cur.textRedo()) {
+ if (!cur.textRedo())
cur.message(_("No further redo information"));
- updateFlags = Update::None;
- }
+ else
+ processUpdateFlags(Update::Force | Update::FitCursor);
break;
case LFUN_FONT_STATE:
gotoLabel(label);
break;
}
+
+ case LFUN_EXTERNAL_EDIT: {
+ FuncRequest fr(cmd);
+ InsetExternal * inset = getInsetByCode<InsetExternal>(d->cursor_,
+ EXTERNAL_CODE);
+ if (inset)
+ inset->dispatch(d->cursor_, fr);
+ break;
+ }
+
+
+ case LFUN_GRAPHICS_EDIT: {
+ FuncRequest fr(cmd);
+ InsetGraphics * inset = getInsetByCode<InsetGraphics>(d->cursor_,
+ GRAPHICS_CODE);
+ if (inset)
+ inset->dispatch(d->cursor_, fr);
+ break;
+ }
case LFUN_PARAGRAPH_GOTO: {
int const id = convert<int>(to_utf8(cmd.argument()));
for (Buffer * b = &buffer_; i == 0 || b != &buffer_;
b = theBufferList().next(b)) {
- ParIterator par = b->getParFromID(id);
- if (par == b->par_iterator_end()) {
+ DocIterator dit = b->getParFromID(id);
+ if (dit.atEnd()) {
LYXERR(Debug::INFO, "No matching paragraph found! [" << id << "].");
+ ++i;
+ continue;
+ }
+ LYXERR(Debug::INFO, "Paragraph " << dit.paragraph().id()
+ << " found in buffer `"
+ << b->absFileName() << "'.");
+
+ if (b == &buffer_) {
+ // Set the cursor
+ setCursor(dit);
+ processUpdateFlags(Update::Force | Update::FitCursor);
} else {
- LYXERR(Debug::INFO, "Paragraph " << par->id()
- << " found in buffer `"
- << b->absFileName() << "'.");
-
- if (b == &buffer_) {
- // Set the cursor
- setCursor(makeDocIterator(par, 0));
- } else {
- // Switch to other buffer view and resend cmd
- theLyXFunc().dispatch(FuncRequest(
- LFUN_BUFFER_SWITCH, b->absFileName()));
- theLyXFunc().dispatch(cmd);
- updateFlags = Update::None;
- }
- break;
+ // Switch to other buffer view and resend cmd
+ theLyXFunc().dispatch(FuncRequest(
+ LFUN_BUFFER_SWITCH, b->absFileName()));
+ theLyXFunc().dispatch(cmd);
}
- ++i;
+ break;
}
break;
}
break;
case LFUN_WORD_FIND:
- find(this, cmd);
+ if (find(this, cmd))
+ showCursor();
+ else
+ message(_("String not found!"));
break;
case LFUN_WORD_REPLACE: {
break;
case LFUN_SCREEN_RECENTER:
- center();
+ showCursor();
break;
case LFUN_BIBTEX_DATABASE_ADD: {
break;
}
- case LFUN_WORDS_COUNT: {
+ case LFUN_STATISTICS: {
DocIterator from, to;
if (cur.selection()) {
from = cur.selectionBegin();
from = doc_iterator_begin(buffer_.inset());
to = doc_iterator_end(buffer_.inset());
}
- int const count = countWords(from, to);
+ int const words = countWords(from, to);
+ int const chars = countChars(from, to, false);
+ int const chars_blanks = countChars(from, to, true);
docstring message;
- if (count != 1) {
- if (cur.selection())
- message = bformat(_("%1$d words in selection."),
- count);
- else
- message = bformat(_("%1$d words in document."),
- count);
- }
- else {
- if (cur.selection())
- message = _("One word in selection.");
- else
- message = _("One word in document.");
- }
-
- Alert::information(_("Count words"), message);
+ if (cur.selection())
+ message = _("Statistics for the selection:");
+ else
+ message = _("Statistics for the document:");
+ message += "\n\n";
+ if (words != 1)
+ message += bformat(_("%1$d words"), words);
+ else
+ message += _("One word");
+ message += "\n";
+ if (chars_blanks != 1)
+ message += bformat(_("%1$d characters (including blanks)"),
+ chars_blanks);
+ else
+ message += _("One character (including blanks)");
+ message += "\n";
+ if (chars != 1)
+ message += bformat(_("%1$d characters (excluding blanks)"),
+ chars);
+ else
+ message += _("One character (excluding blanks)");
+
+ Alert::information(_("Statistics"), message);
}
break;
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_BUFFER_TOGGLE_EMBEDDING:
+ case LFUN_BUFFER_TOGGLE_EMBEDDING: {
// turn embedding on/off
- buffer_.embeddedFiles().enable(!buffer_.params().embedded);
+ try {
+ buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_, true);
+ } 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
}
}
// 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())
- cur.clearSelection();
+ 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: {
+ // this is the real function we want to invoke
+ FuncRequest tmpcmd = FuncRequest(LFUN_INSET_MODIFY, cmd.argument());
+ // 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;
}
Point p = getPos(cur, cur.boundary());
if (p.y_ < 0 || p.y_ > height_) {
// The cursor is off-screen so recenter before proceeding.
- center();
- updateMetrics();
- //FIXME: updateMetrics() does not update paragraph position
- // This is done at draw() time. So we need a redraw!
- // But no screen update is needed.
- d->update_strategy_ = NoScreenUpdate;
- buffer_.changed();
+ showCursor();
p = getPos(cur, cur.boundary());
}
scroll(cmd.action == LFUN_SCREEN_UP? - height_ : height_);
d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
//FIXME: what to do with cur.x_target()?
cur.finishUndo();
- // The metrics are already up to date. see scroll()
- updateFlags = Update::None;
break;
}
- case LFUN_SCREEN_UP_SELECT:
- case LFUN_SCREEN_DOWN_SELECT: {
+ case LFUN_SCROLL:
+ lfunScroll(cmd);
+ break;
+
+ 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();
- updateFlags = Update::Force | Update::FitCursor;
+ 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;
}
default:
- updateFlags = Update::None;
+ return false;
}
- return updateFlags;
+ return true;
}
width_ = width;
height_ = height;
+ // Clear the paragraph height cache.
+ d->par_height_.clear();
+ // Redo the metrics.
updateMetrics();
}
-Inset const * BufferView::getCoveringInset(Text const & text, int x, int y)
+Inset const * BufferView::getCoveringInset(Text const & text,
+ int x, int y) const
{
TextMetrics & tm = d->text_metrics_[&text];
Inset * inset = tm.checkInsetHit(x, y);
// LFUN_FILE_OPEN generated by drag-and-drop.
FuncRequest cmd = cmd0;
+ Cursor old = cursor();
Cursor cur(*this);
cur.push(buffer_.inset());
cur.selection() = d->cursor_.selection();
// 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);
- //Do we have a selection?
+ // Notify left insets
+ if (cur != old) {
+ old.fixIfBroken();
+ bool badcursor = notifyCursorLeaves(old, cur);
+ if (badcursor)
+ cursor().fixIfBroken();
+ }
+
+ // Do we have a selection?
theSelection().haveSelection(cursor().selection());
// If the command has been dispatched,
- if (cur.result().dispatched()
- // an update is asked,
- && cur.result().update())
+ if (cur.result().dispatched() || cur.result().update())
processUpdateFlags(cur.result().update());
}
+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)
+ return;
+ string const scroll_quantity = cmd.getArg(1);
+ if (scroll_quantity == "up")
+ scrollUp(scroll_step);
+ else if (scroll_quantity == "down")
+ scrollDown(scroll_step);
+ else {
+ int const scroll_value = convert<int>(scroll_quantity);
+ if (scroll_value)
+ scroll(scroll_step * scroll_value);
+ }
+}
+
+
void BufferView::scroll(int y)
{
if (y > 0)
TextMetrics & tm = d->text_metrics_[text];
int ymax = height_ + offset;
while (true) {
-
std::pair<pit_type, ParagraphMetrics const *> last = tm.last();
+ pair<pit_type, ParagraphMetrics const *> last = tm.last();
int bottom_pos = last.second->position() + last.second->descent();
if (last.first + 1 == int(text->paragraphs().size())) {
if (bottom_pos <= height_)
break;
tm.newParMetricsDown();
}
- d->offset_ref_ += offset;
+ d->anchor_ypos_ -= offset;
updateMetrics();
buffer_.changed();
}
TextMetrics & tm = d->text_metrics_[text];
int ymin = - offset;
while (true) {
-
std::pair<pit_type, ParagraphMetrics const *> first = tm.first();
+ pair<pit_type, ParagraphMetrics const *> first = tm.first();
int top_pos = first.second->position() - first.second->ascent();
if (first.first == 0) {
if (top_pos >= 0)
break;
tm.newParMetricsUp();
}
- d->offset_ref_ -= offset;
+ d->anchor_ypos_ += offset;
updateMetrics();
buffer_.changed();
}
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);
- processUpdateFlags(Update::FitCursor);
- 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);
}
if (!changed)
return false;
+ d->cursor_ = cur;
+
updateLabels(buffer_);
updateMetrics();
// Has the cursor just left the inset?
bool badcursor = false;
bool leftinset = (&d->cursor_.inset() != &cur.inset());
- if (leftinset)
+ if (leftinset) {
+ d->cursor_.fixIfBroken();
badcursor = notifyCursorLeaves(d->cursor_, cur);
+ if (badcursor)
+ cur.fixIfBroken();
+ }
// FIXME: shift-mouse selection doesn't work well across insets.
bool do_selection = select && &d->cursor_.anchor().inset() == &cur.inset();
if (!do_selection && !badcursor && d->cursor_.inTexted())
update |= checkDepm(cur, d->cursor_);
- // if the cursor was in an empty script inset and the new
- // position is in the nucleus of the inset, notifyCursorLeaves
- // will kill the script inset itself. So we check all the
- // elements of the cursor to make sure that they are correct.
- // For an example, see bug 2933:
- // http://bugzilla.lyx.org/show_bug.cgi?id=2933
- // The code below could maybe be moved to a DocIterator method.
- //lyxerr << "cur before " << cur <<std::endl;
- DocIterator dit(cur.inset());
- dit.push_back(cur.bottom());
- size_t i = 1;
- while (i < cur.depth() && dit.nextInset() == &cur[i].inset()) {
- dit.push_back(cur[i]);
- ++i;
- }
- //lyxerr << "5 cur after" << dit <<std::endl;
-
- d->cursor_.setCursor(dit);
+ d->cursor_.setCursor(cur);
d->cursor_.boundary(cur.boundary());
if (do_selection)
d->cursor_.setSelection();
} else
d->cursor_.setSelection(d->cursor_, length);
}
+ // Ensure a redraw happens in any case because the new selection could
+ // possibly be on the same screen as the previous selection.
+ processUpdateFlags(Update::Force | Update::FitCursor);
}
pit_type BufferView::anchor_ref() const
{
- return d->anchor_ref_;
+ return d->anchor_pit_;
}
TextMetrics & tm = textMetrics(&buftext);
int old_height = tm.parMetrics(bottom_pit).height();
+ // make sure inline completion pointer is ok
+ if (d->inlineCompletionPos.fixIfBroken())
+ d->inlineCompletionPos = DocIterator();
+
// In Single Paragraph mode, rebreak only
// the (main text, not inset!) paragraph containing the cursor.
// (if this paragraph contains insets etc., rebreaking will
Text & buftext = buffer_.text();
pit_type const npit = int(buftext.paragraphs().size());
- if (d->anchor_ref_ > int(npit - 1)) {
- d->anchor_ref_ = int(npit - 1);
- d->offset_ref_ = 0;
- }
-
// Clear out the position cache in case of full screen redraw,
d->coord_cache_.clear();
TextMetrics & tm = textMetrics(&buftext);
- pit_type const pit = d->anchor_ref_;
- int pit1 = pit;
- int pit2 = pit;
+ // 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(pit);
-
- // Take care of anchor offset if case a recentering is needed.
- updateOffsetRef();
+ 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_);
- int y0 = tm.parMetrics(pit).ascent() - d->offset_ref_;
+ LYXERR(Debug::PAINTING, "metrics: "
+ << " anchor pit = " << d->anchor_pit_
+ << " anchor ypos = " << d->anchor_ypos_);
// Redo paragraphs above anchor if necessary.
- int y1 = y0;
- while (y1 > 0 && pit1 > 0) {
- y1 -= tm.parMetrics(pit1).ascent();
- --pit1;
+ int y1 = d->anchor_ypos_ - anchor_pm.ascent();
+ // We are now just above the anchor paragraph.
+ pit_type pit1 = d->anchor_pit_ - 1;
+ for (; pit1 >= 0 && y1 >= 0; --pit1) {
tm.redoParagraph(pit1);
- y1 -= tm.parMetrics(pit1).descent();
- }
-
- // Take care of ascent of first line
- y1 -= tm.parMetrics(pit1).ascent();
-
- // Normalize anchor for next time
- d->anchor_ref_ = pit1;
- d->offset_ref_ = -y1;
-
- // Grey at the beginning is ugly
- if (pit1 == 0 && y1 > 0) {
- y0 -= y1;
- y1 = 0;
- d->anchor_ref_ = 0;
+ ParagraphMetrics & pm = tm.par_metrics_[pit1];
+ y1 -= pm.descent();
+ // Save the paragraph position in the cache.
+ pm.setPosition(y1);
+ y1 -= pm.ascent();
}
// Redo paragraphs below the anchor if necessary.
- int y2 = y0;
- while (y2 < height_ && pit2 < int(npit) - 1) {
- y2 += tm.parMetrics(pit2).descent();
- ++pit2;
+ int y2 = d->anchor_ypos_ + anchor_pm.descent();
+ // We are now just below the anchor paragraph.
+ pit_type pit2 = d->anchor_pit_ + 1;
+ for (; pit2 < npit && y2 <= height_; ++pit2) {
tm.redoParagraph(pit2);
- y2 += tm.parMetrics(pit2).ascent();
+ ParagraphMetrics & pm = tm.par_metrics_[pit2];
+ y2 += pm.ascent();
+ // Save the paragraph position in the cache.
+ pm.setPosition(y2);
+ y2 += pm.descent();
}
- // Take care of descent of last line
- y2 += tm.parMetrics(pit2).descent();
-
- LYXERR(Debug::PAINTING, "\n y1: " << y1
- << " y2: " << y2
- << " pit1: " << pit1
- << " pit2: " << pit2
- << " npit: " << npit
- << " singlepar: 0");
+ LYXERR(Debug::PAINTING, "Metrics: "
+ << " anchor pit = " << d->anchor_pit_
+ << " anchor ypos = " << d->anchor_ypos_
+ << " y1 = " << y1
+ << " y2 = " << y2
+ << " pit1 = " << pit1
+ << " pit2 = " << pit2);
d->update_strategy_ = FullScreenUpdate;
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");
int pos = sl.pos();
if (pos && boundary)
--pos;
-// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
+// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << endl;
rend = pm.pos2row(pos);
} else
rend = pm.pos2row(sl.pos());
{
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
LYXERR(Debug::PAINTING, "\t\t*** START DRAWING ***");
Text & text = buffer_.text();
TextMetrics const & tm = d->text_metrics_[&text];
- int const y = - d->offset_ref_ + tm.parMetrics(d->anchor_ref_).ascent();
+ int const y = tm.first().second->position();
PainterInfo pi(this, pain);
switch (d->update_strategy_) {
// Clear background.
pain.fillRectangle(0, 0, width_, height_,
buffer_.inset().backgroundColor());
+
+ // Draw everything.
tm.draw(pi, 0, y);
// and possibly grey out below
-
std::pair<pit_type, ParagraphMetrics const *> lastpm = tm.last();
+ 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);
break;
}
-
LYXERR(Debug::PAINTING, "\n\t\t*** END DRAWING ***");
+
+ // The scrollbar needs an update.
+ updateScrollbar();
+
+ // Normalize anchor for next time
+ pair<pit_type, ParagraphMetrics const *> firstpm = tm.first();
+ pair<pit_type, ParagraphMetrics const *> lastpm = tm.last();
+ for (pit_type pit = firstpm.first; pit <= lastpm.first; ++pit) {
+ ParagraphMetrics const & pm = tm.parMetrics(pit);
+ if (pm.position() + pm.descent() > 0) {
+ d->anchor_pit_ = pit;
+ d->anchor_ypos_ = pm.position();
+ break;
+ }
+ }
+ LYXERR(Debug::PAINTING, "Found new anchor pit = " << d->anchor_pit_
+ << " anchor ypos = " << d->anchor_ypos_);
}
}
-void BufferView::showDialog(std::string const & name)
+void BufferView::showDialog(string const & name)
{
if (d->gui_)
d->gui_->showDialog(name, string());
}
-void BufferView::showDialog(std::string const & name,
- std::string const & data, Inset * inset)
+void BufferView::showDialog(string const & name,
+ string const & data, Inset * inset)
{
if (d->gui_)
d->gui_->showDialog(name, data, inset);
}
-void BufferView::updateDialog(std::string const & name, std::string const & data)
+void BufferView::updateDialog(string const & name, string const & data)
{
if (d->gui_)
d->gui_->updateDialog(name, data);
buffer_.changed();
}
+
+docstring const & BufferView::inlineCompletion() const
+{
+ return d->inlineCompletion;
+}
+
+
+size_t const & BufferView::inlineCompletionUniqueChars() const
+{
+ return d->inlineCompletionUniqueChars;
+}
+
+
+DocIterator const & BufferView::inlineCompletionPos() const
+{
+ return d->inlineCompletionPos;
+}
+
+
+bool samePar(DocIterator const & a, DocIterator const & b)
+{
+ if (a.empty() && b.empty())
+ return true;
+ if (a.empty() || b.empty())
+ return false;
+ return &a.innerParagraph() == &b.innerParagraph();
+}
+
+
+void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
+ docstring const & completion, size_t uniqueChars)
+{
+ uniqueChars = min(completion.size(), uniqueChars);
+ bool changed = d->inlineCompletion != completion
+ || d->inlineCompletionUniqueChars != 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) {
+ //lyxerr << "inlineCompletionPos changed" << std::endl;
+ // old or pos are in another paragraph?
+ if ((!samePar(cur, pos) && !pos.empty())
+ || (!samePar(cur, old) && !old.empty())) {
+ singlePar = false;
+ //lyxerr << "different paragraph" << std::endl;
+ }
+ d->inlineCompletionPos = pos;
+ }
+
+ // set update flags
+ if (changed) {
+ if (singlePar && !(cur.disp_.update() & Update::Force))
+ cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ else
+ cur.updateFlags(cur.disp_.update() | Update::Force);
+ }
+}
+
} // namespace lyx
projects / lyx.git / blobdiff