X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=6a031f73b12416d873627c10e76cde0de56d85f4;hb=4b07057b7eaf1b91da715f4f266f1395f7d9bf7c;hp=9a78e888604732f03d25e223304cf6a4d5372a8c;hpb=acc7e9789ec79f67c2444b2b325eeca93f6fa578;p=lyx.git

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 9a78e88860..dac09f18e7 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -4,36 +4,51 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
-#include "Lsstream.h"
-
-#include <time.h>
-#include <locale.h>
-
-#include <cstdlib>
-#include <cctype>
-#include <cstring>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include "lyxfunc.h"
 #include "version.h"
 #include "kbmap.h"
-#include "lyxfunc.h"
+#include "lyxrow.h"
 #include "bufferlist.h"
+#include "BufferView.h"
 #include "ColorHandler.h"
 #include "lyxserver.h"
-#include "lyx.h"
 #include "intl.h"
 #include "lyx_main.h"
 #include "lyx_cb.h"
 #include "LyXAction.h"
+#include "debug.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
+#include "gettext.h"
+#include "Lsstream.h"
+#include "trans_mgr.h"
+#include "layout.h"
+#include "WorkArea.h"
+#include "bufferview_funcs.h"
+#include "minibuffer.h"
+#include "vspace.h"
+#include "LyXView.h"
+#include "lyx_gui_misc.h"
+#include "FloatList.h"
+#include "converter.h"
+#include "exporter.h"
+#include "importer.h"
+#include "FontLoader.h"
+#include "TextCache.h"
+#include "lyxfind.h"
+#include "undo_funcs.h"
+#include "ParagraphParameters.h"
+
 #include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
@@ -51,101 +66,120 @@
 #include "insets/insetmarginal.h"
 #include "insets/insetminipage.h"
 #include "insets/insetfloat.h"
+#if 0
 #include "insets/insetlist.h"
-#include "insets/insettabular.h"
 #include "insets/insettheorem.h"
+#endif
+#include "insets/insettabular.h"
 #include "insets/insetcaption.h"
+
 #include "mathed/formulamacro.h"
-#include "spellchecker.h" // RVDK_PATCH_5
-#include "minibuffer.h"
-#include "vspace.h"
-#include "LyXView.h"
-#include "filedlg.h"
-#include "lyx_gui_misc.h"
+#include "mathed/math_cursor.h"
+#include "mathed/math_inset.h"
+
+#include "frontends/FileDialog.h"
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+#include "frontends/Alert.h"
+
+#include "graphics/GraphicsCache.h"
+
+#include "support/lyxalgo.h"
+#include "support/LAssert.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
-#include "support/syscall.h"
+#include "support/forkedcontr.h"
 #include "support/lstrings.h"
 #include "support/path.h"
 #include "support/lyxfunctional.h"
-#include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "trans_mgr.h"
-#include "layout.h"
-#include "WorkArea.h"
-#include "lyxfr1.h"
-#include "bufferview_funcs.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
-#include "FloatList.h"
-#include "converter.h"
-#include "exporter.h"
-#include "importer.h"
-#include "FontLoader.h"
-#include "TextCache.h"
+
+#include <ctime>
+#include <clocale>
+#include <cstdlib>
+#include <cctype>
+
+#include <utility> 
+#include <algorithm> 
+
 
 using std::pair;
+using std::make_pair; 
 using std::endl;
 using std::find_if;
+using std::vector;
+using std::transform;
+using std::back_inserter;
 
-extern void InsertAsciiFile(BufferView *, string const &, bool);
-extern void math_insert_symbol(string const &);
-extern bool math_insert_greek(char);
 extern BufferList bufferlist;
 extern LyXServer * lyxserver;
-extern int greek_kb_flag;
 extern bool selection_possible;
+extern void MenuSendto();
 
-extern kb_keymap * toplevel_keymap;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
-extern bool MenuWrite(Buffer *);
-extern bool MenuWriteAs(Buffer *);
-extern int  MenuRunLaTeX(Buffer *);
-extern int  MenuBuildProg(Buffer *);
-extern int  MenuRunChktex(Buffer *);
-extern void MenuPrint(Buffer *);
-extern void MenuSendto();
-extern void QuitLyX();
-#if 0
-extern void MenuFax(Buffer *);
-#endif
 extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
 // (alkis)
 extern tex_accent_struct get_accent(kb_action action);
 
-extern void AutoSave(BufferView *);
-extern void MenuInsertLabel(string const &);
-extern void MenuLayoutCharacter();
-extern void MenuLayoutParagraph();
-extern void MenuLayoutPreamble();
-extern void MenuLayoutSave();
+extern void ShowLatexLog();
 
-extern Buffer * NewLyxFile(string const &);
-extern void LoadLyXFile(string const &);
-extern void Reconfigure(BufferView *);
 
-extern LyXTextClass::size_type current_layout;
-extern int getISOCodeFromLaTeX(char *);
+#if 0
 
-extern void ShowLatexLog();
+///
+class MiniBufferController : public SigC::Object {
+public:
+	///
+	MiniBufferController() {
+		minibuffer
+			.cmdReady
+			.connect(slot(this,
+				      &MiniBufferController::receiveCommand));
+		minibuffer
+			.argReady
+			.connect(slot(this,
+				      &MiniBufferController::receiveArg));
+	}
+	///
+	void receiveCmd(string const & cmd) {}
+	///
+	void receiveArg(string const & arg) {}
+	
+	
+private:
+};
+
+namespace {
+
+MiniBufferController mb_ctrl;
+
+}
+#endif
 
-/* === globals =========================================================== */
 
-bool LyXFunc::show_sc = true;
+/* === globals =========================================================== */
 
 
 LyXFunc::LyXFunc(LyXView * o)
-	: owner(o)
+	: owner(o),
+	keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
+	cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get())
 {
 	meta_fake_bit = 0;
 	lyx_dead_action = LFUN_NOACTION;
 	lyx_calling_dead_action = LFUN_NOACTION;
-	setupLocalKeymap();
+}
+
+
+inline
+LyXText * LyXFunc::TEXT(bool flag = true) const
+{
+	if (flag)
+		return owner->view()->text;
+	return owner->view()->getLyXText();
 }
 
 
@@ -155,69 +189,72 @@ LyXFunc::LyXFunc(LyXView * o)
 // a moveCursorUpdate to some of the functions that updated the cursor, but
 // that did not show its new position.
 inline
-void LyXFunc::moveCursorUpdate(bool selecting)
+void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
 {
-	if (selecting || owner->view()->text->mark_set) {
-		owner->view()->text->SetSelection();
-		owner->view()->toggleToggle();
+	if (selecting || TEXT(flag)->selection.mark()) {
+		TEXT(flag)->setSelection(owner->view());
+		if (TEXT(flag)->bv_owner)
+		    owner->view()->toggleToggle();
 	}
-	owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+	owner->view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
 	owner->view()->showCursor();
 	
 	/* ---> Everytime the cursor is moved, show the current font state. */
 	// should this too me moved out of this func?
-	//owner->showState();
 	owner->view()->setState();
 }
 
 
-int LyXFunc::processKeySym(KeySym keysym, unsigned int state) 
+void LyXFunc::handleKeyFunc(kb_action action)
+{
+	char c = keyseq.getiso();
+
+	if (keyseq.length() > 1) {
+		c = 0;
+	}
+	
+	owner->getIntl()->getTrans()
+		.deadkey(c, get_accent(action).accent, TEXT(false));
+	// Need to clear, in case the minibuffer calls these
+	// actions
+	keyseq.clear();
+	// copied verbatim from do_accent_char
+	owner->view()->update(TEXT(false),
+	       BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	TEXT(false)->selection.cursor = TEXT(false)->cursor;
+}
+
+
+void LyXFunc::processKeySym(KeySym keysym, unsigned int state) 
 {
 	string argument;
 	
 	if (lyxerr.debugging(Debug::KEY)) {
-		char * tmp = XKeysymToString(keysym);
-		string stm = (tmp ? tmp : "");
+		char const * tmp = XKeysymToString(keysym);
+		string const stm = (tmp ? tmp : "");
 		lyxerr << "KeySym is "
 		       << stm
 		       << "["
-		       << keysym << "]"
+		       << keysym << "] State is ["
+		       << state << "]"
 		       << endl;
 	}
 	// Do nothing if we have nothing (JMarc)
 	if (keysym == NoSymbol) {
 		lyxerr[Debug::KEY] << "Empty kbd action (probably composing)"
 				   << endl;
-		//return 0;
-		return FL_PREEMPT;
+		return;
 	}
 
-	if (owner->view()->available()) {
-		// this function should be used always [asierra060396]
-		UpdatableInset * tli = owner->view()->theLockingInset();
-		if (tli && (keysym == XK_Escape)) {
-			if (tli == tli->GetLockingInset()) {
-				owner->view()->unlockInset(tli);
-				owner->view()->text->CursorRight(owner->view());
-				moveCursorUpdate(false);
-				owner->showState();
-			} else {
-				tli->UnlockInsetInInset(owner->view(),
-							tli->GetLockingInset(),true);
-			}
-			//return 0;
-			return FL_PREEMPT;
-		}
-	}
-	
-	// Can we be sure that this will work for all X-Windows
+	// Can we be sure that this will work for all X Window
 	// implementations? (Lgb)
 	// This code snippet makes lyx ignore some keys. Perhaps
 	// all of them should be explictly mentioned?
 	if ((keysym >= XK_Shift_L && keysym <= XK_Hyper_R)
-	   || keysym == XK_Mode_switch || keysym == 0x0)
-		return 0;
-
+	    || keysym == XK_Mode_switch || keysym == 0x0) {
+		return;
+	}
+	
 	// Do a one-deep top-level lookup for
 	// cancel and meta-fake keys. RVDK_PATCH_5
 	cancel_meta_seq.reset();
@@ -225,29 +262,40 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
 	int action = cancel_meta_seq.addkey(keysym, state
 					    &(ShiftMask|ControlMask
 					      |Mod1Mask)); 
-
+	if (lyxerr.debugging(Debug::KEY)) {
+		lyxerr << "action first set to [" << action << "]" << endl;
+	}
+	
 	// When not cancel or meta-fake, do the normal lookup. 
 	// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
 	// Mostly, meta_fake_bit = 0. RVDK_PATCH_5.
 	if ((action != LFUN_CANCEL) && (action != LFUN_META_FAKE)) {
-
+		if (lyxerr.debugging(Debug::KEY)) {
+			lyxerr << "meta_fake_bit is ["
+			       << meta_fake_bit << "]" << endl;
+		}
 		// remove Caps Lock and Mod2 as a modifiers
 		action = keyseq.addkey(keysym,
 				       (state | meta_fake_bit)
 				       &(ShiftMask|ControlMask
-					 |Mod1Mask));      
+					 |Mod1Mask));
+		if (lyxerr.debugging(Debug::KEY)) {
+			lyxerr << "action now set to ["
+			       << action << "]" << endl;
+		}
 	}
 	// Dont remove this unless you know what you are doing.
 	meta_fake_bit = 0;
 		
-	if (action == 0) action = LFUN_PREFIX;
+	// can this happen now ? 
+	if (action == LFUN_NOACTION) {
+		action = LFUN_PREFIX;
+	}
 
 	if (lyxerr.debugging(Debug::KEY)) {
-		string buf;
-		keyseq.print(buf);
-		lyxerr << "Key ["
+		lyxerr << "Key [action="
 		       << action << "]["
-		       << buf << "]"
+		       << keyseq.print() << "]"
 		       << endl;
 	}
 
@@ -255,60 +303,67 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
 	// why not return already here if action == -1 and
 	// num_bytes == 0? (Lgb)
 
