X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=d1d768ac36b652dc994091710f066efa08d17265;hb=c66d2f1ee555358a0a378bcdc9783a1306bd8990;hp=cea4268b0c0c2a8b8faa926b9a9902baa8bd2487;hpb=eb11f2c542876ad71c5bfdcc207c57a26a0eeb8b;p=lyx.git

diff --git a/src/BufferView.C b/src/BufferView.C
index cea4268b0c..d1d768ac36 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -60,9 +60,8 @@
 #include "insets/insettext.h"
 
 #include "frontends/Alert.h"
-#include "frontends/Application.h"
 #include "frontends/FileDialog.h"
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 
 #include "graphics/Previews.h"
 
@@ -79,22 +78,20 @@
 #include <vector>
 
 
-using lyx::docstring;
-using lyx::pos_type;
+namespace lyx {
 
-using lyx::support::addPath;
-using lyx::support::bformat;
-using lyx::support::FileFilterList;
-using lyx::support::fileSearch;
-using lyx::support::isDirWriteable;
-using lyx::support::makeDisplayPath;
-using lyx::support::makeAbsPath;
-using lyx::support::package;
+using support::addPath;
+using support::bformat;
+using support::FileFilterList;
+using support::fileSearch;
+using support::isDirWriteable;
+using support::makeDisplayPath;
+using support::makeAbsPath;
+using support::package;
 
 using std::distance;
 using std::endl;
 using std::istringstream;
-using std::find;
 using std::make_pair;
 using std::min;
 using std::max;
@@ -102,12 +99,10 @@ using std::mem_fun_ref;
 using std::string;
 using std::vector;
 
+namespace Alert = frontend::Alert;
 
 namespace {
 
-unsigned int const saved_positions_num = 20;
-
-
 /// Return an inset of this class if it exists at the current cursor position
 template <class T>
 T * getInsetByCode(LCursor & cur, InsetBase::Code code)
@@ -125,23 +120,12 @@ T * getInsetByCode(LCursor & cur, InsetBase::Code code)
 
 
 BufferView::BufferView()
-	: buffer_(0), wh_(0),
+	: width_(0), height_(0), buffer_(0), wh_(0),
 	  cursor_(*this),
 	  multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
 	  intl_(new Intl)
 {
 	xsel_cache_.set = false;
-
-	saved_positions.resize(saved_positions_num);
-	// load saved bookmarks
-	lyx::Session::BookmarkList & bmList = LyX::ref().session().loadBookmarks();
-	for (lyx::Session::BookmarkList::iterator bm = bmList.begin();
-		bm != bmList.end(); ++bm)
-		if (bm->get<0>() < saved_positions_num)
-			saved_positions[bm->get<0>()] = Position( bm->get<1>(), bm->get<2>(), bm->get<3>() );
-	// and then clear them
-	bmList.clear();
-
 	intl_->initKeyMapper(lyxrc.use_kbmap);
 }
 
@@ -169,7 +153,7 @@ void BufferView::setBuffer(Buffer * b)
 		buffer_->saveCursor(cursor_.selectionBegin(),
 				    cursor_.selectionEnd());
 		// current buffer is going to be switched-off, save cursor pos
-		LyX::ref().session().saveFilePosition(buffer_->fileName(),
+		LyX::ref().session().lastFilePos().save(buffer_->fileName(),
 			boost::tie(cursor_.pit(), cursor_.pos()) );
 	}
 
@@ -185,7 +169,7 @@ void BufferView::setBuffer(Buffer * b)
 		lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
 				    << " No Buffer!" << endl;
 		// We are closing the buffer, use the first buffer as current
-		buffer_ = theApp->bufferList().first();
+		buffer_ = theBufferList().first();
 	} else {
 		// Set current buffer
 		buffer_ = b;
@@ -215,8 +199,8 @@ void BufferView::setBuffer(Buffer * b)
 
 	update();
 
-	if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
-		lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
+	if (buffer_ && graphics::Previews::status() != LyXRC::PREVIEW_OFF)
+		graphics::Previews::get().generateBufferPreviews(*buffer_);
 }
 
 
@@ -232,7 +216,7 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 		s = filename;
 
 	// File already open?
-	if (theApp->bufferList().exists(s)) {
+	if (theBufferList().exists(s)) {
 		docstring const file = makeDisplayPath(s, 20);
 		docstring text = bformat(_("The document %1$s is already "
 						     "loaded.\n\nDo you want to revert "
@@ -241,27 +225,28 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 			text, 0, 1,  _("&Revert"), _("&Switch to document"));
 
 		if (ret != 0) {
-			setBuffer(theApp->bufferList().getBuffer(s));
+			setBuffer(theBufferList().getBuffer(s));
 			return true;
 		}
 		// FIXME: should be LFUN_REVERT
-		if (!theApp->bufferList().close(theApp->bufferList().getBuffer(s), false))
+		if (!theBufferList().close(theBufferList().getBuffer(s), false))
 			return false;
 		// Fall through to new load. (Asger)
+		buffer_ = 0;
 	}
 
 	Buffer * b = 0;
 
 	if (found) {
-		b = theApp->bufferList().newBuffer(s);
-		if (!::loadLyXFile(b, s)) {
-			theApp->bufferList().release(b);
+		b = theBufferList().newBuffer(s);
+		if (!lyx::loadLyXFile(b, s)) {
+			theBufferList().release(b);
 			return false;
 		}
 	} else {
 		docstring text = bformat(_("The document %1$s does not yet "
 						     "exist.\n\nDo you want to create "
-						     "a new document?"), lyx::from_utf8(s));
+						     "a new document?"), from_utf8(s));
 		int const ret = Alert::prompt(_("Create new document?"),
 			 text, 0, 1, _("&Create"), _("Cancel"));
 
@@ -279,9 +264,9 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 
 	// scroll to the position when the file was last closed
 	if (lyxrc.use_lastfilepos) {
-		lyx::pit_type pit;
-		lyx::pos_type pos;
-		boost::tie(pit, pos) = LyX::ref().session().loadFilePosition(s);
+		pit_type pit;
+		pos_type pos;
+		boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(s);
 		// I am not sure how to separate the following part to a function
 		// so I will leave this to Lars.
 		//
@@ -300,7 +285,7 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 	}
 
 	if (tolastfiles)
-		LyX::ref().session().addLastFile(b->fileName());
+		LyX::ref().session().lastFiles().add(b->fileName());
 
 	return true;
 }
@@ -309,7 +294,7 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 void BufferView::reload()
 {
 	string const fn = buffer_->fileName();
-	if (theApp->bufferList().close(buffer_, false))
+	if (theBufferList().close(buffer_, false))
 		loadLyXFile(fn);
 }
 
@@ -330,10 +315,11 @@ void BufferView::resize()
 bool BufferView::fitCursor()
 {
 	if (bv_funcs::status(this, cursor_) == bv_funcs::CUR_INSIDE) {
-		LyXFont const font = cursor_.getFont();
-		int const asc = font_metrics::maxAscent(font);
-		int const des = font_metrics::maxDescent(font);
-		Point const p = bv_funcs::getPos(cursor_, cursor_.boundary());
+		frontend::FontMetrics const & fm =
+			theFontMetrics(cursor_.getFont());
+		int const asc = fm.maxAscent();
+		int const des = fm.maxDescent();
+		Point const p = bv_funcs::getPos(*this, cursor_, cursor_.boundary());
 		if (p.y_ - asc >= 0 && p.y_ + des < height_)
 			return false;
 	}
@@ -353,7 +339,7 @@ bool BufferView::multiParSel()
 }
 
 
-bool BufferView::update(Update::flags flags)
+std::pair<bool, bool> BufferView::update(Update::flags flags)
 {
 	// This is close to a hot-path.
 	if (lyxerr.debugging(Debug::DEBUG)) {
@@ -367,20 +353,40 @@ bool BufferView::update(Update::flags flags)
 
 	// Check needed to survive LyX startup
 	if (!buffer_)
-		return false;
+		return make_pair(false, false);
+
+	if (lyxerr.debugging(Debug::WORKAREA)) {
+		lyxerr[Debug::WORKAREA] << "BufferView::update" << std::endl;
+	}
 
 	// Update macro store
 	buffer_->buildMacros();
 
-	// First drawing step
-	updateMetrics(flags & Update::SinglePar);
-
+	// Now do the first drawing step if needed. This consists on updating
+	// the CoordCache in updateMetrics().
 	// The second drawing step is done in WorkArea::redraw() if needed.
-	bool const need_second_step =
-		(flags & (Update::Force | Update::FitCursor | Update::MultiParSel))
-		&& (fitCursor() || multiParSel());
 
-	return need_second_step;
+	// Case when no explicit update is requested.
+	if (!(flags & (Update::SinglePar | Update::Force))) {
+		if (fitCursor() || multiParSel()) {
+			// a CoordCache update is needed
+			updateMetrics(false);
+			// tell the frontend to update the screen.
+			return make_pair(true, false);
+		}
+		// no need to do anything.
+		return make_pair(false, false);
+	}
+
+	// We are now in the case (Update::SinglePar | Update::Force)
+	bool single_par = flags & Update::SinglePar;
+	updateMetrics(single_par);
+
+	// Don't forget to do check for fitCursor() and multiParSel().
+	fitCursor();
+	multiParSel();
+
+	return make_pair(true, single_par);
 }
 
 
@@ -400,11 +406,13 @@ void BufferView::updateScrollbar()
 		offset_ref_ = 0;
 	}
 
-	lyxerr[Debug::GUI]
-		<< BOOST_CURRENT_FUNCTION
-		<< " Updating scrollbar: height: " << t.paragraphs().size()
-		<< " curr par: " << cursor_.bottom().pit()
-		<< " default height " << defaultRowHeight() << endl;
+	if (lyxerr.debugging(Debug::GUI)) {
+		lyxerr[Debug::GUI]
+			<< BOOST_CURRENT_FUNCTION
+			<< " Updating scrollbar: height: " << t.paragraphs().size()
+			<< " curr par: " << cursor_.bottom().pit()
+			<< " default height " << defaultRowHeight() << endl;
+	}
 
 	// It would be better to fix the scrollbar to understand
 	// values in [0..1] and divide everything by wh
@@ -423,18 +431,21 @@ void BufferView::updateScrollbar()
 	// Look at paragraph heights on-screen
 	int sumh = 0;
 	int nh = 0;
-	for (lyx::pit_type pit = anchor_ref_; pit <= parsize; ++pit) {
+	for (pit_type pit = anchor_ref_; pit <= parsize; ++pit) {
 		if (sumh > height_)
 			break;
 		int const h2 = t.getPar(pit).height();
 		sumh += h2;
 		nh++;
 	}
+
+	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));
@@ -462,7 +473,7 @@ void BufferView::scrollDocView(int value)
 	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_);
