X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=3fdb769ed792b49a9beb6d1cf710b61a1ac33c5f;hb=fc2658eff011adb08192cf897416698c34aab268;hp=63b3f4529b7608b5b25e135d4c92a56429932d49;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 63b3f4529b..3fdb769ed7 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -23,7 +23,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "EmbeddedFiles.h"
 #include "ErrorList.h"
@@ -31,7 +30,6 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "Intl.h"
 #include "InsetIterator.h"
 #include "Language.h"
@@ -41,6 +39,7 @@
 #include "LyXFunc.h"
 #include "Layout.h"
 #include "LyXRC.h"
+#include "MenuBackend.h"
 #include "MetricsInfo.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
@@ -54,15 +53,14 @@
 #include "VSpace.h"
 #include "WordLangTuple.h"
 
-
 #include "insets/InsetBibtex.h"
 #include "insets/InsetCommand.h" // ChangeRefs
 #include "insets/InsetRef.h"
 #include "insets/InsetText.h"
 
 #include "frontends/alert.h"
+#include "frontends/Application.h"
 #include "frontends/Delegates.h"
-#include "frontends/FileDialog.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
@@ -70,47 +68,25 @@
 #include "graphics/Previews.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Package.h"
 #include "support/types.h"
-#include "support/fs_extras.h"
-
-#include <boost/bind.hpp>
-#include <boost/current_function.hpp>
-#include <boost/next_prior.hpp>
-#include <boost/filesystem/operations.hpp>
 
 #include <cerrno>
 #include <fstream>
 #include <functional>
+#include <iterator>
 #include <vector>
 
-using std::distance;
-using std::endl;
-using std::ifstream;
-using std::istringstream;
-using std::istream_iterator;
-using std::make_pair;
-using std::min;
-using std::max;
-using std::mem_fun_ref;
-using std::string;
-using std::vector;
-
-namespace fs = boost::filesystem;
+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::makeDisplayPath;
-using support::makeAbsPath;
-using support::package;
-
 namespace Alert = frontend::Alert;
 
 namespace {
@@ -202,6 +178,7 @@ void gotoInset(BufferView * bv, vector<InsetCode> const & codes,
 
 	tmpcur.clearSelection();
 	bv->setCursor(tmpcur);
+	bv->showCursor();
 }
 
 
@@ -212,132 +189,16 @@ void gotoInset(BufferView * bv, InsetCode code, bool same_content)
 }
 
 
+/// A map from a Text to the associated text metrics
+typedef map<Text const *, TextMetrics> TextMetricsCache;
 