-	if (keyseq.length > 1 || keyseq.length < -1) {
-		string buf;
-		keyseq.print(buf);
-		owner->getMiniBuffer()->Set(buf);
+	if (keyseq.length() > 1 && !keyseq.deleted()) {
+		owner->message(keyseq.print());
 	}
 
-	if (action == -1) {
-		if (keyseq.length < -1) { // unknown key sequence...
-			string buf;
-			LyXBell();
-			keyseq.print(buf);
-			owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf);
-			return 0;
-		}
-	
-		char isochar = keyseq.getiso();
-		if (!(state & ControlMask) &&
-		    !(state & Mod1Mask) &&
-		    (isochar && keysym < 0xF000)) {
-			argument += isochar;
+	if (action == LFUN_UNKNOWN_ACTION) {
+		// It is unknown, but what if we remove all
+		// the modifiers? (Lgb)
+		action = keyseq.addkey(keysym, 0);
+
+		if (lyxerr.debugging(Debug::KEY)) {
+			lyxerr << "Removing modifiers...\n"
+			       << "Action now set to ["
+			       << action << "]" << endl;
 		}
-		if (argument.empty()) {
-			lyxerr.debug() << "Empty argument!" << endl;
-			// This can`t possibly be of any use
-			// so we`ll skip the dispatch.
-			return 0;
+		if (action == LFUN_UNKNOWN_ACTION) {
+			owner->message(_("Unknown function."));
+			return;
 		}
 	}
 
-        bool tmp_sc = show_sc;
-	show_sc = false;
-	Dispatch(action, argument);
-	show_sc = tmp_sc;
-	
-	return 0;
+	if (action == LFUN_SELFINSERT) {
+		// This is very X dependent.
+		unsigned int c = keysym;
+		string argument;
+		
+		c = kb_keymap::getiso(c);
+
+		if (c > 0)
+			argument = static_cast<char>(c);
+		
+		dispatch(LFUN_SELFINSERT, argument);
+		lyxerr[Debug::KEY] << "SelfInsert arg[`"
+				   << argument << "']" << endl;
+	}
+	else
+		verboseDispatch(action, false);
 } 
 
 
-LyXFunc::func_status LyXFunc::getStatus(int ac) const
+FuncStatus LyXFunc::getStatus(int ac) const
 {
-        kb_action action;
-        func_status flag = LyXFunc::OK;
-        string argument;
-        Buffer * buf = owner->buffer();
-	
- 	if (lyxaction.isPseudoAction(ac)) 
-		action = lyxaction.retrieveActionArg(ac, argument);
-	else
-		action = static_cast<kb_action>(ac);
+	kb_action action;
+	string argument;
+	action = lyxaction.retrieveActionArg(ac, argument);
+	return getStatus(action, argument);
+}
+
+
+FuncStatus LyXFunc::getStatus(kb_action action,
+			      string const & argument) const
+{
+	FuncStatus flag;
+	Buffer * buf = owner->buffer();
 	
 	if (action == LFUN_UNKNOWN_ACTION) {
-		setErrorMessage(N_("Unknown action"));
-		return LyXFunc::Unknown;
+		setStatusMessage(N_("Unknown action"));
+		return flag.unknown(true);
 	}
+
+	// the default error message if we disable the command
+	setStatusMessage(N_("Command disabled"));
 	
 	// Check whether we need a buffer
 	if (!lyxaction.funcHasFlag(action, LyXAction::NoBuffer)) {
@@ -320,18 +375,19 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 			    !lyxaction.funcHasFlag(action,
 						   LyXAction::ReadOnly)) {
 				// no
-				setErrorMessage(N_("Document is read-only"));
-				flag |= LyXFunc::Disabled;
+				setStatusMessage(N_("Document is read-only"));
+				flag.disabled(true);
 			}
 		} else {
 			// no
-			setErrorMessage(N_("Command not allowed with"
+			setStatusMessage(N_("Command not allowed with"
 					   "out any document open"));
-			flag |= LyXFunc::Disabled;
-			return flag;
+			return flag.disabled(true);
 		}
 	}
 
+	UpdatableInset * tli = owner->view()->theLockingInset();
+	
 	// I would really like to avoid having this switch and rather try to
 	// encode this in the function itself.
         bool disable = false;
@@ -340,20 +396,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 		disable = !Exporter::IsExportable(buf, "dvi")
 			|| lyxrc.print_command == "none";
 		break;
-#if 0
-	case LFUN_FAX:
-		disable = !Exporter::IsExportable(buf, "ps")
-			|| lyxrc.fax_command == "none";
-		break;
-#else
 	case LFUN_EXPORT:
 		disable = argument == "fax" &&
 			!Exporter::IsExportable(buf, argument);
 		break;
-#endif
-	case LFUN_IMPORT:
-		disable = !Importer::IsImportable(argument);
-		break;
 	case LFUN_UNDO:
 		disable = buf->undostack.empty();
 		break;
@@ -363,6 +409,11 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 	case LFUN_SPELLCHECK:
 		disable = lyxrc.isp_command == "none";
 		break;
+#ifndef HAVE_LIBAIKSAURUS
+	case LFUN_THESAURUS_ENTRY:
+		disable = true;
+		break;
+#endif
 	case LFUN_RUNCHKTEX:
 		disable = lyxrc.chktex_command == "none";
 		break;
@@ -371,38 +422,41 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 		break;
 
 	case LFUN_LAYOUT_TABULAR:
-		disable = true;
-		if (owner->view()->theLockingInset()) {
-			disable = (owner->view()->theLockingInset()->LyxCode() != Inset::TABULAR_CODE) &&
-				!owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE);
-		}
+		disable = !tli
+			|| (tli->lyxCode() != Inset::TABULAR_CODE
+			    && !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+		break;
+
+	case LFUN_LAYOUT:
+	case LFUN_LAYOUT_PARAGRAPH: {
+		Inset * inset = TEXT(false)->cursor.par()->inInset();
+		disable = inset && inset->forceDefaultParagraphs(inset);
 		break;
+	}
 
 	case LFUN_TABULAR_FEATURE:
 		disable = true;
-		if (owner->view()->theLockingInset()) {
-			func_status ret = LyXFunc::Disabled;
-			if (owner->view()->theLockingInset()->LyxCode() == Inset::TABULAR_CODE) {
-				ret = static_cast<InsetTabular *>
-					(owner->view()->theLockingInset())->
-					getStatus(argument);
-			} else if (owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+		if (tli) {
+			FuncStatus ret;
+			//ret.disabled(true);
+			if (tli->lyxCode() == Inset::TABULAR_CODE) {
+				ret = static_cast<InsetTabular *>(tli)
+					->getStatus(argument);
+			} else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
 				ret = static_cast<InsetTabular *>
-					(owner->view()->theLockingInset()->
-					GetFirstLockingInsetOfType(Inset::TABULAR_CODE))->
-					getStatus(argument);
+					(tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
+					->getStatus(argument);
 			}
 			flag |= ret;
 			disable = false;
 		} else {
-		    static InsetTabular inset(*owner->buffer(), 1, 1);
-		    func_status ret;
-
-		    disable = true;
-		    ret = inset.getStatus(argument);
-		    if ((ret & LyXFunc::ToggleOn) ||
-			(ret & LyXFunc::ToggleOff))
-			flag |= LyXFunc::ToggleOff;
+			static InsetTabular inset(*owner->buffer(), 1, 1);
+			FuncStatus ret;
+
+			disable = true;
+			ret = inset.getStatus(argument);
+			if (ret.onoff(true) || ret.onoff(false))
+				flag.setOnOff(false);
 		}
 		break;
 
@@ -420,240 +474,526 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
 	case LFUN_VC_HISTORY:
 		disable = !buf->lyxvc.inUse();
 		break;
-	case LFUN_REF_BACK:
-		disable = owner->view()->NoSavedPositions();
-		break;
-	default:
+	case LFUN_BOOKMARK_GOTO:
+		disable =  !owner->view()->
+			isSavedPosition(strToUnsignedInt(argument));
 		break;
-        }
-        if (disable)
-                flag |= LyXFunc::Disabled;
-
-	if (buf) {
-		func_status box = LyXFunc::ToggleOff;
-		LyXFont font;
-		if (owner->view()->theLockingInset() &&
-		    owner->view()->theLockingInset()->getLyXText(owner->view()))
-		    font = owner->view()->theLockingInset()->
-			getLyXText(owner->view())->real_current_font;
-		else
-		    font = owner->view()->text->real_current_font;
-		switch (action) {
-		case LFUN_EMPH:
-			if (font.emph() == LyXFont::ON)
-				box = LyXFunc::ToggleOn;
-			break;
-		case LFUN_NOUN:
-			if (font.noun() == LyXFont::ON)
-				box = LyXFunc::ToggleOn;
-			break;
-		case LFUN_BOLD:
-			if (font.series() == LyXFont::BOLD_SERIES)
-				box = LyXFunc::ToggleOn;
-			break;
-		case LFUN_TEX:
-			if (font.latex() == LyXFont::ON)
-				box = LyXFunc::ToggleOn;
-			break;
-		default:
-			box = LyXFunc::OK;
-			break;
-		}
-		flag |= box;
-	}
-
-	return flag;
-}
-
-
-string const LyXFunc::Dispatch(string const & s) 
-{
-	// Split command string into command and argument
-	string cmd;
-	string line = frontStrip(s);
-	string arg = strip(frontStrip(split(line, cmd, ' ')));
-
-	return Dispatch(lyxaction.LookupFunc(cmd), arg);
-}
 
 
-string const LyXFunc::Dispatch(int ac,
-			 string const & do_not_use_this_arg)
-{
-	lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac
-			      <<"] arg[" << do_not_use_this_arg << "]" << endl;
-	
-	string argument;
-	kb_action action;
-	LyXText * text = 0;
-        
-        // we have not done anything wrong yet.
-        errorstat = false;
-	dispatch_buffer.erase();
-	
-	// if action is a pseudo-action, we need the real action
-	if (lyxaction.isPseudoAction(ac)) {
-		string tmparg;
-		action = static_cast<kb_action>
-			(lyxaction.retrieveActionArg(ac, tmparg));
-		if (!tmparg.empty())
-			argument = tmparg;
-	} else {
-		action = static_cast<kb_action>(ac);
-		if (!do_not_use_this_arg.empty())
-			argument = do_not_use_this_arg; // except here
+	case LFUN_INSET_TOGGLE: {
+		LyXText * lt = owner->view()->getLyXText();
+  		disable = !(isEditableInset(lt->getInset())
+  			    || (lt->inset_owner
+				&& lt->inset_owner->owner()
+  				&& lt->inset_owner->owner()->isOpen()));
+		break;
 	}
-    
-	selection_possible = false;
-	
-	if (owner->view()->available())
-		owner->view()->hideCursor();
-
-	// We cannot use this function here
-	if (getStatus(ac) & Disabled)
-		goto exit_with_message;
-
-	commandshortcut.erase();
-	
-	if (lyxrc.display_shortcuts && show_sc) {
-		if (action != LFUN_SELFINSERT) {
-			// Put name of command and list of shortcuts
-			// for it in minibuffer
-			string comname = lyxaction.getActionName(action);
-
-			int pseudoaction = action;
-			bool argsadded = false;
-
-			if (!argument.empty()) {
-				// If we have the command with argument, 
-				// this is better
-				pseudoaction = 
-					lyxaction.searchActionArg(action,
-							  	  argument);
+	case LFUN_MATH_VALIGN: 
+		if (mathcursor) {
+			char align = mathcursor->valign();
+			if (align == '\0') {
+				disable = true;
+				break;
+			}
+			if (argument.empty()) {
+				flag.clear();
+				break;
+			}
+			if (!contains("tcb", argument[0])) {
+				disable = true;
+				break;
+			}
+			flag.setOnOff(argument[0] == align);
+		} else
+			disable = true;
+		break;
 
-				if (pseudoaction == -1) {
-					pseudoaction = action;
-				} else {
-					comname += " " + argument;
-					argsadded = true;
-				}
+	case LFUN_MATH_HALIGN: 
+		if (mathcursor) {
+			char align = mathcursor->halign();
+			if (align == '\0') {
+				disable = true;
+				break;
+			}
+			if (argument.empty()) {
+				flag.clear();
+				break;
+			}
+			if (!contains("lcr", argument[0])) {
+				disable = true;
+				break;
+			}
+			flag.setOnOff(argument[0] == align);
+		} else
+			disable = true;
+		break;
+
+	case LFUN_MATH_MUTATE: 
+		if (tli && (tli->lyxCode() == Inset::MATH_CODE)) {
+			MathInsetTypes type = mathcursor->formula()->getType();
+			if (argument == "inline") {
+				flag.setOnOff(type == LM_OT_SIMPLE);
+			} else if (argument == "display") {
+				flag.setOnOff(type == LM_OT_EQUATION);
+			} else if (argument == "eqnarray") {
+				flag.setOnOff(type == LM_OT_EQNARRAY);
+			} else if (argument == "align") {
+				flag.setOnOff(type == LM_OT_ALIGN);
+			} else {
+				disable = true;
 			}
+		} else
+			disable = true;
+		break;
 
-			string shortcuts = toplevel_keymap->findbinding(pseudoaction);
+	// we just need to be in math mode to enable that
+	case LFUN_MATH_SIZE: 
+	case LFUN_MATH_SPACE:
+	case LFUN_MATH_LIMITS: 
+	case LFUN_MATH_NONUMBER: 
+	case LFUN_MATH_NUMBER:
+		disable = !mathcursor;
+		break;
 
-			if (!shortcuts.empty()) {
-				comname += ": " + shortcuts;
-			} else if (!argsadded) {
-				comname += " " + argument;
-			}
+	// we need to be math mode and a math array for that
+	// Hack: halign produces non-zero result iff we are in a math array
+	case LFUN_MATH_ROW_INSERT: 
+	case LFUN_MATH_ROW_DELETE: 
+	case LFUN_MATH_COLUMN_INSERT: 
+	case LFUN_MATH_COLUMN_DELETE: 
+		disable = !mathcursor || !mathcursor->halign();
+		break;
 
-			if (!comname.empty()) {
-				comname = strip(comname);
-				commandshortcut = "(" + comname + ')';
-				owner->getMiniBuffer()->Set(commandshortcut);
-				// Here we could even add a small pause,
-				// to annoy the user and make him learn
-				// the shortcuts.
-				// No! That will just annoy, not teach
-				// anything. The user will read the messages
-				// if they are interested. (Asger)
-			}
-		}
-        }
+	default:
+		break;
+	}
 
-	if (owner->view()->available() && owner->view()->theLockingInset()) {
-		UpdatableInset::RESULT result;
-		if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
-				     (keyseq.length >= -1)))
-		{
-			if ((action==LFUN_UNKNOWN_ACTION) && argument.empty()){
-				argument = keyseq.getiso();
-			}
-			// Undo/Redo pre 0.13 is a bit tricky for insets.
-		        if (action == LFUN_UNDO) {
-				int slx;
-				int sly;
-				UpdatableInset * inset = 
-					owner->view()->theLockingInset();
-				inset->GetCursorPos(owner->view(), slx, sly);
-				owner->view()->unlockInset(inset);
-				owner->view()->menuUndo();
-				if (owner->view()->text->cursor.par()->
-				    IsInset(owner->view()->text->cursor.pos())) {
-					inset = static_cast<UpdatableInset*>(
-						owner->view()->text->cursor.par()->
-						GetInset(owner->view()->text->
-							 cursor.pos()));
+	// the functions which insert insets
+	Inset::Code code = Inset::NO_CODE;
+	switch (action) {
+	case LFUN_INSET_TEXT:
+		code = Inset::TEXT_CODE;
+		break;
+	case LFUN_INSET_ERT:
+		code = Inset::ERT_CODE;		
+		break;
+	case LFUN_INSET_GRAPHICS:
+		code = Inset::GRAPHICS_CODE;
+		break;
+	case LFUN_INSET_FOOTNOTE:
+		code = Inset::FOOT_CODE;
+		break;
+	case LFUN_DIALOG_TABULAR_INSERT:
+	case LFUN_INSET_TABULAR:
+		code = Inset::TABULAR_CODE;
+		break;
+	case LFUN_INSET_EXTERNAL:
+		code = Inset::EXTERNAL_CODE;
+		break;
+	case LFUN_INSET_MARGINAL:
+		code = Inset::MARGIN_CODE;
+		break;
+	case LFUN_INSET_MINIPAGE:
+		code = Inset::MINIPAGE_CODE;
+		break;
+	case LFUN_INSET_FLOAT:
+	case LFUN_INSET_WIDE_FLOAT:
+		code = Inset::FLOAT_CODE;
+		break;
+	case LFUN_FLOAT_LIST:
+		code = Inset::FLOAT_LIST_CODE;
+		break;
+#if 0
+	case LFUN_INSET_LIST:
+		code = Inset::LIST_CODE;
+		break;
+	case LFUN_INSET_THEOREM:
+		code = Inset::THEOREM_CODE;
+		break;
+#endif
+	case LFUN_INSET_CAPTION:
+		code = Inset::CAPTION_CODE;
+		break;
+	case LFUN_INSERT_NOTE:
+		code = Inset::IGNORE_CODE;
+		break;
+	case LFUN_INSERT_LABEL:
+		code = Inset::LABEL_CODE;
+		break;
+	case LFUN_REF_INSERT:
+		code = Inset::REF_CODE;
+		break;
+	case LFUN_CITATION_CREATE:
+	case LFUN_CITATION_INSERT:
+		code = Inset::CITE_CODE;
+		break;
+	case LFUN_INSERT_BIBTEX:
+		code = Inset::BIBTEX_CODE;
+		break;
+	case LFUN_INDEX_INSERT:
+	case LFUN_INDEX_INSERT_LAST:
+	case LFUN_INDEX_CREATE:
+		code = Inset::INDEX_CODE;
+		break;
+	case LFUN_INDEX_PRINT:
+		code = Inset::INDEX_PRINT_CODE;
+		break;
+	case LFUN_CHILD_INSERT:
+		code = Inset::INCLUDE_CODE;
+		break;
+	case LFUN_TOC_INSERT:
+		code = Inset::TOC_CODE;
+		break;
+	case LFUN_PARENTINSERT:
+		code = Inset::PARENT_CODE;
+		break;
+	case LFUN_HTMLURL:
+	case LFUN_URL:
+	case LFUN_INSERT_URL:
+		code = Inset::URL_CODE;
+		break;
+	case LFUN_QUOTE:
+		// always allow this, since we will inset a raw quote
+		// if an inset is not allowed.
+		break;
+	case LFUN_HYPHENATION:
+	case LFUN_LIGATURE_BREAK:
+	case LFUN_HFILL:
+	case LFUN_MENU_SEPARATOR:
+	case LFUN_LDOTS:
+	case LFUN_END_OF_SENTENCE:
+	case LFUN_PROTECTEDSPACE:
+		code = Inset::SPECIALCHAR_CODE;
+		break;
+	default:
+		break;
+	}
+	if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code)) {
+		disable = true;
+	}
+
+	if (disable)
+			flag.disabled(true);
+	
+	// A few general toggles
+	switch (action) {
+	case LFUN_READ_ONLY_TOGGLE:
+		flag.setOnOff(buf->isReadonly());
+		break;
+	case LFUN_APPENDIX:
+		flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+		break;
+	case LFUN_SWITCHBUFFER:
+		// toggle on the current buffer, but do not toggle off
+		// the other ones (is that a good idea?) 
+		if (argument == buf->fileName())
+			flag.setOnOff(true);
+		break;
+	default:
+		break;
+	}
+
+	// the font related toggles
+	if (!mathcursor) {
+		LyXFont const & font = TEXT(false)->real_current_font;
+		switch (action) {
+		case LFUN_EMPH:
+			flag.setOnOff(font.emph() == LyXFont::ON);
+			break;
+		case LFUN_NOUN:
+			flag.setOnOff(font.noun() == LyXFont::ON);
+			break;
+		case LFUN_BOLD:
+			flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
+			break;
+		case LFUN_SANS:
+			flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
+			break;
+		case LFUN_ROMAN:
+			flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
+			break;
+		case LFUN_CODE:
+			flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
+			break;
+		default:
+			break;
+		}
+	}
+	else {
+		MathTextCodes tc = mathcursor->getLastCode();
+		switch (action) {
+		case LFUN_BOLD:
+			flag.setOnOff(tc == LM_TC_BF);
+			break;
+		case LFUN_SANS:
+			flag.setOnOff(tc == LM_TC_SF);
+			break;
+		case LFUN_EMPH:
+			flag.setOnOff(tc == LM_TC_CAL);
+			break;
+		case LFUN_ROMAN:
+			flag.setOnOff(tc == LM_TC_RM);
+			break;
+		case LFUN_CODE:
+			flag.setOnOff(tc == LM_TC_TT);
+			break;
+		case LFUN_NOUN:
+			flag.setOnOff(tc == LM_TC_BB);
+			break;
+		case LFUN_DEFAULT:
+			flag.setOnOff(tc == LM_TC_VAR);
+			break;
+		default:
+			break;
+		}
+	}
+	
+	return flag;
+}
+
+
+// temporary dispatch method
+void LyXFunc::miniDispatch(string const & s) 
+{
+	string s2(frontStrip(strip(s))); 
+ 
+	if (!s2.empty()) {
+		verboseDispatch(s2, true);
+	}
+}
+
+
+void LyXFunc::verboseDispatch(string const & s, bool show_sc) 
+{
+	int action = lyxaction.LookupFunc(frontStrip(s));
+ 
+	if (action == LFUN_UNKNOWN_ACTION) {
+		string const msg = string(_("Unknown function ("))
+			+ s + ")";
+		owner->message(msg);
+	} else {
+		verboseDispatch(action, show_sc);
+	} 
+}
+
+
+void LyXFunc::verboseDispatch(int ac, bool show_sc) 
+{
+	string argument;
+	kb_action action;
+        
+	// get the real action and argument
+	action = lyxaction.retrieveActionArg(ac, argument);
+
+	verboseDispatch(action, argument, show_sc);
+}
+
+
+
+void LyXFunc::verboseDispatch(kb_action action,
+			      string const & argument, bool show_sc)
+{
+	string res = dispatch(action, argument);
+
+	commandshortcut.erase();
+	
+	if (lyxrc.display_shortcuts && show_sc) {
+		if (action != LFUN_SELFINSERT) {
+			// Put name of command and list of shortcuts
+			// for it in minibuffer
+			string comname = lyxaction.getActionName(action);
+			
+			int pseudoaction = action;
+			bool argsadded = false;
+			
+			if (!argument.empty()) {
+				// the pseudoaction is useful for the bindings
+				pseudoaction = 
+					lyxaction.searchActionArg(action,
+							  	  argument);
+
+				if (pseudoaction == LFUN_UNKNOWN_ACTION) {
+					pseudoaction = action;
 				} else {
-					inset = 0;
+					comname += " " + argument;
+					argsadded = true;
 				}
-				if (inset)
-					inset->Edit(owner->view(),slx,sly,0);
-				return string();
+			}
+
+			string const shortcuts =
+				toplevel_keymap->findbinding(pseudoaction);
+
+			if (!shortcuts.empty()) {
+				comname += ": " + shortcuts;
+			} else if (!argsadded && !argument.empty()) {
+				comname += " " + argument;
+			}
+
+			if (!comname.empty()) {
+				comname = strip(comname);
+				commandshortcut = "(" + comname + ')';
+			}
+		}
+        }
+
+	if (res.empty()) {
+		if (!commandshortcut.empty()) {
+			owner->getMiniBuffer()->addSet(commandshortcut);
+		}
+	} else {
+		owner->getMiniBuffer()->addSet(' ' + commandshortcut);
+	}
+}
+
+
+string const LyXFunc::dispatch(kb_action action, string argument)
+{
+	lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << action
+			      <<"] arg[" << argument << "]" << endl;
+
+        // we have not done anything wrong yet.
+        errorstat = false;
+	dispatch_buffer.erase();
+
+#ifdef NEW_DISPATCHER
+	// We try do call the most specific dispatcher first:
+	//  1. the lockinginset's dispatch
+	//  2. the bufferview's dispatch
+	//  3. the lyxview's dispatch
+#endif
+
+	selection_possible = false;
+
+	if (owner->view()->available())
+		owner->view()->hideCursor();
+
+	// We cannot use this function here
+	if (getStatus(action, argument).disabled()) {
+		lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: "
+		       << lyxaction.getActionName(action)
+		       << " [" << action << "] is disabled at this location"
+		       << endl;
+		setErrorMessage(getStatusMessage());
+		goto exit_with_message;
+	}
+
+	if (owner->view()->available() && owner->view()->theLockingInset()) {
+		UpdatableInset::RESULT result;
+		if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
+				     (!keyseq.deleted())))
+		{
+			if ((action == LFUN_UNKNOWN_ACTION)
+			    && argument.empty()) {
+				argument = keyseq.getiso();
+			}
+			// Undo/Redo is a bit tricky for insets.
+			if (action == LFUN_UNDO) {
+				owner->view()->menuUndo();
+				goto exit_with_message;
 			} else if (action == LFUN_REDO) {
-				int slx;
-				int sly;
-				UpdatableInset * inset = owner->view()->
-					theLockingInset();
-				inset->GetCursorPos(owner->view(), slx, sly);
-				owner->view()->unlockInset(inset);
 				owner->view()->menuRedo();
-				inset = static_cast<UpdatableInset*>(
-					owner->view()->text->cursor.par()->
-					GetInset(owner->view()->text->
-						 cursor.pos()));
-				if (inset)
-					inset->Edit(owner->view(),slx,sly,0); 
-				return string();
+				goto exit_with_message;
 			} else if (((result=owner->view()->theLockingInset()->
-				   LocalDispatch(owner->view(), action,
-						 argument)) ==
-				   UpdatableInset::DISPATCHED) ||
-				   (result == UpdatableInset::DISPATCHED_NOUPDATE))
-				return string();
-			else {
-				setMessage(N_("Text mode"));
+				     // Hand-over to inset's own dispatch:
+			             localDispatch(owner->view(), action, argument)) ==
+			            UpdatableInset::DISPATCHED) ||
+			           (result == UpdatableInset::DISPATCHED_NOUPDATE))
+				goto exit_with_message;
+					// If UNDISPATCHED, just soldier on
+			else if (result == UpdatableInset::FINISHED) {
+					if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+						TEXT()->cursorRight(owner->view());
+						moveCursorUpdate(true, false);
+						owner->showState();
+					}
+					goto exit_with_message;
+			} else if (result == UpdatableInset::FINISHED_RIGHT) {
+				if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+					TEXT()->cursorRight(owner->view());
+					moveCursorUpdate(true, false);
+					owner->showState();
+				}
+				goto exit_with_message;
+			} else if (result == UpdatableInset::FINISHED_UP) {
+				if (TEXT()->cursor.row()->previous()) {
+					TEXT()->cursorUp(owner->view());
+					moveCursorUpdate(true, false);
+					owner->showState();
+				}
+				goto exit_with_message;
+			} else if (result == UpdatableInset::FINISHED_DOWN) {
+				if (TEXT()->cursor.row()->next())
+					TEXT()->cursorDown(owner->view());
+				else
+					TEXT()->cursorRight(owner->view());
+				moveCursorUpdate(true, false);
+				owner->showState();
+				goto exit_with_message;
+			} else {
+				//setMessage(N_("Text mode"));
 				switch (action) {
 				case LFUN_UNKNOWN_ACTION:
 				case LFUN_BREAKPARAGRAPH:
 				case LFUN_BREAKLINE:
-					owner->view()->text->CursorRight(owner->view());
+					TEXT()->cursorRight(owner->view());
 					owner->view()->setState();
 					owner->showState();
 					break;
 				case LFUN_RIGHT:
-					if (!owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
-						owner->view()->text->CursorRight(owner->view());
-						moveCursorUpdate(false);
+					if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+						TEXT()->cursorRight(owner->view());
+						moveCursorUpdate(true, false);
 						owner->showState();
 					}
-					return string();
+					goto exit_with_message;
 				case LFUN_LEFT: 
-					if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
-						owner->view()->text->CursorRight(owner->view());
-						moveCursorUpdate(false);
+					if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+						TEXT()->cursorRight(owner->view());
+						moveCursorUpdate(true, false);
 						owner->showState();
 					}
-					return string();
+					goto exit_with_message;
 				case LFUN_DOWN:
-					owner->view()->text->CursorDown(owner->view());
-					moveCursorUpdate(false);
+					if (TEXT()->cursor.row()->next())
+						TEXT()->cursorDown(owner->view());
+					else
+						TEXT()->cursorRight(owner->view());
+					moveCursorUpdate(true, false);
 					owner->showState();
-					return string();
+					goto exit_with_message;
 				default:
 					break;
 				}
 			}
 		}
