#include "BufferView.h"
+#include "BranchList.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferList.h"
#include "BufferParams.h"
-#include "bufferview_funcs.h"
-#include "callback.h" // added for Dispatch functions
#include "CoordCache.h"
+#include "Cursor.h"
#include "CutAndPaste.h"
-#include "debug.h"
#include "DispatchResult.h"
#include "ErrorList.h"
#include "factory.h"
#include "FloatList.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
#include "Intl.h"
#include "InsetIterator.h"
#include "Language.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "Session.h"
-#include "TexRow.h"
#include "Text.h"
#include "TextClass.h"
-#include "toc.h"
-#include "Undo.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 "insets/InsetNote.h"
#include "frontends/alert.h"
-#include "frontends/FileDialog.h"
+#include "frontends/Application.h"
+#include "frontends/Delegates.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "frontends/Selection.h"
#include "graphics/Previews.h"
#include "support/convert.h"
-#include "support/FileFilterList.h"
+#include "support/debug.h"
+#include "support/ExceptionMessage.h"
#include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
#include "support/Package.h"
#include "support/types.h"
-#include <boost/bind.hpp>
-#include <boost/current_function.hpp>
-
+#include <cerrno>
+#include <fstream>
#include <functional>
+#include <iterator>
#include <vector>
-using std::distance;
-using std::endl;
-using std::istringstream;
-using std::make_pair;
-using std::min;
-using std::max;
-using std::mem_fun_ref;
-using std::string;
-using std::vector;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::addPath;
-using support::bformat;
-using support::FileFilterList;
-using support::FileName;
-using support::fileSearch;
-using support::isDirWriteable;
-using support::isFileReadable;
-using support::makeDisplayPath;
-using support::package;
-
namespace Alert = frontend::Alert;
namespace {
/// Return an inset of this class if it exists at the current cursor position
template <class T>
-T * getInsetByCode(Cursor const & cur, Inset::Code code)
+T * getInsetByCode(Cursor const & cur, InsetCode code)
{
DocIterator it = cur;
Inset * inset = it.nextInset();
}
-bool findInset(DocIterator & dit, vector<Inset_code> const & codes,
+bool findInset(DocIterator & dit, vector<InsetCode> const & codes,
bool same_content);
-bool findNextInset(DocIterator & dit, vector<Inset_code> const & codes,
- string const & contents)
+bool findNextInset(DocIterator & dit, vector<InsetCode> const & codes,
+ docstring const & contents)
{
DocIterator tmpdit = dit;
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)->getContents() == contents)) {
+ static_cast<InsetCommand const *>(inset)->getFirstNonOptParam() == contents)) {
dit = tmpdit;
return true;
}
}
-/// Looks for next inset with one of the the given code
-bool findInset(DocIterator & dit, vector<Inset_code> const & codes,
+/// Looks for next inset with one of the given codes.
+bool findInset(DocIterator & dit, vector<InsetCode> const & codes,
bool same_content)
{
- string contents;
+ docstring contents;
DocIterator tmpdit = dit;
tmpdit.forwardInset();
if (!tmpdit)
if (same_content) {
Inset const * inset = tmpdit.nextInset();
if (inset
- && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
- contents = static_cast<InsetCommand const *>(inset)->getContents();
+ && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
+ contents = static_cast<InsetCommand const *>(inset)->getFirstNonOptParam();
}
}
/// Looks for next inset with the given code
-void findInset(DocIterator & dit, Inset_code code, bool same_content)
+void findInset(DocIterator & dit, InsetCode code, bool same_content)
{
- findInset(dit, vector<Inset_code>(1, code), same_content);
+ findInset(dit, vector<InsetCode>(1, code), same_content);
}
/// Moves cursor to the next inset with one of the given codes.
-void gotoInset(BufferView * bv, vector<Inset_code> const & codes,
+void gotoInset(BufferView * bv, vector<InsetCode> const & codes,
bool same_content)
{
Cursor tmpcur = bv->cursor();
tmpcur.clearSelection();
bv->setCursor(tmpcur);
+ bv->showCursor();
}
/// Moves cursor to the next inset with given code.
-void gotoInset(BufferView * bv, Inset_code code, bool same_content)
+void gotoInset(BufferView * bv, InsetCode code, bool same_content)
{
- gotoInset(bv, vector<Inset_code>(1, code), same_content);
+ gotoInset(bv, vector<InsetCode>(1, code), same_content);
}
+/// A map from a Text to the associated text metrics
+typedef map<Text const *, TextMetrics> TextMetricsCache;
+
+enum ScreenUpdateStrategy {
+ NoScreenUpdate,
+ SingleParUpdate,
+ FullScreenUpdate,
+ DecorationUpdate
+};
+
} // anon namespace
+/////////////////////////////////////////////////////////////////////
+//
+// BufferView
+//
+/////////////////////////////////////////////////////////////////////
+
+struct BufferView::Private
+{
+ Private(BufferView & bv): wh_(0), cursor_(bv),
+ anchor_pit_(0), anchor_ypos_(0),
+ inlineCompletionUniqueChars_(0),
+ last_inset_(0), gui_(0)
+ {}
+
+ ///
+ ScrollbarParameters scrollbarParameters_;
+ ///
+ ScreenUpdateStrategy update_strategy_;
+ ///
+ CoordCache coord_cache_;
+
+ /// Estimated average par height for scrollbar.
+ int wh_;
+ /// this is used to handle XSelection events in the right manner.
+ struct {
+ CursorSlice cursor;
+ CursorSlice anchor;
+ bool set;
+ } xsel_cache_;
+ ///
+ Cursor cursor_;
+ ///
+ pit_type anchor_pit_;
+ ///
+ int anchor_ypos_;
+ ///
+ vector<int> par_height_;
+
+ ///
+ DocIterator inlineCompletionPos_;
+ ///
+ docstring inlineCompletion_;
+ ///
+ size_t inlineCompletionUniqueChars_;
+
+ /// keyboard mapping object.
+ Intl intl_;
+
+ /// last visited inset.
+ /** kept to send setMouseHover(false).
+ * Not owned, so don't delete.
+ */
+ Inset * last_inset_;
+
+ mutable TextMetricsCache text_metrics_;
+
+ /// Whom to notify.
+ /** Not owned, so don't delete.
+ */
+ frontend::GuiBufferViewDelegate * gui_;
+
+ /// Cache for Find Next
+ FuncRequest search_request_cache_;
+};
+
+
BufferView::BufferView(Buffer & buf)
- : width_(0), height_(0), buffer_(buf), wh_(0),
- cursor_(*this),
- multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
- need_centering_(false), intl_(new Intl), last_inset_(0)
+ : width_(0), height_(0), full_screen_(false), buffer_(buf), d(new Private(*this))
{
- xsel_cache_.set = false;
- intl_->initKeyMapper(lyxrc.use_kbmap);
+ d->xsel_cache_.set = false;
+ d->intl_.initKeyMapper(lyxrc.use_kbmap);
- cursor_.push(buffer_.inset());
- cursor_.resetAnchor();
- cursor_.setCurrentFont();
+ d->cursor_.push(buffer_.inset());
+ d->cursor_.resetAnchor();
+ d->cursor_.setCurrentFont();
if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
- graphics::Previews::get().generateBufferPreviews(buffer_);
+ thePreviews().generateBufferPreviews(buffer_);
}
// currently can only handle bottom (whole document) level pit and pos.
// That is to say, if a cursor is in a nested inset, it will be
// restore to the left of the top level inset.
- LyX::ref().session().lastFilePos().save(
- support::FileName(buffer_.fileName()),
- boost::tie(cursor_.bottom().pit(), cursor_.bottom().pos()) );
+ LastFilePosSection::FilePos fp;
+ fp.pit = d->cursor_.bottom().pit();
+ fp.pos = d->cursor_.bottom().pos();
+ theSession().lastFilePos().save(buffer_.fileName(), fp);
+
+ delete d;
+}
+
+
+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_;
+}
+
+
+Intl const & BufferView::getIntl() const
+{
+ return d->intl_;
+}
+
+
+CoordCache & BufferView::coordCache()
+{
+ return d->coord_cache_;
+}
+
+
+CoordCache const & BufferView::coordCache() const
+{
+ return d->coord_cache_;
}
bool BufferView::fitCursor()
{
- if (cursorStatus(cursor_) == CUR_INSIDE) {
+ if (cursorStatus(d->cursor_) == CUR_INSIDE) {
frontend::FontMetrics const & fm =
- theFontMetrics(cursor_.getFont());
+ theFontMetrics(d->cursor_.getFont().fontInfo());
int const asc = fm.maxAscent();
int const des = fm.maxDescent();
- Point const p = getPos(cursor_, cursor_.boundary());
+ Point const p = getPos(d->cursor_, d->cursor_.boundary());
if (p.y_ - asc >= 0 && p.y_ + des < height_)
return false;
}
- center();
return true;
}
-bool BufferView::multiParSel()
-{
- if (!cursor_.selection())
- return false;
- bool ret = multiparsel_cache_;
- multiparsel_cache_ = cursor_.selBegin().pit() != cursor_.selEnd().pit();
- // Either this, or previous selection spans paragraphs
- return ret || multiparsel_cache_;
-}
-
-
-bool BufferView::update(Update::flags flags)
+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.
- last_inset_ = 0;
+ d->last_inset_ = 0;
// This is close to a hot-path.
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::DEBUG, "BufferView::processUpdateFlags()"
<< "[fitcursor = " << (flags & Update::FitCursor)
<< ", forceupdate = " << (flags & Update::Force)
<< ", singlepar = " << (flags & Update::SinglePar)
- << "] buffer: " << &buffer_ << endl;
+ << "] buffer: " << &buffer_);
- // Update macro store
- if (!(cursor().inMathed() && cursor().inMacroMode()))
- buffer_.buildMacros();
+ buffer_.updateMacros();
// Now do the first drawing step if needed. This consists on updating
// the CoordCache in updateMetrics().
// Case when no explicit update is requested.
if (!flags) {
// no need to redraw anything.
- metrics_info_.update_strategy = NoScreenUpdate;
- return false;
+ d->update_strategy_ = NoScreenUpdate;
+ return;
}
if (flags == Update::Decoration) {
- metrics_info_.update_strategy = DecorationUpdate;
- return true;
+ d->update_strategy_ = DecorationUpdate;
+ buffer_.changed();
+ return;
}
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(false);
- return true;
+ if (fitCursor()) {
+ showCursor();
+ return;
}
if (flags & Update::Decoration) {
- metrics_info_.update_strategy = DecorationUpdate;
- return true;
+ d->update_strategy_ = DecorationUpdate;
+ buffer_.changed();
+ return;
}
// no screen update is needed.
- metrics_info_.update_strategy = NoScreenUpdate;
- return false;
+ d->update_strategy_ = NoScreenUpdate;
+ return;
}
- bool full_metrics = flags & Update::Force;
- if (flags & Update::MultiParSel)
- full_metrics |= multiParSel();
+ bool const full_metrics = flags & Update::Force || !singleParUpdate();
- bool const single_par = !full_metrics;
- updateMetrics(single_par);
+ if (full_metrics)
+ // We have to update the full screen metrics.
+ updateMetrics();
- if (flags & Update::FitCursor) {
- //FIXME: updateMetrics() does not update paragraph position
- // This is done at draw() time. So we need a redraw!
+ if (!(flags & Update::FitCursor)) {
+ // Nothing to do anymore. Trigger a redraw and return
buffer_.changed();
- if (fitCursor())
- updateMetrics(false);
- else
- // The screen has already been updated thanks to the
- // 'buffer_.changed()' call three line above. So no need
- // to redraw again.
- return false;
+ return;
}
- // tell the frontend to update the screen.
- return true;
+ // updateMetrics() does not update paragraph position
+ // This is done at draw() time. So we need a redraw!
+ buffer_.changed();
+
+ if (fitCursor()) {
+ // The cursor is off screen so ensure it is visible.
+ // refresh it:
+ showCursor();
+ }
}
void BufferView::updateScrollbar()
{
+ if (height_ == 0 && width_ == 0)
+ return;
+
+ // 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 = text_metrics_[&t];
+ TextMetrics & tm = d->text_metrics_[&t];
+
+ LYXERR(Debug::GUI, " Updating scrollbar: height: "
+ << t.paragraphs().size()
+ << " curr par: " << d->cursor_.bottom().pit()
+ << " default height " << defaultRowHeight());
+
+ 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);
+ }
- int const parsize = int(t.paragraphs().size() - 1);
- if (anchor_ref_ > parsize) {
- anchor_ref_ = parsize;
- offset_ref_ = 0;
+ // Look at paragraph heights on-screen
+ 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]);
}
- LYXERR(Debug::GUI)
- << BOOST_CURRENT_FUNCTION
- << " Updating scrollbar: height: " << t.paragraphs().size()
- << " curr par: " << cursor_.bottom().pit()
- << " default height " << defaultRowHeight() << endl;
+ 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;
+ }
- // It would be better to fix the scrollbar to understand
- // values in [0..1] and divide everything by wh
+ 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];
- // estimated average paragraph height:
- if (wh_ == 0)
- wh_ = height_ / 4;
+ d->scrollbarParameters_.position = 0;
+ // The reference is the top position so we remove one page.
+ d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
+}
- int h = tm.parMetrics(anchor_ref_).height();
- // Normalize anchor/offset (MV):
- while (offset_ref_ > h && anchor_ref_ < parsize) {
- anchor_ref_++;
- offset_ref_ -= h;
- h = tm.parMetrics(anchor_ref_).height();
- }
- // Look at paragraph heights on-screen
- int sumh = 0;
- int nh = 0;
- for (pit_type pit = anchor_ref_; pit <= parsize; ++pit) {
- if (sumh > height_)
- break;
- int const h2 = tm.parMetrics(pit).height();
- sumh += h2;
- nh++;
- }
+ScrollbarParameters const & BufferView::scrollbarParameters() const
+{
+ return d->scrollbarParameters_;
+}
- BOOST_ASSERT(nh);
- int const hav = sumh / nh;
- // More realistic average paragraph height
- if (hav > wh_)
- wh_ = hav;
- BOOST_ASSERT(h);
- scrollbarParameters_.height = (parsize + 1) * wh_;
- scrollbarParameters_.position = anchor_ref_ * wh_ + int(offset_ref_ * wh_ / float(h));
- scrollbarParameters_.lineScrollHeight = int(wh_ * defaultRowHeight() / float(h));
+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);
}
-ScrollbarParameters const & BufferView::scrollbarParameters() const
+docstring BufferView::contextMenu(int x, int y) const
{
- return scrollbarParameters_;
+ // 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) << BOOST_CURRENT_FUNCTION
- << "[ value = " << value << "]" << endl;
+ 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);
+ updateMetrics();
+ buffer_.changed();
+ return;
+ }
- Text & t = buffer_.text();
- TextMetrics & tm = 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(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;
+ }
- anchor_ref_ = int(bar * t.paragraphs().size());
- if (anchor_ref_ > int(t.paragraphs().size()) - 1)
- 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(anchor_ref_);
- int const h = tm.parMetrics(anchor_ref_).height();
- offset_ref_ = int((bar * t.paragraphs().size() - anchor_ref_) * h);
- updateMetrics(false);
- 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 = text_metrics_[&buffer_.text()];
+ TextMetrics & tm = d->text_metrics_[&buffer_.text()];
int const height = 2 * defaultRowHeight();
int const first = height;
int const last = height_ - height;
- Cursor & cur = cursor_;
+ Cursor & cur = d->cursor_;
switch (cursorStatus(cur)) {
case CUR_ABOVE:
Change const BufferView::getCurrentChange() const
{
- if (!cursor_.selection())
+ if (!d->cursor_.selection())
return Change(Change::UNCHANGED);
- DocIterator dit = cursor_.selectionBegin();
+ DocIterator dit = d->cursor_.selectionBegin();
return dit.paragraph().lookupChange(dit.pos());
}
// acturately locate a bookmark in a 'live' lyx session.
// pit and pos will be updated with bottom level pit/pos
// when lyx exits.
- LyX::ref().session().bookmarks().save(
- FileName(buffer_.fileName()),
- cursor_.bottom().pit(),
- cursor_.bottom().pos(),
- cursor_.paragraph().id(),
- cursor_.pos(),
+ theSession().bookmarks().save(
+ buffer_.fileName(),
+ d->cursor_.bottom().pit(),
+ d->cursor_.bottom().pos(),
+ d->cursor_.paragraph().id(),
+ d->cursor_.pos(),
idx
);
if (idx)
int top_id, pos_type top_pos)
{
bool success = false;
- DocIterator doc_it;
+ DocIterator dit;
- cursor_.clearSelection();
+ d->cursor_.clearSelection();
// if a valid par_id is given, try it first
// 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.
- cursor_.setCurrentFont();
- // center the screen on this new position.
- center();
+ d->cursor_.setCurrentFont();
+ // 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();
+ if (fitCursor())
+ showCursor();
}
return success;
void BufferView::translateAndInsert(char_type c, Text * t, Cursor & cur)
{
if (lyxrc.rtl_support) {
- if (cursor_.real_current_font.isRightToLeft()) {
- if (intl_->keymap == Intl::PRIMARY)
- intl_->keyMapSec();
+ if (d->cursor_.real_current_font.isRightToLeft()) {
+ if (d->intl_.keymap == Intl::PRIMARY)
+ d->intl_.keyMapSec();
} else {
- if (intl_->keymap == Intl::SECONDARY)
- intl_->keyMapPrim();
+ if (d->intl_.keymap == Intl::SECONDARY)
+ d->intl_.keyMapPrim();
}
}
- intl_->getTransManager().translateAndInsert(c, t, cur);
+ d->intl_.getTransManager().translateAndInsert(c, t, cur);
}
}
-void BufferView::updateOffsetRef()
+void BufferView::showCursor()
{
- // No need to update offset_ref_ in this case.
- if (!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 = cursor_.bottom();
- TextMetrics & tm = text_metrics_[bot.text()];
- ParagraphMetrics const & pm = tm.parMetrics(bot.pit());
- int y = coordOffset(cursor_, cursor_.boundary()).y_;
- offset_ref_ = y + pm.ascent() - height_ / 2;
+ LYXERR(Debug::SCROLLING, "recentering!");
- need_centering_ = false;
-}
+ CursorSlice const & bot = dit.bottom();
+ TextMetrics & tm = d->text_metrics_[bot.text()];
+
+ 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()
-{
- anchor_ref_ = cursor_.bottom().pit();
- need_centering_ = true;
+ if (tm.contains(bot_pit)) {
+ ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
+ LASSERT(!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();
+ int scrolled = 0;
+ 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());
+ // else, nothing to do, the cursor is already visible so we just return.
+ if (scrolled != 0) {
+ updateMetrics();
+ buffer_.changed();
+ }
+ 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();
}
{
FuncStatus flag;
- Cursor & cur = cursor_;
+ Cursor & cur = d->cursor_;
switch (cmd.action) {
case LFUN_UNDO:
- flag.enabled(!buffer_.undostack().empty());
+ flag.setEnabled(buffer_.undo().hasUndoStack());
break;
case LFUN_REDO:
- flag.enabled(!buffer_.redostack().empty());
+ 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:
- // FIXME handle non-trivially
- case LFUN_OUTLINE_UP:
- case LFUN_OUTLINE_DOWN:
- case LFUN_OUTLINE_IN:
- case LFUN_OUTLINE_OUT:
case LFUN_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
case LFUN_WORD_FIND:
case LFUN_SCREEN_RECENTER:
case LFUN_BIBTEX_DATABASE_ADD:
case LFUN_BIBTEX_DATABASE_DEL:
- case LFUN_WORDS_COUNT:
- case LFUN_NEXT_INSET_TOGGLE:
- flag.enabled(true);
+ case LFUN_GRAPHICS_GROUPS_UNIFY:
+ case LFUN_NOTES_MUTATE:
+ case LFUN_ALL_INSETS_TOGGLE:
+ case LFUN_STATISTICS:
+ 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()
- || getInsetByCode<InsetRef>(cur, Inset::REF_CODE));
+ 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: {
flag.setOnOff(buffer_.params().compressed);
break;
}
-
+
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.setEnabled(true);
+ break;
+
+ case LFUN_LAYOUT_TABULAR:
+ flag.setEnabled(cur.innerInsetOfType(TABULAR_CODE));
+ break;
+
+ case LFUN_LAYOUT:
+ flag.setEnabled(!cur.inset().forcePlainLayout(cur.idx()));
+ break;
+
+ case LFUN_LAYOUT_PARAGRAPH:
+ 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;
+ }
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;
}
-Update::flags BufferView::dispatch(FuncRequest const & cmd)
+bool BufferView::dispatch(FuncRequest const & cmd)
{
- //lyxerr << BOOST_CURRENT_FUNCTION
- // << [ cmd = " << cmd << "]" << endl;
+ //lyxerr << [ cmd = " << cmd << "]" << endl;
// Make sure that the cached BufferView is correct.
- LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION
- << " action[" << cmd.action << ']'
+ LYXERR(Debug::ACTION, " action[" << cmd.action << ']'
<< " arg[" << to_utf8(cmd.argument()) << ']'
<< " x[" << cmd.x << ']'
<< " y[" << cmd.y << ']'
- << " button[" << cmd.button() << ']'
- << endl;
+ << " button[" << cmd.button() << ']');
- Cursor & cur = cursor_;
- // Default Update flags.
- Update::flags updateFlags = Update::Force | Update::FitCursor;
+ Cursor & cur = d->cursor_;
switch (cmd.action) {
case LFUN_UNDO:
cur.message(_("Undo"));
cur.clearSelection();
- if (!textUndo(*this)) {
+ 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 (!textRedo(*this)) {
+ if (!cur.textRedo())
cur.message(_("No further redo information"));
- updateFlags = Update::None;
- }
- break;
-
- case LFUN_FILE_INSERT:
- // FIXME UNICODE
- menuInsertLyXFile(to_utf8(cmd.argument()));
- break;
-
- case LFUN_FILE_INSERT_PLAINTEXT_PARA:
- // FIXME UNICODE
- insertPlaintextFile(this, to_utf8(cmd.argument()), true);
- break;
-
- case LFUN_FILE_INSERT_PLAINTEXT:
- // FIXME UNICODE
- insertPlaintextFile(this, to_utf8(cmd.argument()), false);
+ else
+ processUpdateFlags(Update::Force | Update::FitCursor);
break;
case LFUN_FONT_STATE:
docstring label = cmd.argument();
if (label.empty()) {
InsetRef * inset =
- getInsetByCode<InsetRef>(cursor_,
- Inset::REF_CODE);
+ getInsetByCode<InsetRef>(d->cursor_,
+ REF_CODE);
if (inset) {
label = inset->getParam("reference");
// persistent=false: use temp_bookmark
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);
+
+ // FIXME I'm adding the last break to solve a crash,
+ // but that is obviously not right.
+ if (!cur.result().dispatched())
+ // It did not work too; no action needed.
+ break;
+ 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)) {
- ParIterator par = b->getParFromID(id);
- if (par == b->par_iterator_end()) {
- LYXERR(Debug::INFO)
- << "No matching paragraph found! ["
- << id << "]." << endl;
+ 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
+ dit.pos() = pos;
+ setCursor(dit);
+ processUpdateFlags(Update::Force | Update::FitCursor);
} else {
- LYXERR(Debug::INFO)
- << "Paragraph " << par->id()
- << " found in buffer `"
- << b->fileName() << "'." << endl;
-
- 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->fileName()));
- 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;
}
- case LFUN_OUTLINE_UP:
- toc::outline(toc::Up, cursor_);
- cursor_.text()->setCursor(cursor_, cursor_.pit(), 0);
- updateLabels(buffer_);
- break;
- case LFUN_OUTLINE_DOWN:
- toc::outline(toc::Down, cursor_);
- cursor_.text()->setCursor(cursor_, cursor_.pit(), 0);
- updateLabels(buffer_);
- break;
- case LFUN_OUTLINE_IN:
- toc::outline(toc::In, cursor_);
- updateLabels(buffer_);
- break;
- case LFUN_OUTLINE_OUT:
- toc::outline(toc::Out, cursor_);
- updateLabels(buffer_);
- break;
-
case LFUN_NOTE_NEXT:
- gotoInset(this, Inset::NOTE_CODE, false);
+ gotoInset(this, NOTE_CODE, false);
break;
case LFUN_REFERENCE_NEXT: {
- vector<Inset_code> tmp;
- tmp.push_back(Inset::LABEL_CODE);
- tmp.push_back(Inset::REF_CODE);
+ vector<InsetCode> tmp;
+ tmp.push_back(LABEL_CODE);
+ tmp.push_back(REF_CODE);
gotoInset(this, tmp, true);
break;
}
case LFUN_ALL_CHANGES_ACCEPT:
// select complete document
- cursor_.reset(buffer_.inset());
- cursor_.selHandle(true);
- buffer_.text().cursorBottom(cursor_);
+ d->cursor_.reset(buffer_.inset());
+ d->cursor_.selHandle(true);
+ buffer_.text().cursorBottom(d->cursor_);
// accept everything in a single step to support atomic undo
- buffer_.text().acceptOrRejectChanges(cursor_, Text::ACCEPT);
+ buffer_.text().acceptOrRejectChanges(d->cursor_, 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
- cursor_.reset(buffer_.inset());
- cursor_.selHandle(true);
- buffer_.text().cursorBottom(cursor_);
+ d->cursor_.reset(buffer_.inset());
+ d->cursor_.selHandle(true);
+ buffer_.text().cursorBottom(d->cursor_);
// 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(cursor_, Text::REJECT);
+ buffer_.text().acceptOrRejectChanges(d->cursor_, 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:
- 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;
break;
case LFUN_SCREEN_RECENTER:
- center();
+ showCursor();
break;
case LFUN_BIBTEX_DATABASE_ADD: {
- Cursor tmpcur = cursor_;
- findInset(tmpcur, Inset::BIBTEX_CODE, false);
+ Cursor tmpcur = d->cursor_;
+ findInset(tmpcur, BIBTEX_CODE, false);
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
- Inset::BIBTEX_CODE);
+ BIBTEX_CODE);
if (inset) {
- if (inset->addDatabase(to_utf8(cmd.argument())))
+ if (inset->addDatabase(cmd.argument()))
buffer_.updateBibfilesCache();
}
break;
}
case LFUN_BIBTEX_DATABASE_DEL: {
- Cursor tmpcur = cursor_;
- findInset(tmpcur, Inset::BIBTEX_CODE, false);
+ Cursor tmpcur = d->cursor_;
+ findInset(tmpcur, BIBTEX_CODE, false);
InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
- Inset::BIBTEX_CODE);
+ BIBTEX_CODE);
if (inset) {
- if (inset->delDatabase(to_utf8(cmd.argument())))
+ if (inset->delDatabase(cmd.argument()))
buffer_.updateBibfilesCache();
}
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.");
- }
+ 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(_("Count words"), message);
+ Alert::information(_("Statistics"), message);
}
break;
// turn compression on/off
buffer_.params().compressed = !buffer_.params().compressed;
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();
if (inset) {
if (inset->isActive()) {
Cursor tmpcur = cur;
- tmpcur.pushLeft(*inset);
+ 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())
- 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: {
+ // 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;
}
Point p = getPos(cur, cur.boundary());
if (p.y_ < 0 || p.y_ > height_) {
// The cursor is off-screen so recenter before proceeding.
- center();
- updateMetrics(false);
- //FIXME: updateMetrics() does not update paragraph position
- // This is done at draw() time. So we need a redraw!
- buffer_.changed();
+ showCursor();
p = getPos(cur, cur.boundary());
}
- scroll(cmd.action == LFUN_SCREEN_UP? - height_ : height_);
+ int const scrolled = scroll(cmd.action == LFUN_SCREEN_UP
+ ? - 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());
- text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
+ updateMetrics();
+ buffer_.changed();
+ d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
//FIXME: what to do with cur.x_target()?
- finishUndo();
- // The metrics are already up to date. see scroll()
- updateFlags = Update::None;
+ cur.finishUndo();
+ break;
+ }
+
+ case LFUN_SCROLL:
+ lfunScroll(cmd);
+ break;
+
+ case LFUN_SCREEN_UP_SELECT: {
+ cur.selHandle(true);
+ 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();
+ processUpdateFlags(Update::SinglePar | Update::FitCursor);
break;
}
- case LFUN_SCREEN_UP_SELECT:
case LFUN_SCREEN_DOWN_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());
- text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
- finishUndo();
- while (cur.depth() > initial_depth) {
- cur.forwardInset();
+ if (isBottomScreen()) {
+ lyx::dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
+ cur.finishUndo();
+ break;
}
- // FIXME: we need to do a redraw again because of the selection
- 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;
+ }
+
+ case LFUN_BRANCH_ACTIVATE:
+ case LFUN_BRANCH_DEACTIVATE:
+ buffer_.dispatch(cmd);
+ processUpdateFlags(Update::Force);
+ break;
+
+ // These two could be rewriten using some command like forall <insetname> <command>
+ // once the insets refactoring is done.
+ case LFUN_GRAPHICS_GROUPS_UNIFY: {
+ if (cmd.argument().empty())
+ break;
+ //view()->cursor().recordUndoFullDocument(); let inset-apply do that job
+ graphics::unifyGraphicsGroups(cur.buffer(), to_utf8(cmd.argument()));
+ processUpdateFlags(Update::Force | Update::FitCursor);
+ break;
+ }
+
+ case LFUN_NOTES_MUTATE: {
+ if (cmd.argument().empty())
+ break;
+ cur.recordUndoFullDocument();
+
+ if (mutateNotes(cur, cmd.getArg(0), cmd.getArg(1))) {
+ processUpdateFlags(Update::Force);
+ }
+ 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);
+
+ 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);
+ }
+ }
+ processUpdateFlags(Update::Force | Update::FitCursor);
break;
}
default:
- updateFlags = Update::None;
+ return false;
}
- return updateFlags;
+ return true;
}
docstring const BufferView::requestSelection()
{
- Cursor & cur = cursor_;
+ Cursor & cur = d->cursor_;
+ LYXERR(Debug::SELECTION, "requestSelection: cur.selection: " << cur.selection());
if (!cur.selection()) {
- xsel_cache_.set = false;
+ d->xsel_cache_.set = false;
return docstring();
}
- if (!xsel_cache_.set ||
- cur.top() != xsel_cache_.cursor ||
- cur.anchor_.top() != xsel_cache_.anchor)
+ LYXERR(Debug::SELECTION, "requestSelection: xsel_cache.set: " << d->xsel_cache_.set);
+ if (!d->xsel_cache_.set ||
+ cur.top() != d->xsel_cache_.cursor ||
+ cur.anchor_.top() != d->xsel_cache_.anchor)
{
- xsel_cache_.cursor = cur.top();
- xsel_cache_.anchor = cur.anchor_.top();
- xsel_cache_.set = cur.selection();
+ d->xsel_cache_.cursor = cur.top();
+ d->xsel_cache_.anchor = cur.anchor_.top();
+ d->xsel_cache_.set = cur.selection();
return cur.selectionAsString(false);
}
return docstring();
void BufferView::clearSelection()
{
- cursor_.clearSelection();
+ d->cursor_.clearSelection();
// Clear the selection buffer. Otherwise a subsequent
// middle-mouse-button paste would use the selection buffer,
// not the more current external selection.
cap::clearSelection();
- xsel_cache_.set = false;
+ 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();
width_ = width;
height_ = height;
- updateMetrics(false);
+ // 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 = text_metrics_[&text];
+ TextMetrics & tm = d->text_metrics_[&text];
Inset * inset = tm.checkInsetHit(x, y);
if (!inset)
return 0;
}
-bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
+void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
{
- //lyxerr << BOOST_CURRENT_FUNCTION << "[ cmd0 " << cmd0 << "]" << endl;
+ //lyxerr << "[ cmd0 " << cmd0 << "]" << endl;
// This is only called for mouse related events including
// LFUN_FILE_OPEN generated by drag-and-drop.
FuncRequest cmd = cmd0;
+ Cursor old = cursor();
Cursor cur(*this);
cur.push(buffer_.inset());
- cur.selection() = cursor_.selection();
+ cur.selection() = d->cursor_.selection();
// Either the inset under the cursor or the
// surrounding Text will handle this event.
// Get inset under mouse, if there is one.
Inset const * covering_inset =
getCoveringInset(buffer_.text(), cmd.x, cmd.y);
- if (covering_inset == last_inset_)
+ if (covering_inset == d->last_inset_)
// Same inset, no need to do anything...
- return false;
+ return;
bool need_redraw = false;
// const_cast because of setMouseHover().
Inset * inset = const_cast<Inset *>(covering_inset);
- if (last_inset_)
+ if (d->last_inset_)
// Remove the hint on the last hovered inset (if any).
- need_redraw |= last_inset_->setMouseHover(false);
+ need_redraw |= d->last_inset_->setMouseHover(false);
if (inset)
// Highlighted the newly hovered inset (if any).
need_redraw |= inset->setMouseHover(true);
- last_inset_ = inset;
+ d->last_inset_ = inset;
if (!need_redraw)
- return false;
+ return;
+
+ LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
+ << cmd.x << ", " << cmd.y << ")");
- // if last metrics update was in singlepar mode, WorkArea::redraw() will
- // not expose the button for redraw. We adjust here the metrics dimension
- // to enable a full redraw in any case as this is not costly.
- TextMetrics & tm = text_metrics_[&buffer_.text()];
- std::pair<pit_type, ParagraphMetrics const *> firstpm = tm.first();
- std::pair<pit_type, ParagraphMetrics const *> lastpm = tm.last();
- int y1 = firstpm.second->position() - firstpm.second->ascent();
- int y2 = lastpm.second->position() + lastpm.second->descent();
- metrics_info_ = ViewMetricsInfo(firstpm.first, lastpm.first, y1, y2,
- FullScreenUpdate, buffer_.text().paragraphs().size());
- // Reinitialize anchor to first pit.
- anchor_ref_ = firstpm.first;
- offset_ref_ = -y1;
- LYXERR(Debug::PAINTING)
- << "Mouse hover detected at: (" << cmd.x << ", " << cmd.y << ")"
- << "\nTriggering redraw: y1: " << y1 << " y2: " << y2
- << " pit1: " << firstpm.first << " pit2: " << lastpm.first << endl;
+ d->update_strategy_ = DecorationUpdate;
// This event (moving without mouse click) is not passed further.
// This should be changed if it is further utilized.
- return true;
+ buffer_.changed();
+ return;
}
// Build temporary cursor.
- Inset * inset = text_metrics_[&buffer_.text()].editXY(cur, cmd.x, cmd.y);
+ Inset * inset = d->text_metrics_[&buffer_.text()].editXY(cur, cmd.x, cmd.y);
// Put anchor at the same position.
cur.resetAnchor();
// via the temp cursor. If the inset wishes to change the real
// cursor it has to do so explicitly by using
// cur.bv().cursor() = cur; (or similar)
- if (inset) {
+ if (inset)
inset->dispatch(cur, cmd);
- }
// 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());
- // Redraw if requested and necessary.
- if (cur.result().dispatched() && cur.result().update())
- return update(cur.result().update());
+ // If the command has been dispatched,
+ if (cur.result().dispatched() || cur.result().update())
+ processUpdateFlags(cur.result().update());
+}
- return false;
+
+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);
+ }
+ updateMetrics();
+ buffer_.changed();
}
-void BufferView::scroll(int y)
+int BufferView::scroll(int y)
{
if (y > 0)
- scrollDown(y);
- else if (y < 0)
- scrollUp(-y);
+ return scrollDown(y);
+ if (y < 0)
+ return scrollUp(-y);
+ return 0;
}
-void BufferView::scrollDown(int offset)
+int BufferView::scrollDown(int offset)
{
Text * text = &buffer_.text();
- TextMetrics & tm = text_metrics_[text];
+ 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_)
- return;
+ return 0;
offset = min(offset, bottom_pos - height_);
break;
}
break;
tm.newParMetricsDown();
}
- offset_ref_ += offset;
- updateMetrics(false);
- buffer_.changed();
+ d->anchor_ypos_ -= offset;
+ return -offset;
}
-void BufferView::scrollUp(int offset)
+int BufferView::scrollUp(int offset)
{
Text * text = &buffer_.text();
- TextMetrics & tm = text_metrics_[text];
+ 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)
- return;
+ return 0;
offset = min(offset, - top_pos);
break;
}
break;
tm.newParMetricsUp();
}
- offset_ref_ -= offset;
- updateMetrics(false);
- buffer_.changed();
+ d->anchor_ypos_ += offset;
+ return offset;
}
buffer_.texrow().getIdFromRow(row, tmpid, tmppos);
- cursor_.reset(buffer_.inset());
+ d->cursor_.reset(buffer_.inset());
if (tmpid == -1)
- buffer_.text().setCursor(cursor_, 0, 0);
+ buffer_.text().setCursor(d->cursor_, 0, 0);
else
- buffer_.text().setCursor(cursor_, buffer_.getParFromID(tmpid).pit(), tmppos);
+ buffer_.text().setCursor(d->cursor_, buffer_.getParFromID(tmpid).pit(), tmppos);
}
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);
- update();
- 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);
}
TextMetrics & BufferView::textMetrics(Text const * t)
{
- TextMetricsCache::iterator tmc_it = text_metrics_.find(t);
- if (tmc_it == text_metrics_.end()) {
- tmc_it = text_metrics_.insert(
+ TextMetricsCache::iterator tmc_it = d->text_metrics_.find(t);
+ if (tmc_it == d->text_metrics_.end()) {
+ tmc_it = d->text_metrics_.insert(
make_pair(t, TextMetrics(this, const_cast<Text *>(t)))).first;
}
return tmc_it->second;
{
size_t const n = dit.depth();
for (size_t i = 0; i < n; ++i)
- dit[i].inset().edit(cursor_, true);
+ dit[i].inset().edit(d->cursor_, true);
- cursor_.setCursor(dit);
- cursor_.selection() = false;
+ d->cursor_.setCursor(dit);
+ d->cursor_.selection() = false;
}
return false;
bool need_anchor_change = false;
- bool changed = cursor_.text()->deleteEmptyParagraphMechanism(cur, old,
+ bool changed = d->cursor_.text()->deleteEmptyParagraphMechanism(cur, old,
need_anchor_change);
if (need_anchor_change)
if (!changed)
return false;
+ d->cursor_ = cur;
+
updateLabels(buffer_);
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
return true;
}
-bool BufferView::mouseSetCursor(Cursor & cur)
+bool BufferView::mouseSetCursor(Cursor & cur, bool select)
{
- BOOST_ASSERT(&cur.bv() == this);
+ LASSERT(&cur.bv() == this, /**/);
- // this event will clear selection so we save selection for
- // persistent selection
- cap::saveSelection(cursor());
+ if (!select)
+ // this event will clear selection so we save selection for
+ // persistent selection
+ cap::saveSelection(cursor());
// Has the cursor just left the inset?
bool badcursor = false;
- bool leftinset = (&cursor_.inset() != &cur.inset());
- if (leftinset)
- badcursor = notifyCursorLeaves(cursor_, cur);
+ bool leftinset = (&d->cursor_.inset() != &cur.inset());
+ 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();
// do the dEPM magic if needed
// FIXME: (1) move this to InsetText::notifyCursorLeaves?
// FIXME: (2) if we had a working InsetText::notifyCursorLeaves,
// the leftinset bool would not be necessary (badcursor instead).
bool update = leftinset;
- if (!badcursor && cursor_.inTexted())
- update |= checkDepm(cur, 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;
-
- cursor_.setCursor(dit);
- cursor_.boundary(cur.boundary());
- cursor_.clearSelection();
- finishUndo();
+ if (!do_selection && !badcursor && d->cursor_.inTexted())
+ update |= checkDepm(cur, d->cursor_);
+
+ d->cursor_.setCursor(cur);
+ d->cursor_.boundary(cur.boundary());
+ if (do_selection)
+ d->cursor_.setSelection();
+ else
+ d->cursor_.clearSelection();
+
+ d->cursor_.finishUndo();
+ d->cursor_.setCurrentFont();
return update;
}
void BufferView::putSelectionAt(DocIterator const & cur,
int length, bool backwards)
{
- cursor_.clearSelection();
+ d->cursor_.clearSelection();
setCursor(cur);
if (length) {
if (backwards) {
- cursor_.pos() += length;
- cursor_.setSelection(cursor_, -length);
+ d->cursor_.pos() += length;
+ d->cursor_.setSelection(d->cursor_, -length);
} else
- cursor_.setSelection(cursor_, length);
+ 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);
}
Cursor & BufferView::cursor()
{
- return cursor_;
+ return d->cursor_;
}
Cursor const & BufferView::cursor() const
{
- return cursor_;
+ return d->cursor_;
}
pit_type BufferView::anchor_ref() const
{
- return anchor_ref_;
-}
-
-
-ViewMetricsInfo const & BufferView::viewMetricsInfo()
-{
- return metrics_info_;
+ return d->anchor_pit_;
}
bool BufferView::singleParUpdate()
{
Text & buftext = buffer_.text();
- pit_type const bottom_pit = cursor_.bottom().pit();
+ pit_type const bottom_pit = d->cursor_.bottom().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
// the singlePar optimisation.
return false;
- int y1 = pm.position() - pm.ascent();
- int y2 = pm.position() + pm.descent();
- metrics_info_ = ViewMetricsInfo(bottom_pit, bottom_pit, y1, y2,
- SingleParUpdate, buftext.paragraphs().size());
- LYXERR(Debug::PAINTING)
- << BOOST_CURRENT_FUNCTION
- << "\ny1: " << y1
- << " y2: " << y2
+ d->update_strategy_ = SingleParUpdate;
+
+ LYXERR(Debug::PAINTING, "\ny1: " << pm.position() - pm.ascent()
+ << " y2: " << pm.position() + pm.descent()
<< " pit: " << bottom_pit
- << " singlepar: 1"
- << endl;
+ << " singlepar: 1");
return true;
}
-void BufferView::updateMetrics(bool singlepar)
+void BufferView::updateMetrics()
{
- if (singlepar && singleParUpdate())
- // No need to update the full screen metrics.
+ if (height_ == 0 || width_ == 0)
return;
Text & buftext = buffer_.text();
pit_type const npit = int(buftext.paragraphs().size());
- if (anchor_ref_ > int(npit - 1)) {
- anchor_ref_ = int(npit - 1);
- offset_ref_ = 0;
- }
-
// Clear out the position cache in case of full screen redraw,
- coord_cache_.clear();
+ d->coord_cache_.clear();
// Clear out paragraph metrics to avoid having invalid metrics
// in the cache from paragraphs not relayouted below
// The complete text metrics will be redone.
- text_metrics_.clear();
+ d->text_metrics_.clear();
TextMetrics & tm = textMetrics(&buftext);
- pit_type const pit = 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() - 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
- anchor_ref_ = pit1;
- offset_ref_ = -y1;
-
- // Grey at the beginning is ugly
- if (pit1 == 0 && y1 > 0) {
- y0 -= y1;
- y1 = 0;
- 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)
- << BOOST_CURRENT_FUNCTION
- << "\n y1: " << y1
- << " y2: " << y2
- << " pit1: " << pit1
- << " pit2: " << pit2
- << " npit: " << npit
- << " singlepar: 0"
- << endl;
+ LYXERR(Debug::PAINTING, "Metrics: "
+ << " anchor pit = " << d->anchor_pit_
+ << " anchor ypos = " << d->anchor_ypos_
+ << " y1 = " << y1
+ << " y2 = " << y2
+ << " pit1 = " << pit1
+ << " pit2 = " << pit2);
- metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2,
- FullScreenUpdate, npit);
+ d->update_strategy_ = FullScreenUpdate;
if (lyxerr.debugging(Debug::WORKAREA)) {
- LYXERR(Debug::WORKAREA) << "BufferView::updateMetrics" << endl;
- coord_cache_.dump();
+ LYXERR(Debug::WORKAREA, "BufferView::updateMetrics");
+ d->coord_cache_.dump();
}
}
-void BufferView::menuInsertLyXFile(string const & filenm)
+void BufferView::insertLyXFile(FileName const & fname)
{
- BOOST_ASSERT(cursor_.inTexted());
- string filename = filenm;
-
- if (filename.empty()) {
- // Launch a file browser
- // FIXME UNICODE
- string initpath = lyxrc.document_path;
- string const trypath = buffer_.filePath();
- // If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
- initpath = trypath;
-
- // FIXME UNICODE
- FileDialog fileDlg(_("Select LyX document to insert"),
- LFUN_FILE_INSERT,
- make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(),
- "examples"))));
-
- FileDialog::Result result =
- fileDlg.open(from_utf8(initpath),
- FileFilterList(_("LyX Documents (*.lyx)")),
- docstring());
-
- if (result.first == FileDialog::Later)
- return;
-
- // FIXME UNICODE
- filename = to_utf8(result.second);
-
- // check selected filename
- if (filename.empty()) {
- // emit message signal.
- message(_("Canceled."));
- return;
- }
- }
+ LASSERT(d->cursor_.inTexted(), /**/);
// Get absolute path of file and add ".lyx"
// to the filename if necessary
- filename = fileSearch(string(), filename, "lyx").absFilename();
+ FileName filename = fileSearch(string(), fname.absFilename(), "lyx");
- docstring const disp_fn = makeDisplayPath(filename);
+ docstring const disp_fn = makeDisplayPath(filename.absFilename());
// emit message signal.
message(bformat(_("Inserting document %1$s..."), disp_fn));
docstring res;
Buffer buf("", false);
- if (lyx::loadLyXFile(&buf, FileName(filename))) {
+ if (buf.loadLyXFile(filename)) {
ErrorList & el = buffer_.errorList("Parse");
// Copy the inserted document error list into the current buffer one.
el = buf.errorList("Parse");
- recordUndo(cursor_);
- cap::pasteParagraphList(cursor_, buf.paragraphs(),
- buf.params().getTextClassPtr(), el);
+ buffer_.undo().recordUndo(d->cursor_);
+ cap::pasteParagraphList(d->cursor_, buf.paragraphs(),
+ buf.params().documentClassPtr(), el);
res = _("Document %1$s inserted.");
- } else
+ } else {
res = _("Could not insert document %1$s");
+ }
+ updateMetrics();
+ buffer_.changed();
// emit message signal.
message(bformat(res, disp_fn));
buffer_.errors("Parse");
- updateMetrics(false);
}
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
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
void BufferView::draw(frontend::Painter & pain)
{
+ if (height_ == 0 || width_ == 0)
+ return;
+ LYXERR(Debug::PAINTING, "\t\t*** START DRAWING ***");
+ Text & text = buffer_.text();
+ TextMetrics const & tm = d->text_metrics_[&text];
+ int const y = tm.first().second->position();
PainterInfo pi(this, pain);
- // Should the whole screen, including insets, be refreshed?
- // FIXME: We should also distinguish DecorationUpdate to avoid text
- // drawing if possible. This is not possible to do easily right now
- // because of the single backing pixmap.
- pi.full_repaint = metrics_info_.update_strategy != SingleParUpdate;
-
- if (pi.full_repaint)
- // Clear background (if not delegated to rows)
- pain.fillRectangle(0, metrics_info_.y1, width_,
- metrics_info_.y2 - metrics_info_.y1,
+
+ switch (d->update_strategy_) {
+
+ case NoScreenUpdate:
+ // If no screen painting is actually needed, only some the different
+ // coordinates of insets and paragraphs needs to be updated.
+ pi.full_repaint = true;
+ pi.pain.setDrawingEnabled(false);
+ tm.draw(pi, 0, y);
+ break;
+
+ case SingleParUpdate:
+ pi.full_repaint = false;
+ // In general, only the current row of the outermost paragraph
+ // will be redrawn. Particular cases where selection spans
+ // multiple paragraph are correctly detected in TextMetrics.
+ tm.draw(pi, 0, y);
+ break;
+
+ case DecorationUpdate:
+ // FIXME: We should also distinguish DecorationUpdate to avoid text
+ // drawing if possible. This is not possible to do easily right now
+ // because of the single backing pixmap.
+
+ case FullScreenUpdate:
+ // The whole screen, including insets, will be refreshed.
+ pi.full_repaint = true;
+
+ // Clear background.
+ pain.fillRectangle(0, 0, width_, height_,
buffer_.inset().backgroundColor());
- LYXERR(Debug::PAINTING) << "\t\t*** START DRAWING ***" << endl;
- Text & text = buffer_.text();
- TextMetrics const & tm = text_metrics_[&text];
- int y = metrics_info_.y1 + tm.parMetrics(metrics_info_.p1).ascent();
- if (!pi.full_repaint)
- tm.drawParagraph(pi, metrics_info_.p1, 0, y);
- else
+ // Draw everything.
tm.draw(pi, 0, y);
- LYXERR(Debug::PAINTING) << "\n\t\t*** END DRAWING ***" << endl;
-
- // and grey out above (should not happen later)
-// lyxerr << "par ascent: " << text.getPar(metrics_info_.p1).ascent() << endl;
- if (metrics_info_.y1 > 0
- && metrics_info_.update_strategy == FullScreenUpdate)
- pain.fillRectangle(0, 0, width_, metrics_info_.y1, Color::bottomarea);
-
- // and possibly grey out below
-// lyxerr << "par descent: " << text.getPar(metrics_info_.p1).ascent() << endl;
- if (metrics_info_.y2 < height_
- && metrics_info_.update_strategy == FullScreenUpdate)
- pain.fillRectangle(0, metrics_info_.y2, width_,
- height_ - metrics_info_.y2, Color::bottomarea);
+
+ // 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);
+ 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::message(docstring const & msg)
+{
+ if (d->gui_)
+ d->gui_->message(msg);
+}
+
+
+void BufferView::showDialog(string const & name)
+{
+ if (d->gui_)
+ d->gui_->showDialog(name, string());
+}
+
+
+void BufferView::showDialog(string const & name,
+ string const & data, Inset * inset)
+{
+ if (d->gui_)
+ d->gui_->showDialog(name, data, inset);
+}
+
+
+void BufferView::updateDialog(string const & name, string const & data)
+{
+ if (d->gui_)
+ d->gui_->updateDialog(name, data);
+}
+
+
+void BufferView::setGuiDelegate(frontend::GuiBufferViewDelegate * gui)
+{
+ d->gui_ = gui;
+}
+
+
+// FIXME: Move this out of BufferView again
+docstring BufferView::contentsOfPlaintextFile(FileName const & fname)
+{
+ if (!fname.isReadableFile()) {
+ docstring const error = from_ascii(strerror(errno));
+ docstring const file = makeDisplayPath(fname.absFilename(), 50);
+ docstring const text =
+ bformat(_("Could not read the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
+ Alert::error(_("Could not read file"), text);
+ return docstring();
+ }
+
+ if (!fname.isReadableFile()) {
+ docstring const file = makeDisplayPath(fname.absFilename(), 50);
+ docstring const text =
+ bformat(_("%1$s\n is not readable."), file);
+ Alert::error(_("Could not open file"), text);
+ return docstring();
+ }
+
+ // FIXME UNICODE: We don't know the encoding of the file
+ docstring file_content = fname.fileContents("UTF-8");
+ if (file_content.empty()) {
+ Alert::error(_("Reading not UTF-8 encoded file"),
+ _("The file is not UTF-8 encoded.\n"
+ "It will be read as local 8Bit-encoded.\n"
+ "If this does not give the correct result\n"
+ "then please change the encoding of the file\n"
+ "to UTF-8 with a program other than LyX.\n"));
+ file_content = fname.fileContents("local8bit");
+ }
+
+ return normalize_c(file_content);
+}
+
+
+void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph)
+{
+ docstring const tmpstr = contentsOfPlaintextFile(f);
+
+ if (tmpstr.empty())
+ return;
+
+ Cursor & cur = cursor();
+ cap::replaceSelection(cur);
+ buffer_.undo().recordUndo(cur);
+ if (asParagraph)
+ cur.innerText()->insertStringAsParagraphs(cur, tmpstr);
+ else
+ cur.innerText()->insertStringAsLines(cur, tmpstr);
+
+ updateMetrics();
+ 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