-/// the type of outline operation
-enum OutlineOp {
-	OutlineUp, // Move this header with text down
-	OutlineDown,   // Move this header with text up
-	OutlineIn, // Make this header deeper
-	OutlineOut // Make this header shallower
+enum ScreenUpdateStrategy {
+	NoScreenUpdate,
+	SingleParUpdate,
+	FullScreenUpdate,
+	DecorationUpdate
 };
 
-
-void outline(OutlineOp mode, Cursor & cur)
-{
-	Buffer & buf = cur.buffer();
-	pit_type & pit = cur.pit();
-	ParagraphList & pars = buf.text().paragraphs();
-	ParagraphList::iterator bgn = pars.begin();
-	// The first paragraph of the area to be copied:
-	ParagraphList::iterator start = boost::next(bgn, pit);
-	// The final paragraph of area to be copied:
-	ParagraphList::iterator finish = start;
-	ParagraphList::iterator end = pars.end();
-
-	TextClass::const_iterator lit =
-		buf.params().getTextClass().begin();
-	TextClass::const_iterator const lend =
-		buf.params().getTextClass().end();
-
-	int const thistoclevel = start->layout()->toclevel;
-	int toclevel;
-	switch (mode) {
-		case OutlineUp: {
-			// Move out (down) from this section header
-			if (finish != end)
-				++finish;
-			// Seek the one (on same level) below
-			for (; finish != end; ++finish) {
-				toclevel = finish->layout()->toclevel;
-				if (toclevel != Layout::NOT_IN_TOC
-				    && toclevel <= thistoclevel) {
-					break;
-				}
-			}
-			ParagraphList::iterator dest = start;
-			// Move out (up) from this header
-			if (dest == bgn)
-				break;
-			// Search previous same-level header above
-			do {
-				--dest;
-				toclevel = dest->layout()->toclevel;
-			} while(dest != bgn
-				&& (toclevel == Layout::NOT_IN_TOC
-				    || toclevel > thistoclevel));
-			// Not found; do nothing
-			if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)
-				break;
-			pit_type const newpit = std::distance(bgn, dest);
-			pit_type const len = std::distance(start, finish);
-			pit_type const deletepit = pit + len;
-			buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
-			pars.insert(dest, start, finish);
-			start = boost::next(pars.begin(), deletepit);
-			pit = newpit;
-			pars.erase(start, finish);
-			break;
-		}
-		case OutlineDown: {
-			// Go down out of current header:
-			if (finish != end)
-				++finish;
-			// Find next same-level header:
-			for (; finish != end; ++finish) {
-				toclevel = finish->layout()->toclevel;
-				if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
-					break;
-			}
-			ParagraphList::iterator dest = finish;
-			// Go one down from *this* header:
-			if (dest != end)
-				++dest;
-			else
-				break;
-			// Go further down to find header to insert in front of:
-			for (; dest != end; ++dest) {
-				toclevel = dest->layout()->toclevel;
-				if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
-					break;
-			}
-			// One such was found:
-			pit_type newpit = std::distance(bgn, dest);
-			pit_type const len = std::distance(start, finish);
-			buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
-			pars.insert(dest, start, finish);
-			start = boost::next(bgn, pit);
-			pit = newpit - len;
-			pars.erase(start, finish);
-			break;
-		}
-		case OutlineIn:
-			buf.undo().recordUndo(cur);
-			for (; lit != lend; ++lit) {
-				if ((*lit)->toclevel == thistoclevel + 1 &&
-				    start->layout()->labeltype == (*lit)->labeltype) {
-					start->layout((*lit));
-					break;
-				}
-			}
-			break;
-		case OutlineOut:
-			buf.undo().recordUndo(cur);
-			for (; lit != lend; ++lit) {
-				if ((*lit)->toclevel == thistoclevel - 1 &&
-				    start->layout()->labeltype == (*lit)->labeltype) {
-					start->layout((*lit));
-					break;
-				}
-			}
-			break;
-		default:
-			break;
-	}
-}
-
-/// A map from a Text to the associated text metrics
-typedef std::map<Text const *, TextMetrics> TextMetricsCache;
-
 } // anon namespace
 
 
@@ -350,14 +211,14 @@ typedef std::map<Text const *, TextMetrics> TextMetricsCache;
 struct BufferView::Private
 {
 	Private(BufferView & bv): wh_(0), cursor_(bv),
-		multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
-		need_centering_(false), last_inset_(0), gui_(0)
+		anchor_pit_(0), anchor_ypos_(0),
+		last_inset_(0), gui_(0)
 	{}
 
 	///
 	ScrollbarParameters scrollbarParameters_;
 	///
-	ViewMetricsInfo metrics_info_;
+	ScreenUpdateStrategy update_strategy_;
 	///
 	CoordCache coord_cache_;
 
@@ -372,13 +233,11 @@ struct BufferView::Private
 	///
 	Cursor cursor_;
 	///
-	bool multiparsel_cache_;
-	///
-	pit_type anchor_ref_;
+	pit_type anchor_pit_;
 	///
-	int offset_ref_;
+	int anchor_ypos_;
 	///
-	bool need_centering_;
+	vector<int> par_height_;
 
 	/// keyboard mapping object.
 	Intl intl_;
@@ -420,9 +279,10 @@ BufferView::~BufferView()
 	// 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_.absFileName()),
-		boost::tie(d->cursor_.bottom().pit(), d->cursor_.bottom().pos()) );
+	LastFilePosSection::FilePos fp;
+	fp.pit = d->cursor_.bottom().pit();
+	fp.pos = d->cursor_.bottom().pos();
+	LyX::ref().session().lastFilePos().save(buffer_.fileName(), fp);
 
 	delete d;
 }
