#include "math_parser.h"
#include "math_scriptinset.h"
#include "math_spaceinset.h"
+#include "math_symbolinset.h"
#include "math_support.h"
#include "math_unknowninset.h"
#include "outputparams.h"
#include "undo.h"
-#include "support/std_sstream.h"
#include "support/lstrings.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
+#include <sstream>
+
using lyx::cap::copySelection;
using lyx::cap::grabAndEraseSelection;
using lyx::cap::cutSelection;
}
-void MathNestInset::drawSelection(PainterInfo & pi, int, int) const
+void MathNestInset::drawSelection(PainterInfo & pi, int x, int y) const
{
+ // FIXME: hack to get position cache warm
+ draw(pi, x, y);
+
// this should use the x/y values given, not the cached values
LCursor & cur = pi.base.bv->cursor();
if (!cur.selection())
CursorSlice s1 = cur.selBegin();
CursorSlice s2 = cur.selEnd();
//lyxerr << "MathNestInset::drawing selection: "
- // << " s1: " << s1 << " s2: " << s2 << endl;
+ // << " s1: " << s1 << " s2: " << s2 << endl;
if (s1.idx() == s2.idx()) {
MathArray const & c = cell(s1.idx());
int x1 = c.xo() + c.pos2x(s1.pos());
pi.pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
//lyxerr << "MathNestInset::drawing selection 3: "
// << " x1: " << x1 << " x2: " << x2
- // << " y1: " << y1 << " y2: " << y2 << endl;
+ // << " y1: " << y1 << " y2: " << y2 << endl;
} else {
for (idx_type i = 0; i < nargs(); ++i) {
if (idxBetween(i, s1.idx(), s2.idx())) {
}
-void MathNestInset::notifyCursorLeaves(LCursor & cur)
+void MathNestInset::notifyCursorLeaves(LCursor & /*cur*/)
{
+#ifdef WITH_WARNINGS
#warning look here
+#endif
#if 0
MathArray & ar = cur.cell();
// remove base-only "scripts"
}
-void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
{
//lyxerr << "MathNestInset: request: " << cmd << std::endl;
//CursorSlice sl = cur.current();
switch (cmd.action) {
case LFUN_PASTE: {
+ recordUndo(cur);
cur.message(_("Paste"));
replaceSelection(cur);
size_t n = 0;
- istringstream is(cmd.argument.c_str());
+ istringstream is(cmd.argument);
is >> n;
pasteSelection(cur, n);
cur.clearSelection(); // bug 393
break;
case LFUN_FINISHED_UP:
- //idxUpDown(cur, true);
cur.bv().cursor() = cur;
break;
case LFUN_FINISHED_DOWN:
- //idxUpDown(cur, false);
cur.bv().cursor() = cur;
break;
cur.selHandle(cmd.action == LFUN_RIGHTSEL);
cur.autocorrect() = false;
cur.clearTargetX();
- if (cur.inMacroMode())
- cur.macroModeClose();
- else if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
+ cur.macroModeClose();
+ if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
cur.pushLeft(*cur.nextAtom().nucleus());
cur.inset().idxFirst(cur);
} else if (cur.posRight() || idxRight(cur)
cur.selHandle(cmd.action == LFUN_LEFTSEL);
cur.autocorrect() = false;
cur.clearTargetX();
- if (cur.inMacroMode())
- cur.macroModeClose();
- else if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
+ cur.macroModeClose();
+ if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
cur.posLeft();
cur.push(*cur.nextAtom().nucleus());
cur.inset().idxLast(cur);
case LFUN_PRIORSEL:
case LFUN_PRIOR:
- case LFUN_BEGINNINGBUFSEL:
- case LFUN_BEGINNINGBUF:
cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
- case LFUN_ENDBUFSEL:
- case LFUN_ENDBUF:
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
break;
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
cur.erase();
cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
break;
case LFUN_INSET_TOGGLE:
+ recordUndo(cur);
//lockToggle();
if (cur.pos() != cur.lastpos()) {
// toggle previous inset ...
break;
case LFUN_SELFINSERT:
- if (cmd.argument.empty()) {
- cmd = FuncRequest(LFUN_FINISHED_RIGHT);
- break;
- }
- recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
if (cmd.argument.size() != 1) {
cur.insert(cmd.argument);
break;
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
break;
-#if 0
-//
-// this needs to be incorporated
-//
- // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
- bool remove_inset = false;
-
- DispatchResult result(true);
- bool was_macro = cur.inMacroMode();
+ //case LFUN_GETXY:
+ // sprintf(dispatch_buffer, "%d %d",);
+ // break;
- cur.normalize();
- cur.touch();
-#endif
-
- // case LFUN_GETXY:
- // sprintf(dispatch_buffer, "%d %d",);
- // DispatchResult= dispatch_buffer;
- // break;
case LFUN_SETXY: {
lyxerr << "LFUN_SETXY broken!" << endl;
int x = 0;
int y = 0;
- istringstream is(cmd.argument.c_str());
+ istringstream is(cmd.argument);
is >> x >> y;
cur.setScreenPos(x, y);
break;
case LFUN_MATH_MODE:
#if 1
+ // ignore math-mode on when already in math mode
+ if (currentMode() == InsetBase::MATH_MODE && cmd.argument == "on")
+ break;
cur.macroModeClose();
selClearOrDel(cur);
cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
cur.posLeft();
cur.pushLeft(*cur.nextInset());
#else
- if (currentMode() == InsetBase::TEXT_MODE)
+ if (currentMode() == InsetBase::TEXT_MODE) {
cur.niceInsert(MathAtom(new MathHullInset("simple")));
- else
+ cur.message(_("create new math text environment ($...$)"));
+ } else {
handleFont(cur, cmd.argument, "textrm");
- //cur.owner()->message(_("math text mode toggled"));
+ cur.message(_("entered math text mode (textrm)"));
+ }
#endif
break;
case LFUN_MATH_SIZE:
#if 0
- if (!arg.empty()) {
- recordUndo(cur, Undo::ATOMIC);
- cur.setSize(arg);
- }
+ recordUndo(cur);
+ cur.setSize(arg);
#endif
break;
break;
}
-#ifdef WITH_WARNINGS
-#warning look here
-#endif
-#if 0
-
- case LFUN_WORD_REPLACE:
- case LFUN_WORD_FIND:
- if (!searchForward(&cur.bv(), cmd.getArg(0), false, false))
- cur.undispatched();
- break;
-
- cur.normalize();
- cur.touch();
-
- BOOST_ASSERT(cur.inMathed());
-
- if (result.dispatched()) {
- revealCodes(cur);
- cur.bv().stuffClipboard(cur.grabSelection());
- } else {
- if (remove_inset)
- cur.bv().owner()->dispatch(FuncRequest(LFUN_DELETE));
- }
- break;
-#endif
-
default:
- MathDimInset::priv_dispatch(cur, cmd);
+ MathDimInset::doDispatch(cur, cmd);
break;
}
}
FuncStatus & flag) const
{
// the font related toggles
- //string tc = "mathnormal";
+ //string tc = "mathnormal";
bool ret = true;
switch (cmd.action) {
#if 0
}
-InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y)
+InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y) const
{
int idx_min = 0;
int dist_min = 1000000;
idx_min = i;
}
}
- MathArray & ar = cell(idx_min);
- cur.push(*this);
+ MathArray const & ar = cell(idx_min);
+ cur.push(const_cast<MathNestInset&>(*this));
cur.idx() = idx_min;
cur.pos() = ar.x2pos(x - ar.xo());
lyxerr << "found cell : " << idx_min << " pos: " << cur.pos() << endl;
if (ar[i]->covers(x, y))
return ar[i].nucleus()->editXY(cur, x, y);
}
- return this;
-}
-
-
-void MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest & cmd)
-{
- //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
-
- if (cmd.button() == mouse_button::button1) {
- // try to dispatch to enclosed insets first
- //cur.bv().stuffClipboard(cur.grabSelection());
- return;
- }
-
- if (cmd.button() == mouse_button::button2) {
- MathArray ar;
- asArray(cur.bv().getClipboard(), ar);
- cur.clearSelection();
- cur.setScreenPos(cmd.x, cmd.y);
- cur.insert(ar);
- cur.bv().update();
- return;
- }
-
- if (cmd.button() == mouse_button::button3) {
- // try to dispatch to enclosed insets first
- cur.bv().owner()->getDialogs().show("mathpanel");
- return;
- }
-
- cur.undispatched();
+ return const_cast<MathNestInset*>(this);
}
if (cmd.button() == mouse_button::button1) {
first_x = cmd.x;
first_y = cmd.y;
- //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
lyxerr << "lfunMousePress: setting cursor to: " << cur << endl;
cur.resetAnchor();
cur.bv().cursor() = cur;
void MathNestInset::lfunMouseMotion(LCursor & cur, FuncRequest & cmd)
{
// only select with button 1
- if (cmd.button() != mouse_button::button1)
+ if (cmd.button() == mouse_button::button1) {
+ LCursor & bvcur = cur.bv().cursor();
+ if (abs(cmd.x - first_x) + abs(cmd.y - first_y) > 4
+ && bvcur.anchor_.hasPart(cur)) {
+ first_x = cmd.x;
+ first_y = cmd.y;
+
+ bvcur.setCursor(cur);
+ bvcur.selection() = true;
+ }
+ }
+}
+
+
+void MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest & cmd)
+{
+ lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
+
+ if (cmd.button() == mouse_button::button1) {
+ //cur.bv().stuffClipboard(cur.grabSelection());
return;
+ }
- if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
+ if (cmd.button() == mouse_button::button2) {
+ MathArray ar;
+ asArray(cur.bv().getClipboard(), ar);
+ cur.clearSelection();
+ cur.setScreenPos(cmd.x, cmd.y);
+ cur.insert(ar);
+ cur.bv().update();
return;
+ }
- first_x = cmd.x;
- first_y = cmd.y;
+ if (cmd.button() == mouse_button::button3) {
+ // try to dispatch to enclosed insets first
+ cur.bv().owner()->getDialogs().show("mathpanel");
+ return;
+ }
- cur.bv().cursor().setCursor(cur, true);
+ cur.undispatched();
}
// handle macroMode
if (cur.inMacroMode()) {
string name = cur.macroName();
- lyxerr << "interpret macro name: '" << name << "'" << endl;
/// are we currently typing '#1' or '#2' or...?
if (name == "\\#") {
} else if (c == '{') {
cur.backspace();
cur.niceInsert(MathAtom(new MathBraceInset));
+ } else if (c == '%') {
+ cur.backspace();
+ cur.niceInsert(MathAtom(new MathCommentInset));
} else if (c == '#') {
- lyxerr << "setting name to " << name + c << endl;
BOOST_ASSERT(cur.activeMacro());
cur.activeMacro()->setName(name + c);
- lyxerr << "set name to " << name + c << endl;
} else {
cur.backspace();
cur.niceInsert(createMathInset(string(1, c)));
return true;
}
- if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#') {
+ if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#' || c == '%') {
cur.niceInsert(createMathInset(string(1, c)));
return true;
}
- if (c == '%') {
- cur.niceInsert(MathAtom(new MathCommentInset));
+ if (c == '~') {
+ cur.niceInsert(createMathInset("sim"));
return true;
}
bool MathNestInset::script(LCursor & cur, bool up)
{
- // Hack to get \\^ and \\_ working
+ // Hack to get \^ and \_ working
lyxerr << "handling script: up: " << up << endl;
if (cur.inMacroMode() && cur.macroName() == "\\") {
if (up)
lyxerr << "converting prev atom " << endl;
cur.prevAtom() = MathAtom(new MathScriptInset(cur.prevAtom(), up));
}
- lyxerr << "new scriptinset 2: cur:\n" << cur << endl;
--cur.pos();
- lyxerr << "new scriptinset 3: cur:\n" << cur << endl;
MathScriptInset * inset = cur.nextAtom().nucleus()->asScriptInset();
- lyxerr << "new scriptinset 3: inset:\n" << inset << endl;
cur.push(*inset);
cur.idx() = 1;
cur.pos() = 0;
projects / lyx.git / blobdiff