+	t.redoParagraph(*this, anchor_ref_);
 	int const h = t.getPar(anchor_ref_).height();
 	offset_ref_ = int((bar * t.paragraphs().size() - anchor_ref_) * h);
 }
@@ -489,7 +500,7 @@ void BufferView::setCursorFromScrollbar()
 		cur.clearSelection();
 		break;
 	case bv_funcs::CUR_INSIDE:
-		int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
+		int const y = bv_funcs::getPos(*this, cur, cur.boundary()).y_;
 		int const newy = min(last, max(y, first));
 		if (y != newy) {
 			cur.reset(buffer_->inset());
@@ -499,7 +510,7 @@ void BufferView::setCursorFromScrollbar()
 }
 
 
-Change const BufferView::getCurrentChange()
+Change const BufferView::getCurrentChange() const
 {
 	if (!cursor_.selection())
 		return Change(Change::UNCHANGED);
@@ -509,73 +520,31 @@ Change const BufferView::getCurrentChange()
 }
 
 
-void BufferView::savePosition(unsigned int i)
+void BufferView::saveBookmark(bool persistent)
 {
-	if (i >= saved_positions_num)
-		return;
-	BOOST_ASSERT(cursor_.inTexted());
-	saved_positions[i] = Position(buffer_->fileName(),
-				      cursor_.paragraph().id(),
-				      cursor_.pos());
-	if (i > 0)
+	LyX::ref().session().bookmarks().save(
+		buffer_->fileName(),
+		cursor_.paragraph().id(),
+		cursor_.pos(),
+		persistent
+	);
+	if (persistent)
 		// emit message signal.
-		message(bformat(_("Saved bookmark %1$d"), i));
+		message(_("Save bookmark"));
 }
 
 