@@ -475,22 +335,10 @@ bool BufferView::fitCursor()
 		if (p.y_ - asc >= 0 && p.y_ + des < height_)
 			return false;
 	}
-	center();
 	return true;
 }
 
 
-bool BufferView::multiParSel()
-{
-	if (!d->cursor_.selection())
-		return false;
-	bool ret = d->multiparsel_cache_;
-	d->multiparsel_cache_ = d->cursor_.selBegin().pit() != d->cursor_.selEnd().pit();
-	// Either this, or previous selection spans paragraphs
-	return ret || d->multiparsel_cache_;
-}
-
-
 void BufferView::processUpdateFlags(Update::flags flags)
 {
 	// last_inset_ points to the last visited inset. This pointer may become
@@ -498,16 +346,13 @@ void BufferView::processUpdateFlags(Update::flags flags)
 	// causes screen update(), I reset last_inset_ to avoid such a problem.
 	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().
@@ -516,116 +361,117 @@ void BufferView::processUpdateFlags(Update::flags flags)
 	// Case when no explicit update is requested.
 	if (!flags) {
 		// no need to redraw anything.
-		d->metrics_info_.update_strategy = NoScreenUpdate;
+		d->update_strategy_ = NoScreenUpdate;
 		return;
 	}
 
 	if (flags == Update::Decoration) {
-		d->metrics_info_.update_strategy = DecorationUpdate;
+		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);
-			buffer_.changed();
+		if (fitCursor()) {
+			showCursor();
 			return;
 		}
 		if (flags & Update::Decoration) {
-			d->metrics_info_.update_strategy = DecorationUpdate;
+			d->update_strategy_ = DecorationUpdate;
 			buffer_.changed();
 			return;
 		}
 		// no screen update is needed.
-		d->metrics_info_.update_strategy = NoScreenUpdate;
+		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)) {
+		// 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(false);
-	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;
-	}
+	Text & t = buffer_.text();
+	TextMetrics & tm = d->text_metrics_[&t];		
 
-	LYXERR(Debug::GUI)
-		<< BOOST_CURRENT_FUNCTION
-		<< " Updating scrollbar: height: " << t.paragraphs().size()
+	LYXERR(Debug::GUI, " Updating scrollbar: height: "
+		<< t.paragraphs().size()
 		<< " curr par: " << d->cursor_.bottom().pit()
-		<< " default height " << defaultRowHeight() << endl;
+		<< " default height " << defaultRowHeight());
+
+	int const parsize = int(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);
+	}
 
 	// 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();
-	}
 	// 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++;
+	pit_type first_visible_pit = -1;
+	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) {
+		ParagraphMetrics const & pm = tm.parMetrics(pit);
+		d->par_height_[pit] = pm.height();
+		if (first_visible_pit >= 0 || pm.position() + pm.descent() <= 0)
+			continue;
+		first_visible_pit = pit;
+		LYXERR(Debug::SCROLLING, "first visible pit " << first_visible_pit);
+		// FIXME: we should look for the first visible row within
+		// the deepest inset!
+		int row_pos = pm.position();
+		size_t const nrows = pm.rows().size();
+		for (size_t i = 0; i != nrows; ++i) {
+			Row const & row = pm.rows()[i];
+			if (row_pos >= 0) {
+				LYXERR(Debug::SCROLLING, "first visible row " << i
+					<< "(row pos = " << row_pos << ");");
+				break;
+			}
+			row_pos += row.height();
+		}
+		d->scrollbarParameters_.position = row_pos;
 	}
 
