X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=fb46ea88cc2aa86342592d0291dde68db5c37e92;hb=15271fce0705ea5611647b5b3d1e993362ff5284;hp=2437438d1aff3ea885ee92edc64306265cb94b2a;hpb=104424a34cd4c125c59bd25b1fc6cccb41a655ec;p=lyx.git

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 2437438d1a..fb46ea88cc 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -16,8 +16,6 @@
 #include "lyxrow.h"
 #include "LyXView.h"
 #include "commandtags.h"
-#include "lyxfunc.h"
-#include "minibuffer.h"
 #include "font.h"
 #include "bufferview_funcs.h"
 #include "TextCache.h"
@@ -55,7 +53,10 @@
 #include "insets/insettabular.h"
 #include "insets/insettheorem.h"
 #include "insets/insetcaption.h"
+#include "insets/insetfloatlist.h"
 #include "mathed/formulamacro.h"
+#include "gettext.h"
+
 extern LyXTextClass::size_type current_layout;
 extern int greek_kb_flag;
 
@@ -222,7 +223,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	}
 	// should update layoutchoice even if we don't have a buffer.
 	owner_->updateLayoutChoice();
-	owner_->getMiniBuffer()->Init();
+
 	owner_->updateWindowTitle();
 }
 
@@ -251,7 +252,7 @@ void BufferView::Pimpl::redraw()
 
 bool BufferView::Pimpl::fitCursor(LyXText * text)
 {
-	Assert(screen_.get());
+	lyx::Assert(screen_.get());
  
 	bool ret = screen_->FitCursor(text, bv_);
 	if (ret)
@@ -287,7 +288,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 
 	ProhibitInput(bv_);
 
-	owner_->getMiniBuffer()->Set(_("Formatting document..."));   
+	owner_->message(_("Formatting document..."));
 
 	if (bv_->text) {
 		par = bv_->text->cursor.par();
@@ -344,7 +345,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 	// this will scroll the screen such that the cursor becomes visible
 	updateScrollbar();
 	redraw();
-	owner_->getMiniBuffer()->Init();
+
 	bv_->setState();
 	AllowInput(bv_);
 
@@ -359,8 +360,6 @@ void BufferView::Pimpl::updateScreen()
 {
 	// Regenerate the screen.
 	screen_.reset(new LyXScreen(workarea_));
-	//delete screen_;
-	//screen_ = new LyXScreen(workarea_);
 }
 
 
@@ -634,7 +633,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
 		selection_possible = false;
 		owner_->updateLayoutChoice();
-		owner_->getMiniBuffer()->Set(inset->EditMessage());
+		owner_->message(inset->EditMessage());
 		inset->InsetButtonPress(bv_, xpos, ypos, button);
 		inset->Edit(bv_, xpos, ypos, button);
 		return;
@@ -796,7 +795,8 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 			bv_->text->SetCursorParUndo(bv_->buffer());
 		}
 
-		owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
+		owner_->message(inset_hit->EditMessage());
+
 		if (inset_hit->Editable()==Inset::HIGHLY_EDITABLE) {
 			// Highly editable inset, like math
 			UpdatableInset *inset = (UpdatableInset *)inset_hit;
@@ -808,73 +808,6 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 		return;
 	}
 
-#ifndef NEW_INSETS
-	// check whether we want to open a float
-	if (bv_->text) {
-		bool hit = false;
-		char c = ' ';
-		if (bv_->text->cursor.pos() <
-		    bv_->text->cursor.par()->Last()) {
-			c = bv_->text->cursor.par()->
-				GetChar(bv_->text->cursor.pos());
-		}
-	       if(!bv_->text->selection)
-		if (c == LyXParagraph::META_FOOTNOTE
-		    || c == LyXParagraph::META_MARGIN
-		    || c == LyXParagraph::META_FIG
-		    || c == LyXParagraph::META_TAB
-		    || c == LyXParagraph::META_WIDE_FIG
-		    || c == LyXParagraph::META_WIDE_TAB
-                    || c == LyXParagraph::META_ALGORITHM){
-			hit = true;
-		} else
-			if (bv_->text->cursor.pos() - 1 >= 0) {
-			c = bv_->text->cursor.par()->
-				GetChar(bv_->text->cursor.pos() - 1);
-			if (c == LyXParagraph::META_FOOTNOTE
-			    || c == LyXParagraph::META_MARGIN
-			    || c == LyXParagraph::META_FIG
-			    || c == LyXParagraph::META_TAB
-			    || c == LyXParagraph::META_WIDE_FIG 
-			    || c == LyXParagraph::META_WIDE_TAB
-			    || c == LyXParagraph::META_ALGORITHM){
-				// We are one step too far to the right
-				bv_->text->CursorLeft(bv_);
-				hit = true;
-			}
-		}
-		if (hit == true) {
-			bv_->toggleFloat();
-			selection_possible = false;
-			return;
-		}
-	}
-	// Do we want to close a float? (click on the float-label)
-	if (bv_->text->cursor.row()->par()->footnoteflag == 
-	    LyXParagraph::OPEN_FOOTNOTE
-	    && bv_->text->cursor.row()->previous() &&
-	    bv_->text->cursor.row()->previous()->par()->
-	    footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
-		LyXFont font(LyXFont::ALL_SANE);
-		font.setSize(LyXFont::SIZE_FOOTNOTE);
-
-		int box_x = 20; // LYX_PAPER_MARGIN;
-		box_x += lyxfont::width(" wide-tab ", font);
-
-		unsigned int screen_first = bv_->text->first;
-
-		if (x < box_x
-		    && y + screen_first > bv_->text->cursor.y() -
-		    bv_->text->cursor.row()->baseline()
-		    && y + screen_first < bv_->text->cursor.y() -
-		    bv_->text->cursor.row()->baseline()
-		    + lyxfont::maxAscent(font) * 1.2 + lyxfont::maxDescent(font) * 1.2) {
-			bv_->toggleFloat();
-			selection_possible = false;
-			return;
-		}
-	}
-#else
 	// check whether we want to open a float
 	if (bv_->text) {
 		bool hit = false;
@@ -893,7 +826,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 			return;
 		}
 	}
