#include "Lsstream.h"
#include "support/LAssert.h"
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "formula.h"
#include "formulamacro.h"
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);
+ }
}
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;
mathcursor->getPos(x, y);
math_font_max_dim(font_, 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);
}
BufferView * bv = cmd.view();
hideInsetCursor(bv);
showInsetCursor(bv);
- bv->updateInset(this, true);
- //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << "\n";
+ 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) == MathInset::UNDISPATCHED) {
// launch math panel for right mouse button
bv->owner()->getDialogs().showMathPanel();
}
Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
- releaseMathCursor(bv);
- mathcursor = new MathCursor(this, cmd.x == 0);
- //lyxerr << "lfunMousePress: buttons: " << cmd.button() << "\n";
+ //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
+
+ if (!mathcursor || mathcursor->formula() != this) {
+ lyxerr[Debug::MATHED] << "re-create cursor" << endl;
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, cmd.x == 0);
+ metrics(bv);
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ }
if (cmd.button() == mouse_button::button3) {
mathcursor->dispatch(cmd);
}
if (cmd.button() == mouse_button::button1) {
- // just set the cursor here
- //lyxerr << "setting cursor\n";
- metrics(bv);
first_x = cmd.x;
first_y = cmd.y;
mathcursor->selClear();
return DISPATCHED;
// only select with button 1
- if (cmd.button() != mouse_button::button1)
+ 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;
// << " 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:
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_PRIOR:
case LFUN_BEGINNINGBUFSEL:
case LFUN_BEGINNINGBUF:
- result = FINISHED_UP;
+ result = FINISHED;
updateLocal(bv, false);
break;
case LFUN_NEXT:
case LFUN_ENDBUFSEL:
case LFUN_ENDBUF:
- result = FINISHED_DOWN;
+ 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:
// 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;
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;
unsigned int n = 1;
string v_align;
string h_align;
- istringstream is(argument);
+ istringstream is(STRCONV(argument));
is >> m >> n >> v_align >> h_align;
m = max(1u, m);
n = max(1u, n);
mathcursor->niceInsert(argument);
updateLocal(bv, true);
break;
-
+
case -1:
case LFUN_SELFINSERT:
if (!argument.empty()) {
} 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();
+ 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