-	BOOST_ASSERT(nh);
-	int const hav = sumh / nh;
-	// More realistic average paragraph height
-	if (hav > d->wh_)
-		d->wh_ = hav;
+	d->scrollbarParameters_.height = 0;
+	for (size_t i = 0; i != d->par_height_.size(); ++i) {
+		if (i == first_visible_pit)
+			d->scrollbarParameters_.position += d->scrollbarParameters_.height;
+		d->scrollbarParameters_.height += 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));
+	// We prefer fixed size line scrolling.
+	d->scrollbarParameters_.lineScrollHeight = defaultRowHeight();
 }
 
 
@@ -635,28 +481,58 @@ ScrollbarParameters const & BufferView::scrollbarParameters() const
 }
 
 
-void BufferView::scrollDocView(int value)
+docstring BufferView::toolTip(int x, int y) const
 {
-	LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION
-			   << "[ value = " << value << "]" << endl;
+	// 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);
+}
 
-	Text & t = buffer_.text();
-	TextMetrics & tm = d->text_metrics_[&t];
 
-	float const bar = value / float(d->wh_ * t.paragraphs().size());
+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);
 
-	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;
+	// FIXME: Do something more elaborate here.
+	return from_ascii("edit");
+}
 
-	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(false);
+
+void BufferView::scrollDocView(int 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;
+	}
+
+	int par_pos = 0;
+	for (size_t i = 0; i != d->par_height_.size(); ++i) {
+		par_pos += d->par_height_[i];
+		if (par_pos >= value) {
+			d->anchor_pit_ = pit_type(i);
+			break;
+		}
+	}
+
+	LYXERR(Debug::SCROLLING, "value = " << value
+		<< "\tanchor_ref_ = " << d->anchor_pit_
+		<< "\tpar_pos = " << par_pos);
+
+	d->anchor_ypos_ = par_pos - value;
+	updateMetrics();
 	buffer_.changed();
 }
 
 
+// FIXME: this method is not working well.
 void BufferView::setCursorFromScrollbar()
 {
 	TextMetrics & tm = d->text_metrics_[&buffer_.text()];
@@ -722,7 +598,7 @@ void BufferView::saveBookmark(unsigned int idx)
 	// pit and pos will be updated with bottom level pit/pos
 	// when lyx exits.
 	LyX::ref().session().bookmarks().save(
-		FileName(buffer_.absFileName()),
+		buffer_.fileName(),
 		d->cursor_.bottom().pit(),
 		d->cursor_.bottom().pos(),
 		d->cursor_.paragraph().id(),
@@ -784,8 +660,12 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos,
 		setCursor(doc_it);
 		// set the current font.
 		d->cursor_.setCurrentFont();
-		// center the screen on this new position.
-		center();
+		// 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;
@@ -814,31 +694,61 @@ int BufferView::workWidth() const
 }
 
 
-void BufferView::updateOffsetRef()
+void BufferView::showCursor()
 {
-	// No need to update d->offset_ref_ in this case.
-	if (!d->need_centering_)
-		return;
-
 	// We are not properly started yet, delay until resizing is
 	// done.
 	if (height_ == 0)
 		return;
 
+	LYXERR(Debug::SCROLLING, "recentering!");
+
 	CursorSlice & bot = d->cursor_.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 = d->cursor_.bottom().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.has(bot_pit)) {
+		ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
+		int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
+		int ypos = pm.position() + offset;
+		Dimension const & row_dim = d->cursor_.textRow().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;
+	}
+
+	tm.redoParagraph(bot_pit);
+	ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
+	int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
+
+	d->anchor_pit_ = bot_pit;
+	Dimension const & row_dim = d->cursor_.textRow().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_ = offset + pm.ascent() - height_ / 2;
+
+	updateMetrics();
+	buffer_.changed();
 }
 
 
@@ -867,11 +777,6 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 	case LFUN_LABEL_INSERT:
 	case LFUN_INFO_INSERT:
 	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:
@@ -998,57 +903,33 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 }
 
 
-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 = 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;
-		}
 		break;
 
 	case LFUN_REDO:
 		cur.message(_("Redo"));
 		cur.clearSelection();