-#endif
+
 	// Maybe we want to edit a bibitem ale970302
 	if (bv_->text->cursor.par()->bibkey && x < 20 + 
 	    bibitemMaxWidth(bv_, textclasslist.
@@ -924,11 +857,7 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 	text->SetCursor(bv_, cursor, cursor.par(),cursor.pos(),true);
 
 
-#ifndef NEW_INSETS
-	if (cursor.pos() < cursor.par()->Last()
-#else
 	if (cursor.pos() < cursor.par()->size()
-#endif
 	    && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
 	    && cursor.par()->GetInset(cursor.pos())
 	    && cursor.par()->GetInset(cursor.pos())->Editable()) {
@@ -973,7 +902,8 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 #if 0
 			if (move_cursor && (tmpinset != bv_->theLockingInset()))
 #endif
-				text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true);
+				text->SetCursor(bv_, cursor.par(),
+						cursor.pos() - 1, true);
 			x = x - start_x;
 			// The origin of an inset is on the baseline
 			y = y_tmp - (text->cursor.y()); 
@@ -1019,9 +949,6 @@ void BufferView::Pimpl::workAreaExpose()
 
 			// The main window size has changed, repaint most stuff
 			redraw();
-			// ...including the minibuffer
-			owner_->getMiniBuffer()->Init();
-
 		} else if (screen_.get())
 		    screen_->Redraw(bv_->text, bv_);
 	} else {
@@ -1100,12 +1027,7 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
       	}
 
 	if ((f & CHANGE)) {
-		if (buffer_->isLyxClean()) {
-			buffer_->markDirty();
-			owner_->getMiniBuffer()->setTimer(4);
-		} else {
-			buffer_->markDirty();
-		}
+		buffer_->markDirty();
 	}
 }
 
@@ -1216,8 +1138,10 @@ void BufferView::Pimpl::savePosition(unsigned int i)
 	saved_positions[i] = Position(buffer_->fileName(),
 				      bv_->text->cursor.par()->id(),
 				      bv_->text->cursor.pos());
-	if (i > 0)
-		owner_->getMiniBuffer()->Set(_("Saved bookmark ") + tostr(i));
+	if (i > 0) {
+		string const str = _("Saved bookmark") + ' ' + tostr(i);
+		owner_->message(str);
+	}
 }
 
 
@@ -1226,7 +1150,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
 	if (i >= saved_positions_num)
 		return;
 
