#include "funcrequest.h"
#include "BufferView.h"
#include "lyxtext.h"
-#include "lyxfunc.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "debug.h"
releaseMathCursor(bv);
mathcursor = new MathCursor(this, true);
metrics(bv);
- mathcursor->setPos(x, y);
- //lyxerr << "setting pos to " << x << "," << y << "\n";
-
+ mathcursor->setPos(x + xo_, y + yo_);
// if that is removed, we won't get the magenta box when entering an
// inset for the first time
bv->updateInset(this, false);
// calling metrics here destroys the cached xo,yo positions e.g. in
// MathParboxinset. And it would be too expensive anyway...
//metrics(bv);
+ if (!mathcursor) {
+ lyxerr << "getCursorPos - should not happen";
+ x = y = 0;
+ return;
+ }
mathcursor->getPos(x, y);
- //x -= xo_;
+ x = mathcursor->targetX();
+ x -= xo_;
y -= yo_;
//lyxerr << "getCursorPos: " << x << " " << y << "\n";
}
return;
fitInsetCursor(bv);
int x, y, asc, des;
- getCursorPos(bv, x, y);
+ mathcursor->getPos(x, y);
math_font_max_dim(font_, asc, des);
- bv->showLockedInsetCursor(x, y, asc, des);
+ bv->showLockedInsetCursor(x, y - yo_, asc, des);
setCursorVisible(true);
//lyxerr << "showInsetCursor: " << x << " " << y << "\n";
}
}
-bool InsetFormulaBase::insetButtonRelease(BufferView * bv,
- int x, int y, mouse_button::state button)
+Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
{
if (!mathcursor)
- return false;
+ return UNDISPATCHED;
- //lyxerr << "insetButtonRelease: " << x << " " << y << "\n";
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
showInsetCursor(bv);
bv->updateInset(this, false);
- if (button == mouse_button::button3) {
+ if (cmd.button() == mouse_button::button3) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch(FuncRequest(bv, LFUN_MOUSE_RELEASE, x, y, 3)))
- return true;
-
- // launch math panel for right mouse button
- bv->owner()->getDialogs().showMathPanel();
- return true;
+ if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {
+ // launch math panel for right mouse button
+ bv->owner()->getDialogs().showMathPanel();
+ }
+ return DISPATCHED;
}
- if (button == mouse_button::button1) {
+ if (cmd.button() == mouse_button::button1) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch(FuncRequest(bv, LFUN_MOUSE_RELEASE, x, y, 1)))
- return true;
-
+ mathcursor->dispatch(cmd);
// try to set the cursor
//delete mathcursor;
//mathcursor = new MathCursor(this, x == 0);
//metrics(bv);
//mathcursor->setPos(x + xo_, y + yo_);
- return true;
+ return DISPATCHED;
}
- return false;
+ return UNDISPATCHED;
}
-void InsetFormulaBase::insetButtonPress(BufferView * bv,
- int x, int y, mouse_button::state button)
+Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
- //lyxerr << "insetButtonPress: "
- // << x << " " << y << " but: " << button << "\n";
- //lyxerr << "formula: ";
- //par()->dump();
-
+ BufferView * bv = cmd.view();
releaseMathCursor(bv);
- mathcursor = new MathCursor(this, x == 0);
+ mathcursor = new MathCursor(this, cmd.x == 0);
- if (button == mouse_button::button1) {
+ if (cmd.button() == mouse_button::button1) {
// just set the cursor here
//lyxerr << "setting cursor\n";
metrics(bv);
- first_x = x;
- first_y = y;
+ first_x = cmd.x;
+ first_y = cmd.y;
mathcursor->selClear();
- mathcursor->setPos(x + xo_, y + yo_);
-
- if (mathcursor->dispatch(FuncRequest(bv, LFUN_MOUSE_PRESS, x, y, 1))) {
- //delete mathcursor;
- return;
- }
-
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ mathcursor->dispatch(cmd);
+ return DISPATCHED;
}
- if (button == mouse_button::button3) {
- if (mathcursor->dispatch(FuncRequest(bv, LFUN_MOUSE_PRESS, x, y, 3))) {
- //delete mathcursor;
- return;
- }
+ if (cmd.button() == mouse_button::button3) {
+ mathcursor->dispatch(cmd);
+ //delete mathcursor;
+ return DISPATCHED;
}
bv->updateInset(this, false);
+ return DISPATCHED;
}
-void InsetFormulaBase::insetMotionNotify(BufferView * bv,
- int x, int y, mouse_button::state button)
+Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
{
if (!mathcursor)
- return;
+ return DISPATCHED;
- if (button == mouse_button::button1)
- if (mathcursor->dispatch(FuncRequest(bv, LFUN_MOUSE_MOTION, x, y, 1)))
- return;
+ if (mathcursor->dispatch(FuncRequest(cmd)) != MathInset::UNDISPATCHED)
+ return DISPATCHED;
- if (button == mouse_button::button3)
- if (mathcursor->dispatch(FuncRequest(bv, LFUN_MOUSE_MOTION, x, y, 3)))
- return;
-
- if (abs(x - first_x) < 2 && abs(y - first_y) < 2) {
+ if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2) {
//lyxerr << "insetMotionNotify: ignored\n";
- return;
+ return DISPATCHED;
}
- first_x = x;
- first_y = y;
+ first_x = cmd.x;
+ first_y = cmd.y;
if (!mathcursor->selection())
mathcursor->selStart();
- //lyxerr << "insetMotionNotify: " << x + xo_ << ' ' << y + yo_
- // << ' ' << button << "\n";
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
- mathcursor->setPos(x + xo_, y + yo_);
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
showInsetCursor(bv);
bv->updateInset(this, false);
+ return DISPATCHED;
}
-UpdatableInset::RESULT
-InsetFormulaBase::localDispatch(FuncRequest const & ev)
+Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
{
- //lyxerr << "InsetFormulaBase::localDispatch: act: " << action
- // << " arg: '" << arg
- // << "' cursor: " << mathcursor << "\n";
+ //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
+ // << " arg: '" << cmd.argument
+ // << " x: '" << cmd.x
+ // << " y: '" << cmd.y
+ // << "' button: " << cmd.button() << "\n";
+
+ switch (cmd.action) {
+ case LFUN_MOUSE_PRESS:
+ return lfunMousePress(cmd);
+ case LFUN_MOUSE_MOTION:
+ return lfunMouseMotion(cmd);
+ case LFUN_MOUSE_RELEASE:
+ return lfunMouseRelease(cmd);
+ case LFUN_MOUSE_DOUBLE:
+ //lyxerr << "Mouse double\n";
+ return localDispatch(FuncRequest(LFUN_WORDSEL));
+ default:
+ break;
+ }
if (!mathcursor)
return UNDISPATCHED;
- BufferView * bv = ev.view();
- string argument = ev.argument;
+ BufferView * bv = cmd.view();
+ string argument = cmd.argument;
RESULT result = DISPATCHED;
bool sel = false;
bool was_macro = mathcursor->inMacroMode();
mathcursor->normalize();
mathcursor->touch();
- switch (ev.action) {
+ switch (cmd.action) {
case LFUN_MATH_MUTATE:
case LFUN_MATH_DISPLAY:
- case LFUN_MATH_HALIGN:
- case LFUN_MATH_VALIGN:
- case LFUN_MATH_ROW_INSERT:
- case LFUN_MATH_ROW_DELETE:
- case LFUN_MATH_COLUMN_INSERT:
- case LFUN_MATH_COLUMN_DELETE:
case LFUN_MATH_NUMBER:
case LFUN_MATH_NONUMBER:
case LFUN_TABINSERT:
case LFUN_DELETE_LINE_FORWARD:
case LFUN_INSERT_LABEL:
case LFUN_MATH_EXTERN:
+ case LFUN_TABULAR_FEATURE:
+ case LFUN_PASTESELECTION:
+ case LFUN_MATH_LIMITS:
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->dispatch(ev);
+ mathcursor->dispatch(cmd);
updateLocal(bv, true);
break;
- case LFUN_WORDRIGHTSEL:
case LFUN_RIGHTSEL:
sel = true; // fall through...
case LFUN_RIGHT:
//bv->owner()->message(mathcursor->info());
break;
- case LFUN_WORDLEFTSEL:
case LFUN_LEFTSEL:
sel = true; // fall through
case LFUN_LEFT:
updateLocal(bv, false);
break;
+ case LFUN_WORDSEL:
+ mathcursor->home(false);
+ mathcursor->end(true);
+ updateLocal(bv, false);
+ break;
+
case LFUN_HOMESEL:
+ case LFUN_WORDLEFTSEL:
sel = true; // fall through
case LFUN_HOME:
+ case LFUN_WORDLEFT:
result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
updateLocal(bv, false);
break;
case LFUN_ENDSEL:
+ case LFUN_WORDRIGHTSEL:
sel = true; // fall through
case LFUN_END:
+ case LFUN_WORDRIGHT:
result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
updateLocal(bv, false);
break;
case LFUN_PRIORSEL:
case LFUN_PRIOR:
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_BEGINNINGBUF:
result = FINISHED_UP;
updateLocal(bv, false);
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
+ case LFUN_ENDBUFSEL:
+ case LFUN_ENDBUF:
result = FINISHED_DOWN;
updateLocal(bv, false);
break;
lyxerr << "LFUN_SETXY broken!\n";
int x = 0;
int y = 0;
- istringstream is(ev.argument.c_str());
+ istringstream is(cmd.argument.c_str());
is >> x >> y;
mathcursor->setPos(x, y);
updateLocal(bv, false);
break;
}
-/*
- case LFUN_PASTESELECTION: {
- string const clip = bv->getClipboard();
- if (!clip.empty())
- mathed_parse_normal(par_, clip);
- break;
- }
-*/
-
case LFUN_PASTE:
if (was_macro)
mathcursor->macroModeClose();
// Special casing for superscript in case of LyX handling
// dead-keys:
case LFUN_CIRCUMFLEX:
- if (ev.argument.empty()) {
+ if (cmd.argument.empty()) {
// do superscript if LyX handles
// deadkeys
bv->lockedInsetStoreUndo(Undo::EDIT);
break;
// Math fonts
- case LFUN_GREEK_TOGGLE: handleFont(bv, ev.argument, "lyxgreek"); break;
- case LFUN_BOLD: handleFont(bv, ev.argument, "textbf"); break;
- case LFUN_SANS: handleFont(bv, ev.argument, "textsf"); break;
- case LFUN_EMPH: handleFont(bv, ev.argument, "mathcal"); break;
- case LFUN_ROMAN: handleFont(bv, ev.argument, "mathrm"); break;
- case LFUN_CODE: handleFont(bv, ev.argument, "texttt"); break;
- case LFUN_FRAK: handleFont(bv, ev.argument, "mathfrak"); break;
- case LFUN_ITAL: handleFont(bv, ev.argument, "mathit"); break;
- case LFUN_NOUN: handleFont(bv, ev.argument, "mathbb"); break;
- case LFUN_DEFAULT: handleFont(bv, ev.argument, "textnormal"); break;
- case LFUN_FREE: handleFont(bv, ev.argument, "textrm"); break;
+ case LFUN_GREEK_TOGGLE: handleFont(bv, cmd.argument, "lyxgreek"); break;
+ case LFUN_BOLD: handleFont(bv, cmd.argument, "textbf"); break;
+ case LFUN_SANS: handleFont(bv, cmd.argument, "textsf"); break;
+ case LFUN_EMPH: handleFont(bv, cmd.argument, "mathcal"); break;
+ case LFUN_ROMAN: handleFont(bv, cmd.argument, "mathrm"); break;
+ case LFUN_CODE: handleFont(bv, cmd.argument, "texttt"); break;
+ case LFUN_FRAK: handleFont(bv, cmd.argument, "mathfrak"); break;
+ case LFUN_ITAL: handleFont(bv, cmd.argument, "mathit"); break;
+ case LFUN_NOUN: handleFont(bv, cmd.argument, "mathbb"); break;
+ case LFUN_FREE: handleFont(bv, cmd.argument, "textrm"); break;
+ case LFUN_DEFAULT: handleFont(bv, cmd.argument, "textnormal"); break;
case LFUN_GREEK:
- handleFont(bv, ev.argument, "lyxgreek1");
- if (ev.argument.size())
- mathcursor->interpret(ev.argument);
+ handleFont(bv, cmd.argument, "lyxgreek1");
+ if (cmd.argument.size())
+ mathcursor->interpret(cmd.argument);
break;
case LFUN_MATH_MODE:
- if (mathcursor->currentMode()) {
- handleFont(bv, ev.argument, "textrm");
- } else {
+ if (mathcursor->currentMode())
+ handleFont(bv, cmd.argument, "textrm");
+ else {
mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
updateLocal(bv, true);
}
//bv->owner()->message(_("math text mode toggled"));
break;
- case LFUN_MATH_LIMITS:
- bv->lockedInsetStoreUndo(Undo::EDIT);
- if (mathcursor->toggleLimits())
- updateLocal(bv, true);
- break;
-
case LFUN_MATH_SIZE:
#if 0
if (!arg.empty()) {
break;
case LFUN_INSERT_MATRIX:
- if (!ev.argument.empty()) {
+ if (!cmd.argument.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->interpret("matrix " + ev.argument);
+ mathcursor->interpret("matrix " + cmd.argument);
updateLocal(bv, true);
}
break;
case LFUN_SUBSCRIPT:
{
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->script(ev.action == LFUN_SUPERSCRIPT);
+ mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
updateLocal(bv, true);
break;
}
{
//lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
string ls;
- string rs = split(ev.argument, ls, ' ');
+ string rs = split(cmd.argument, ls, ' ');
// Reasonable default values
if (ls.empty())
ls = '(';
// updateInset(inset, true);
//}
//
- if (ev.argument.empty()) {
+ if (cmd.argument.empty()) {
InsetCommandParams p("ref");
bv->owner()->getDialogs().createRef(p.getAsString());
} else {
//mathcursor->handleNest(new InsetRef2);
//mathcursor->insert(arg);
- mathcursor->insert(MathAtom(new RefInset(ev.argument)));
+ mathcursor->insert(MathAtom(new RefInset(cmd.argument)));
}
updateLocal(bv, true);
break;
bv->getLyXText()->cutSelection(bv);
openNewInset(bv, f);
}
- bv->owner()->getLyXFunc().setMessage(N_("Math editor mode"));
+ cmd.message(N_("Math editor mode"));
}
case LFUN_MATH_MACRO:
if (cmd.argument.empty())
- bv->owner()->getLyXFunc().setErrorMessage(N_("Missing argument"));
+ cmd.errorMessage(N_("Missing argument"));
else {
string s = cmd.argument;
string const s1 = token(s, ' ', 1);
projects / lyx.git / blobdiff