-		if (!cur.textRedo()) {
+		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(to_utf8(cmd.argument()), true);
-		break;
-
-	case LFUN_FILE_INSERT_PLAINTEXT:
-		// FIXME UNICODE
-		insertPlaintextFile(to_utf8(cmd.argument()), false);
 		break;
 
 	case LFUN_FONT_STATE:
@@ -1085,24 +966,21 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 
 			ParIterator par = b->getParFromID(id);
 			if (par == b->par_iterator_end()) {
-				LYXERR(Debug::INFO)
-					<< "No matching paragraph found! ["
-					<< id << "]." << endl;
+				LYXERR(Debug::INFO, "No matching paragraph found! [" << id << "].");
 			} else {
-				LYXERR(Debug::INFO)
-					<< "Paragraph " << par->id()
+				LYXERR(Debug::INFO, "Paragraph " << par->id()
 					<< " found in buffer `"
-					<< b->absFileName() << "'." << endl;
+					<< b->absFileName() << "'.");
 
 				if (b == &buffer_) {
 					// Set the cursor
 					setCursor(makeDocIterator(par, 0));
+					showCursor();
 				} else {
 					// Switch to other buffer view and resend cmd
 					theLyXFunc().dispatch(FuncRequest(
 						LFUN_BUFFER_SWITCH, b->absFileName()));
 					theLyXFunc().dispatch(cmd);
-					updateFlags = Update::None;
 				}
 				break;
 			}
@@ -1111,25 +989,6 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 		break;
 	}
 
-	case LFUN_OUTLINE_UP:
-		outline(OutlineUp, d->cursor_);
-		d->cursor_.text()->setCursor(d->cursor_, d->cursor_.pit(), 0);
-		updateLabels(buffer_);
-		break;
-	case LFUN_OUTLINE_DOWN:
-		outline(OutlineDown, d->cursor_);
-		d->cursor_.text()->setCursor(d->cursor_, d->cursor_.pit(), 0);
-		updateLabels(buffer_);
-		break;
-	case LFUN_OUTLINE_IN:
-		outline(OutlineIn, d->cursor_);
-		updateLabels(buffer_);
-		break;
-	case LFUN_OUTLINE_OUT:
-		outline(OutlineOut, d->cursor_);
-		updateLabels(buffer_);
-		break;
-
 	case LFUN_NOTE_NEXT:
 		gotoInset(this, NOTE_CODE, false);
 		break;
@@ -1243,7 +1102,7 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 		break;
 
 	case LFUN_SCREEN_RECENTER:
-		center();
+		showCursor();
 		break;
 
 	case LFUN_BIBTEX_DATABASE_ADD: {
@@ -1319,7 +1178,7 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 		if (inset) {
 			if (inset->isActive()) {
 				Cursor tmpcur = cur;
-				tmpcur.pushLeft(*inset);
+				tmpcur.pushBackward(*inset);
 				inset->dispatch(tmpcur, tmpcmd);
 				if (tmpcur.result().dispatched()) {
 					cur.dispatched();
@@ -1343,11 +1202,7 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 		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_);
@@ -1355,13 +1210,14 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 		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: {
+		// Those two are not ready yet for consumption.
+		return false;
+
 		cur.selHandle(true);
 		size_t initial_depth = cur.depth();
 		Point const p = getPos(cur, cur.boundary());
@@ -1374,16 +1230,17 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
 			cur.forwardInset();
 		}
 		// 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;
 		break;
 	}
 
 	default:
-		updateFlags = Update::None;
+		return false;
 	}
 
-	return updateFlags;
+	return true;
 }
 
 
@@ -1429,11 +1286,15 @@ void BufferView::resize(int width, int height)
 	width_ = width;
 	height_ = height;
 
-	updateMetrics(false);
+	// Clear the paragraph height cache.
+	d->par_height_.clear();
+
+	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);
@@ -1464,7 +1325,7 @@ Inset const * BufferView::getCoveringInset(Text const & text, int x, int y)
 
 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.