-	string fname = saved_positions[i].filename;
+	string const fname = saved_positions[i].filename;
 
 	beforeChange(bv_->text);
 
@@ -1241,16 +1165,14 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
 	if (!par)
 		return;
 
-#ifndef NEW_INSETS
-	bv_->text->SetCursor(bv_, par,
-			     min(par->Last(), saved_positions[i].par_pos));
-#else
 	bv_->text->SetCursor(bv_, par,
 			     min(par->size(), saved_positions[i].par_pos));
-#endif
+
 	update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
-	if (i > 0)
-		owner_->getMiniBuffer()->Set(_("Moved to bookmark ") + tostr(i));
+	if (i > 0) {
+		string const str = _("Moved to bookmark") + ' ' + tostr(i);
+		owner_->message(str);
+	}
 }
 
 
@@ -1433,7 +1355,7 @@ Inset * BufferView::Pimpl::getInsetByCode(Inset::Code code)
 		find_if(Buffer::inset_iterator(
 			cursor.par(), cursor.pos()),
 			buffer_->inset_iterator_end(),
-			compare_memfun(&Inset::LyxCode, code)
+			lyx::compare_memfun(&Inset::LyxCode, code)
 			);
 	return it != buffer_->inset_iterator_end() ? (*it) : 0;
 }
@@ -1468,7 +1390,7 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 
 		// check selected filename
 		if (filename.empty()) {
-			owner_->getMiniBuffer()->Set(_("Canceled."));
+			owner_->message(_("Canceled."));
 			return;
 		}
 	}
@@ -1480,16 +1402,18 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 		filename += ".lyx";
 
 	// Inserts document
-	owner_->getMiniBuffer()->Set(_("Inserting document"),
-				     MakeDisplayPath(filename), "...");
+	string const s1 = _("Inserting document") + ' '
+		+ MakeDisplayPath(filename) + " ...";
+	owner_->message(s1);
 	bool const res = bv_->insertLyXFile(filename);
 	if (res) {
-		owner_->getMiniBuffer()->Set(_("Document"),
-					     MakeDisplayPath(filename),
-					     _("inserted."));
+		string const str = _("Document") + ' '
+			+ MakeDisplayPath(filename) + ' ' + _("inserted.");
+		owner_->message(str);
 	} else {
-		owner_->getMiniBuffer()->Set(_("Could not insert document"),
-					     MakeDisplayPath(filename));
+		string const str = _("Could not insert document") + ' '
+			+ MakeDisplayPath(filename);
+		owner_->message(str);
 	}
 }
 
@@ -1506,23 +1430,11 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		break;
 
 	case LFUN_TOC_INSERT:
-	case LFUN_LOA_INSERT:
-	case LFUN_LOF_INSERT:
-	case LFUN_LOT_INSERT:
 	{
 		InsetCommandParams p;
-		
-		if (action == LFUN_TOC_INSERT )
-			p.setCmdName( "tableofcontents" );
-		else if (action == LFUN_LOA_INSERT )
-			p.setCmdName( "listofalgorithms" );
-		else if (action == LFUN_LOF_INSERT )
-			p.setCmdName( "listoffigures" );
-		else
-			p.setCmdName( "listoftables" );
-
-		Inset * inset = new InsetTOC( p );
-		if (!bv_->insertInset( inset, "Standard", true ) )
+		p.setCmdName("tableofcontents");
+		Inset * inset = new InsetTOC(p);
+		if (!bv_->insertInset(inset, "Standard", true))
 			delete inset;
 		break;
 	}
@@ -1772,7 +1684,16 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			bv_->updateInset(TEXT(bv_)->inset_owner, true);
 		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 		break;
+
+	case LFUN_TRANSPOSE_CHARS:
+		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
+		TEXT(bv_)->TransposeChars(*bv_);
+		if (TEXT(bv_)->inset_owner)
+			bv_->updateInset(TEXT(bv_)->inset_owner, true);
+		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		break;
 		
+					  
 	case LFUN_INSERT_LABEL:
 		MenuInsertLabel(bv_, argument);
 		break;
@@ -1832,11 +1753,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
 		if (is_rtl)
 			TEXT(bv_)->CursorLeft(bv_, false);
