#include "bufferparams.h"
#include "coordcache.h"
#include "cursor.h"
+#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "factory.h"
BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner,
int width, int height)
- : bv_(&bv), owner_(owner), buffer_(0), cursor_timeout(400),
- using_xterm_cursor(false), cursor_(bv) ,
+ : bv_(&bv), owner_(owner), buffer_(0), wh_(0), cursor_timeout(400),
+ using_xterm_cursor(false), cursor_(bv),
anchor_ref_(0), offset_ref_(0)
{
xsel_cache_.set = false;
}
LyXText & t = *bv_->text();
- if (anchor_ref_ > int(t.paragraphs().size()) - 1) {
- anchor_ref_ = int(t.paragraphs().size()) - 1;
+ int const parsize = int(t.paragraphs().size() - 1);
+ if (anchor_ref_ > parsize) {
+ anchor_ref_ = parsize;
offset_ref_ = 0;
}
// values in [0..1] and divide everything by wh
// estimated average paragraph height:
- int const wh = workarea().workHeight() / 4;
+ if (wh_ == 0)
+ wh_ = workarea().workHeight() / 4;
int h = t.getPar(anchor_ref_).height();
+
// Normalize anchor/offset (MV):
- while (offset_ref_ > h) {
+ while (offset_ref_ > h && anchor_ref_ < parsize) {
anchor_ref_++;
offset_ref_ -= h;
h = t.getPar(anchor_ref_).height();
}
+ // Look at paragraph heights on-screen
+ int sumh = 0;
+ int nh = 0;
+ for (lyx::pit_type pit = anchor_ref_; pit <= parsize; ++pit) {
+ if (sumh > workarea().workHeight())
+ break;
+ int const h2 = t.getPar(pit).height();
+ sumh += h2;
+ nh++;
+ }
+ int const hav = sumh / nh;
+ // More realistic average paragraph height
+ if (hav > wh_)
+ wh_ = hav;
- // The "+ 2" makes inoculates doc bottom display against
- // unrealistic wh values (docs with very large paragraphs) (MV)
- workarea().setScrollbarParams((t.paragraphs().size() + 2) * wh,
- anchor_ref_ * wh + int(offset_ref_ * wh / float(h)),
- int(wh * defaultRowHeight() / float(h)));
-// workarea().setScrollbarParams(t.paragraphs().size(), anchor_ref_, 1);
+ workarea().setScrollbarParams((parsize + 1) * wh_,
+ anchor_ref_ * wh_ + int(offset_ref_ * wh_ / float(h)),
+ int(wh_ * defaultRowHeight() / float(h)));
}
screen().hideCursor();
- int const wh = workarea().workHeight() / 4;
-
LyXText & t = *bv_->text();
- float const bar = value / float(wh * t.paragraphs().size());
+ float const bar = value / float(wh_ * t.paragraphs().size());
anchor_ref_ = int(bar * t.paragraphs().size());
+ if (anchor_ref_ > int(t.paragraphs().size()) - 1)
+ anchor_ref_ = int(t.paragraphs().size()) - 1;
t.redoParagraph(anchor_ref_);
int const h = t.getPar(anchor_ref_).height();
offset_ref_ = int((bar * t.paragraphs().size() - anchor_ref_) * h);
}
+bool BufferView::Pimpl::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_;
+}
+
+
void BufferView::Pimpl::update(Update::flags flags)
{
lyxerr[Debug::DEBUG]
// First drawing step
ViewMetricsInfo vi = metrics(flags & Update::SinglePar);
- bool forceupdate(flags & Update::Force);
+ bool forceupdate(flags & (Update::Force | Update::SinglePar));
if ((flags & Update::FitCursor) && fitCursor()) {
forceupdate = true;
vi = metrics();
}
+ if ((flags & Update::MultiParSel) && multiParSel()) {
+ forceupdate = true;
+ vi = metrics();
+ }
if (forceupdate) {
// Second drawing step
screen().redraw(*bv_, vi);
void BufferView::Pimpl::MenuInsertLyXFile(string const & filenm)
{
+ BOOST_ASSERT(cursor_.inTexted());
string filename = filenm;
if (filename.empty()) {
string const disp_fn = MakeDisplayPath(filename);
owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
- cursor_.clearSelection();
- bv_->getLyXText()->breakParagraph(cursor_);
-
- BOOST_ASSERT(cursor_.inTexted());
+ string res;
+ Buffer buf("", false);
+ buf.error.connect(boost::bind(&BufferView::Pimpl::addError, this, _1));
+ if (::loadLyXFile(&buf, MakeAbsPath(filename))) {
+ lyx::cap::pasteParagraphList(cursor_, buf.paragraphs(),
+ buf.params().textclass);
+ res = _("Document %1$s inserted.");
+ } else
+ res = _("Could not insert document %1$s");
- string const fname = MakeAbsPath(filename);
- bool const res = buffer_->readFile(fname, cursor_.pit());
+ owner_->message(bformat(res, disp_fn));
+ bv_->showErrorList(_("Document insertion"));
resizeCurrentBuffer();
-
- string s = res ? _("Document %1$s inserted.")
- : _("Could not insert document %1$s");
- owner_->message(bformat(s, disp_fn));
}
buffer_->undostack().clear();
} else {
cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
- bool const found = lyx::find::findNextChange(bv_);
- if (found) {
- // We reset the cursor to the start of the
- // document, since the Changes Dialog is going
- // to search for the next change anyway.
- cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
+ if (lyx::find::findNextChange(bv_)) {
owner_->getDialogs().show("changes");
return;
}
if (cur.result().update())
update(Update::FitCursor | Update::Force);
else
- update();
+ update(Update::FitCursor | Update::MultiParSel);
}
// See workAreaKeyPress
case LFUN_FILE_INSERT:
case LFUN_FILE_INSERT_ASCII_PARA:
case LFUN_FILE_INSERT_ASCII:
+ // FIXME: Actually, these LFUNS should be moved to LyXText
+ flag.enabled(cursor_.inTexted());
+ break;
case LFUN_FONT_STATE:
case LFUN_INSERT_LABEL:
case LFUN_BOOKMARK_SAVE:
}
case LFUN_MERGE_CHANGES:
- owner_->getDialogs().show("changes");
+ if (lyx::find::findNextChange(bv_))
+ owner_->getDialogs().show("changes");
break;
case LFUN_ACCEPT_ALL_CHANGES: {
projects / lyx.git / blobdiff