@@ -1502,23 +1363,10 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 		if (!need_redraw)
 			return;
 
-		// 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 = d->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();
-		d->metrics_info_ = ViewMetricsInfo(firstpm.first, lastpm.first, y1, y2,
-			FullScreenUpdate, buffer_.text().paragraphs().size());
-		// Reinitialize anchor to first pit.
-		d->anchor_ref_ = firstpm.first;
-		d->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;
+		LYXERR(Debug::PAINTING, "Mouse hover detected at: ("
+			<< cmd.x << ", " << cmd.y << ")");
+
+		d->update_strategy_ = DecorationUpdate;
 
 		// This event (moving without mouse click) is not passed further.
 		// This should be changed if it is further utilized.
@@ -1570,7 +1418,7 @@ void BufferView::scrollDown(int offset)
 	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_)
@@ -1582,8 +1430,8 @@ void BufferView::scrollDown(int offset)
 			break;
 		tm.newParMetricsDown();
 	}
-	d->offset_ref_ += offset;
-	updateMetrics(false);
+	d->anchor_ypos_ -= offset;
+	updateMetrics();
 	buffer_.changed();
 }
 
@@ -1594,7 +1442,7 @@ void BufferView::scrollUp(int offset)
 	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)
@@ -1606,8 +1454,8 @@ void BufferView::scrollUp(int offset)
 			break;
 		tm.newParMetricsUp();
 	}
-	d->offset_ref_ -= offset;
-	updateMetrics(false);
+	d->anchor_ypos_ += offset;
+	updateMetrics();
 	buffer_.changed();
 }
 
@@ -1632,9 +1480,9 @@ 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()) {
+		if (find(labels.begin(), labels.end(), label) != labels.end()) {
 			setCursor(it);
-			processUpdateFlags(Update::FitCursor);
+			showCursor();
 			return;
 		}
 	}
@@ -1700,7 +1548,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old)
 
 	updateLabels(buffer_);
 
-	updateMetrics(false);
+	updateMetrics();
 	buffer_.changed();
 	return true;
 }
@@ -1739,7 +1587,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 	// 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;
+	//lyxerr << "cur before " << cur <<endl;
 	DocIterator dit(cur.inset());
 	dit.push_back(cur.bottom());
 	size_t i = 1;
@@ -1747,7 +1595,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 		dit.push_back(cur[i]);
 		++i;
 	}
-	//lyxerr << "5 cur after" << dit <<std::endl;
+	//lyxerr << "5 cur after" << dit <<endl;
 
 	d->cursor_.setCursor(dit);
 	d->cursor_.boundary(cur.boundary());
@@ -1757,6 +1605,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 		d->cursor_.clearSelection();
 
 	d->cursor_.finishUndo();
+	d->cursor_.setCurrentFont();
 	return update;
 }
 
@@ -1792,13 +1641,7 @@ Cursor const & BufferView::cursor() const
 
 pit_type BufferView::anchor_ref() const
 {
-	return d->anchor_ref_;
-}
-
-
-ViewMetricsInfo const & BufferView::viewMetricsInfo()
-{
-	return d->metrics_info_;
+	return d->anchor_pit_;
 }
 
 
@@ -1820,35 +1663,21 @@ bool BufferView::singleParUpdate()
 		// the singlePar optimisation.
 		return false;
 
-	int y1 = pm.position() - pm.ascent();
-	int y2 = pm.position() + pm.descent();
-	d->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.
-		return;
-
 	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();
 
@@ -1859,124 +1688,73 @@ void BufferView::updateMetrics(bool singlepar)
 
 	TextMetrics & tm = textMetrics(&buftext);
 
-	pit_type const pit = d->anchor_ref_;
-	int pit1 = pit;
-	int pit2 = pit;
-
 	// 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_];
+	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, "Metrics: "
+		<< " anchor pit = " << d->anchor_pit_
+		<< " anchor ypos = " << d->anchor_ypos_
+		<< " y1 = " << y1
+		<< " y2 = " << y2
+		<< " pit1 = " << pit1
+		<< " pit2 = " << pit2);
 
