X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=49aca6c6ab76e0df0a8f8f61d96c2fd927bee97b;hb=31b56dac8042735f75229ad480b3e98531c181ff;hp=66fd7fc5356cd9e988c76c1b30c6da5596b43229;hpb=ee7a1321a7e1538db895c77307a8dc021248f315;p=lyx.git

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 66fd7fc535..49aca6c6ab 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -64,6 +64,7 @@ extern int greek_kb_flag;
 
 using std::vector;
 using std::find_if;
+using std::find;
 using std::pair;
 using std::endl;
 using std::make_pair;
@@ -81,10 +82,10 @@ extern bool math_insert_greek(BufferView *, char);
 extern void sigchldhandler(pid_t pid, int * status);
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
-const unsigned int saved_positions_num = 20;
-
 namespace {
 
+const unsigned int saved_positions_num = 20;
+
 inline
 void waitForX()
 {
@@ -112,7 +113,8 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 	     int xpos, int ypos, int width, int height)
 	: bv_(b), owner_(o), buffer_(0),
 	  current_scrollbar_value(0), cursor_timeout(400),
-	  workarea_(xpos, ypos, width, height), using_xterm_cursor(false)
+	  workarea_(xpos, ypos, width, height), using_xterm_cursor(false),
+	  inset_slept(false)
 {
 	// Setup the signals
 	workarea_.scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
@@ -138,10 +140,8 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 	
 	cursor_timeout.timeout.connect(slot(this,
 					    &BufferView::Pimpl::cursorToggle));
-	//current_scrollbar_value = 0;
 	cursor_timeout.start();
 	workarea_.setFocus();
-	//using_xterm_cursor = false;
 	saved_positions.resize(saved_positions_num);
 }
 
@@ -157,7 +157,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
 			    << b << ")" << endl;
 	if (buffer_) {
-		bv_->insetSleep();
+		insetSleep();
 		buffer_->delUser(bv_);
 
 		// Put the old text into the TextCache, but
@@ -203,7 +203,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 		// require bv_->text.
 		owner_->getDialogs()->updateBufferDependent(true);
 		redraw();
-		bv_->insetWakeup();
+		insetWakeup();
 	} else {
 		lyxerr[Debug::INFO] << "  No Buffer!" << endl;
 		owner_->updateMenubar();
@@ -291,12 +291,12 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 	if (bv_->text) {
 		par = bv_->text->cursor.par();
 		pos = bv_->text->cursor.pos();
-		selstartpar = bv_->text->sel_start_cursor.par();
-		selstartpos = bv_->text->sel_start_cursor.pos();
-		selendpar = bv_->text->sel_end_cursor.par();
-		selendpos = bv_->text->sel_end_cursor.pos();
-		selection = bv_->text->selection;
-		mark_set = bv_->text->mark_set;
+		selstartpar = bv_->text->selection.start.par();
+		selstartpos = bv_->text->selection.start.pos();
+		selendpar = bv_->text->selection.end.par();
+		selendpos = bv_->text->selection.end.pos();
+		selection = bv_->text->selection.set();
+		mark_set = bv_->text->selection.mark();
 		the_locking_inset = bv_->text->the_locking_inset;
 		delete bv_->text;
 		bv_->text = new LyXText(bv_);
@@ -320,20 +320,20 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 	updateScreen();
 
 	if (par) {
-		bv_->text->selection = true;
+		bv_->text->selection.set(true);
 		/* at this point just to avoid the Delete-Empty-Paragraph
 		 * Mechanism when setting the cursor */
-		bv_->text->mark_set = mark_set;
+		bv_->text->selection.mark(mark_set);
 		if (selection) {
 			bv_->text->SetCursor(bv_, selstartpar, selstartpos);
-			bv_->text->sel_cursor = bv_->text->cursor;
+			bv_->text->selection.cursor = bv_->text->cursor;
 			bv_->text->SetCursor(bv_, selendpar, selendpos);
 			bv_->text->SetSelection(bv_);
 			bv_->text->SetCursor(bv_, par, pos);
 		} else {
 			bv_->text->SetCursor(bv_, par, pos);
-			bv_->text->sel_cursor = bv_->text->cursor;
-			bv_->text->selection = false;
+			bv_->text->selection.cursor = bv_->text->cursor;
+			bv_->text->selection.set(false);
 		}
 		// remake the inset locking
 		bv_->text->the_locking_inset = the_locking_inset;
@@ -344,7 +344,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 	updateScrollbar();
 	redraw();
 
-	bv_->setState();
+	setState();
 	AllowInput(bv_);
 
 	/// get rid of the splash screen if it's not gone already
@@ -367,58 +367,41 @@ void BufferView::Pimpl::updateScrollbar()
 	 * maximum must be the working area height. No scrolling will 
 	 * be possible */
 
-	if (!buffer_) {
+	if (!bv_->text) {
 		workarea_.setScrollbar(0, 1.0);
 		return;
 	}
-	
-	static unsigned long max2 = 0;
-	static unsigned long height2 = 0;
 
-	unsigned long cbth = 0;
-	long cbsf = 0;
-
-	if (bv_->text) {
-		cbth = bv_->text->height;
-		cbsf = bv_->text->first;
-	}
+	static unsigned long text_height;
+	static unsigned long work_height;
 
+	unsigned long const tmp_text_height = bv_->text->height;
+	long const tmp_scrollbar_value = bv_->text->first;
+	
 	// check if anything has changed.
-	if (max2 == cbth &&
-	    height2 == workarea_.height() &&
-	    current_scrollbar_value == cbsf)
+	if (text_height == tmp_text_height
+	    && work_height == workarea_.height()
+	    && current_scrollbar_value == tmp_scrollbar_value)
 		return; // no
-	max2 = cbth;
-	height2 = workarea_.height();
-	current_scrollbar_value = cbsf;
 
-	if (cbth <= height2) { // text is smaller than screen
-		workarea_.setScrollbar(0, 1.0); // right?
+	// update values
+	text_height = tmp_text_height;
+	work_height = workarea_.height();
+	current_scrollbar_value = tmp_scrollbar_value;
+
+	long const height_diff = text_height - work_height;
+	
+	if (height_diff <= 0) {
+		workarea_.setScrollbar(0, 1.0);
 		return;
 	}
 
-	long maximum_height = workarea_.height() * 3 / 4 + cbth;
-	long value = cbsf;
-
-	// set the scrollbar
-	double hfloat = workarea_.height();
-	double maxfloat = maximum_height;
-
-	float slider_size = 0.0;
-	int slider_value = value;
-
-	workarea_.setScrollbarBounds(0, bv_->text->height - workarea_.height());
+	
+	workarea_.setScrollbarBounds(0, height_diff);
 	double const lineh = bv_->text->DefaultHeight();
 	workarea_.setScrollbarIncrements(lineh);
-	if (maxfloat > 0.0) {
-		if ((hfloat / maxfloat) * float(height2) < 3)
-			slider_size = 3.0/float(height2);
-		else
-			slider_size = hfloat / maxfloat;
-	} else
-		slider_size = hfloat;
-
-	workarea_.setScrollbar(slider_value, slider_size / workarea_.height());
+	double const slider_size = 1.0 / double(height_diff) ;
+	workarea_.setScrollbar(current_scrollbar_value, slider_size);
 }
 
 
@@ -491,7 +474,7 @@ int BufferView::Pimpl::scrollDown(long time)
    
 	double value = workarea_.getScrollbarValue();
 	pair<float, float> p = workarea_.getScrollbarBounds();
-	double max = p.second;
+	double const max = p.second;
 	
 	if (value == max) return 0;
 
@@ -531,7 +514,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 	// Check for inset locking
 	if (bv_->theLockingInset()) {
 		LyXCursor cursor = bv_->text->cursor;
-		LyXFont font = bv_->text->GetFont(bv_->buffer(),
+		LyXFont font = bv_->text->GetFont(buffer_,
 						  cursor.par(), cursor.pos());
 		int width = bv_->theLockingInset()->width(bv_, font);
 		int inset_x = font.isVisibleRightToLeft()
@@ -545,8 +528,9 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 		return;
 	}
    
-	/* The test for not selection possible is needed, that only motion events are 
-	 * used, where the bottom press event was on the drawing area too */
+	/* The test for not selection possible is needed, that only motion
+	   events are used, where the bottom press event was on
+	   the drawing area too */
 	if (!selection_possible)
 		return;
  
@@ -554,7 +538,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 
 	bv_->text->SetCursorFromCoordinates(bv_, x, y + bv_->text->first);
       
-	if (!bv_->text->selection)
+	if (!bv_->text->selection.set())
 		update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
       
 	bv_->text->SetSelection(bv_);
@@ -568,9 +552,6 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 					    unsigned int button)
 {
-	last_click_x = -1;
-	last_click_y = -1;
-
 	if (!buffer_ || !screen_.get()) return;
 
 	Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button);
@@ -612,7 +593,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	// Middle button press pastes if we have a selection
 	bool paste_internally = false;
 	if (button == 2
-	    && bv_->text->selection) {
+	    && bv_->text->selection.set()) {
 		owner_->getLyXFunc()->Dispatch(LFUN_COPY);
 		paste_internally = true;
 	}
@@ -646,7 +627,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
 		bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_first);
 	bv_->text->FinishUndo();
-	bv_->text->sel_cursor = bv_->text->cursor;
+	bv_->text->selection.cursor = bv_->text->cursor;
 	bv_->text->cursor.x_fix(bv_->text->cursor.x());
 	
 	owner_->updateLayoutChoice();
@@ -711,7 +692,7 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 		screen_->HideCursor();
 		screen_->ToggleSelection(text, bv_);
 		text->CursorHome(bv_);
-		text->sel_cursor = text->cursor;
+		text->selection.cursor = text->cursor;
 		text->CursorEnd(bv_);
 		text->SetSelection(bv_);
 		screen_->ToggleSelection(text, bv_, false);
@@ -766,7 +747,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 	if (button == 2)
 		return;
 
-	bv_->setState();
+	setState();
 	owner_->showState();
 
 	// Did we hit an editable inset?
@@ -790,7 +771,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 		// ...or maybe the SetCursorParUndo()
 		// below isn't necessary at all anylonger?
 		if (inset_hit->LyxCode() == Inset::REF_CODE) {
-			bv_->text->SetCursorParUndo(bv_->buffer());
+			bv_->text->SetCursorParUndo(buffer_);
 		}
 
 		owner_->message(inset_hit->EditMessage());
@@ -862,7 +843,7 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 
 		// Check whether the inset really was hit
 		Inset * tmpinset = cursor.par()->GetInset(cursor.pos());
-		LyXFont font = text->GetFont(bv_->buffer(),
+		LyXFont font = text->GetFont(buffer_,
 						  cursor.par(), cursor.pos());
 		int const width = tmpinset->width(bv_, font);
 		int const inset_x = font.isVisibleRightToLeft()
@@ -886,7 +867,7 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 	    (cursor.par()->GetInset(cursor.pos() - 1)) &&
 	    (cursor.par()->GetInset(cursor.pos() - 1)->Editable())) {
 		Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1);
-		LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
+		LyXFont font = text->GetFont(buffer_, cursor.par(),
 						  cursor.pos()-1);
 		int const width = tmpinset->width(bv_, font);
 		int const inset_x = font.isVisibleRightToLeft()
@@ -914,8 +895,8 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 
 void BufferView::Pimpl::workAreaExpose()
 {
-	static int work_area_width = 0;
-	static unsigned int work_area_height = 0;
+	static int work_area_width;
+	static unsigned int work_area_height;
 
 	bool const widthChange = workarea_.workWidth() != work_area_width;
 	bool const heightChange = workarea_.height() != work_area_height;
@@ -1008,15 +989,15 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
 {
 	owner_->updateLayoutChoice();
 
-	if (!text->selection && (f & SELECT)) {
-		text->sel_cursor = text->cursor;
+	if (!text->selection.set() && (f & SELECT)) {
+		text->selection.cursor = text->cursor;
 	}
 
 	text->FullRebreak(bv_);
 
 	if (text->inset_owner) {
 	    text->inset_owner->SetUpdateStatus(bv_, InsetText::NONE);
-	    bv_->updateInset(text->inset_owner, true);
+	    updateInset(text->inset_owner, true);
 	} else
 	    update();
 
@@ -1041,7 +1022,7 @@ void BufferView::Pimpl::cursorToggle()
 	}
  
 	int status = 1;
-	int pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
+	int const pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
 	if (pid == -1) // error find out what is wrong
 		; // ignore it for now.
 	else if (pid > 0)
@@ -1202,19 +1183,19 @@ void BufferView::Pimpl::setState()
 
 void BufferView::Pimpl::insetSleep()
 {
-	if (bv_->theLockingInset() && !bv_->inset_slept) {
+	if (bv_->theLockingInset() && !inset_slept) {
 		bv_->theLockingInset()->GetCursorPos(bv_, bv_->slx, bv_->sly);
 		bv_->theLockingInset()->InsetUnlock(bv_);
-		bv_->inset_slept = true;
+		inset_slept = true;
 	}
 }
 
 
 void BufferView::Pimpl::insetWakeup()
 {
-	if (bv_->theLockingInset() && bv_->inset_slept) {
+	if (bv_->theLockingInset() && inset_slept) {
 		bv_->theLockingInset()->Edit(bv_, bv_->slx, bv_->sly, 0);
-		bv_->inset_slept = false;
+		inset_slept = false;
 	}
 }
 
@@ -1222,11 +1203,11 @@ void BufferView::Pimpl::insetWakeup()
 void BufferView::Pimpl::insetUnlock()
 {
 	if (bv_->theLockingInset()) {
-		if (!bv_->inset_slept)
+		if (!inset_slept)
 			bv_->theLockingInset()->InsetUnlock(bv_);
 		bv_->theLockingInset(0);
 		bv_->text->FinishUndo();
-		bv_->inset_slept = false;
+		inset_slept = false;
 	}
 }
 
@@ -1333,10 +1314,10 @@ void BufferView::Pimpl::moveCursorUpdate(bool selecting)
 {
 	LyXText * lt = bv_->getLyXText();
 	
-	if (selecting || lt->mark_set) {
+	if (selecting || lt->selection.mark()) {
 		lt->SetSelection(bv_);
 		if (lt->bv_owner)
-			bv_->toggleToggle();
+			toggleToggle();
 	}
 	update(lt, BufferView::SELECT|BufferView::FITCUR);
 	showCursor();
@@ -1344,7 +1325,7 @@ void BufferView::Pimpl::moveCursorUpdate(bool selecting)
 	/* ---> Everytime the cursor is moved, show the current font state. */
 	// should this too me moved out of this func?
 	//owner->showState();
-	bv_->setState();
+	setState();
 }
 
 
@@ -1355,8 +1336,7 @@ Inset * BufferView::Pimpl::getInsetByCode(Inset::Code code)
 		find_if(Buffer::inset_iterator(
 			cursor.par(), cursor.pos()),
 			buffer_->inset_iterator_end(),
-			lyx::compare_memfun(&Inset::LyxCode, code)
-			);
+			lyx::compare_memfun(&Inset::LyxCode, code));
 	return it != buffer_->inset_iterator_end() ? (*it) : 0;
 }
 
@@ -1445,7 +1425,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		InsetCommandParams p;
 		p.setCmdName("tableofcontents");
 		Inset * inset = new InsetTOC(p);
-		if (!bv_->insertInset(inset, "Standard", true))
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 		break;
 	}
@@ -1460,11 +1440,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_GRAPHICS:
 	{
 		Inset * new_inset = new InsetGraphics;
-		if (!bv_->insertInset(new_inset)) {
+		if (!insertInset(new_inset)) {
 			delete new_inset;
 		} else {
 			// this is need because you don't use a inset->Edit()
-			bv_->updateInset(new_inset, true);
+			updateInset(new_inset, true);
 			new_inset->Edit(bv_, 0, 0, 0);
 		}
 		break;
@@ -1501,11 +1481,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		break;
 		
 	case LFUN_GOTOERROR:
-		bv_->gotoInset(Inset::ERROR_CODE, false);
+		gotoInset(Inset::ERROR_CODE, false);
 		break;
 		
 	case LFUN_GOTONOTE:
-		bv_->gotoInset(Inset::IGNORE_CODE, false);
+		gotoInset(Inset::IGNORE_CODE, false);
 		break;
 
 	case LFUN_REFERENCE_GOTO:
@@ -1513,7 +1493,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		vector<Inset::Code> tmp;
 		tmp.push_back(Inset::LABEL_CODE);
 		tmp.push_back(Inset::REF_CODE);
-		bv_->gotoInset(tmp, true);
+		gotoInset(tmp, true);
 		break;
 	}
 
@@ -1684,7 +1664,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       | BufferView::FITCUR);
 		lt->ChangeWordCase(bv_, LyXText::text_uppercase);
 		if (lt->inset_owner)
-			bv_->updateInset(lt->inset_owner, true);
+			updateInset(lt->inset_owner, true);
 		update(lt,
 		       BufferView::SELECT
 		       | BufferView::FITCUR
@@ -1699,7 +1679,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->ChangeWordCase(bv_, LyXText::text_lowercase);
 		if (lt->inset_owner)
-			bv_->updateInset(lt->inset_owner, true);
+			updateInset(lt->inset_owner, true);
 		update(lt,
 		       BufferView::SELECT
 		       | BufferView::FITCUR
@@ -1715,7 +1695,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		lt->ChangeWordCase(bv_,
 				   LyXText::text_capitalization);
 		if (lt->inset_owner)
-			bv_->updateInset(lt->inset_owner, true);
+			updateInset(lt->inset_owner, true);
 		update(lt,
 		       BufferView::SELECT
 		       | BufferView::FITCUR
@@ -1730,7 +1710,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->TransposeChars(*bv_);
 		if (lt->inset_owner)
-			bv_->updateInset(lt->inset_owner, true);
+			updateInset(lt->inset_owner, true);
 		update(lt,
 		       BufferView::SELECT
 		       | BufferView::FITCUR
@@ -1752,10 +1732,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			p.setFromString(argument);
 
 			InsetRef * inset = new InsetRef(p, *buffer_);
-			if (!bv_->insertInset(inset))
+			if (!insertInset(inset))
 				delete inset;
 			else
-				bv_->updateInset(inset, true);
+				updateInset(inset, true);
 		}
 		break;
 
@@ -1795,7 +1775,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		LyXText * lt = bv_->getLyXText();
 		
 		bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		if (is_rtl)
@@ -1832,10 +1812,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		// it simpler? (Lgb)
 		LyXText * lt = bv_->getLyXText();
 		bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
-		LyXCursor const & cur = lt->cursor;
+		LyXCursor const cur = lt->cursor;
 		if (!is_rtl)
 			lt->CursorLeft(bv_, false);
 		if ((is_rtl || cur != lt->cursor) && // only if really moved!
@@ -1872,7 +1852,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
 		lt->CursorUp(bv_);
@@ -1886,7 +1866,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
 		lt->CursorDown(bv_);
@@ -1900,7 +1880,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
 		lt->CursorUpParagraph(bv_);
@@ -1914,7 +1894,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
 		lt->CursorDownParagraph(bv_);
@@ -1928,7 +1908,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
 		cursorPrevious(lt);
@@ -1942,7 +1922,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::UPDATE);
 		cursorNext(lt);
@@ -1956,7 +1936,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		lt->CursorHome(bv_);
@@ -1970,7 +1950,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
@@ -1986,7 +1966,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
@@ -2001,7 +1981,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
@@ -2018,7 +1998,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
@@ -2035,7 +2015,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
@@ -2050,7 +2030,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->mark_set)
+		if (!lt->selection.mark())
 			beforeChange(lt);
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
@@ -2293,7 +2273,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 
-		if (lt->mark_set) {
+		if (lt->selection.mark()) {
 			beforeChange(lt);
 			update(lt,
 			       BufferView::SELECT
@@ -2301,13 +2281,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			owner_->getLyXFunc()->setMessage(N_("Mark removed"));
 		} else {
 			beforeChange(lt);
-			lt->mark_set = 1;
+			lt->selection.mark(true);
 			update(lt,
 			       BufferView::SELECT
 			       | BufferView::FITCUR);
 			owner_->getLyXFunc()->setMessage(N_("Mark set"));
 		}
-		lt->sel_cursor = lt->cursor;
+		lt->selection.cursor = lt->cursor;
 	}
 	break;
 		
@@ -2315,9 +2295,9 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 
-		if (!lt->selection) {
+		if (!lt->selection.set()) {
 			lt->Delete(bv_);
-			lt->sel_cursor = lt->cursor;
+			lt->selection.cursor = lt->cursor;
 			update(lt,
 			       BufferView::SELECT
 			       | BufferView::FITCUR
@@ -2342,7 +2322,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 		LyXCursor cursor = lt->cursor;
 
-		if (!lt->selection) {
+		if (!lt->selection.set()) {
 			if (cursor.pos() == cursor.par()->size()) {
 				lt->CursorRight(bv_);
 				cursor = lt->cursor;
@@ -2367,7 +2347,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 				} else {
 					lt->CursorLeft(bv_);
 					lt->Delete(bv_);
-					lt->sel_cursor = lt->cursor;
+					lt->selection.cursor = lt->cursor;
 					update(lt,
 					       BufferView::SELECT
 					       | BufferView::FITCUR
@@ -2375,7 +2355,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 				}
 			} else {
 				lt->Delete(bv_);
-				lt->sel_cursor = lt->cursor;
+				lt->selection.cursor = lt->cursor;
 				update(lt,
 				       BufferView::SELECT
 				       | BufferView::FITCUR
@@ -2398,46 +2378,68 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 		/* -------> Delete word backward. */
 	case LFUN_DELETE_WORD_BACKWARD:
-		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
-		bv_->getLyXText()->DeleteWordBackward(bv_);
-		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->DeleteWordBackward(bv_);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
 		moveCursorUpdate(false);
 		owner_->showState();
-		break;
+	}
+	break;
 		
 		/* -------> Kill to end of line. */
 	case LFUN_DELETE_LINE_FORWARD:
-		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
-		bv_->getLyXText()->DeleteLineForward(bv_);
-		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->DeleteLineForward(bv_);
+		update(lt,
+		       BufferView::SELECT
+		       | BufferView::FITCUR
+		       | BufferView::CHANGE);
 		moveCursorUpdate(false);
-		break;
+	}
+	break;
 		
 		/* -------> Set mark off. */
 	case LFUN_MARK_OFF:
-		beforeChange(bv_->getLyXText());
-		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
-		bv_->getLyXText()->sel_cursor = bv_->getLyXText()->cursor;
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		beforeChange(lt);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->selection.cursor = lt->cursor;
 		owner_->getLyXFunc()->setMessage(N_("Mark off"));
-		break;
+	}
+	break;
 
 		/* -------> Set mark on. */
 	case LFUN_MARK_ON:
-		beforeChange(bv_->getLyXText());
-		bv_->getLyXText()->mark_set = 1;
-		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
-		bv_->getLyXText()->sel_cursor = bv_->getLyXText()->cursor;
+	{
+		LyXText * lt = bv_->getLyXText();
+		
+		beforeChange(lt);
+		lt->selection.mark(true);
+		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		lt->selection.cursor = lt->cursor;
 		owner_->getLyXFunc()->setMessage(N_("Mark on"));
-		break;
+	}
+	break;
 		
 	case LFUN_BACKSPACE:
 	{
 		LyXText * lt = bv_->getLyXText();
 		
-		if (!lt->selection) {
+		if (!lt->selection.set()) {
 			if (owner_->getIntl()->getTrans().backspace()) {
 				lt->Backspace(bv_);
-				lt->sel_cursor = lt->cursor;
+				lt->selection.cursor = lt->cursor;
 				update(lt,
 				       BufferView::SELECT
 				       | BufferView::FITCUR
@@ -2461,7 +2463,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 		LyXCursor cursor = lt->cursor;
 		
-		if (!lt->selection) {
+		if (!lt->selection.set()) {
 			if (cursor.pos() == 0 
 			    && !(cursor.par()->params.spaceTop() 
 				 == VSpace (VSpace::NONE))) {
@@ -2480,7 +2482,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 				       | BufferView::CHANGE);
 			} else {
 				lt->Backspace(bv_);
-				lt->sel_cursor = cursor;
+				lt->selection.cursor = cursor;
 				update(lt,
 				       BufferView::SELECT
 				       | BufferView::FITCUR
@@ -2501,7 +2503,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       BufferView::SELECT
 		       | BufferView::FITCUR
 		       | BufferView::CHANGE);
-		lt->sel_cursor = lt->cursor;
+		lt->selection.cursor = lt->cursor;
 		setState();
 		owner_->showState();
 		break;
@@ -2517,7 +2519,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       BufferView::SELECT
 		       | BufferView::FITCUR
 		       | BufferView::CHANGE);
-		lt->sel_cursor = lt->cursor;
+		lt->selection.cursor = lt->cursor;
 		setState();
 		owner_->showState();
 		break;
@@ -2556,7 +2558,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		       BufferView::SELECT
 		       | BufferView::FITCUR
 		       | BufferView::CHANGE);
-		lt->sel_cursor = cursor;
+		lt->selection.cursor = cursor;
 		setState();
 		owner_->showState();
 	}
@@ -2634,17 +2636,17 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		p.setFromString( argument );
 
 		InsetUrl * inset = new InsetUrl( p );
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset( inset, true );
+			updateInset( inset, true );
 	}
 	break;
 	
 	case LFUN_INSET_TEXT:
 	{
 		InsetText * new_inset = new InsetText;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2654,7 +2656,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_ERT:
 	{
 		InsetERT * new_inset = new InsetERT;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2664,7 +2666,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_EXTERNAL:
 	{
 		InsetExternal * new_inset = new InsetExternal;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2674,7 +2676,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_FOOTNOTE:
 	{
 		InsetFoot * new_inset = new InsetFoot;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2684,7 +2686,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_MARGINAL:
 	{
 		InsetMarginal * new_inset = new InsetMarginal;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2694,7 +2696,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_MINIPAGE:
 	{
 		InsetMinipage * new_inset = new InsetMinipage;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2706,7 +2708,25 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		// check if the float type exist
 		if (floatList.typeExist(argument)) {
 			InsetFloat * new_inset = new InsetFloat(argument);
-			if (bv_->insertInset(new_inset))
+			if (insertInset(new_inset))
+				new_inset->Edit(bv_, 0, 0, 0);
+			else
+				delete new_inset;
+		} else {
+			lyxerr << "Non-existant float type: "
+			       << argument << endl;
+		}
+		
+	}
+	break;
+
+	case LFUN_INSET_WIDE_FLOAT:
+	{
+		// check if the float type exist
+		if (floatList.typeExist(argument)) {
+			InsetFloat * new_inset = new InsetFloat(argument);
+			new_inset->wide(true);
+			if (insertInset(new_inset))
 				new_inset->Edit(bv_, 0, 0, 0);
 			else
 				delete new_inset;
@@ -2721,7 +2741,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_LIST:
 	{
 		InsetList * new_inset = new InsetList;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2731,7 +2751,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_INSET_THEOREM:
 	{
 		InsetTheorem * new_inset = new InsetTheorem;
-		if (bv_->insertInset(new_inset))
+		if (insertInset(new_inset))
 			new_inset->Edit(bv_, 0, 0, 0);
 		else
 			delete new_inset;
@@ -2748,8 +2768,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			new_inset->setOwner(bv_->theLockingInset());
 			new_inset->SetAutoBreakRows(true);
 			new_inset->SetDrawFrame(0, InsetText::LOCKED);
-			new_inset->SetFrameColor(0, LColor::footnoteframe);
-			if (bv_->insertInset(new_inset))
+			new_inset->SetFrameColor(0, LColor::captionframe);
+			if (insertInset(new_inset))
 				new_inset->Edit(bv_, 0, 0, 0);
 			else
 				delete new_inset;
@@ -2759,12 +2779,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	
 	case LFUN_INSET_TABULAR:
 	{
-		int r = 2, c = 2;
+		int r = 2;
+		int c = 2;
 		if (!argument.empty())
 			::sscanf(argument.c_str(),"%d%d", &r, &c);
 		InsetTabular * new_inset =
 			new InsetTabular(*buffer_, r, c);
-		bool rtl =
+		bool const rtl =
 			bv_->getLyXText()->real_current_font.isRightToLeft();
 		if (!open_new_inset(new_inset, rtl))
 			delete new_inset;
@@ -2792,6 +2813,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 	case LFUN_SETXY:
 	{
+#warning Should check sscanf for errors (Lgb)
 		int x;
 		int y;
 		::sscanf(argument.c_str(), " %d %d", &x, &y);
@@ -2920,10 +2942,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		p.setFromString( argument );
 
 		InsetCitation * inset = new InsetCitation( p );
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset( inset, true );
+			updateInset( inset, true );
 	}
 	break;
 		    
@@ -2940,7 +2962,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		InsetCommandParams p( "BibTeX", db, bibstyle );
 		InsetBibtex * inset = new InsetBibtex(p);
 		
-		if (bv_->insertInset(inset)) {
+		if (insertInset(inset)) {
 			if (argument.empty())
 				inset->Edit(bv_, 0, 0, 0);
 		} else
@@ -3008,10 +3030,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		p.setFromString(argument);
 		InsetIndex * inset = new InsetIndex(p);
 
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset(inset, true);
+			updateInset(inset, true);
 	}
 	break;
 		    
@@ -3029,10 +3051,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		InsetCommandParams p("index", curstring);
 		InsetIndex * inset = new InsetIndex(p);
 
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else
-			bv_->updateInset(inset, true);
+			updateInset(inset, true);
 	}
 	break;
 
@@ -3040,7 +3062,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		InsetCommandParams p("printindex");
 		Inset * inset = new InsetPrintIndex(p);
-		if (!bv_->insertInset(inset, "Standard", true))
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 	}
 	break;
@@ -3050,7 +3072,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		lyxerr << "arg " << argument << endl;
 		InsetCommandParams p( "lyxparent", argument );
 		Inset * inset = new InsetParent(p, *buffer_);
-		if (!bv_->insertInset(inset, "Standard", true))
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 	}
 		 
@@ -3063,10 +3085,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		p.masterFilename_ = buffer_->fileName();
 
 		InsetInclude * inset = new InsetInclude(p);
-		if (!bv_->insertInset(inset))
+		if (!insertInset(inset))
 			delete inset;
 		else {
-			bv_->updateInset(inset, true);
+			updateInset(inset, true);
 			bv_->owner()->getDialogs()->showInclude(inset);
 		}
 	}
@@ -3076,7 +3098,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		// We should check the argument for validity. (Lgb)
 		Inset * inset = new InsetFloatList(argument);
-		if (!bv_->insertInset(inset, "Standard", true))
+		if (!insertInset(inset, "Standard"))
 			delete inset;
 	}
 	break;
@@ -3098,7 +3120,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		LyXText * lt = bv_->getLyXText();
 		
 		if (lyxrc.auto_region_delete) {
-			if (lt->selection){
+			if (lt->selection.set()) {
 				lt->CutSelection(bv_, false);
 				bv_->update(lt,
 					    BufferView::SELECT
@@ -3125,7 +3147,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			    | BufferView::FITCUR
 			    | BufferView::CHANGE);
 		
-		lt->sel_cursor = lt->cursor;
+		lt->selection.cursor = lt->cursor;
 		moveCursorUpdate(false);
 		
 		// real_current_font.number can change so we need to
@@ -3149,13 +3171,18 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		char datetmp[32];
 		int const datetmp_len =
 			::strftime(datetmp, 32, arg.c_str(), now_tm);
+
+		LyXText * lt = bv_->getLyXText();
+		
 		for (int i = 0; i < datetmp_len; i++) {
-			bv_->getLyXText()->InsertChar(bv_, datetmp[i]);
-			update(bv_->getLyXText(),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			lt->InsertChar(bv_, datetmp[i]);
+			update(lt,
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 		}
 
-		bv_->getLyXText()->sel_cursor = bv_->getLyXText()->cursor;
+		lt->selection.cursor = lt->cursor;
 		moveCursorUpdate(false);
 	}
 	break;
@@ -3213,10 +3240,10 @@ void BufferView::Pimpl::protectedBlank(LyXText * lt)
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset =
 			new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-		if (!bv_->insertInset(new_inset))
+		if (!insertInset(new_inset))
 			delete new_inset;
 		else
-			bv_->updateInset(new_inset, true);
+			updateInset(new_inset, true);
 	}
 }
 
@@ -3230,7 +3257,7 @@ void BufferView::Pimpl::menuSeparator()
 		update(lt, BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
-		bv_->insertInset(new_inset);
+		insertInset(new_inset);
 	}
 }
 
@@ -3242,7 +3269,7 @@ void BufferView::Pimpl::endOfSentenceDot()
 		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
-		bv_->insertInset(new_inset);
+		insertInset(new_inset);
 	}
 }
 
@@ -3254,7 +3281,7 @@ void BufferView::Pimpl::ldots()
 		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::LDOTS);
-		bv_->insertInset(new_inset);
+		insertInset(new_inset);
 	}
 }
 
@@ -3266,7 +3293,7 @@ void BufferView::Pimpl::hyphenationPoint()
 		update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
 		InsetSpecialChar * new_inset = 
 			new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
-		bv_->insertInset(new_inset);
+		insertInset(new_inset);
 	}
 }
 
@@ -3274,7 +3301,7 @@ void BufferView::Pimpl::hyphenationPoint()
 void BufferView::Pimpl::insertNote()
 {
 	InsetInfo * new_inset = new InsetInfo();
-	bv_->insertInset(new_inset);
+	insertInset(new_inset);
 	new_inset->Edit(bv_, 0, 0, 0);
 }
 
@@ -3286,7 +3313,7 @@ bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind)
 	
 	beforeChange(lt);
 	lt->FinishUndo();
-	if (!bv_->insertInset(new_inset)) {
+	if (!insertInset(new_inset)) {
 		delete new_inset;
 		return false;
 	}
@@ -3297,3 +3324,155 @@ bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind)
 		new_inset->Edit(bv_, 0, 0, 0);
 	return true;
 }
+
+
+bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
+{
+	// if we are in a locking inset we should try to insert the
+	// inset there otherwise this is a illegal function now
+	if (bv_->theLockingInset()) {
+		if (bv_->theLockingInset()->InsertInsetAllowed(inset))
+		    return bv_->theLockingInset()->InsertInset(bv_, inset);
+		return false;
+	}
+
+	// not quite sure if we want this...
+	bv_->text->SetCursorParUndo(buffer_);
+	bv_->text->FreezeUndo();
+	
+	beforeChange(bv_->text);
+	if (!lout.empty()) {
+		update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+		bv_->text->BreakParagraph(bv_);
+		update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+		if (bv_->text->cursor.par()->size()) {
+			bv_->text->CursorLeft(bv_);
+			
+			bv_->text->BreakParagraph(bv_);
+			update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		}
+
+		pair<bool, LyXTextClass::size_type> lres =
+			textclasslist.NumberOfLayout(buffer_->params
+						     .textclass, lout);
+		LyXTextClass::size_type lay;
+		if (lres.first != false) {
+			// layout found
+			lay = lres.second;
+		} else {
+			// layout not fount using default "Standard" (0)
+			lay = 0;
+		}
+		 
+		bv_->text->SetLayout(bv_, lay);
+		
+		bv_->text->SetParagraph(bv_, 0, 0,
+				   0, 0,
+				   VSpace(VSpace::NONE), VSpace(VSpace::NONE),
+				   LYX_ALIGN_LAYOUT, 
+				   string(),
+				   0);
+		update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		
+		bv_->text->current_font.setLatex(LyXFont::OFF);
+	}
+	
+	bv_->text->InsertInset(bv_, inset);
+	update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+	bv_->text->UnFreezeUndo();
+	return true;
+}
+
+
+void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
+{
+	if (!inset)
+		return;
+
+	// first check for locking insets
+	if (bv_->theLockingInset()) {
+		if (bv_->theLockingInset() == inset) {
+			if (bv_->text->UpdateInset(bv_, inset)) {
+				update();
+				if (mark_dirty) {
+					buffer_->markDirty();
+				}
+				updateScrollbar();
+				return;
+			}
+		} else if (bv_->theLockingInset()->UpdateInsetInInset(bv_, inset)) {
+			if (bv_->text->UpdateInset(bv_,
+						   bv_->theLockingInset())) {
+				update();
+				if (mark_dirty){
+					buffer_->markDirty();
+				}
+				updateScrollbar();
+				return;
+			}
+		}
+	}
+  
+	// then check the current buffer
+	if (available()) {
+		hideCursor();
+		update(bv_->text, BufferView::UPDATE);
+		if (bv_->text->UpdateInset(bv_, inset)) {
+			if (mark_dirty) {
+				update(bv_->text,
+				       BufferView::SELECT
+				       | BufferView::FITCUR
+				       | BufferView::CHANGE);
+			} else {
+				update(bv_->text, SELECT);
+			}
+			return;
+		}
+	}
+}
+
+
+void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
+				  bool same_content)
+{
+	if (!available()) return;
+	
+	hideCursor();
+	beforeChange(bv_->text);
+	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+	
+	string contents;
+	if (same_content &&
+	    bv_->text->cursor.par()->GetChar(bv_->text->cursor.pos()) == LyXParagraph::META_INSET) {
+		Inset const * inset = bv_->text->cursor.par()->GetInset(bv_->text->cursor.pos());
+		if (find(codes.begin(), codes.end(), inset->LyxCode())
+		    != codes.end())
+			contents =
+				static_cast<InsetCommand const *>(inset)->getContents();
+	}
+	
+	if (!bv_->text->GotoNextInset(bv_, codes, contents)) {
+		if (bv_->text->cursor.pos() 
+		    || bv_->text->cursor.par() != bv_->text->FirstParagraph()) {
+			LyXCursor tmp = bv_->text->cursor;
+			bv_->text->cursor.par(bv_->text->FirstParagraph());
+			bv_->text->cursor.pos(0);
+			if (!bv_->text->GotoNextInset(bv_, codes, contents)) {
+				bv_->text->cursor = tmp;
+				bv_->owner()->message(_("No more insets"));
+			}
+		} else {
+			bv_->owner()->message(_("No more insets"));
+		}
+	}
+	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+	bv_->text->selection.cursor = bv_->text->cursor;
+}
+
+
+void BufferView::Pimpl::gotoInset(Inset::Code code, bool same_content)
+{
+	gotoInset(vector<Inset::Code>(1, code), same_content);
+}