#include "Lsstream.h"
#include "support/LAssert.h"
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "formula.h"
#include "formulamacro.h"
#include "textpainter.h"
#include "frontends/Dialogs.h"
#include "intl.h"
-#include "insets/insetcommandparams.h"
#include "ref_inset.h"
using std::endl;
using std::ostream;
using std::vector;
using std::abs;
+using std::max;
MathCursor * mathcursor = 0;
void InsetFormulaBase::handleFont
(BufferView * bv, string const & arg, string const & font)
{
+ // this whole function is a hack and won't work for incremental font
+ // changes...
bv->lockedInsetStoreUndo(Undo::EDIT);
- bool sel = mathcursor->selection();
- if (sel)
+ if (mathcursor->par()->name() == font) {
+ mathcursor->handleFont(font);
updateLocal(bv, true);
- mathcursor->handleNest(createMathInset(font));
- mathcursor->insert(arg);
- if (!sel)
- updateLocal(bv, false);
+ } else {
+ bool sel = mathcursor->selection();
+ if (sel)
+ updateLocal(bv, true);
+ mathcursor->handleNest(createMathInset(font));
+ mathcursor->insert(arg);
+ if (!sel)
+ updateLocal(bv, false);
+ }
}
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);
return;
}
mathcursor->getPos(x, y);
- //x -= xo_;
+ x = mathcursor->targetX();
+ x -= xo_;
y -= yo_;
- //lyxerr << "getCursorPos: " << x << " " << y << "\n";
+ //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
}
void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
{
- //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
+ if (!mathcursor) {
+ lyxerr[Debug::MATHED] << "toggleInsetCursor impossible" << endl;
+ return;
+ }
+ //lyxerr << "toggleInsetCursor: " << isCursorVisible() << endl;
if (isCursorVisible())
hideInsetCursor(bv);
else
void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
{
+ if (!mathcursor) {
+ lyxerr << "showInsetCursor impossible" << endl;
+ return;
+ }
if (isCursorVisible())
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";
+ //lyxerr << "showInsetCursor: " << x << ' ' << y << endl;
}
void InsetFormulaBase::hideInsetCursor(BufferView * bv)
{
+ if (!mathcursor)
+ return;
if (!isCursorVisible())
return;
bv->hideLockedInsetCursor();
setCursorVisible(false);
- //lyxerr << "hideInsetCursor: \n";
+ //lyxerr << "hideInsetCursor: " << endl;
}
math_font_max_dim(font_, asc, des);
getCursorPos(bv, x, y);
//y += yo_;
- //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
+ //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << endl;
bv->fitLockedInsetCursor(x, y, asc, des);
}
}
-Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
{
if (!mathcursor)
return UNDISPATCHED;
hideInsetCursor(bv);
showInsetCursor(bv);
bv->updateInset(this, false);
+ //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
if (cmd.button() == mouse_button::button3) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {
+ if (mathcursor->dispatch(cmd) == UNDISPATCHED) {
// launch math panel for right mouse button
+ lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
bv->owner()->getDialogs().showMathPanel();
}
return DISPATCHED;
}
+ if (cmd.button() == mouse_button::button2) {
+ mathcursor->selClear();
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ mathcursor->insert(asArray(bv->getClipboard()));
+ bv->updateInset(this, true);
+ return DISPATCHED;
+ }
+
if (cmd.button() == mouse_button::button1) {
// try to dispatch to enclosed insets first
mathcursor->dispatch(cmd);
+ cmd.view()->stuffClipboard(mathcursor->grabSelection());
// try to set the cursor
//delete mathcursor;
//mathcursor = new MathCursor(this, x == 0);
//mathcursor->setPos(x + xo_, y + yo_);
return DISPATCHED;
}
+
return UNDISPATCHED;
}
-Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
- releaseMathCursor(bv);
- mathcursor = new MathCursor(this, cmd.x == 0);
+ //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
- if (cmd.button() == mouse_button::button1) {
- // just set the cursor here
- //lyxerr << "setting cursor\n";
+ if (!mathcursor || mathcursor->formula() != this) {
+ lyxerr[Debug::MATHED] << "re-create cursor" << endl;
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, cmd.x == 0);
metrics(bv);
- first_x = cmd.x;
- first_y = cmd.y;
- mathcursor->selClear();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ }
+
+ if (cmd.button() == mouse_button::button3) {
mathcursor->dispatch(cmd);
return DISPATCHED;
}
- if (cmd.button() == mouse_button::button3) {
+
+ if (cmd.button() == mouse_button::button1) {
+ first_x = cmd.x;
+ first_y = cmd.y;
+ mathcursor->selClear();
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
mathcursor->dispatch(cmd);
- //delete mathcursor;
return DISPATCHED;
}
+
bv->updateInset(this, false);
return DISPATCHED;
}
-Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
{
if (!mathcursor)
return DISPATCHED;
- if (mathcursor->dispatch(FuncRequest(cmd)) != MathInset::UNDISPATCHED)
+ if (mathcursor->dispatch(FuncRequest(cmd)) != UNDISPATCHED)
return DISPATCHED;
- if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2) {
- //lyxerr << "insetMotionNotify: ignored\n";
+ // only select with button 1
+ if (cmd.button() != mouse_button::button1)
return DISPATCHED;
- }
+
+ if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
+ return DISPATCHED;
+
first_x = cmd.x;
first_y = cmd.y;
}
-Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
{
//lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
// << " arg: '" << cmd.argument
// << " x: '" << cmd.x
// << " y: '" << cmd.y
- // << "' button: " << cmd.button() << "\n";
+ // << "' button: " << cmd.button() << endl;
+
+ // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
+ bool remove_inset = false;
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
+ //lyxerr << "Mouse single press\n";
return lfunMousePress(cmd);
case LFUN_MOUSE_MOTION:
- return lfunMouseMotion(cmd);
+ //return lfunMouseMotion(cmd);
case LFUN_MOUSE_RELEASE:
+ //lyxerr << "Mouse single release\n";
return lfunMouseRelease(cmd);
+ case LFUN_MOUSE_DOUBLE:
+ //lyxerr << "Mouse double\n";
+ return localDispatch(FuncRequest(LFUN_WORDSEL));
default:
break;
}
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(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_UP_PARAGRAPHSEL:
+ case LFUN_UP_PARAGRAPH:
+ case LFUN_DOWN_PARAGRAPHSEL:
+ case LFUN_DOWN_PARAGRAPH:
+ result = FINISHED;
+ 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:
- result = FINISHED_UP;
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_BEGINNINGBUF:
+ result = FINISHED;
updateLocal(bv, false);
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
- result = FINISHED_DOWN;
+ case LFUN_ENDBUFSEL:
+ case LFUN_ENDBUF:
+ result = FINISHED_RIGHT;
updateLocal(bv, false);
break;
case LFUN_DELETE_WORD_BACKWARD:
case LFUN_BACKSPACE:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->backspace();
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ if (mathcursor->backspace()) {
+ result = DISPATCHED;
+ } else {
+ result = FINISHED;
+ remove_inset = true;
+ }
updateLocal(bv, true);
break;
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->erase();
- bv->updateInset(this, true);
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ if (mathcursor->erase()) {
+ result = DISPATCHED;
+ } else {
+ result = FINISHED;
+ remove_inset = true;
+ }
+ updateLocal(bv, true);
break;
// case LFUN_GETXY:
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();
// Math fonts
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_BOLD: handleFont(bv, cmd.argument, "mathbf"); break;
+ case LFUN_SANS: handleFont(bv, cmd.argument, "mathsf"); 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_DEFAULT: handleFont(bv, cmd.argument, "textnormal"); break;
case LFUN_FREE: handleFont(bv, cmd.argument, "textrm"); break;
+ case LFUN_DEFAULT: handleFont(bv, cmd.argument, "textnormal"); break;
case LFUN_GREEK:
handleFont(bv, cmd.argument, "lyxgreek1");
if (cmd.argument.size())
- mathcursor->interpret(cmd.argument);
+ mathcursor->insert(asArray(cmd.argument));
break;
case LFUN_MATH_MODE:
- if (mathcursor->currentMode())
- handleFont(bv, cmd.argument, "textrm");
- else {
+ if (mathcursor->currentMode() == MathInset::TEXT_MODE) {
mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
updateLocal(bv, true);
+ } else {
+ handleFont(bv, cmd.argument, "textrm");
}
//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()) {
#endif
break;
- case LFUN_INSERT_MATRIX:
- if (!cmd.argument.empty()) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->interpret("matrix " + cmd.argument);
+ case LFUN_INSERT_MATRIX: {
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ unsigned int m = 1;
+ unsigned int n = 1;
+ string v_align;
+ string h_align;
+ istringstream is(STRCONV(argument));
+ is >> m >> n >> v_align >> h_align;
+ m = max(1u, m);
+ n = max(1u, n);
+ v_align += 'c';
+ mathcursor->niceInsert(
+ MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
updateLocal(bv, true);
- }
break;
+ }
case LFUN_SUPERSCRIPT:
case LFUN_SUBSCRIPT:
argument = "\n";
// fall through
- case -1:
+// FIXME: We probably should swap parts of "math-insert" and "self-insert"
+// handling such that "self-insert" works on "arbitrary stuff" too, and
+// math-insert only handles special math things like "matrix".
case LFUN_INSERT_MATH:
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ mathcursor->niceInsert(argument);
+ updateLocal(bv, true);
+ break;
+
+ case -1:
case LFUN_SELFINSERT:
if (!argument.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
if (argument.size() == 1)
result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
else
- result = mathcursor->interpret(argument) ? DISPATCHED : FINISHED_RIGHT;
+ mathcursor->insert(asArray(argument));
updateLocal(bv, true);
}
break;
updateLocal(bv, true);
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, *buffer_);
- // if (!insertInset(inset))
- // delete inset;
- // else
- // updateInset(inset, true);
- //}
- //
- if (cmd.argument.empty()) {
- InsetCommandParams p("ref");
- bv->owner()->getDialogs().createRef(p.getAsString());
+ case LFUN_DIALOG_SHOW_NEW_INSET: {
+ string const & name = argument;
+ if (name == "ref") {
+ string data = "ref LatexCommand \\ref{}\n\\end_inset\n\n";
+ bv->owner()->getDialogs().show(name, data, 0);
+ } else
+ result = UNDISPATCHED;
+ }
+ break;
+
+ case LFUN_INSET_APPLY: {
+ string const name = cmd.getArg(0);
+ InsetBase * base =
+ bv->owner()->getDialogs().getOpenInset(name);
+
+ if (base) {
+ FuncRequest fr(bv, LFUN_INSET_MODIFY, cmd.argument);
+ result = base->localDispatch(fr);
} else {
- //mathcursor->handleNest(new InsetRef2);
- //mathcursor->insert(arg);
- mathcursor->insert(MathAtom(new RefInset(cmd.argument)));
+ // Turn 'argument' into a temporary RefInset.
+ MathArray ar;
+ if (string2RefInset(cmd.argument, ar)) {
+ mathcursor->insert(ar);
+ } else {
+ result = UNDISPATCHED;
+ }
}
- updateLocal(bv, true);
- break;
+ if (result == DISPATCHED)
+ updateLocal(bv, true);
+ }
+ break;
default:
result = UNDISPATCHED;
fitInsetCursor(bv);
showInsetCursor(bv);
revealCodes(bv);
+ cmd.view()->stuffClipboard(mathcursor->grabSelection());
} else {
releaseMathCursor(bv);
bv->unlockInset(this);
+ if (remove_inset)
+ bv->owner()->dispatch(FuncRequest(LFUN_DELETE));
}
return result; // original version
}
+string InsetFormulaBase::selectionAsString() const
+{
+ return mathcursor ? mathcursor->grabSelection() : string();
+}
+
/////////////////////////////////////////////////////////////////////
}
break;
- case LFUN_GREEK:
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
+ case LFUN_GREEK:
+ case LFUN_INSERT_MATH:
+ case LFUN_INSERT_MATRIX:
case LFUN_MATH_DELIM: {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- bv->theLockingInset()->
+ bv->theLockingInset()->
localDispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
bv->theLockingInset()->localDispatch(cmd);
}
projects / lyx.git / blobdiff