-	LYXERR(Debug::PAINTING)
-		<< BOOST_CURRENT_FUNCTION
-		<< "\n y1: " << y1
-		<< " y2: " << y2
-		<< " pit1: " << pit1
-		<< " pit2: " << pit2
-		<< " npit: " << npit
-		<< " singlepar: 0"
-		<< endl;
-
-	d->metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2,
-		FullScreenUpdate, npit);
+	d->update_strategy_ = FullScreenUpdate;
 
 	if (lyxerr.debugging(Debug::WORKAREA)) {
-		LYXERR(Debug::WORKAREA) << "BufferView::updateMetrics" << endl;
+		LYXERR(Debug::WORKAREA, "BufferView::updateMetrics");
 		d->coord_cache_.dump();
 	}
 }
 
 
-void BufferView::menuInsertLyXFile(string const & filenm)
+void BufferView::insertLyXFile(FileName const & fname)
 {
 	BOOST_ASSERT(d->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 (FileName(trypath).isDirWritable())
-			initpath = trypath;
-
-		// FIXME UNICODE
-		FileDialog dlg(_("Select LyX document to insert"), LFUN_FILE_INSERT);
-		dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
-		dlg.setButton2(_("Examples|#E#e"),
-			from_utf8(addPath(package().system_support().absFilename(),
-			"examples")));
-
-		FileDialog::Result result =
-			dlg.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;
-		}
-	}
 
 	// 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 (buf.loadLyXFile(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");
@@ -1988,10 +1766,11 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 		res = _("Could not insert document %1$s");
 	}
 
+	updateMetrics();
+	buffer_.changed();
 	// emit message signal.
 	message(bformat(res, disp_fn));
 	buffer_.errors("Parse");
-	updateMetrics(false);
 }
 
 
@@ -2057,7 +1836,7 @@ Point BufferView::coordOffset(DocIterator const & dit, bool boundary) const
 		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());
