X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.cpp;h=a03aaefb168a38304e91042f1d076bc59d1a13bd;hb=9296344b9a26191a2092d175a51e357ecc35145d;hp=1f0adda5045a15428e02745687eeed430d2c8dfc;hpb=d2ad9ae6e2db76c1cbb92f0f069aa0f2fdcbcc31;p=lyx.git

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 1f0adda504..a03aaefb16 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -32,8 +32,8 @@
 #include "MathCompletionList.h"
 #include "MathData.h"
 #include "MathFactory.h"
-#include "MathMacro.h"
-#include "MathMacroArgument.h"
+#include "InsetMathMacro.h"
+#include "InsetMathMacroArgument.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
@@ -735,20 +735,18 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_MOUSE_DOUBLE:
 	case LFUN_WORD_SELECT:
 		cur.pos() = 0;
-		cur.resetAnchor();
-		cur.selection(true);
+		cur.bv().mouseSetCursor(cur);
 		cur.pos() = cur.lastpos();
-		cur.bv().cursor() = cur;
+		cur.bv().mouseSetCursor(cur, true);
 		break;
 
 	case LFUN_MOUSE_TRIPLE:
 		cur.idx() = 0;
 		cur.pos() = 0;
-		cur.resetAnchor();
-		cur.selection(true);
+		cur.bv().mouseSetCursor(cur);
 		cur.idx() = cur.lastidx();
 		cur.pos() = cur.lastpos();
-		cur.bv().cursor() = cur;
+		cur.bv().mouseSetCursor(cur, true);
 		break;
 
 	case LFUN_LINE_BEGIN:
@@ -815,8 +813,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cur.recordUndoSelection();
 		// if the inset can not be removed from within, delete it
 		if (!cur.backspace(cmd.getArg(0) == "force")) {
-			FuncRequest cmd = FuncRequest(LFUN_CHAR_DELETE_FORWARD, "force");
-			cur.innerText()->dispatch(cur, cmd);
+			FuncRequest newcmd = FuncRequest(LFUN_CHAR_DELETE_FORWARD, "force");
+			cur.innerText()->dispatch(cur, newcmd);
 		}
 		break;
 
@@ -829,8 +827,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cur.recordUndoSelection();
 		// if the inset can not be removed from within, delete it
 		if (!cur.erase(cmd.getArg(0) == "force")) {
-			FuncRequest cmd = FuncRequest(LFUN_CHAR_DELETE_FORWARD, "force");
-			cur.innerText()->dispatch(cur, cmd);
+			FuncRequest newcmd = FuncRequest(LFUN_CHAR_DELETE_FORWARD, "force");
+			cur.innerText()->dispatch(cur, newcmd);
 		}
 		break;
 
@@ -838,8 +836,12 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 		if (cur.selection())
 			cur.clearSelection();
 		else  {
-			cmd = FuncRequest(LFUN_FINISHED_FORWARD);
-			cur.undispatched();
+			if (cur.inMacroMode())
+				cur.macroModeClose(true);
+			else {
+				cmd = FuncRequest(LFUN_FINISHED_FORWARD);
+				cur.undispatched();
+			}
 		}
 		break;
 
@@ -898,7 +900,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 		int y = 0;
 		istringstream is(to_utf8(cmd.argument()));
 		is >> x >> y;
-		cur.setScreenPos(x, y);
+		cur.setTargetX(x);
 		break;
 	}
 
@@ -1208,7 +1210,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 		bool fold = act == LFUN_MATH_MACRO_FOLD;
 		bool found = findMacroToFoldUnfold(it, fold);
 		if (found) {
-			MathMacro * macro = it.nextInset()->asInsetMath()->asMacro();
+			InsetMathMacro * macro = it.nextInset()->asInsetMath()->asMacro();
 			cur.recordUndoInset();
 			if (fold)
 				macro->fold(cur);
@@ -1304,7 +1306,7 @@ bool InsetMathNest::findMacroToFoldUnfold(Cursor & it, bool fold) const {
 		// go backward through the current cell
 		Inset * inset = it.nextInset();
 		while (inset && inset->asInsetMath()) {
-			MathMacro * macro = inset->asInsetMath()->asMacro();
+			InsetMathMacro * macro = inset->asInsetMath()->asMacro();
 			if (macro) {
 				// found the an macro to open/close?
 				if (macro->folded() != fold)
@@ -1495,7 +1497,7 @@ void InsetMathNest::edit(Cursor & cur, bool front, EntryDirection entry_from)
 
 Inset * InsetMathNest::editXY(Cursor & cur, int x, int y)
 {
-	int idx_min = 0;
+	int idx_min = -1;
 	int dist_min = 1000000;
 	for (idx_type i = 0, n = nargs(); i != n; ++i) {
 		int const d = cell(i).dist(cur.bv(), x, y);
@@ -1504,6 +1506,9 @@ Inset * InsetMathNest::editXY(Cursor & cur, int x, int y)
 			idx_min = i;
 		}
 	}
+	if (idx_min == -1)
+		return this;
+
 	MathData & ar = cell(idx_min);
 	cur.push(*this);
 	cur.idx() = idx_min;
@@ -1636,7 +1641,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c)
 			cur.backspace();
 			int n = c - '0';
 			if (n >= 1 && n <= 9)
-				cur.insert(new MathMacroArgument(n));
+				cur.insert(new InsetMathMacroArgument(n));
 			return true;
 		}
 
@@ -2030,8 +2035,7 @@ bool InsetMathNest::insertCompletion(Cursor & cur, docstring const & s,
 #if 0
 		// FIXME: this creates duplicates in the completion popup
 		// which looks ugly. Moreover the changes the list lengths
-		// which seems to
-		confuse the popup as well.
+		// which seems to confuse the popup as well.
 		MathCompletionList::addToFavorites(inset->name());
 #endif
 		lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, " "));