-void BufferView::restorePosition(unsigned int i)
+void BufferView::moveToPosition(int par_id, pos_type par_pos)
 {
-	if (i >= saved_positions_num)
-		return;
-
-	string const fname = saved_positions[i].filename;
-
 	cursor_.clearSelection();
 
-	if (fname != buffer_->fileName()) {
-		Buffer * b = 0;
-		if (theApp->bufferList().exists(fname))
-			b = theApp->bufferList().getBuffer(fname);
-		else {
-			b = theApp->bufferList().newBuffer(fname);
-			// Don't ask, just load it
-			::loadLyXFile(b, fname);
-		}
-		if (b)
-			setBuffer(b);
-	}
-
-	ParIterator par = buffer_->getParFromID(saved_positions[i].par_id);
+	ParIterator par = buffer_->getParFromID(par_id);
 	if (par == buffer_->par_iterator_end())
 		return;
 
-	setCursor(makeDocIterator(par, min(par->size(), saved_positions[i].par_pos)));
-
-	if (i > 0)
-		// emit message signal.
-		message(bformat(_("Moved to bookmark %1$d"), i));
-}
-
-
-bool BufferView::isSavedPosition(unsigned int i)
-{
-	return i < saved_positions_num && !saved_positions[i].filename.empty();
+	setCursor(makeDocIterator(par, min(par->size(), par_pos)));
 }
 