-		if (owner->view()->theLockingInset())
-			text = owner->view()->theLockingInset()->
-				getLyXText(owner->view());
 	}
 
-	if (!text)
-	    text = owner->view()->text;
-
 	switch (action) {
+
+	case LFUN_ESCAPE:
+	{
+		if (!owner->view()->available()) break;
+		// this function should be used always [asierra060396]
+		UpdatableInset * tli =
+			owner->view()->theLockingInset();
+		if (tli) {
+			UpdatableInset * lock = tli->getLockingInset();
+			
+			if (tli == lock) {
+				owner->view()->unlockInset(tli);
+				TEXT()->cursorRight(owner->view());
+				moveCursorUpdate(true, false);
+				owner->showState();
+			} else {
+				tli->unlockInsetInInset(owner->view(),
+							lock,
+							true);
+			}
+			finishUndo();
+		}
+	}
+	break;
+			
 		// --- Misc -------------------------------------------
 	case LFUN_WORDFINDFORWARD  : 
 	case LFUN_WORDFINDBACKWARD : {
@@ -666,71 +1006,49 @@ string const LyXFunc::Dispatch(int ac,
 		} else {
 			searched_string = last_search;
 		}
-
-		LyXText * ltCur = owner->view()->text ;
-
-		if (!searched_string.empty() &&
-		    ((action == LFUN_WORDFINDBACKWARD) ? 
-		     ltCur->SearchBackward(owner->view(), searched_string) :
-		     ltCur->SearchForward(owner->view(), searched_string))) {
-
-			// ??? What is that ???
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-
-			// ??? Needed ???
-			// clear the selection (if there is any) 
-			owner->view()->toggleSelection();
-			owner->view()->text->ClearSelection();
-
-			// Move cursor so that successive C-s 's will not stand in place. 
-			if (action == LFUN_WORDFINDFORWARD ) 
-				owner->view()->text->CursorRightOneWord(owner->view());
-			owner->view()->text->FinishUndo();
-			moveCursorUpdate(false);
-
-			// ??? Needed ???
-			// set the new selection 
-			// SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected);
-			owner->view()->toggleSelection(false);
-		} else 
-			LyXBell();	
-	 
-		// REMOVED : if (owner->view()->getWorkArea()->focus)
-		owner->view()->showCursor();
+		bool fw = (action == LFUN_WORDFINDBACKWARD);
+		if (!searched_string.empty()) {
+			LyXFind(owner->view(), searched_string, fw);
+		}
+//		owner->view()->showCursor();
 	}
 	break;
-
+		
 	case LFUN_PREFIX:
 	{
-		if (owner->view()->available()) {
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+		if (owner->view()->available() && !owner->view()->theLockingInset()) {
+			owner->view()->update(TEXT(),
+					      BufferView::SELECT|BufferView::FITCUR);
 		}
-		string buf;
-		keyseq.print(buf, true);
-		owner->getMiniBuffer()->Set(buf, string(), string(), 1);
+		owner->message(keyseq.print());
 	}
 	break;
 
 	// --- Misc -------------------------------------------
 	case LFUN_EXEC_COMMAND:
-		owner->getMiniBuffer()->PrepareForCommand(); 
-		break;
+	{
+		vector<string> allCmds;
+		transform(lyxaction.func_begin(), lyxaction.func_end(),
+			  back_inserter(allCmds), lyx::firster());
+		static vector<string> hist;
+		owner->getMiniBuffer()->getString(MiniBuffer::spaces,
+						  allCmds, hist);
+	}
+	break;
 		
 	case LFUN_CANCEL:                   // RVDK_PATCH_5
 		keyseq.reset();
 		meta_fake_bit = 0;
 		if (owner->view()->available())
 			// cancel any selection
-			Dispatch(LFUN_MARK_OFF);
+			dispatch(LFUN_MARK_OFF);
 		setMessage(N_("Cancel"));
 		break;
 
 	case LFUN_META_FAKE:                                 // RVDK_PATCH_5
 	{
 		meta_fake_bit = Mod1Mask;
-		string buf;
-		keyseq.print(buf, true);
-		setMessage(buf); // RVDK_PATCH_5
+		setMessage(keyseq.print());
 	}
 	break;  
 
@@ -747,49 +1065,32 @@ string const LyXFunc::Dispatch(int ac,
 		owner->view()->center();
 		break;
 		
-	case LFUN_APPENDIX:
-		if (owner->view()->available()) {
-			owner->view()->text->toggleAppendix(owner->view());
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		}
-		break;
-
 		// --- Menus -----------------------------------------------
 	case LFUN_MENUNEW:
-		MenuNew(false);
+		menuNew(false);
 		break;
 		
 	case LFUN_MENUNEWTMPLT:
-		MenuNew(true);
-		break;
-		
-	case LFUN_MENUOPEN:
-		MenuOpen();
+		menuNew(true);
 		break;
 		
 	case LFUN_CLOSEBUFFER:
-		CloseBuffer();
+		closeBuffer();
 		break;
 		
 	case LFUN_MENUWRITE:
 		if (!owner->buffer()->isUnnamed()) {
-			owner->getMiniBuffer()->Set(_("Saving document"),
-						    MakeDisplayPath(owner->buffer()->fileName()),
-						    "...");
-			MenuWrite(owner->buffer());
-			//owner->getMiniBuffer()-> {
-			//	Set(_("Document saved as"),
-			//	    MakeDisplayPath(owner->buffer()->fileName()));
-			//} else {
-			//owner->getMiniBuffer()->Set(_("Save failed!"));
-			//}
-		} else {
-			MenuWriteAs(owner->buffer());
-		}
+			ostringstream s1;
+			s1 << _("Saving document") << ' '
+			   << MakeDisplayPath(owner->buffer()->fileName() + "...");
+			owner->message(s1.str().c_str());
+			MenuWrite(owner->view(), owner->buffer());
+		} else
+			WriteAs(owner->view(), owner->buffer());
 		break;
 		
-	case LFUN_MENUWRITEAS:
-		MenuWriteAs(owner->buffer());
+	case LFUN_WRITEAS:
+		WriteAs(owner->view(), owner->buffer(), argument);
 		break;
 		
 	case LFUN_MENURELOAD:
@@ -816,14 +1117,11 @@ string const LyXFunc::Dispatch(int ac,
 		owner->getDialogs()->showPrint();
 		break;
 
-#if 0
-	case LFUN_FAX:
-		MenuFax(owner->buffer());
-		break;
-#endif
-		
 	case LFUN_EXPORT:
-		Exporter::Export(owner->buffer(), argument, false);
+		if (argument == "custom")
+			MenuSendto();
+		else
+			Exporter::Export(owner->buffer(), argument, false);
 		break;
 
 	case LFUN_IMPORT:
@@ -835,75 +1133,34 @@ string const LyXFunc::Dispatch(int ac,
 		break;
 		
 	case LFUN_TOCVIEW:
+#if 0
 	case LFUN_LOFVIEW:
 	case LFUN_LOTVIEW:
 	case LFUN_LOAVIEW:
+#endif
 	{
 		InsetCommandParams p;
-		
-		if (action == LFUN_TOCVIEW )
-			p.setCmdName( "tableofcontents" );
-		else if (action == LFUN_LOAVIEW )
-			p.setCmdName( "listofalgorithms" );
-		else if (action == LFUN_LOFVIEW )
-			p.setCmdName( "listoffigures" );
-		else
-			p.setCmdName( "listoftables" );
 
-		owner->getDialogs()->createTOC( p.getAsString() );
+#if 0
+		if (action == LFUN_TOCVIEW)
+#endif
+			p.setCmdName("tableofcontents");
+#if 0
+		else if (action == LFUN_LOAVIEW)
+			p.setCmdName("listof{algorithm}{List of Algorithms}");
+		else if (action == LFUN_LOFVIEW)
+			p.setCmdName("listoffigures");
+		else
+			p.setCmdName("listoftables");
+#endif
+		owner->getDialogs()->createTOC(p.getAsString());
 		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 (!owner->view()->insertInset( inset, "Standard", true ) )
-			delete inset;
-		break;
-	}
-		
 	case LFUN_DIALOG_TABULAR_INSERT:
 		owner->getDialogs()->showTabularCreate();
 		break;
 		
-	case LFUN_TABULAR_FEATURE:
-	case LFUN_SCROLL_INSET:
-		// this is not handled here as this funktion is only aktive
-		// if we have a locking_inset and that one is (or contains)
-		// a tabular-inset
-		break;
-
-	case LFUN_FIGURE:
-		Figure();
-		break;
-
-	case LFUN_INSET_GRAPHICS:
-	{
-		Inset * new_inset = new InsetGraphics;
-		if (!owner->view()->insertInset(new_inset)) {
-			delete new_inset;
-		} else {
-			// this is need because you don't use a inset->Edit()
-			owner->view()->updateInset(new_inset, true);
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		}
-		break;
-	}
-	
 	case LFUN_AUTOSAVE:
 		AutoSave(owner->view());
 		break;
@@ -917,146 +1174,37 @@ string const LyXFunc::Dispatch(int ac,
 		break;
 		
 	case LFUN_MENUSEARCH:
-	{
-		// Ok this is one _very_ bad solution, but I think that some
-		// of this will be rewritten as part of GUI indep anyway.
-		// Lgb
-		static LyXFindReplace FR_;
-		FR_.StartSearch(owner->view());
-	}
-	break;
-		
-	case LFUN_PASTE:
-		owner->view()->paste();
-		owner->view()->setState();
-		break;
-		
-	case LFUN_PASTESELECTION:
-	{
-	        bool asPara = false;
-		if (argument == "paragraph") asPara = true;
-		owner->view()->pasteClipboard(asPara);
-	}
-	break;
-	
-	case LFUN_CUT:
-		owner->view()->cut();
-		break;
-		
-	case LFUN_COPY:
-		owner->view()->copy();
-		break;
-		
-	case LFUN_LAYOUT_COPY:
-		owner->view()->copyEnvironment();
-		break;
-		
-	case LFUN_LAYOUT_PASTE:
-		owner->view()->pasteEnvironment();
-		owner->view()->setState();
-		break;
-		
-	case LFUN_GOTOERROR:
-		owner->view()->gotoError();
+		owner->getDialogs()->showSearch();
 		break;
 		
 	case LFUN_REMOVEERRORS:
 		if (owner->view()->removeAutoInsets()) {
 			owner->view()->redraw();
-			owner->view()->fitCursor(owner->view()->text);
+			owner->view()->fitCursor();
 		}
 		break;
-		
-	case LFUN_GOTONOTE:
-		owner->view()->gotoNote();
-		break;
-
-#ifndef NEW_INSETS
-	case LFUN_OPENSTUFF:
-		owner->view()->openStuff();
-		break;
-#endif
-		
-	case LFUN_HYPHENATION:
-		owner->view()->hyphenationPoint();
-		break;
-		
-	case LFUN_LDOTS:
-		owner->view()->ldots();
-		break;
-		
-	case LFUN_END_OF_SENTENCE:
-		owner->view()->endOfSentenceDot();
-		break;
 
-	case LFUN_MENU_SEPARATOR:
-		owner->view()->menuSeparator();
-		break;
-		
-	case LFUN_HFILL:
-		owner->view()->hfill();
-		break;
-		
 	case LFUN_DEPTH:
-		changeDepth(owner->view(), 0);
+		changeDepth(owner->view(), TEXT(false), 0);
 		break;
 		
 	case LFUN_DEPTH_MIN:
-		changeDepth(owner->view(), -1);
+		changeDepth(owner->view(), TEXT(false), -1);
 		break;
 		
 	case LFUN_DEPTH_PLUS:
-		changeDepth(owner->view(), 1);
+		changeDepth(owner->view(), TEXT(false), 1);
 		break;
 		
 	case LFUN_FREE:
-		Free(owner->view());
-		owner->view()->setState();
-		owner->showState();
-		break;
-		
-	case LFUN_TEX:
-		Tex(owner->view());
-		owner->view()->setState();
-		owner->showState();
+		owner->getDialogs()->setUserFreeFont();
 		break;
-#ifndef NEW_INSETS		
-	case LFUN_MELT:
-		Melt(owner->view());
-		break;
-#endif
+
 	case LFUN_RECONFIGURE:
 		Reconfigure(owner->view());
 		break;
-#ifndef NEW_INSETS
-	case LFUN_FOOTMELT:
-		if (owner->view()->available()
-		    && !owner->view()->text->selection
-		    && owner->view()->text->cursor.par()->footnoteflag
-		    != LyXParagraph::NO_FOOTNOTE)
-			{ // only melt footnotes with FOOTMELT, not margins etc
-				if (owner->view()->text->cursor.par()->footnotekind == LyXParagraph::FOOTNOTE)
-					Melt(owner->view());
-			}
-		else
-			Foot(owner->view()); 
-		owner->view()->setState();
-		break;
 
-	case LFUN_MARGINMELT:
-		if (owner->view()->available()
-		    && !owner->view()->text->selection
-		    && owner->view()->text->cursor.par()->footnoteflag
-		    != LyXParagraph::NO_FOOTNOTE) {
-			// only melt margins
-			if (owner->view()->text->cursor.par()->footnotekind == LyXParagraph::MARGIN)
-				Melt(owner->view());
-		} else
-			Margin(owner->view()); 
-		owner->view()->setState();
-		break;
-#endif
-#ifndef NEW_INSETS
+#if 0
 	case LFUN_FLOATSOPERATE:
 		if (argument == "openfoot")
 			owner->view()->allFloats(1,0);
@@ -1068,52 +1216,42 @@ string const LyXFunc::Dispatch(int ac,
 			owner->view()->allFloats(0,1);
 		break;
 #else
-#warning Find another implementation here (or another lyxfunc)!
+#ifdef WITH_WARNINGS
+//#warning Find another implementation here (or another lyxfunc)!
 #endif
-	case LFUN_HELP_COPYRIGHT:
-		owner->getDialogs()->showCopyright();
+#endif
+	case LFUN_HELP_ABOUTLYX:
+		owner->getDialogs()->showAboutlyx();
 		break;
 
-	case LFUN_HELP_CREDITS:
-		owner->getDialogs()->showCredits();
+	case LFUN_HELP_TEXINFO:
+		owner->getDialogs()->showTexinfo();
 		break;
 
-        case LFUN_HELP_OPEN: {
-		string arg = argument;
+        case LFUN_HELP_OPEN:
+	{
+		string const arg = argument;
 		if (arg.empty()) {
 			setErrorMessage(N_("Missing argument"));
 			break;
 		}
-		ProhibitInput(owner->view());
-		string fname = i18nLibFileSearch("doc", arg, "lyx");
+		owner->prohibitInput();
+		string const fname = i18nLibFileSearch("doc", arg, "lyx");
 		if (fname.empty()) {
 			lyxerr << "LyX: unable to find documentation file `"
 			       << arg << "'. Bad installation?" << endl;
-			AllowInput(owner->view());
+			owner->allowInput();
 			break;
 		}
-		owner->getMiniBuffer()->Set(_("Opening help file"),
-					    MakeDisplayPath(fname),"...");
-		owner->view()->buffer(bufferlist.loadLyXFile(fname,false));
-		AllowInput(owner->view());
+		ostringstream str;
+		str << _("Opening help file") << ' '
+		    << MakeDisplayPath(fname) << "...";
+		owner->message(str.str().c_str());
+		owner->view()->buffer(bufferlist.loadLyXFile(fname, false));
+		owner->allowInput();
 		break;
         }
 
-	case LFUN_HELP_VERSION: {
-		ProhibitInput(owner->view());
-		string msg(_("LyX Version "));
-		msg += LYX_VERSION;
-		msg += " of ";
-		msg += LYX_RELEASE;
-		fl_show_message(msg.c_str(),
-				(_("Library directory: ")
-				 + MakeDisplayPath(system_lyxdir)).c_str(),
-				(_("User directory: ") 
-				 + MakeDisplayPath(user_lyxdir)).c_str());
-		AllowInput(owner->view());
-		break;
-	}
-	
 		// --- version control -------------------------------
 	case LFUN_VC_REGISTER:
 	{
@@ -1152,7 +1290,7 @@ string const LyXFunc::Dispatch(int ac,
 		
 	case LFUN_VC_HISTORY:
 	{
-		owner->buffer()->lyxvc.showLog();
+		owner->getDialogs()->showVCLogFile();
 		break;
 	}
 	
@@ -1162,20 +1300,6 @@ string const LyXFunc::Dispatch(int ac,
                 owner->view()->buffer(bufferlist.getBuffer(argument));
 		break;
 
-
-	case LFUN_FILE_INSERT:
-	{
-		MenuInsertLyXFile(argument);
-	}
-	break;
-	
-	case LFUN_FILE_INSERT_ASCII:
-	{
-		bool asPara = (argument == "paragraph");
-		InsertAsciiFile(owner->view(), string(), asPara);
-	}
-	break;
-	
 	case LFUN_FILE_NEW:
 	{
 		// servercmd: argument must be <file>:<template>
@@ -1186,1236 +1310,137 @@ string const LyXFunc::Dispatch(int ac,
 	break;
 			
 	case LFUN_FILE_OPEN:
-		owner->view()->buffer(bufferlist.loadLyXFile(argument));
+		open(argument);
 		break;
 
 	case LFUN_LATEX_LOG:
-		ShowLatexLog();
+		owner->getDialogs()->showLogFile();
 		break;
 		
-	case LFUN_LAYOUTNO:
-	{
-		lyxerr.debug() << "LFUN_LAYOUTNO: (arg) " << argument << endl;
-		int sel = strToInt(argument);
-		lyxerr.debug() << "LFUN_LAYOUTNO: (sel) "<< sel << endl;
-		
-		// Should this give a setMessage instead?
-		if (sel == 0) 
-			return string(); // illegal argument
-
-		--sel; // sel 1..., but layout 0...
-
-		// Pretend we got the name instead.
-		Dispatch(int(LFUN_LAYOUT), 
-			 textclasslist.NameOfLayout(owner->view()
-						    ->buffer()->params.textclass,
-						    sel));
-		return string();
-	}
-		
-	case LFUN_LAYOUT:
-	{
-		lyxerr.debug() << "LFUN_LAYOUT: (arg) "
-			       << argument << endl;
-		
-		// Derive layout number from given argument (string)
-		// and current buffer's textclass (number). */    
-		LyXTextClassList::ClassList::size_type tclass =
-			owner->view()->buffer()->params.textclass;
-		pair <bool, LyXTextClass::size_type> layout = 
-			textclasslist.NumberOfLayout(tclass, argument);
-
-		// If the entry is obsolete, use the new one instead.
-		if (layout.first) {
-			string obs = textclasslist.Style(tclass,layout.second)
-			      .obsoleted_by();
-			if (!obs.empty()) 
-				layout = 
-				  textclasslist.NumberOfLayout(tclass, obs);
-		}
-
-		// see if we found the layout number:
-		if (!layout.first) {
-			setErrorMessage(string(N_("Layout ")) + argument + 
-					N_(" not known"));
-			break;
-		}
-
-		if (current_layout != layout.second) {
-			owner->view()->hideCursor();
-			current_layout = layout.second;
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-			owner->view()->text->
-				SetLayout(owner->view(), layout.second);
-			owner->setLayout(layout.second);
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			owner->view()->setState();
-		}
-	}
-	break;
-
 	case LFUN_LAYOUT_DOCUMENT:
-		owner->getDialogs()->showLayoutDocument();
+		owner->getDialogs()->showDocument();
 		break;
 		
 	case LFUN_LAYOUT_PARAGRAPH:
-#ifdef USE_OLD_PARAGRAPH_LAYOUT
-		MenuLayoutParagraph();
-#else
-		owner->getDialogs()->showLayoutParagraph();
-#endif
+		owner->getDialogs()->showParagraph();
 		break;
 		
 	case LFUN_LAYOUT_CHARACTER:
-		MenuLayoutCharacter();
+		owner->getDialogs()->showCharacter();
 		break;
 
 	case LFUN_LAYOUT_TABULAR:
 	    if (owner->view()->theLockingInset()) {
-		if (owner->view()->theLockingInset()->LyxCode()==Inset::TABULAR_CODE) {
+		if (owner->view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
 		    InsetTabular * inset = static_cast<InsetTabular *>
 			(owner->view()->theLockingInset());
-		    inset->OpenLayoutDialog(owner->view());
+		    inset->openLayoutDialog(owner->view());
 		} else if (owner->view()->theLockingInset()->
-			   GetFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
+			   getFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
 		    InsetTabular * inset = static_cast<InsetTabular *>(
-			owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE));
-		    inset->OpenLayoutDialog(owner->view());
+			owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+		    inset->openLayoutDialog(owner->view());
 		}
 	    }
 	    break;
 
 	case LFUN_LAYOUT_PREAMBLE:
-		MenuLayoutPreamble();
-		break;
-		
-	case LFUN_LAYOUT_SAVE_DEFAULT:
-		MenuLayoutSave();
+		owner->getDialogs()->showPreamble();
 		break;
 		
 	case LFUN_DROP_LAYOUTS_CHOICE:
 		owner->getToolbar()->openLayoutList();
 		break;
 
-	case LFUN_LANGUAGE:
-		Lang(owner->view(), argument);
-		owner->view()->setState();
-		owner->showState();
-		break;
-
-	case LFUN_EMPH:
-		Emph(owner->view());
-		owner->showState();
-		break;
-
-	case LFUN_BOLD:
-		Bold(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_NOUN:
-		Noun(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_CODE:
-		Code(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_SANS:
-		Sans(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_ROMAN:
-		Roman(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_DEFAULT:
-		StyleReset(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_UNDERLINE:
-		Underline(owner->view());
-		owner->showState();
-		break;
-		
-	case LFUN_FONT_SIZE:
-		FontSize(owner->view(), argument);
-		owner->showState();
-		break;
-		
-	case LFUN_FONT_STATE:
-		setMessage(CurrentState(owner->view()));
-		break;
-		
-	case LFUN_UPCASE_WORD:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->ChangeWordCase(owner->view(), LyXText::text_uppercase);
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		break;
-		
-	case LFUN_LOWCASE_WORD:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->ChangeWordCase(owner->view(), LyXText::text_lowercase);
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		break;
+	case LFUN_MENU_OPEN_BY_NAME:
+		owner->getMenubar()->openByName(argument);
+		break; // RVDK_PATCH_5
 		
-	case LFUN_CAPITALIZE_WORD:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->ChangeWordCase(owner->view(),
-				     LyXText::text_capitalization);
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	case LFUN_SPELLCHECK:
+		if (lyxrc.isp_command != "none")
+			owner->getDialogs()->showSpellchecker();
 		break;
 		
-	case LFUN_INSERT_LABEL:
-		MenuInsertLabel(argument);
+	// --- lyxserver commands ----------------------------
+
+
+	case LFUN_GETNAME:
+		setMessage(owner->buffer()->fileName());
+		lyxerr[Debug::INFO] << "FNAME["
+			       << owner->buffer()->fileName()
+			       << "] " << endl;
 		break;
 		
-	case LFUN_REF_INSERT:
-		if (argument.empty()) {
-			InsetCommandParams p("ref");
-		owner->getDialogs()->createRef(p.getAsString());
-		} else {
-			InsetCommandParams p;
-			p.setFromString(argument);
-
-			InsetRef * inset = new InsetRef(p, *owner->buffer());
-			if (!owner->view()->insertInset(inset))
-				delete inset;
-			else
-				owner->view()->updateInset(inset, true);
-		}
-		break;
-
-	case LFUN_REF_BACK:
+	case LFUN_NOTIFY:
 	{
-		owner->view()->restorePosition();
+		dispatch_buffer = keyseq.print();
+		lyxserver->notifyClient(dispatch_buffer);
 	}
 	break;
 
-	case LFUN_REF_GOTO:
+	case LFUN_GOTOFILEROW:
 	{
-		string label(argument);
-		if (label.empty()) {
-			InsetRef * inset = 
-				static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
-			if (inset)
-                                label = inset->getContents();
+		string file_name;
+		int row;
+		istringstream istr(argument.c_str());
+		istr >> file_name >> row;
+		// Must replace extension of the file to be .lyx and get full path
+		string const s(ChangeExtension(file_name, ".lyx"));
+
+		// Either change buffer or load the file
+		if (bufferlist.exists(s)) {
+		        owner->view()->buffer(bufferlist.getBuffer(s));
+		} else {
+		        owner->view()->buffer(bufferlist.loadLyXFile(s));
 		}
 		
-		if (!label.empty()) {
-			owner->view()->savePosition();
-			if (!owner->view()->gotoLabel(label))
-				WriteAlert(_("Error"), 
-					   _("Couldn't find this label"), 
-					   _("in current document."));
-		}
+		// Set the cursor  
+		owner->view()->setCursorFromRow(row);
+
+		// Recenter screen
+		owner->view()->center();
 	}
 	break;
-		
-	case LFUN_MENU_OPEN_BY_NAME:
-		owner->getMenubar()->openByName(argument);
-		break; // RVDK_PATCH_5
-		
-	case LFUN_SPELLCHECK:
-		if (lyxrc.isp_command != "none")
-			ShowSpellChecker(owner->view());
-		break; // RVDK_PATCH_5
-		
-		// --- Cursor Movements -----------------------------
-	case LFUN_RIGHT:
+
+	case LFUN_GOTO_PARAGRAPH:
 	{
-		LyXText * tmptext = owner->view()->text;
-		bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params);
-		if (!tmptext->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (is_rtl)
-			tmptext->CursorLeft(owner->view(), false);
-		if (tmptext->cursor.pos() < tmptext->cursor.par()->Last()
-		    && tmptext->cursor.par()->GetChar(tmptext->cursor.pos())
-		    == LyXParagraph::META_INSET
-		    && tmptext->cursor.par()->GetInset(tmptext->cursor.pos())
-		    && tmptext->cursor.par()->GetInset(tmptext->cursor.pos())->Editable() == Inset::HIGHLY_EDITABLE){
-			Inset * tmpinset = tmptext->cursor.par()->GetInset(tmptext->cursor.pos());
-			setMessage(tmpinset->EditMessage());
-			tmpinset->Edit(owner->view(), 0, 0, 0);
+		istringstream istr(argument.c_str());
+
+		int id;
+		istr >> id;
+		Paragraph * par = owner->buffer()->getParFromID(id);
+		if (par == 0) {
+			lyxerr[Debug::INFO] << "No matching paragraph found! ["
+					    << id << "]" << endl;
 			break;
+		} else {
+			lyxerr << "Paragraph " << par->id()
+			       << " found." << endl;
+		}
+
+		if (owner->view()->theLockingInset())
+			owner->view()->unlockInset(owner->view()->theLockingInset());
+		if (par->inInset()) {
+			par->inInset()->edit(owner->view());
 		}
-		if (!is_rtl)
-			tmptext->CursorRight(owner->view(), false);
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
+		// Set the cursor
+		owner->view()->getLyXText()->setCursor(owner->view(), par, 0);
+		owner->view()->setState();
 		owner->showState();
+
+		// Recenter screen
+		owner->view()->center();
 	}
 	break;
-		
-	case LFUN_LEFT:
-	{
-		// This is soooo ugly. Isn`t it possible to make
-		// it simpler? (Lgb)
-		LyXText * txt = owner->view()->text;
-		bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params);
-		if (!txt->mark_set) owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		LyXCursor cur = txt->cursor;
-		if (!is_rtl)
-			txt->CursorLeft(owner->view(), false);
-		if ((cur != txt->cursor) && // only if really moved!
-		    txt->cursor.pos() < txt->cursor.par()->Last() &&
-		    (txt->cursor.par()->GetChar(txt->cursor.pos()) ==
-		     LyXParagraph::META_INSET) &&
-		    txt->cursor.par()->GetInset(txt->cursor.pos()) &&
-		    (txt->cursor.par()->GetInset(txt->cursor.pos())->Editable()
-		     == Inset::HIGHLY_EDITABLE))
-		{
-			Inset * tmpinset = txt->cursor.par()->GetInset(txt->cursor.pos());
-			setMessage(tmpinset->EditMessage());
-			LyXFont font = txt->GetFont(owner->view()->buffer(),
-						    txt->cursor.par(),
-						    txt->cursor.pos());
-			tmpinset->Edit(owner->view(),
-				       tmpinset->x() +
-				       tmpinset->width(owner->view(),font),
-				       tmpinset->descent(owner->view(),font),
-				       0);
-			break;
-		}
-		if  (is_rtl)
-			txt->CursorRight(owner->view(), false);
 
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
+	case LFUN_APROPOS:
+	case LFUN_GETTIP:
+	{
+		int const qa = lyxaction.LookupFunc(argument);
+		setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
 	}
 	break;
-		
-	case LFUN_UP:
-		if (!owner->view()->text->mark_set) owner->view()->beforeChange();
-		owner->view()->update(BufferView::UPDATE);
-		owner->view()->text->CursorUp(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_DOWN:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::UPDATE);
-		owner->view()->text->CursorDown(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
 
-	case LFUN_UP_PARAGRAPH:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::UPDATE);
-		owner->view()->text->CursorUpParagraph(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_DOWN_PARAGRAPH:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::UPDATE);
-		owner->view()->text->CursorDownParagraph(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_PRIOR:
-		if (!text->mark_set)
-		    owner->view()->beforeChange();
-		owner->view()->update(BufferView::UPDATE);
-		owner->view()->cursorPrevious(text);
-		owner->view()->text->FinishUndo();
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, false);
-		else
-		    moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_NEXT:
-		if (!text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::UPDATE);
-		owner->view()->cursorNext(text);
-		owner->view()->text->FinishUndo();
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, false);
-		else
-		    moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_HOME:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorHome(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_END:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorEnd(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_SHIFT_TAB:
-	case LFUN_TAB:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorTab(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_WORDRIGHT:
-		if (!text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-			text->CursorLeftOneWord(owner->view());
-		else
-			text->CursorRightOneWord(owner->view());
-		owner->view()->text->FinishUndo();
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_WORDLEFT:
-		if (!text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-			text->CursorRightOneWord(owner->view());
-		else
-			text->CursorLeftOneWord(owner->view());
-		owner->view()->text->FinishUndo();
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_BEGINNINGBUF:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorTop(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-	case LFUN_ENDBUF:
-		if (!owner->view()->text->mark_set)
-			owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorBottom(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-
-      
-		/* cursor selection ---------------------------- */
-	case LFUN_RIGHTSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-			owner->view()->text->CursorLeft(owner->view());
-		else
-			owner->view()->text->CursorRight(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_LEFTSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-			owner->view()->text->CursorRight(owner->view());
-		else
-			owner->view()->text->CursorLeft(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_UPSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorUp(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_DOWNSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorDown(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-
-	case LFUN_UP_PARAGRAPHSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorUpParagraph(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_DOWN_PARAGRAPHSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorDownParagraph(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_PRIORSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->cursorPrevious(text);
-		owner->view()->text->FinishUndo();
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, false);
-		else
-		    moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_NEXTSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->cursorNext(text);
-		owner->view()->text->FinishUndo();
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, false);
-		else
-		    moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_HOMESEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorHome(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_ENDSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorEnd(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_WORDRIGHTSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-			owner->view()->text->CursorLeftOneWord(owner->view());
-		else
-			owner->view()->text->CursorRightOneWord(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_WORDLEFTSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-			owner->view()->text->CursorRightOneWord(owner->view());
-		else
-			owner->view()->text->CursorLeftOneWord(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_BEGINNINGBUFSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorTop(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-		
-	case LFUN_ENDBUFSEL:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		owner->view()->text->CursorBottom(owner->view());
-		owner->view()->text->FinishUndo();
-		moveCursorUpdate(true);
-		owner->showState();
-		break;
-
-		// --- text changing commands ------------------------
-	case LFUN_BREAKLINE:
-		owner->view()->beforeChange();
-		owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		moveCursorUpdate(false);
-		break;
-		
-	case LFUN_PROTECTEDSPACE:
-	{
-		LyXLayout const & style =
-			textclasslist.Style(owner->view()->buffer()->params.textclass,
-					    owner->view()->text->cursor.par()->GetLayout());
-
-		if (style.free_spacing) {
-			owner->view()->text->InsertChar(owner->view(), ' ');
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		} else {
-			owner->view()->protectedBlank();
-		}
-		moveCursorUpdate(false);
-	}
-	break;
-		
-	case LFUN_SETMARK:
-		if (text->mark_set) {
-			owner->view()->beforeChange();
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-			setMessage(N_("Mark removed"));
-		} else {
-			owner->view()->beforeChange();
-			text->mark_set = 1;
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-			setMessage(N_("Mark set"));
-		}
-		text->sel_cursor = text->cursor;
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		break;
-		
-	case LFUN_DELETE:
-		if (!owner->view()->text->selection) {
-			owner->view()->text->Delete(owner->view());
-			owner->view()->text->sel_cursor = 
-				owner->view()->text->cursor;
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			// It is possible to make it a lot faster still
-			// just comment out the lone below...
-			owner->view()->showCursor();
-		} else {
-			owner->view()->cut();
-		}
-		moveCursorUpdate(false);
-		owner->showState();
-		owner->view()->setState();
-		break;
-
-	case LFUN_DELETE_SKIP:
-	{
-		// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-		
-		LyXCursor cursor = owner->view()->text->cursor;
-
-		if (!owner->view()->text->selection) {
-			if (cursor.pos() == cursor.par()->Last()) {
-				owner->view()->text->CursorRight(owner->view());
-				cursor = owner->view()->text->cursor;
-				if (cursor.pos() == 0
-				    && !(cursor.par()->added_space_top 
-					 == VSpace (VSpace::NONE))) {
-					owner->view()->text->SetParagraph
-						(owner->view(),
-						 cursor.par()->line_top,
-						 cursor.par()->line_bottom,
-						 cursor.par()->pagebreak_top, 
-						 cursor.par()->pagebreak_bottom,
-						 VSpace(VSpace::NONE), 
-						 cursor.par()->added_space_bottom,
-						 cursor.par()->align, 
-						 cursor.par()->labelwidthstring, 0);
-					owner->view()->text->CursorLeft(owner->view());
-					owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-				} else {
-					owner->view()->text->CursorLeft(owner->view());
-					owner->view()->text->Delete(owner->view());
-					owner->view()->text->sel_cursor = 
-						owner->view()->text->cursor;
-					owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-				}
-			} else {
-				owner->view()->text->Delete(owner->view());
-				owner->view()->text->sel_cursor = 
-					owner->view()->text->cursor;
-				owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			}
-		} else {
-			owner->view()->cut();
-		}
-	}
-	break;
-
-	/* -------> Delete word forward. */
-	case LFUN_DELETE_WORD_FORWARD:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->DeleteWordForward(owner->view());
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-
-		/* -------> Delete word backward. */
-	case LFUN_DELETE_WORD_BACKWARD:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->DeleteWordBackward(owner->view());
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		moveCursorUpdate(false);
-		owner->showState();
-		break;
-		
-		/* -------> Kill to end of line. */
-	case LFUN_DELETE_LINE_FORWARD:
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->DeleteLineForward(owner->view());
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		moveCursorUpdate(false);
-		break;
-		
-		/* -------> Set mark off. */
-	case LFUN_MARK_OFF:
-		owner->view()->beforeChange();
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->sel_cursor = text->cursor;
-		setMessage(N_("Mark off"));
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		break;
-
-		/* -------> Set mark on. */
-	case LFUN_MARK_ON:
-		owner->view()->beforeChange();
-		owner->view()->text->mark_set = 1;
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-		text->sel_cursor = text->cursor;
-		if (text->inset_owner)
-		    owner->view()->updateInset(text->inset_owner, true);
-		setMessage(N_("Mark on"));
-		break;
-		
-	case LFUN_BACKSPACE:
-	{
-		if (!owner->view()->text->selection) {
-			if (owner->getIntl()->getTrans()->backspace()) {
-				owner->view()->text->Backspace(owner->view());
-				owner->view()->text->sel_cursor = 
-					owner->view()->text->cursor;
-				owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-				// It is possible to make it a lot faster still
-				// just comment out the lone below...
-				owner->view()->showCursor();
-			}
-		} else {
-			owner->view()->cut();
-		}
-		owner->showState();
-		owner->view()->setState();
-	}
-	break;
-
-	case LFUN_BACKSPACE_SKIP:
-	{
-		// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-		
-		LyXCursor cursor = owner->view()->text->cursor;
-		
-		if (!owner->view()->text->selection) {
-			if (cursor.pos() == 0 
-			    && !(cursor.par()->added_space_top 
-				 == VSpace (VSpace::NONE))) {
-				owner->view()->text->SetParagraph 
-					(owner->view(),
-					 cursor.par()->line_top,      
-					 cursor.par()->line_bottom,
-					 cursor.par()->pagebreak_top, 
-					 cursor.par()->pagebreak_bottom,
-					 VSpace(VSpace::NONE), cursor.par()->added_space_bottom,
-					 cursor.par()->align, 
-					 cursor.par()->labelwidthstring, 0);
-				owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			} else {
-				owner->view()->text->Backspace(owner->view());
-				owner->view()->text->sel_cursor 
-					= cursor;
-				owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			}
-		} else
-			owner->view()->cut();
-	}
-	break;
-
-	case LFUN_BREAKPARAGRAPH:
-	{
-		owner->view()->beforeChange();
-		owner->view()->text->BreakParagraph(owner->view(), 0);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		owner->view()->text->sel_cursor = 
-			owner->view()->text->cursor;
-		owner->view()->setState();
-		owner->showState();
-		break;
-	}
-
-	case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
-	{
-		owner->view()->beforeChange();
-		owner->view()->text->BreakParagraph(owner->view(), 1);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		owner->view()->text->sel_cursor = 
-			owner->view()->text->cursor;
-		owner->view()->setState();
-		owner->showState();
-		break;
-	}
-	
-	case LFUN_BREAKPARAGRAPH_SKIP:
-	{
-		// When at the beginning of a paragraph, remove
-		// indentation and add a "defskip" at the top.
-		// Otherwise, do the same as LFUN_BREAKPARAGRAPH.
-		
-		LyXCursor cursor = owner->view()->text->cursor;
-		
-		owner->view()->beforeChange();
-		if (cursor.pos() == 0) {
-			if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) {
-				owner->view()->text->SetParagraph
-					(owner->view(),
-					 cursor.par()->line_top,      
-					 cursor.par()->line_bottom,
-					 cursor.par()->pagebreak_top, 
-					 cursor.par()->pagebreak_bottom,
-					 VSpace(VSpace::DEFSKIP), cursor.par()->added_space_bottom,
-					 cursor.par()->align, 
-					 cursor.par()->labelwidthstring, 1);
-				//owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-			} 
-		}
-		else {
-			owner->view()->text->BreakParagraph(owner->view(), 0);
-			//owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		}
-
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		owner->view()->text->sel_cursor = cursor;
-		owner->view()->setState();
-		owner->showState();
-	}
-	break;
-
-	case LFUN_PARAGRAPH_SPACING:
-	{
-		LyXParagraph * par = owner->view()->text->cursor.par();
-		Spacing::Space cur_spacing = par->spacing.getSpace();
-		float cur_value = 1.0;
-		if (cur_spacing == Spacing::Other) {
-			cur_value = par->spacing.getValue();
-		}
-		
-		istringstream istr(argument.c_str());
-
-		string tmp;
-		istr >> tmp;
-		Spacing::Space new_spacing = cur_spacing;
-		float new_value = cur_value;
-		if (tmp.empty()) {
-			lyxerr << "Missing argument to `paragraph-spacing'"
-			       << endl;
-		} else if (tmp == "single") {
-			new_spacing = Spacing::Single;
-		} else if (tmp == "onehalf") {
-			new_spacing = Spacing::Onehalf;
-		} else if (tmp == "double") {
-			new_spacing = Spacing::Double;
-		} else if (tmp == "other") {
-			new_spacing = Spacing::Other;
-			float tmpval = 0.0;
-			istr >> tmpval;
-			lyxerr << "new_value = " << tmpval << endl;
-			if (tmpval != 0.0)
-				new_value = tmpval;
-		} else if (tmp == "default") {
-			new_spacing = Spacing::Default;
-		} else {
-			lyxerr << _("Unknown spacing argument: ")
-			       << argument << endl;
-		}
-		if (cur_spacing != new_spacing || cur_value != new_value) {
-			par->spacing.set(new_spacing, new_value);
-			owner->view()->text->RedoParagraph(owner->view());
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		}
-	}
-	break;
-	
-	case LFUN_QUOTE:
-		owner->view()->beforeChange();
-		owner->view()->text->InsertChar(owner->view(), '\"');  // This " matches the single quote in the code
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-                moveCursorUpdate(false);
-		break;
-
-	case LFUN_HTMLURL:
-	case LFUN_URL:
-	{
-		InsetCommandParams p;
-		if (action == LFUN_HTMLURL)
-			p.setCmdName("htmlurl");
-		else
-			p.setCmdName("url");
-		owner->getDialogs()->createUrl( p.getAsString() );
-	}
-	break;
-		    
-	case LFUN_INSERT_URL:
-	{
-		InsetCommandParams p;
-		p.setFromString( argument );
-
-		InsetUrl * inset = new InsetUrl( p );
-		if (!owner->view()->insertInset(inset))
-			delete inset;
-		else
-			owner->view()->updateInset( inset, true );
-	}
-	break;
-		    
-	case LFUN_INSET_TEXT:
-	{
-		InsetText * new_inset = new InsetText;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-	
-	case LFUN_INSET_ERT:
-	{
-		InsetERT * new_inset = new InsetERT;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-	
-	case LFUN_INSET_EXTERNAL:
-	{
-		InsetExternal * new_inset = new InsetExternal;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-	
-	case LFUN_INSET_FOOTNOTE:
-	{
-		InsetFoot * new_inset = new InsetFoot;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
-	case LFUN_INSET_MARGINAL:
-	{
-		InsetMarginal * new_inset = new InsetMarginal;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
-	case LFUN_INSET_MINIPAGE:
-	{
-		InsetMinipage * new_inset = new InsetMinipage;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
-	case LFUN_INSET_FLOAT:
-	{
-		// check if the float type exist
-		if (floatList.typeExist(argument)) {
-			InsetFloat * new_inset = new InsetFloat(argument);
-			if (owner->view()->insertInset(new_inset))
-				new_inset->Edit(owner->view(), 0, 0, 0);
-			else
-				delete new_inset;
-		} else {
-			lyxerr << "Non-existant float type: "
-			       << argument << endl;
-		}
-		
-	}
-	break;
-
-	case LFUN_INSET_LIST:
-	{
-		InsetList * new_inset = new InsetList;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
-	case LFUN_INSET_THEOREM:
-	{
-		InsetTheorem * new_inset = new InsetTheorem;
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
-	case LFUN_INSET_CAPTION:
-	{
-		// Do we have a locking inset...
-		if (owner->view()->theLockingInset()) {
-			lyxerr << "Locking inset code: "
-			       << static_cast<int>(owner->view()->theLockingInset()->LyxCode());
-			InsetCaption * new_inset = new InsetCaption;
-			new_inset->setOwner(owner->view()->theLockingInset());
-			new_inset->SetAutoBreakRows(true);
-			new_inset->SetDrawFrame(0, InsetText::LOCKED);
-			new_inset->SetFrameColor(0, LColor::footnoteframe);
-			if (owner->view()->insertInset(new_inset))
-				new_inset->Edit(owner->view(), 0, 0, 0);
-			else
-				delete new_inset;
-		}
-	}
-	break;
-	
-	case LFUN_INSET_TABULAR:
-	{
-		int r = 2, c = 2;
-		if (!argument.empty())
-			::sscanf(argument.c_str(),"%d%d", &r, &c);
-		InsetTabular * new_inset =
-			new InsetTabular(*owner->buffer(), r, c);
-		if (owner->view()->insertInset(new_inset))
-			new_inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete new_inset;
-	}
-	break;
-
-	// --- lyxserver commands ----------------------------
-
-	case LFUN_CHARATCURSOR:
-	{
-		LyXParagraph::size_type pos = 
-			owner->view()->text->cursor.pos();
-		if (pos < owner->view()->text->cursor.par()->size())
-			//dispatch_buffer = owner->view()->text->
-			//	cursor.par()->text[pos];
-			dispatch_buffer =
-				owner->view()->text->
-				cursor.par()->GetChar(pos);
-		else
-			dispatch_buffer = "EOF";
-	}
-	break;
-	
-	case LFUN_GETXY:
-		dispatch_buffer = 
-			tostr(owner->view()->text->cursor.x()) + ' '
-			+ tostr(owner->view()->text->cursor.y());
-		break;
-		
-	case LFUN_SETXY:
-	{
-		int x;
-		int y;
-		::sscanf(argument.c_str(), " %d %d", &x, &y);
-		owner->view()->text->SetCursorFromCoordinates(owner->view(), x, y);
-	}
-	break;
-	
-	case LFUN_GETLAYOUT:
-		dispatch_buffer =  
-			tostr(owner->view()->text->cursor.par()->layout);
-		break;
-			
-	case LFUN_GETFONT:
-	{
-		LyXFont & font = owner->view()->text->current_font;
-                if (font.shape() == LyXFont::ITALIC_SHAPE)
-			dispatch_buffer = 'E';
-                else if (font.shape() == LyXFont::SMALLCAPS_SHAPE)
-			dispatch_buffer = 'N';
-                else
-			dispatch_buffer = '0';
-
-	}
-	break;
-
-	case LFUN_GETLATEX:
-	{
-		LyXFont & font = owner->view()->text->current_font;
-                if (font.latex() == LyXFont::ON)
-			dispatch_buffer = 'L';
-                else
-			dispatch_buffer = '0';
-	}
-	break;
-
-	case LFUN_GETNAME:
-		setMessage(owner->buffer()->fileName());
-		lyxerr.debug() << "FNAME["
-			       << owner->buffer()->fileName()
-			       << "] " << endl;
-		break;
-		
-	case LFUN_NOTIFY:
-	{
-		string buf;
-		keyseq.print(buf);
-		dispatch_buffer = buf;
-		lyxserver->notifyClient(dispatch_buffer);
-	}
-	break;
-
-	case LFUN_GOTOFILEROW:
-	{
-	        char file_name[100];
-		int row;
-		::sscanf(argument.c_str(), " %s %d", file_name, &row);
-
-		// Must replace extension of the file to be .lyx and get full path
-		string s = ChangeExtension(string(file_name), ".lyx");
-
-		// Either change buffer or load the file
-		if (bufferlist.exists(s))
-		        owner->view()->buffer(bufferlist.getBuffer(s));
-		else
-		        owner->view()->buffer(bufferlist.loadLyXFile(s));
-
-		// Set the cursor  
-		owner->view()->setCursorFromRow(row);
-
-		// Recenter screen
-		owner->view()->center();
-	}
-	break;
-
-	case LFUN_GOTO_PARAGRAPH:
-	{
-                istringstream istr(argument.c_str());
-
-		int id;
-		istr >> id;
-		LyXParagraph * par = owner->view()->text->GetParFromID(id);
-
-		// Set the cursor
-		owner->view()->text->SetCursor(owner->view(), par, 0);
-		owner->view()->setState();
-		owner->showState();
-
-		// Recenter screen
-		owner->view()->center();
-	}
-	break;
-
-	case LFUN_APROPOS:
-	case LFUN_GETTIP:
-	{
-		int const qa = lyxaction.LookupFunc(argument);
-		setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
-	}
-	break;
-
-	// --- accented characters ---------------------------
-		
-	case LFUN_UMLAUT:
-	case LFUN_CIRCUMFLEX:
-	case LFUN_GRAVE:
-	case LFUN_ACUTE:
-	case LFUN_TILDE:
-	case LFUN_CEDILLA:
-	case LFUN_MACRON:
-	case LFUN_DOT:
-	case LFUN_UNDERDOT:
-	case LFUN_UNDERBAR:
-	case LFUN_CARON:
-	case LFUN_SPECIAL_CARON:
-	case LFUN_BREVE:
-	case LFUN_TIE:
-	case LFUN_HUNG_UMLAUT:
-	case LFUN_CIRCLE:
-	case LFUN_OGONEK:
-	{
-		char c = 0;
-		
-		if (keyseq.length == -1 && keyseq.getiso() != 0) 
-			c = keyseq.getiso();
-		
-		owner->getIntl()->getTrans()->
-			deadkey(c, get_accent(action).accent, 
-				owner->view()->text);
-		
-		// Need to reset, in case the minibuffer calls these
-		// actions
-		keyseq.reset();
-		keyseq.length = 0;
-		
-		// copied verbatim from do_accent_char
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-		owner->view()->text->sel_cursor = 
-			owner->view()->text->cursor;
-	}   
-	break;
-	
 	// --- toolbar ----------------------------------
 	case LFUN_PUSH_TOOLBAR:
 	{
@@ -2449,273 +1474,56 @@ string const LyXFunc::Dispatch(int ac,
 	// --- insert characters ----------------------------------------
 
 	// ---  Mathed stuff. If we are here, there is no locked inset yet.
-	
-	// Greek mode     
-	case LFUN_GREEK:
-	{
-		if (!greek_kb_flag) {
-			greek_kb_flag = 1;
-			setMessage(N_("Math greek mode on"));
-		} else
-			greek_kb_flag = 0;
-	}  
-	break;
-      
-	// Greek keyboard      
-	case LFUN_GREEK_TOGGLE:
-	{
-		greek_kb_flag = greek_kb_flag ? 0 : 2;
-		if (greek_kb_flag) {
-			setMessage(N_("Math greek keyboard on"));
-		} else {
-			setMessage(N_("Math greek keyboard off"));
-		}
-	}
-	break;
-	
-	case LFUN_MATH_DELIM:     
-	case LFUN_INSERT_MATRIX:
-	{ 	   
-		if (owner->view()->available()) { 
-			if (owner->view()->
-			    open_new_inset(new InsetFormula(false)))
-			{
-				owner->view()->theLockingInset()
-					->LocalDispatch(owner->view(),
-							action,
-							argument);
-			}
-		}
-	}	   
-	break;
-	       
-	case LFUN_INSERT_MATH:
-	{
-		math_insert_symbol(argument);
-	}
-	break;
-	
-	case LFUN_MATH_DISPLAY:
-	{
-		if (owner->view()->available())
-			owner->view()->open_new_inset(new InsetFormula(true));
-		break;
-	}
-		    
-	case LFUN_MATH_MACRO:
-	{
-		if (owner->view()->available()) {
-			string s(argument);
-		        if (s.empty())
-				setErrorMessage(N_("Missing argument"));
-		        else {
-				string s1 = token(s, ' ', 1);
-				int na = s1.empty() ? 0 : lyx::atoi(s1);
-				owner->view()->
-					open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na));
-			}
-		}
-	}
-	break;
-
-	case LFUN_MATH_MODE:   // Open or create a math inset
-	{		
-		if (owner->view()->available())
-			owner->view()->open_new_inset(new InsetFormula);
-		setMessage(N_("Math editor mode"));
-	}
-	break;
-	  
+	case LFUN_MATH_EXTERN:
 	case LFUN_MATH_NUMBER:
+	case LFUN_MATH_NONUMBER:
 	case LFUN_MATH_LIMITS:
 	{
 		setErrorMessage(N_("This is only allowed in math mode!"));
-	
 	}
 	break;
 
+	// passthrough hat and underscore outside mathed:
+	case LFUN_SUBSCRIPT:
+		dispatch(LFUN_SELFINSERT, "_");
+		break;
+	case LFUN_SUPERSCRIPT:
+		dispatch(LFUN_SELFINSERT, "^");
+		break;
+
 	case LFUN_MATH_PANEL:
-	{
-		show_symbols_form(this);
-	}
-	break;
+		owner->getDialogs()->showMathPanel();
+		break;
 	
 	case LFUN_CITATION_CREATE:
 	{
-		// Should do this "at source"
-		InsetCommandParams p( "cite" );
-		
-		if (contains(argument, "|")) {
-			p.setContents( token(argument, '|', 0) );
-			p.setOptions(  token(argument, '|', 1) );
-		} else {
-			p.setContents( argument );
-		}
-
-		owner->getDialogs()->createCitation( p.getAsString() );
-	}
-	break;
-		    
-	case LFUN_CITATION_INSERT:
-	{
-		InsetCommandParams p;
-		p.setFromString( argument );
-
-		InsetCitation * inset = new InsetCitation( p );
-		if (!owner->view()->insertInset(inset))
-			delete inset;
-		else
-			owner->view()->updateInset( inset, true );
-	}
-	break;
-		    
-	case LFUN_INSERT_BIBTEX:
-	{   
-		// ale970405+lasgoutt970425
-		// The argument can be up to two tokens separated 
-		// by a space. The first one is the bibstyle.
-		string db       = token(argument, ' ', 0);
-		string bibstyle = token(argument, ' ', 1);
-		if (bibstyle.empty())
-			bibstyle = "plain";
-
-		InsetCommandParams p( "BibTeX", db, bibstyle );
-		InsetBibtex * inset = new InsetBibtex(p);
+		InsetCommandParams p("cite");
 		
-		if (owner->view()->insertInset(inset)) {
-			if (argument.empty())
-				inset->Edit(owner->view(), 0, 0, 0);
+		if (!argument.empty()) {
+			// This should be set at source, ie when typing
+			// "citation-insert foo" in the minibuffer.
+			// Question: would pybibliographer also need to be
+			// changed. Suspect so. Leave as-is therefore.
+			if (contains(argument, "|")) {
+				p.setContents(token(argument, '|', 0));
+				p.setOptions( token(argument, '|', 1));
+			} else {
+				p.setContents(argument);
+			}
+			dispatch(LFUN_CITATION_INSERT, p.getAsString());
 		} else
-			delete inset;
-	}
-	break;
-		
-	// BibTeX data bases
-	case LFUN_BIBDB_ADD:
-	{
-		InsetBibtex * inset = 
-			static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
-		if (inset) {
-			inset->addDatabase(argument);
-		}
-	}
-	break;
-		    
-	case LFUN_BIBDB_DEL:
-	{
-		InsetBibtex * inset = 
-			static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
-		if (inset) {
-			inset->delDatabase(argument);
-		}
-	}
-	break;
-	
-	case LFUN_BIBTEX_STYLE:
-	{
-		InsetBibtex * inset = 
-			static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
-		if (inset) {
-			inset->setOptions(argument);
-		}
-	}
-	break;
-		
-	case LFUN_INDEX_CREATE:
-	{
-		InsetCommandParams p( "index" );
-		
-		if (argument.empty()) {
-			// Get the word immediately preceding the cursor
-			LyXParagraph::size_type curpos = 
-				owner->view()->text->cursor.pos() - 1;
-
-			string curstring;
-			if (curpos >= 0 )
-				curstring = owner->view()->text
-					    ->cursor.par()->GetWord(curpos);
-
-			p.setContents( curstring );
-		} else {
-			p.setContents( argument );
-		}
-
-		owner->getDialogs()->createIndex( p.getAsString() );
-	}
-	break;
-		    
-	case LFUN_INDEX_INSERT:
-	{
-		InsetCommandParams p;
-		p.setFromString( argument );
-		InsetIndex * inset = new InsetIndex( p );
-
-		if (!owner->view()->insertInset(inset))
-			delete inset;
-		else
-			owner->view()->updateInset( inset, true );
-	}
-	break;
-		    
-	case LFUN_INDEX_INSERT_LAST:
-	{
-		// Get word immediately preceding the cursor
-		LyXParagraph::size_type curpos = 
-			owner->view()->text->cursor.pos() - 1;
-	  	// Can't do that at the beginning of a paragraph
-	  	if (curpos < 0 ) break;
-
-		string curstring( owner->view()->text
-				  ->cursor.par()->GetWord(curpos) );
-
-		InsetCommandParams p( "index", curstring );
-		InsetIndex * inset = new InsetIndex( p );
-
-		if (!owner->view()->insertInset(inset))
-			delete inset;
-		else
-			owner->view()->updateInset( inset, true );
+			owner->getDialogs()->createCitation(p.getAsString());
 	}
 	break;
 		    
-	case LFUN_INDEX_PRINT:
-	{
-		InsetCommandParams p( "printindex" );
-		Inset * inset = new InsetPrintIndex(p);
-		if (!owner->view()->insertInset(inset, "Standard", true))
-			delete inset;
-	}
-	break;
-
-	case LFUN_PARENTINSERT:
-	{
-		lyxerr << "arg " << argument << endl;
-		InsetCommandParams p( "lyxparent", argument );
-		Inset * inset = new InsetParent(p, *owner->buffer());
-		if (!owner->view()->insertInset(inset, "Standard", true))
-			delete inset;
-	}
-	break;
-
-	case LFUN_CHILDINSERT:
-	{
-		InsetCommandParams p( "Include", argument );
-		Inset * inset = new InsetInclude(p, *owner->buffer());
-		if (owner->view()->insertInset(inset, "Standard", true))
-			inset->Edit(owner->view(), 0, 0, 0);
-		else
-			delete inset;
-	}
-	break;
-
 	case LFUN_CHILDOPEN:
 	{
-		string filename =
+		string const filename =
 			MakeAbsPath(argument, 
-				    OnlyPath(owner->buffer()->fileName()));
+				    owner->buffer()->filePath());
 		setMessage(N_("Opening child document ") +
 			   MakeDisplayPath(filename) + "...");
-		owner->view()->savePosition();
+		owner->view()->savePosition(0);
 		if (bufferlist.exists(filename))
 			owner->view()->buffer(bufferlist.getBuffer(filename));
 		else
@@ -2723,37 +1531,6 @@ string const LyXFunc::Dispatch(int ac,
 	}
 	break;
 
-	case LFUN_INSERT_NOTE:
-		owner->view()->insertNote();
-		break;
-#ifndef NEW_INSETS
-	case LFUN_INSERTFOOTNOTE: 
-	{
-		LyXParagraph::footnote_kind kind;
-		if (argument == "footnote")
-			{ kind = LyXParagraph::FOOTNOTE; }
-		else if (argument == "margin")
-			{ kind = LyXParagraph::MARGIN; }
-		else if (argument == "figure")
-			{ kind = LyXParagraph::FIG; }
-		else if (argument == "table")
-			{ kind = LyXParagraph::TAB; }
-		else if (argument == "wide-fig")
-			{ kind = LyXParagraph::WIDE_FIG; }
-		else if (argument == "wide-tab")
-			{ kind = LyXParagraph::WIDE_TAB; }
-		else if (argument == "algorithm")
-			{ kind = LyXParagraph::ALGORITHM; }
-		else {
-			setErrorMessage(N_("Unknown kind of footnote"));
-			break;
-		}
-		owner->view()->text->InsertFootnoteEnvironment(owner->view(), kind);
-		owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		owner->view()->setState();
-	}
-	break;
-#endif
 	case LFUN_TOGGLECURSORFOLLOW:
 		lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
 		break;
@@ -2774,58 +1551,14 @@ string const LyXFunc::Dispatch(int ac,
 		owner->getIntl()->ToggleKeyMap();
 		break;
 
-	case LFUN_SELFINSERT:
-	{
-		LyXFont old_font(owner->view()->text->real_current_font);
-		for (string::size_type i = 0; i < argument.length(); ++i) {
-			owner->view()->text->InsertChar(owner->view(), argument[i]);
-			// This needs to be in the loop, or else we
-			// won't break lines correctly. (Asger)
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-		}
-		owner->view()->text->sel_cursor = 
-			owner->view()->text->cursor;
-		moveCursorUpdate(false);
-
-		// real_current_font.number can change so we need to 
-		// update the minibuffer
-		if (old_font != owner->view()->text->real_current_font)
-			owner->showState();
-	}
-	break;
-
 	case LFUN_SEQUENCE: 
 	{
 		// argument contains ';'-terminated commands
 		while (argument.find(';') != string::npos) {
 			string first;
 			argument = split(argument, first, ';');
-			Dispatch(first);
-		}
-	}
-	break;
-
-	case LFUN_DATE_INSERT:  // jdblair: date-insert cmd
-	{
-		struct tm * now_tm;
-		
-		time_t now_time_t = time(NULL);
-		now_tm = localtime(&now_time_t);
-		setlocale(LC_TIME, "");
-		string arg;
-		if (!argument.empty())
-			arg = argument;
-		else 
-			arg = lyxrc.date_insert_format;
-		char datetmp[32];
-		int datetmp_len = ::strftime(datetmp, 32, arg.c_str(), now_tm);
-		for (int i = 0; i < datetmp_len; i++) {
-			owner->view()->text->InsertChar(owner->view(), datetmp[i]);
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			verboseDispatch(first, false);
 		}
-
-		owner->view()->text->sel_cursor = owner->view()->text->cursor;
-		moveCursorUpdate(false);
 	}
 	break;
 
@@ -2848,8 +1581,8 @@ string const LyXFunc::Dispatch(int ac,
 		fontloader.update();
 		// Of course we should only do the resize and the textcache.clear
 		// if values really changed...but not very important right now. (Lgb)
-		// All buffers will need resize
-		bufferlist.resize();
+		// All visible buffers will need resize
+		owner->resize();
 		// We also need to empty the textcache so that
 		// the buffer will be formatted correctly after
 		// a zoom change.
@@ -2859,165 +1592,140 @@ string const LyXFunc::Dispatch(int ac,
 
 	case LFUN_SET_COLOR:
 	{
-		string lyx_name, x11_name;
-		x11_name = split(argument, lyx_name, ' ');
+		string lyx_name;
+		string const x11_name = split(argument, lyx_name, ' ');
 		if (lyx_name.empty() || x11_name.empty()) {
-			LyXBell();
 			setErrorMessage(N_("Syntax: set-color <lyx_name>"
 						" <x11_name>"));
 			break;
 			}
 
+		bool const graphicsbg_changed =
+			(lyx_name == lcolor.getLyXName(LColor::graphicsbg) &&
+			 x11_name != lcolor.getX11Name(LColor::graphicsbg));
+
 		if (!lcolor.setColor(lyx_name, x11_name)) {
-			static string err1 (N_("Set-color \""));
-			static string err2 (N_("\" failed - color is undefined "
-						"or may not be redefined"));
-			LyXBell();
-			setErrorMessage(err1 + lyx_name + err2);
+			static string const err1 (N_("Set-color \""));
+			static string const err2 (
+				N_("\" failed - color is undefined "
+				   "or may not be redefined"));
+			setErrorMessage(_(err1) + lyx_name + _(err2));
 			break;
 		}
+
 		lyxColorHandler->updateColor(lcolor.getFromLyXName(lyx_name));
+
+		if (graphicsbg_changed) {
+			grfx::GCache & gc = grfx::GCache::get();
+			gc.changeDisplay(true);
+		}
+		
 		owner->view()->redraw();
 		break;
 	}
 
-	case LFUN_UNKNOWN_ACTION:
-	{
-		if (!owner->buffer()) {
-			LyXBell();
-			setErrorMessage(N_("No document open"));
-			break;
-		}
+	case LFUN_MESSAGE:
+		owner->message(argument);
+		break;
 
-		if (owner->buffer()->isReadonly()) {
-			LyXBell();
-			setErrorMessage(N_("Document is read only"));
-			break;
-		}
-			 
-		if (!argument.empty()) {
-			
-			/* Automatically delete the currently selected
-			 * text and replace it with what is being
-			 * typed in now. Depends on lyxrc settings
-			 * "auto_region_delete", which defaults to
-			 * true (on). */
-		
-			if (lyxrc.auto_region_delete) {
-				if (owner->view()->text->selection){
-					owner->view()->text->CutSelection(owner->view(), false);
-					owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-				}
-			}
-			
-			owner->view()->beforeChange();
-			LyXFont old_font(owner->view()->text->real_current_font);
-			for (string::size_type i = 0;
-			     i < argument.length(); ++i) {
-				if (greek_kb_flag) {
-					if (!math_insert_greek(argument[i]))
-						owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-				} else
-					owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-			}
+	case LFUN_MESSAGE_PUSH:
+		owner->messagePush(argument);
+		break;
+
+	case LFUN_MESSAGE_POP:
+		owner->messagePop();
+		break;
 
-			owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	case LFUN_FORKS_SHOW:
+		owner->getDialogs()->showForks();
+		break;
 
-			owner->view()->text->sel_cursor = 
-				owner->view()->text->cursor;
-			moveCursorUpdate(false);
+	case LFUN_FORKS_KILL:
+	{
+		if (!isStrInt(argument))
+			break;
 
-			// real_current_font.number can change so we need to
-			// update the minibuffer
-			if (old_font != owner->view()->text->real_current_font)
-				owner->showState();
-			return string();
-		} else {
-			// why is an "Unknown action" with empty
-			// argument even dispatched in the first
-			// place? I`ll probably change that. (Lgb)
-			LyXBell();
-			setErrorMessage(N_("Unknown action"));
-		}
+		pid_t const pid = strToInt(argument);
+		ForkedcallsController & fcc = ForkedcallsController::get();
+		fcc.kill(pid);
 		break;
 	}
 
 	default:
-		lyxerr << "A truly unknown func!" << endl;
+		// Then if it was none of the above
+		// Trying the BufferView::pimpl dispatch:
+		if (!owner->view()->Dispatch(action, argument))
+			lyxerr << "A truly unknown func ["
+			       << lyxaction.getActionName(action) << "]!"
+			       << endl;
 		break;
 	} // end of switch
-  exit_with_message:
 
-	string res = getMessage();
+exit_with_message:
 
-	if (res.empty()) {
-		if (!commandshortcut.empty()) {
-			string newbuf = owner->getMiniBuffer()->GetText();
-			if (newbuf != commandshortcut) {
-				owner->getMiniBuffer()->Set(newbuf
-							    + " " +
-							    commandshortcut);
-			}
-		}
-	} else {
-		string msg(_(res));
-		msg += " ";
-		msg += commandshortcut;
-		owner->getMiniBuffer()->Set(msg);
-	}
+	string const res = getMessage();
 
+	if (!res.empty())
+		owner->message(_(res));
+	owner->updateMenubar();
+	owner->updateToolbar();
+	
 	return res;
 }
 
 
 void LyXFunc::setupLocalKeymap()
 {
-	keyseq.stdmap = keyseq.curmap = toplevel_keymap;
-	cancel_meta_seq.stdmap = cancel_meta_seq.curmap = toplevel_keymap;
+	keyseq.stdmap = keyseq.curmap = toplevel_keymap.get();
+	cancel_meta_seq.stdmap = cancel_meta_seq.curmap = toplevel_keymap.get();
 }
 
 
-void LyXFunc::MenuNew(bool fromTemplate)
+void LyXFunc::menuNew(bool fromTemplate)
 {
 	string initpath = lyxrc.document_path;
-	LyXFileDlg fileDlg;
 
 	if (owner->view()->available()) {
-		string trypath = owner->buffer()->filepath;
+		string const trypath = owner->buffer()->filePath();
 		// If directory is writeable, use this as default.
-		if (IsDirWriteable(trypath) == 1)
+		if (IsDirWriteable(trypath))
 			initpath = trypath;
 	}
 
-	static int newfile_number = 0;
+	static int newfile_number;
 	string s;
-
+	
 	if (lyxrc.new_ask_filename) {
-		ProhibitInput(owner->view());
-		fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-		fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
-		string fname = fileDlg.Select(_("Enter Filename for new document"), 
-				       initpath, "*.lyx", _("newfile"));
-		AllowInput(owner->view());
+		FileDialog fileDlg(owner, _("Enter filename for new document"),
+				   LFUN_SELECT_FILE_SYNC,
+			make_pair(string(_("Documents|#o#O")),
+				  string(lyxrc.document_path)),
+			make_pair(string(_("Templates|#T#t")),
+				  string(lyxrc.template_path)));
+
+		FileDialog::Result result =
+			fileDlg.Select(initpath,
+				       _("*.lyx|LyX Documents (*.lyx)"),
+				       _("newfile"));
 	
-		if (fname.empty()) {
-			owner->getMiniBuffer()->Set(_("Canceled."));
-			lyxerr.debug() << "New Document Cancelled." << endl;
+		if (result.second.empty()) {
+			owner->message(_("Canceled."));
+			lyxerr[Debug::INFO] << "New Document Cancelled." << endl;
 			return;
 		}
 	
 		// get absolute path of file and make sure the filename ends
 		// with .lyx
-		s = MakeAbsPath(fname);
+		s = MakeAbsPath(result.second);
 		if (!IsLyXFilename(s))
 			s += ".lyx";
 
 		// Check if the document already is open
 		if (bufferlist.exists(s)) {
-			switch (AskConfirmation(_("Document is already open:"), 
-					       MakeDisplayPath(s, 50),
-					       _("Do you want to close that document now?\n"
-						 "('No' will just switch to the open version)")))
+			switch (Alert::askConfirmation(_("Document is already open:"),
+						MakeDisplayPath(s, 50),
+						_("Do you want to close that document now?\n"
+						  "('No' will just switch to the open version)")))
 			{
 			case 1: // Yes: close the document
 				if (!bufferlist.close(bufferlist.getBuffer(s)))
@@ -3028,28 +1736,33 @@ void LyXFunc::MenuNew(bool fromTemplate)
 				owner->view()->buffer(bufferlist.getBuffer(s));
 				return;
 			case 3: // Cancel: Do nothing
-				owner->getMiniBuffer()->Set(_("Canceled."));
+				owner->message(_("Canceled."));
 				return;
 			}
 		}
 		// Check whether the file already exists
-		if (IsLyXFilename(s)) {
-			FileInfo fi(s);
-			if (fi.readable() &&
-			    AskQuestion(_("File already exists:"), 
-					MakeDisplayPath(s, 50),
-					_("Do you want to open the document?"))) {
+		FileInfo fi(s);
+		if (fi.readable() &&
+		    Alert::askQuestion(_("File already exists:"), 
+				MakeDisplayPath(s, 50),
+				_("Do you want to open the document?"))) {
 				// loads document
-				owner->getMiniBuffer()->Set(_("Opening document"), 
-							    MakeDisplayPath(s), "...");
-				XFlush(fl_get_display());
-				owner->view()->buffer(
-					bufferlist.loadLyXFile(s));
-				owner->getMiniBuffer()->Set(_("Document"),
-							    MakeDisplayPath(s),
-							    _("opened."));
-				return;
-			}
+			string const disp_fn(MakeDisplayPath(s));
+			
+			ostringstream str;
+			str << _("Opening  document") << ' '
+			    << disp_fn << "...";
+			
+			owner->message(str.str().c_str());
+			//XFlush(fl_get_display());
+			owner->view()->buffer(bufferlist.loadLyXFile(s));
+			ostringstream str2;
+			str2 << _("Document") << ' '
+			     << disp_fn << ' ' << _("opened.");
+			
+			owner->message(str2.str().c_str());
+			
+			return;
 		}
 	} else {
 		s = AddName(lyxrc.document_path,
@@ -3067,103 +1780,146 @@ void LyXFunc::MenuNew(bool fromTemplate)
 	// The template stuff
 	string templname;
 	if (fromTemplate) {
-		ProhibitInput(owner->view());
-		string fname = fileDlg.Select(_("Choose template"),
-				       lyxrc.template_path,
-				       "*.lyx");
-		AllowInput(owner->view());
-		if (fname.empty()) return;
+		FileDialog fileDlg(owner, _("Select template file"),
+			LFUN_SELECT_FILE_SYNC,
+			make_pair(string(_("Documents|#o#O")),
+				  string(lyxrc.document_path)),
+			make_pair(string(_("Templates|#T#t")),
+				  string(lyxrc.template_path)));
+
+		FileDialog::Result result =
+			fileDlg.Select(lyxrc.template_path,
+				       _("*.lyx|LyX Documents (*.lyx)"));
+	
+		if (result.first == FileDialog::Later)
+			return;
+
+		string const fname = result.second;
+
+		if (fname.empty()) 
+			return;
                 templname = fname;
 	}
   
 	// find a free buffer
-	lyxerr.debug() << "Find a free buffer." << endl;
+	lyxerr[Debug::INFO] << "Find a free buffer." << endl;
 	owner->view()->buffer(bufferlist.newFile(s, templname));
 }
 
 
-void LyXFunc::MenuOpen()
+void LyXFunc::open(string const & fname)
 {
 	string initpath = lyxrc.document_path;
-	LyXFileDlg fileDlg;
   
 	if (owner->view()->available()) {
-		string trypath = owner->buffer()->filepath;
+		string const trypath = owner->buffer()->filePath();
 		// If directory is writeable, use this as default.
-		if (IsDirWriteable(trypath) == 1)
+		if (IsDirWriteable(trypath))
 			initpath = trypath;
 	}
 
-	// launches dialog
-	ProhibitInput(owner->view());
-	fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-	fileDlg.SetButton(1, _("Examples"), 
-			  AddPath(system_lyxdir, "examples"));
-	string filename = fileDlg.Select(_("Select Document to Open"),
-					 initpath, "*.lyx");
-	AllowInput(owner->view());
+	string filename;
+ 
+	if (fname.empty()) {
+		FileDialog fileDlg(owner, _("Select document to open"),
+			LFUN_FILE_OPEN,
+			make_pair(string(_("Documents|#o#O")),
+				  string(lyxrc.document_path)),
+			make_pair(string(_("Examples|#E#e")),
+				  string(AddPath(system_lyxdir, "examples"))));
+
+		FileDialog::Result result =
+			fileDlg.Select(initpath,
+				       "*.lyx|LyX Documents (*.lyx)");
+	
+		if (result.first == FileDialog::Later)
+			return;
+
+		filename = result.second;
  
-	// check selected filename
-	if (filename.empty()) {
-		owner->getMiniBuffer()->Set(_("Canceled."));
+		// check selected filename
+		if (filename.empty()) {
+			owner->message(_("Canceled."));
+			return;
+		}
+	} else
+		filename = fname;
+
+	// get absolute path of file and add ".lyx" to the filename if
+	// necessary
+	string const fullpath = FileSearch(string(), filename, "lyx");
+	if (fullpath.empty()) {
+		Alert::alert(_("Error"), _("Could not find file"), filename);
 		return;
 	}
 
-	// get absolute path of file and make sure the filename ends
-	// with .lyx
-	filename = MakeAbsPath(filename);
-	if (!IsLyXFilename(filename))
-		filename += ".lyx";
-
+	filename = fullpath;
+ 
 	// loads document
-	owner->getMiniBuffer()->Set(_("Opening document"),
-				    MakeDisplayPath(filename), "...");
+	string const disp_fn(MakeDisplayPath(filename));
+
+	ostringstream str;
+	str << _("Opening document") << ' ' << disp_fn << "...";
+	
+	owner->message(str.str().c_str());
+
 	Buffer * openbuf = bufferlist.loadLyXFile(filename);
 	if (openbuf) {
 		owner->view()->buffer(openbuf);
-		owner->getMiniBuffer()->Set(_("Document"),
-					    MakeDisplayPath(filename),
-					    _("opened."));
+		ostringstream str;
+		str << _("Document") << ' ' << disp_fn << ' ' << _("opened.");
+		owner->message(str.str().c_str());
 	} else {
-		owner->getMiniBuffer()->Set(_("Could not open document"),
-					    MakeDisplayPath(filename));
+		ostringstream str;
+		str << _("Could not open document") << ' ' << disp_fn;
+		owner->message(str.str().c_str());
 	}
 }
 
+
 // checks for running without gui are missing.
 void LyXFunc::doImport(string const & argument)
 {
 	string format;
 	string filename = split(argument, format, ' ');
-	lyxerr.debug() << "LyXFunc::doImport: " << format 
-		       << " file: " << filename << endl;
+	lyxerr[Debug::INFO] << "LyXFunc::doImport: " << format 
+			    << " file: " << filename << endl;
 
 	if (filename.empty()) { // need user interaction
 		string initpath = lyxrc.document_path;
-		LyXFileDlg fileDlg;
 		
 		if (owner->view()->available()) {
-			string trypath = owner->buffer()->filepath;
+			string const trypath = owner->buffer()->filePath();
 			// If directory is writeable, use this as default.
-			if (IsDirWriteable(trypath) == 1)
+			if (IsDirWriteable(trypath))
 				initpath = trypath;
 		}
 
-		// launches dialog
-		ProhibitInput(owner->view());
-		fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-		fileDlg.SetButton(1, _("Examples"), 
-					AddPath(system_lyxdir, "examples"));
-		string text = _("Select ") + formats.PrettyName(format)
+		string const text = _("Select ") + formats.prettyName(format)
 			+ _(" file to import");
-		string format2 = (format == "textparagraph") ? "text" : format;
-		string extension = "*." + formats.Extension(format2);
-		filename = fileDlg.Select(text, initpath, extension);
-		AllowInput(owner->view());
+
+		FileDialog fileDlg(owner, text, 
+			LFUN_IMPORT,
+			make_pair(string(_("Documents|#o#O")),
+				  string(lyxrc.document_path)),
+			make_pair(string(_("Examples|#E#e")),
+				  string(AddPath(system_lyxdir, "examples"))));
+			
+		string const extension = "*." + formats.extension(format)
+			+ "| " + formats.prettyName(format)
+			+ " (*." + formats.extension(format) + ")";
+
+		FileDialog::Result result = fileDlg.Select(initpath,
+							   extension);
+
+		if (result.first == FileDialog::Later)
+			return;
+
+		filename = result.second;
  
 		// check selected filename
-		if (filename.empty()) 
-			owner->getMiniBuffer()->Set(_("Canceled."));
+		if (filename.empty())
+			owner->message(_("Canceled."));
 	}
 
 	// still no filename? abort
@@ -3173,14 +1929,14 @@ void LyXFunc::doImport(string const & argument)
 	// get absolute path of file
 	filename = MakeAbsPath(filename);
 
-	string lyxfile = ChangeExtension(filename, ".lyx");
+	string const lyxfile = ChangeExtension(filename, ".lyx");
 
 	// Check if the document already is open
 	if (bufferlist.exists(lyxfile)) {
-		switch (AskConfirmation(_("Document is already open:"), 
-				       MakeDisplayPath(lyxfile, 50),
-				       _("Do you want to close that document now?\n"
-					 "('No' will just switch to the open version)")))
+		switch (Alert::askConfirmation(_("Document is already open:"), 
+					MakeDisplayPath(lyxfile, 50),
+					_("Do you want to close that document now?\n"
+					  "('No' will just switch to the open version)")))
 			{
 			case 1: // Yes: close the document
 				if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
@@ -3191,87 +1947,34 @@ void LyXFunc::doImport(string const & argument)
 				owner->view()->buffer(bufferlist.getBuffer(lyxfile));
 				return;
 			case 3: // Cancel: Do nothing
-				owner->getMiniBuffer()->Set(_("Canceled."));
+				owner->message(_("Canceled."));
 				return;
 			}
 	}
 
 	// Check if a LyX document by the same root exists in filesystem
-	FileInfo f(lyxfile, true);
-	if (f.exist() && !AskQuestion(_("A document by the name"), 
+	FileInfo const f(lyxfile, true);
+	if (f.exist() && !Alert::askQuestion(_("A document by the name"), 
 				      MakeDisplayPath(lyxfile),
 				      _("already exists. Overwrite?"))) {
-		owner->getMiniBuffer()->Set(_("Canceled."));
+		owner->message(_("Canceled"));
 		return;
 	}
 	// filename should be valid now
-
+	
 	Importer::Import(owner, filename, format);
 }
 
 
-void LyXFunc::MenuInsertLyXFile(string const & filen)
-{
-	string filename = filen;
-
-	if (filename.empty()) {
-		// Launch a file browser
-		string initpath = lyxrc.document_path;
-		LyXFileDlg fileDlg;
-
-		if (owner->view()->available()) {
-			string trypath = owner->buffer()->filepath;
-			// If directory is writeable, use this as default.
-			if (IsDirWriteable(trypath) == 1)
-				initpath = trypath;
-		}
-
-		// launches dialog
-		ProhibitInput(owner->view());
-		fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
-		fileDlg.SetButton(1, _("Examples"), 
-				  AddPath(system_lyxdir, "examples"));
-		filename = fileDlg.Select(_("Select Document to Insert"),
-					  initpath, "*.lyx");
-		AllowInput(owner->view());
-
-		// check selected filename
-		if (filename.empty()) {
-			owner->getMiniBuffer()->Set(_("Canceled."));
-			return;
-		}
-	} 
-
-	// get absolute path of file and make sure the filename ends
-	// with .lyx
-	filename = MakeAbsPath(filename);
-	if (!IsLyXFilename(filename))
-		filename += ".lyx";
-
-	// Inserts document
-	owner->getMiniBuffer()->Set(_("Inserting document"),
-				    MakeDisplayPath(filename), "...");
-	bool res = owner->view()->insertLyXFile(filename);
-	if (res) {
-		owner->getMiniBuffer()->Set(_("Document"),
-					    MakeDisplayPath(filename),
-					    _("inserted."));
-	} else {
-		owner->getMiniBuffer()->Set(_("Could not insert document"),
-					    MakeDisplayPath(filename));
-	}
-}
-
-
 void LyXFunc::reloadBuffer()
 {
-	string fn = owner->buffer()->fileName();
+	string const fn = owner->buffer()->fileName();
 	if (bufferlist.close(owner->buffer()))
 		owner->view()->buffer(bufferlist.loadLyXFile(fn));
 }
 
 
-void LyXFunc::CloseBuffer()
+void LyXFunc::closeBuffer()
 {
 	if (bufferlist.close(owner->buffer()) && !quitting) {
 		if (bufferlist.empty()) {
@@ -3279,27 +1982,13 @@ void LyXFunc::CloseBuffer()
 			// set variables that don't exist
 			// since there's no current buffer
 			owner->getDialogs()->hideBufferDependent();
-		}
-		else {
+		} else {
 			owner->view()->buffer(bufferlist.first());
 		}
 	}
 }
 
 
-Inset * LyXFunc::getInsetByCode(Inset::Code code)
-{
-	LyXCursor cursor = owner->view()->text->cursor;
-	Buffer * buffer = owner->view()->buffer();
-	Buffer::inset_iterator it =
-		find_if(Buffer::inset_iterator(cursor.par(),
-					       cursor.pos()),
-			buffer->inset_iterator_end(),
-			compare_memfun(&Inset::LyxCode, code));
-	return it != buffer->inset_iterator_end() ? (*it) : 0;
-}
-
-
 // Each "owner" should have it's own message method. lyxview and
 // the minibuffer would use the minibuffer, but lyxserver would
 // send an ERROR signal to its client.  Alejandro 970603
@@ -3313,7 +2002,61 @@ void LyXFunc::setErrorMessage(string const & m) const
 }
 
 
-void LyXFunc::setMessage(string const & m)
+void LyXFunc::setMessage(string const & m) const 
 {
 	dispatch_buffer = m;
 }
+
+
+void LyXFunc::setStatusMessage(string const & m) const
+{
+	status_buffer = m;
+}
+
+
+void LyXFunc::initMiniBuffer() 
+{
+	string text = _("Welcome to LyX!");
+	
+	// When meta-fake key is pressed, show the key sequence so far + "M-".
+	if (wasMetaKey()) {
+		text = keyseq.print();
+		text += "M-";
+	}
+
+	// Else, when a non-complete key sequence is pressed,
+	// show the available options.
+	if (keyseq.length() > 0 && !keyseq.deleted()) {
+		text = keyseq.printOptions();
+	}
+   
+	// Else, show the buffer state.
+	else if (owner->view()->available()) {
+		Buffer * tmpbuf = owner->buffer();
+		
+		string const nicename = 
+			MakeDisplayPath(tmpbuf->fileName());
+		// Should we do this instead? (kindo like emacs)
+		// leaves more room for other information
+		text = "LyX: ";
+		text += nicename;
+		if (tmpbuf->lyxvc.inUse()) {
+			text += " [";
+			text += tmpbuf->lyxvc.versionString();
+			text += ' ';
+			text += tmpbuf->lyxvc.locker();
+			if (tmpbuf->isReadonly())
+				text += " (RO)";
+			text += ']';
+		} else if (tmpbuf->isReadonly())
+			text += " [RO]";
+		if (!tmpbuf->isLyxClean())
+			text += _(" (Changed)");
+	} else {
+		if (text != _("Welcome to LyX!")) // this is a hack
+			text = _("* No document open *");
+	}
+	
+	owner->message(text);
+}
+