-#ifndef NEW_INSETS
-		if (TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->Last()
-#else
 		if (TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->size()
-#endif
 		    && TEXT(bv_)->cursor.par()->GetChar(TEXT(bv_)->cursor.pos())
 		    == LyXParagraph::META_INSET
 		    && TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos())
@@ -1845,10 +1762,10 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			owner_->getLyXFunc()->setMessage(tmpinset->EditMessage());
 			int y = 0;
 			if (is_rtl) {
-				LyXFont font = 
+				LyXFont const font = 
 					TEXT(bv_)->GetFont(buffer_,
-							      TEXT(bv_)->cursor.par(),
-							      TEXT(bv_)->cursor.pos());	
+							   TEXT(bv_)->cursor.par(),
+							   TEXT(bv_)->cursor.pos());	
 				y = tmpinset->descent(bv_,font);
 			}
 			tmpinset->Edit(bv_, 0, y, 0);
@@ -1874,11 +1791,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		if (!is_rtl)
 			TEXT(bv_)->CursorLeft(bv_, false);
 		if ((is_rtl || cur != TEXT(bv_)->cursor) && // only if really moved!
-#ifndef NEW_INSETS
-		    TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->Last() &&
-#else
 		    TEXT(bv_)->cursor.pos() < TEXT(bv_)->cursor.par()->size() &&
-#endif
 		    (TEXT(bv_)->cursor.par()->GetChar(TEXT(bv_)->cursor.pos()) ==
 		     LyXParagraph::META_INSET) &&
 		    TEXT(bv_)->cursor.par()->GetInset(TEXT(bv_)->cursor.pos()) &&
@@ -2196,13 +2109,16 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		
 	case LFUN_PROTECTEDSPACE:
 	{
-		LyXLayout const & style =
-			textclasslist.Style(buffer_->params.textclass,
-					    TEXT(bv_)->cursor.par()->GetLayout());
+		LyXLayout const & style = textclasslist
+			.Style(buffer_->params.textclass,
+			       TEXT(bv_)->cursor.par()->GetLayout());
 
 		if (style.free_spacing) {
 			TEXT(bv_)->InsertChar(bv_, ' ');
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			update(TEXT(bv_),
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 		} else {
 			bv_->protectedBlank(TEXT(bv_));
 		}
@@ -2213,12 +2129,14 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	case LFUN_SETMARK:
 		if (TEXT(bv_)->mark_set) {
 			beforeChange(TEXT(bv_));
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
+			update(TEXT(bv_),
+			       BufferView::SELECT|BufferView::FITCUR);
 			owner_->getLyXFunc()->setMessage(N_("Mark removed"));
 		} else {
 			beforeChange(TEXT(bv_));
 			TEXT(bv_)->mark_set = 1;
-			update(TEXT(bv_), BufferView::SELECT|BufferView::FITCUR);
+			update(TEXT(bv_),
+			       BufferView::SELECT|BufferView::FITCUR);
 			owner_->getLyXFunc()->setMessage(N_("Mark set"));
 		}
 		TEXT(bv_)->sel_cursor = TEXT(bv_)->cursor;
@@ -2230,7 +2148,9 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			TEXT(bv_)->sel_cursor = 
 				TEXT(bv_)->cursor;
 			update(TEXT(bv_),
-			       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			       BufferView::SELECT
+			       | BufferView::FITCUR
+			       | BufferView::CHANGE);
 			// It is possible to make it a lot faster still
 			// just comment out the line below...
 			showCursor();
@@ -2249,11 +2169,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		LyXCursor cursor = TEXT(bv_)->cursor;
 
 		if (!TEXT(bv_)->selection) {
-#ifndef NEW_INSETS
-			if (cursor.pos() == cursor.par()->Last()) {
-#else
 			if (cursor.pos() == cursor.par()->size()) {
-#endif
 				TEXT(bv_)->CursorRight(bv_);
 				cursor = TEXT(bv_)->cursor;
 				if (cursor.pos() == 0
@@ -2949,6 +2865,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	}
 	break; 
 
+	case LFUN_FLOAT_LIST:
+	{
+		// We should check the argument for validity. (Lgb)
+		Inset * inset = new InsetFloatList(argument);
+		if (!bv_->insertInset(inset, "Standard", true))
+			delete inset;
+	}
+	break;
+	
 	case LFUN_INSERT_NOTE:
 		bv_->insertNote();
 		break;