-void BufferView::saveSavedPositions()
-{
-	// save bookmarks. It is better to use the pit interface
-	// but I do not know how to effectively convert between
-	// par_id and pit.
-	for (unsigned int i=1; i < saved_positions_num; ++i) {
-		if ( isSavedPosition(i) )
-			LyX::ref().session().saveBookmark( boost::tie(
-				i,
-				saved_positions[i].filename,
-				saved_positions[i].par_id,
-				saved_positions[i].par_pos) );
-	}
-}
 
 void BufferView::switchKeyMap()
 {
@@ -601,11 +570,11 @@ int BufferView::workWidth() const
 void BufferView::center()
 {
 	CursorSlice & bot = cursor_.bottom();
-	lyx::pit_type const pit = bot.pit();
-	bot.text()->redoParagraph(pit);
+	pit_type const pit = bot.pit();
+	bot.text()->redoParagraph(*this, pit);
 	Paragraph const & par = bot.text()->paragraphs()[pit];
 	anchor_ref_ = pit;
-	offset_ref_ = bv_funcs::coordOffset(cursor_, cursor_.boundary()).y_
+	offset_ref_ = bv_funcs::coordOffset(*this, cursor_, cursor_.boundary()).y_
 		+ par.ascent() - height_ / 2;
 }
 
@@ -658,10 +627,6 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 		break;
 	}
 
-	case LFUN_BOOKMARK_GOTO:
-		flag.enabled(isSavedPosition(convert<unsigned int>(lyx::to_utf8(cmd.argument()))));
-		break;
-
 	case LFUN_CHANGES_TRACK:
 		flag.enabled(true);
 		flag.setOnOff(buffer_->params().trackChanges);
@@ -703,7 +668,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 	// Make sure that the cached BufferView is correct.
 	lyxerr[Debug::ACTION] << BOOST_CURRENT_FUNCTION
 		<< " action[" << cmd.action << ']'
-		<< " arg[" << lyx::to_utf8(cmd.argument()) << ']'
+		<< " arg[" << to_utf8(cmd.argument()) << ']'
 		<< " x[" << cmd.x << ']'
 		<< " y[" << cmd.y << ']'
 		<< " button[" << cmd.button() << ']'