@@ -2100,41 +1879,71 @@ Point BufferView::getPos(DocIterator const & dit, bool boundary) const
 
 void BufferView::draw(frontend::Painter & pain)
 {
+	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 = d->metrics_info_.update_strategy != SingleParUpdate;
-
-	if (pi.full_repaint)
-		// Clear background (if not delegated to rows)
-		pain.fillRectangle(0, d->metrics_info_.y1, width_,
-			d->metrics_info_.y2 - d->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 = d->text_metrics_[&text];
-	int y = d->metrics_info_.y1 + tm.parMetrics(d->metrics_info_.p1).ascent();
-	if (!pi.full_repaint)
-		tm.drawParagraph(pi, d->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(d->metrics_info_.p1).ascent() << endl;
-	if (d->metrics_info_.y1 > 0
-		&& d->metrics_info_.update_strategy == FullScreenUpdate)
-		pain.fillRectangle(0, 0, width_, d->metrics_info_.y1, 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  ***");
 
-	// and possibly grey out below
-//	lyxerr << "par descent: " << text.getPar(d->metrics_info_.p1).ascent() << endl;
-	if (d->metrics_info_.y2 < height_
-		&& d->metrics_info_.update_strategy == FullScreenUpdate)
-		pain.fillRectangle(0, d->metrics_info_.y2, width_,
-			height_ - d->metrics_info_.y2, Color_bottomarea);
+	// 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_);
 }
 
 
@@ -2145,30 +1954,22 @@ void BufferView::message(docstring const & msg)
 }
 
 
-void BufferView::showDialog(std::string const & name)
+void BufferView::showDialog(string const & name)
 {
 	if (d->gui_)
-		d->gui_->showDialog(name);
+		d->gui_->showDialog(name, string());
 }
 
 
-void BufferView::showDialogWithData(std::string const & name,
-	std::string const & data)
+void BufferView::showDialog(string const & name,
+	string const & data, Inset * inset)
 {
 	if (d->gui_)
-		d->gui_->showDialogWithData(name, data);
+		d->gui_->showDialog(name, data, inset);
 }
 
 
-void BufferView::showInsetDialog(std::string const & name,
-	std::string const & data, Inset * inset)
-{
-	if (d->gui_)
-		d->gui_->showInsetDialog(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);
@@ -2182,31 +1983,9 @@ void BufferView::setGuiDelegate(frontend::GuiBufferViewDelegate * gui)
 
 
 // FIXME: Move this out of BufferView again
-docstring BufferView::contentsOfPlaintextFile(string const & f,
-	bool asParagraph)
+docstring BufferView::contentsOfPlaintextFile(FileName const & fname)
 {
-	FileName fname(f);
-
-	if (fname.empty()) {
-		FileDialog dlg(_("Select file to insert"),
-				   ( asParagraph
-				     ? LFUN_FILE_INSERT_PLAINTEXT_PARA 
-				     : LFUN_FILE_INSERT_PLAINTEXT) );
-
-		FileDialog::Result result =
-			dlg.open(from_utf8(buffer().filePath()),
-				     FileFilterList(), docstring());
-
-		if (result.first == FileDialog::Later)
-			return docstring();
-
-		fname = makeAbsPath(to_utf8(result.second));
-
-		if (fname.empty())
-			return docstring();
-	}
-
-	if (!fs::is_readable(fname.toFilesystemEncoding())) {
+	if (!fname.isReadableFile()) {
 		docstring const error = from_ascii(strerror(errno));
 		docstring const file = makeDisplayPath(fname.absFilename(), 50);
 		docstring const text =
@@ -2216,36 +1995,16 @@ docstring BufferView::contentsOfPlaintextFile(string const & f,
 		return docstring();
 	}
 
-	ifstream ifs(fname.toFilesystemEncoding().c_str());
-	if (!ifs) {
-		docstring const error = from_ascii(strerror(errno));
+	if (!fname.isReadableFile()) {
 		docstring const file = makeDisplayPath(fname.absFilename(), 50);
 		docstring const text =
-		  bformat(_("Could not open the specified document\n"
-			    "%1$s\ndue to the error: %2$s"), file, error);
+		  bformat(_("%1$s\n is not readable."), file);
 		Alert::error(_("Could not open file"), text);
 		return docstring();
 	}
 
-	ifs.unsetf(std::ios::skipws);
-	istream_iterator<char> ii(ifs);
-	istream_iterator<char> end;
-#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
-	// We use this until the compilers get better...
-	std::vector<char> tmp;
-	copy(ii, end, back_inserter(tmp));
-	string const tmpstr(tmp.begin(), tmp.end());
-#else
-	// This is what we want to use and what we will use once the
-	// compilers get good enough.
-	//string tmpstr(ii, end); // yet a reason for using std::string
-	// alternate approach to get the file into a string:
-	string tmpstr;
-	copy(ii, end, back_inserter(tmpstr));
-#endif
-
 	// FIXME UNICODE: We don't know the encoding of the file
-	docstring file_content = from_utf8(tmpstr);
+	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"
@@ -2253,16 +2012,16 @@ docstring BufferView::contentsOfPlaintextFile(string const & f,
 			       "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 = from_local8bit(tmpstr);
+		file_content = fname.fileContents("local8bit");
 	}
 
 	return normalize_c(file_content);
 }
 
 
-void BufferView::insertPlaintextFile(string const & f, bool asParagraph)
+void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph)
 {
-	docstring const tmpstr = contentsOfPlaintextFile(f, asParagraph);
+	docstring const tmpstr = contentsOfPlaintextFile(f);
 
 	if (tmpstr.empty())
 		return;
@@ -2274,6 +2033,9 @@ void BufferView::insertPlaintextFile(string const & f, bool asParagraph)
 		cur.innerText()->insertStringAsParagraphs(cur, tmpstr);
 	else
 		cur.innerText()->insertStringAsLines(cur, tmpstr);
+
+	updateMetrics();
+	buffer_.changed();
 }
 
 } // namespace lyx