@@ -737,40 +702,37 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 
 	case LFUN_FILE_INSERT:
 		// FIXME: We don't know the encoding of filenames
-		menuInsertLyXFile(lyx::to_utf8(cmd.argument()));
+		menuInsertLyXFile(to_utf8(cmd.argument()));
 		break;
 
 	case LFUN_FILE_INSERT_ASCII_PARA:
 		// FIXME: We don't know the encoding of filenames
-		insertAsciiFile(this, lyx::to_utf8(cmd.argument()), true);
+		insertAsciiFile(this, to_utf8(cmd.argument()), true);
 		break;
 
 	case LFUN_FILE_INSERT_ASCII:
 		// FIXME: We don't know the encoding of filenames
-		insertAsciiFile(this, lyx::to_utf8(cmd.argument()), false);
+		insertAsciiFile(this, to_utf8(cmd.argument()), false);
 		break;
 
 	case LFUN_FONT_STATE:
-		cur.message(lyx::from_utf8(cur.currentState()));
+		cur.message(from_utf8(cur.currentState()));
 		break;
 
 	case LFUN_BOOKMARK_SAVE:
-		savePosition(convert<unsigned int>(lyx::to_utf8(cmd.argument())));
-		break;
-
-	case LFUN_BOOKMARK_GOTO:
-		restorePosition(convert<unsigned int>(lyx::to_utf8(cmd.argument())));
+		saveBookmark(convert<unsigned int>(to_utf8(cmd.argument())));
 		break;
 
 	case LFUN_LABEL_GOTO: {
-		string label = lyx::to_utf8(cmd.argument());
+		docstring label = cmd.argument();
 		if (label.empty()) {
 			InsetRef * inset =
 				getInsetByCode<InsetRef>(cursor_,
 							 InsetBase::REF_CODE);
 			if (inset) {
-				label = inset->getContents();
-				savePosition(0);
+				label = inset->getParam("reference");
+				// persistent=false: use temp_bookmark
+				saveBookmark(false);
 			}
 		}
 
@@ -780,41 +742,54 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 	}
 
 	case LFUN_PARAGRAPH_GOTO: {
-		int const id = convert<int>(lyx::to_utf8(cmd.argument()));
-		ParIterator par = buffer_->getParFromID(id);
-		if (par == buffer_->par_iterator_end()) {
-			lyxerr[Debug::INFO] << "No matching paragraph found! ["
-					    << id << ']' << endl;
-			break;
-		} else {
-			lyxerr[Debug::INFO] << "Paragraph " << par->id()
-					    << " found." << endl;
+		int const id = convert<int>(to_utf8(cmd.argument()));
+		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;
+			} else {
+				lyxerr[Debug::INFO]
+					<< "Paragraph " << par->id()
+					<< " found in buffer `"
+					<< b->fileName() << "'." << endl;
+
+				if (b == buffer_) {
+					// Set the cursor
+					setCursor(makeDocIterator(par, 0));
+					update();
+					switchKeyMap();
+				} else {
+					// Switch to other buffer view and resend cmd
+					theLyXFunc().dispatch(FuncRequest(
+						LFUN_BUFFER_SWITCH, b->fileName()));
+					theLyXFunc().dispatch(cmd);
+				}
+				break;
+			}
+			++i;
 		}
-
-		// Set the cursor
-		setCursor(makeDocIterator(par, 0));
-
-		update();
-		switchKeyMap();
 		break;
 	}
 
 	case LFUN_OUTLINE_UP:
-		lyx::toc::outline(lyx::toc::Up, cursor_);
+		toc::outline(toc::Up, cursor_);
 		cursor_.text()->setCursor(cursor_, cursor_.pit(), 0);
 		updateLabels(*buffer_);
 		break;
 	case LFUN_OUTLINE_DOWN:
-		lyx::toc::outline(lyx::toc::Down, cursor_);
+		toc::outline(toc::Down, cursor_);
 		cursor_.text()->setCursor(cursor_, cursor_.pit(), 0);
 		updateLabels(*buffer_);
 		break;
 	case LFUN_OUTLINE_IN:
-		lyx::toc::outline(lyx::toc::In, cursor_);
+		toc::outline(toc::In, cursor_);
 		updateLabels(*buffer_);
 		break;
 	case LFUN_OUTLINE_OUT:
-		lyx::toc::outline(lyx::toc::Out, cursor_);
+		toc::outline(toc::Out, cursor_);
 		updateLabels(*buffer_);
 		break;
 
@@ -840,11 +815,11 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 	}
 
 	case LFUN_CHANGE_NEXT:
-		lyx::find::findNextChange(this);
+		findNextChange(this);
 		break;
 
 	case LFUN_CHANGES_MERGE:
-		if (lyx::find::findNextChange(this))
+		if (findNextChange(this))
 			showDialog("changes");
 		break;
 
@@ -853,7 +828,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 #ifdef WITH_WARNINGS
 #warning FIXME changes
 #endif
-		while (lyx::find::findNextChange(this))
+		while (findNextChange(this))
 			getLyXText()->acceptChange(cursor_);
 		update();
 		break;
@@ -864,40 +839,40 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 #ifdef WITH_WARNINGS
 #warning FIXME changes
 #endif
-		while (lyx::find::findNextChange(this))
+		while (findNextChange(this))
 			getLyXText()->rejectChange(cursor_);
 		break;
 	}
 
 	case LFUN_WORD_FIND:
-		lyx::find::find(this, cmd);
+		find(this, cmd);
 		break;
 
 	case LFUN_WORD_REPLACE:
-		lyx::find::replace(this, cmd);
+		replace(this, cmd);
 		break;
 
 	case LFUN_MARK_OFF:
 		cur.clearSelection();
 		cur.resetAnchor();
-		cur.message(lyx::from_utf8(N_("Mark off")));
+		cur.message(from_utf8(N_("Mark off")));
 		break;
 
 	case LFUN_MARK_ON:
 		cur.clearSelection();
 		cur.mark() = true;
 		cur.resetAnchor();
-		cur.message(lyx::from_utf8(N_("Mark on")));
+		cur.message(from_utf8(N_("Mark on")));
 		break;
 
 	case LFUN_MARK_TOGGLE:
 		cur.clearSelection();
 		if (cur.mark()) {
 			cur.mark() = false;
-			cur.message(lyx::from_utf8(N_("Mark removed")));
+			cur.message(from_utf8(N_("Mark removed")));
 		} else {
 			cur.mark() = true;
-			cur.message(lyx::from_utf8(N_("Mark set")));
+			cur.message(from_utf8(N_("Mark set")));
 		}
 		cur.resetAnchor();
 		break;
@@ -912,7 +887,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 		InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
 						InsetBase::BIBTEX_CODE);
 		if (inset) {
-			if (inset->addDatabase(lyx::to_utf8(cmd.argument())))
+			if (inset->addDatabase(to_utf8(cmd.argument())))
 				buffer_->updateBibfilesCache();
 		}
 		break;
@@ -924,7 +899,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 		InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
 						InsetBase::BIBTEX_CODE);
 		if (inset) {
-			if (inset->delDatabase(lyx::to_utf8(cmd.argument())))
+			if (inset->delDatabase(to_utf8(cmd.argument())))
 				buffer_->updateBibfilesCache();
 		}
 		break;
@@ -1040,17 +1015,14 @@ void BufferView::workAreaResize(int width, int height)
 	width_ = width;
 	height_ = height;
 
-	if (buffer_ && widthChange) {
-		// The WorkArea content needs a resize
+	if (buffer_)
 		resize();
-	}
 
-	if (widthChange || heightChange)
-		update();
+	update();
 }
 
 
-bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
+std::pair<bool, bool> BufferView::workAreaDispatch(FuncRequest const & cmd0)
 {
 	//lyxerr << BOOST_CURRENT_FUNCTION << "[ cmd0 " << cmd0 << "]" << endl;
 
@@ -1058,26 +1030,21 @@ bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
 	// LFUN_FILE_OPEN generated by drag-and-drop.
 	FuncRequest cmd = cmd0;
 
+	// E.g. Qt mouse press when no buffer
 	if (!buffer_)
-		return false;
+		return make_pair(false, false);
 
 	LCursor cur(*this);
 	cur.push(buffer_->inset());
 	cur.selection() = cursor_.selection();
 
-	// Doesn't go through lyxfunc, so we need to update
-	// the layout choice etc. ourselves
-
-	// E.g. Qt mouse press when no buffer
-	if (!buffer_)
-		return false;
-
 	// Either the inset under the cursor or the
 	// surrounding LyXText will handle this event.
 
 	// Build temporary cursor.
 	cmd.y = min(max(cmd.y, -1), height_);
 	InsetBase * inset = buffer_->text().editXY(cur, cmd.x, cmd.y);
+
 	//lyxerr << BOOST_CURRENT_FUNCTION
 	//       << " * hit inset at tip: " << inset << endl;
 	//lyxerr << BOOST_CURRENT_FUNCTION
@@ -1090,27 +1057,25 @@ bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
 	// 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())
 		cur.dispatch(cmd);
 
-	if (cur.result().dispatched()) {
-		// Redraw if requested or necessary.
-		if (cur.result().update())
-			update(Update::FitCursor | Update::Force);
-		else
-			update(Update::FitCursor | Update::MultiParSel);
-	}
+	// Redraw if requested and necessary.
+	if (cur.result().dispatched() && cur.result().update())
+		return update(cur.result().update());
 
-	return true;
+	// When the above and the inner function are fixed, we can do this:
+	return make_pair(false, false);
 }
 
 
-void BufferView::scroll(int lines)
+void BufferView::scroll(int /*lines*/)
 {
 //	if (!buffer_)
 //		return;
@@ -1146,12 +1111,12 @@ void BufferView::setCursorFromRow(int row)
 }
 
 
-void BufferView::gotoLabel(string const & label)
+void BufferView::gotoLabel(docstring const & label)
 {
 	for (InsetIterator it = inset_iterator_begin(buffer_->inset()); it; ++it) {
-		vector<string> labels;
+		vector<docstring> labels;
 		it->getLabelList(*buffer_, labels);
-		if (find(labels.begin(),labels.end(),label) != labels.end()) {
+		if (std::find(labels.begin(), labels.end(), label) != labels.end()) {
 			setCursor(it);
 			update();
 			return;
@@ -1244,7 +1209,7 @@ LCursor const & BufferView::cursor() const
 }
 
 
-lyx::pit_type BufferView::anchor_ref() const
+pit_type BufferView::anchor_ref() const
 {
 	return anchor_ref_;
 }
@@ -1258,17 +1223,19 @@ ViewMetricsInfo const & BufferView::viewMetricsInfo()
 
 void BufferView::updateMetrics(bool singlepar)
 {
-	// Remove old position cache
-	theCoords.clear();
+	// Clear out the position cache in case of full screen redraw.
+	if (!singlepar)
+		coord_cache_.clear();
+
 	LyXText & buftext = buffer_->text();
-	lyx::pit_type size = int(buftext.paragraphs().size());
+	pit_type size = int(buftext.paragraphs().size());
 
 	if (anchor_ref_ > int(buftext.paragraphs().size() - 1)) {
 		anchor_ref_ = int(buftext.paragraphs().size() - 1);
 		offset_ref_ = 0;
 	}
 
-	lyx::pit_type const pit = anchor_ref_;
+	pit_type const pit = anchor_ref_;
 	int pit1 = pit;
 	int pit2 = pit;
 	size_t const npit = buftext.paragraphs().size();
@@ -1278,7 +1245,7 @@ void BufferView::updateMetrics(bool singlepar)
 	// (if this paragraph contains insets etc., rebreaking will
 	// recursively descend)
 	if (!singlepar || pit == cursor_.bottom().pit())
-		buftext.redoParagraph(pit);
+		buftext.redoParagraph(*this, pit);
 	int y0 = buftext.getPar(pit).ascent() - offset_ref_;
 
 	// Redo paragraphs above anchor if necessary; again, in Single Par
@@ -1288,7 +1255,7 @@ void BufferView::updateMetrics(bool singlepar)
 		y1 -= buftext.getPar(pit1).ascent();
 		--pit1;
 		if (!singlepar || pit1 == cursor_.bottom().pit())
-			buftext.redoParagraph(pit1);
+			buftext.redoParagraph(*this, pit1);
 		y1 -= buftext.getPar(pit1).descent();
 	}
 
@@ -1314,7 +1281,7 @@ void BufferView::updateMetrics(bool singlepar)
 		y2 += buftext.getPar(pit2).descent();
 		++pit2;
 		if (!singlepar || pit2 == cursor_.bottom().pit())
-			buftext.redoParagraph(pit2);
+			buftext.redoParagraph(*this, pit2);
 		y2 += buftext.getPar(pit2).ascent();
 	}
 
@@ -1323,8 +1290,8 @@ void BufferView::updateMetrics(bool singlepar)
 
 	// The coordinates of all these paragraphs are correct, cache them
 	int y = y1;
-	CoordCache::InnerParPosCache & parPos = theCoords.parPos()[&buftext];
-	for (lyx::pit_type pit = pit1; pit <= pit2; ++pit) {
+	CoordCache::InnerParPosCache & parPos = coord_cache_.parPos()[&buftext];
+	for (pit_type pit = pit1; pit <= pit2; ++pit) {
 		Paragraph const & par = buftext.getPar(pit);
 		y += par.ascent();
 		parPos[pit] = Point(0, y);
@@ -1355,6 +1322,11 @@ void BufferView::updateMetrics(bool singlepar)
 		<< endl;
 
 	metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
+
+	if (lyxerr.debugging(Debug::WORKAREA)) {
+		lyxerr[Debug::WORKAREA] << "BufferView::updateMetrics" << endl;
+		coord_cache_.dump();
+	}
 }
 
 
@@ -1365,6 +1337,7 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 
 	if (filename.empty()) {
 		// Launch a file browser
+		// FIXME UNICODE
 		string initpath = lyxrc.document_path;
 
 		if (buffer_) {
@@ -1374,22 +1347,22 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 				initpath = trypath;
 		}
 
-		FileDialog fileDlg(lyx::to_utf8(_("Select LyX document to insert")),
+		// FIXME UNICODE
+		FileDialog fileDlg(_("Select LyX document to insert"),
 			LFUN_FILE_INSERT,
-			make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
-				  string(lyxrc.document_path)),
-			make_pair(string(lyx::to_utf8(_("Examples|#E#e"))),
-				  string(addPath(package().system_support(), "examples"))));
+			make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
+			make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support(), "examples"))));
 
 		FileDialog::Result result =
-			fileDlg.open(initpath,
-				     FileFilterList(lyx::to_utf8(_("LyX Documents (*.lyx)"))),
-				     string());
+			fileDlg.open(from_utf8(initpath),
+				     FileFilterList(_("LyX Documents (*.lyx)")),
+				     docstring());
 
 		if (result.first == FileDialog::Later)
 			return;
 
-		filename = result.second;
+		// FIXME UNICODE
+		filename = to_utf8(result.second);
 
 		// check selected filename
 		if (filename.empty()) {
@@ -1409,11 +1382,12 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 
 	docstring res;
 	Buffer buf("", false);
-	if (::loadLyXFile(&buf, makeAbsPath(filename))) {
+	if (lyx::loadLyXFile(&buf, makeAbsPath(filename))) {
 		ErrorList & el = buffer_->errorList("Parse");
 		// Copy the inserted document error list into the current buffer one.
 		el = buf.errorList("Parse");
-		lyx::cap::pasteParagraphList(cursor_, buf.paragraphs(),
+		recordUndo(cursor_);
+		cap::pasteParagraphList(cursor_, buf.paragraphs(),
 					     buf.params().textclass, el);
 		res = _("Document %1$s inserted.");
 	} else
@@ -1424,3 +1398,6 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 	buffer_->errors("Parse");
 	resize();
 }
+
+
+} // namespace lyx