#include "math_nestinset.h"
+#include "math_arrayinset.h"
+#include "math_data.h"
+#include "math_deliminset.h"
+#include "math_factory.h"
+#include "math_hullinset.h"
+#include "math_mathmlstream.h"
+#include "math_parser.h"
+#include "math_spaceinset.h"
+#include "math_support.h"
+#include "math_mboxinset.h"
+
#include "BufferView.h"
-#include "LColor.h"
+#include "bufferview_funcs.h"
#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include "funcrequest.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
+#include "gettext.h"
+#include "LColor.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"
+using std::endl;
+using std::string;
+using std::istringstream;
+
+
+namespace {
+
+// local global
+int first_x;
+int first_y;
+
+} // namespace anon
+
+
+
+
MathNestInset::MathNestInset(idx_type nargs)
: cells_(nargs), lock_(false)
{}
}
-void MathNestInset::getScreenPos(idx_type idx, pos_type pos, int & x, int & y) const
+void MathNestInset::getCursorPos(CursorSlice const & cur,
+ int & x, int & y) const
{
- MathArray const & ar = cell(idx);
- x = ar.xo() + ar.pos2x(pos);
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+ MathArray const & ar = cur.cell();
+ x = ar.xo() + ar.pos2x(cur.pos());
y = ar.yo();
// move cursor visually into empty cells ("blue rectangles");
- if (cell(idx).empty())
+ if (cur.cell().empty())
x += 2;
}
bool MathNestInset::idxNext(LCursor & cur) const
{
- if (cur.idx() + 1 >= nargs())
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+ if (cur.idx() == cur.lastidx())
return false;
++cur.idx();
cur.pos() = 0;
bool MathNestInset::idxPrev(LCursor & cur) const
{
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
if (cur.idx() == 0)
return false;
--cur.idx();
bool MathNestInset::idxFirst(LCursor & cur) const
{
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
if (nargs() == 0)
return false;
cur.idx() = 0;
bool MathNestInset::idxLast(LCursor & cur) const
{
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
if (nargs() == 0)
return false;
- cur.idx() = nargs() - 1;
+ cur.idx() = cur.lastidx();
cur.pos() = cur.lastpos();
return true;
}
bool MathNestInset::idxHome(LCursor & cur) const
{
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
if (cur.pos() == 0)
return false;
cur.pos() = 0;
bool MathNestInset::idxEnd(LCursor & cur) const
{
+ BOOST_ASSERT(ptr_cmp(cur.inset(), this));
if (cur.lastpos() == cur.lastpos())
return false;
cur.pos() = cur.lastpos();
}
-void MathNestInset::drawSelection(PainterInfo & pi,
- idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const
+void MathNestInset::drawSelection(PainterInfo & pi, int, int) const
{
- if (idx1 == idx2) {
- MathArray const & c = cell(idx1);
- int x1 = c.xo() + c.pos2x(pos1);
+ // this should use the x/y values given, not the cached values
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.inset(), this))
+ return;
+ CursorSlice & s1 = cur.selBegin();
+ CursorSlice & s2 = cur.selEnd();
+ if (s1.idx() == s2.idx()) {
+ MathArray const & c = cell(s1.idx());
+ int x1 = c.xo() + c.pos2x(s1.pos());
int y1 = c.yo() - c.ascent();
- int x2 = c.xo() + c.pos2x(pos2);
+ int x2 = c.xo() + c.pos2x(s2.pos());
int y2 = c.yo() + c.descent();
pi.pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
} else {
for (idx_type i = 0; i < nargs(); ++i) {
- if (idxBetween(i, idx1, idx2)) {
+ if (idxBetween(i, s1.idx(), s2.idx())) {
MathArray const & c = cell(i);
int x1 = c.xo();
int y1 = c.yo() - c.ascent();
}
-bool MathNestInset::editing(BufferView * bv) const
-{
- return bv->cursor().isInside(this);
-}
-
-
bool MathNestInset::lock() const
{
return lock_;
}
+void MathNestInset::handleFont
+ (LCursor & cur, string const & arg, string const & font)
+{
+ // this whole function is a hack and won't work for incremental font
+ // changes...
+ //recordUndo(cur, Undo::ATOMIC);
+
+ if (cur.inset()->asMathInset()->name() == font)
+ cur.handleFont(font);
+ else {
+ cur.handleNest(createMathInset(font));
+ cur.insert(arg);
+ }
+}
+
+
+void MathNestInset::handleFont2(LCursor & cur, string const & arg)
+{
+ //recordUndo(cur, Undo::ATOMIC);
+ LyXFont font;
+ bool b;
+ bv_funcs::string2font(arg, font, b);
+ if (font.color() != LColor::inherit) {
+ MathAtom at = createMathInset("color");
+ asArray(lcolor.getGUIName(font.color()), at.nucleus()->cell(0));
+ cur.handleNest(at, 1);
+ }
+}
+
+
DispatchResult
MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
{
- //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
- // << " arg: '" << cmd.argument
- // << "' x: '" << cmd.x
- // << " y: '" << cmd.y
- // << "' button: " << cmd.button() << endl;
+ lyxerr << "MathNestInset: request: " << cmd << std::endl;
switch (cmd.action) {
+ case LFUN_PASTE:
+ if (!cmd.argument.empty()) {
+ MathArray ar;
+ mathed_parse_cell(ar, cmd.argument);
+ cur.cell().insert(cur.pos(), ar);
+ cur.pos() += ar.size();
+ }
+ return DispatchResult(true, true);
+/*
case LFUN_PASTE: {
- MathArray ar;
- mathed_parse_cell(ar, cmd.argument);
- cur.cell().insert(cur.pos(), ar);
- cur.pos() += ar.size();
+ size_t n = 0;
+ istringstream is(cmd.argument.c_str());
+ is >> n;
+ if (was_macro)
+ cur.macroModeClose();
+ //recordUndo(cur, Undo::ATOMIC);
+ cur.selPaste(n);
return DispatchResult(true, true);
}
+*/
case LFUN_PASTESELECTION:
return dispatch(cur, FuncRequest(LFUN_PASTE, cur.bv().getClipboard()));
case LFUN_MOUSE_PRESS:
- if (cmd.button() == mouse_button::button2)
- return priv_dispatch(cur, FuncRequest(LFUN_PASTESELECTION));
- return DispatchResult(false);
+ return lfunMousePress(cur, cmd);
+ case LFUN_MOUSE_MOTION:
+ return lfunMouseMotion(cur, cmd);
+ case LFUN_MOUSE_RELEASE:
+ return lfunMouseRelease(cur, cmd);
+ case LFUN_MOUSE_DOUBLE:
+ return dispatch(cur, FuncRequest(LFUN_WORDSEL));
case LFUN_RIGHTSEL:
- cur.selection() = true; // fall through...
case LFUN_RIGHT:
+ cur.selHandle(cmd.action == LFUN_RIGHTSEL);
return cur.right() ?
DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
- //lyxerr << "calling scroll 20" << endl;
- //scroll(&cur.bv(), 20);
- // write something to the minibuffer
- //cur.bv().owner()->message(cur.info());
case LFUN_LEFTSEL:
- cur.selection() = true; // fall through
case LFUN_LEFT:
+ cur.selHandle(cmd.action == LFUN_LEFTSEL);
return cur.left() ?
DispatchResult(true, true) : DispatchResult(false, FINISHED);
case LFUN_UPSEL:
- cur.selection() = true; // fall through
case LFUN_UP:
+ cur.selHandle(cmd.action == LFUN_UPSEL);
return cur.up() ?
DispatchResult(true, true) : DispatchResult(false, FINISHED_UP);
case LFUN_DOWNSEL:
- cur.selection() = true; // fall through
case LFUN_DOWN:
+ cur.selHandle(cmd.action == LFUN_DOWNSEL);
return cur.down() ?
DispatchResult(true, true) : DispatchResult(false, FINISHED_DOWN);
case LFUN_WORDSEL:
cur.home();
+ cur.resetAnchor();
cur.selection() = true;
cur.end();
return DispatchResult(true, true);
case LFUN_DOWN_PARAGRAPH:
return DispatchResult(true, FINISHED);
- case LFUN_HOMESEL:
case LFUN_WORDLEFTSEL:
- cur.selection() = true; // fall through
- case LFUN_HOME:
case LFUN_WORDLEFT:
+ cur.selHandle(cmd.action == LFUN_WORDLEFTSEL);
return cur.home()
? DispatchResult(true, true) : DispatchResult(true, FINISHED);
- case LFUN_ENDSEL:
case LFUN_WORDRIGHTSEL:
- cur.selection() = true; // fall through
- case LFUN_END:
case LFUN_WORDRIGHT:
+ cur.selHandle(cmd.action == LFUN_WORDRIGHTSEL);
+ return cur.end()
+ ? DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
+
+ case LFUN_HOMESEL:
+ case LFUN_HOME:
+ cur.selHandle(cmd.action == LFUN_HOMESEL);
+ return cur.home()
+ ? DispatchResult(true, true) : DispatchResult(true, FINISHED);
+
+ case LFUN_ENDSEL:
+ case LFUN_END:
+ cur.selHandle(cmd.action == LFUN_ENDSEL);
return cur.end()
? DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
case LFUN_DELETE_WORD_BACKWARD:
case LFUN_BACKSPACE:
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.backspace();
return DispatchResult(true, true);
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.erase();
return DispatchResult(true, FINISHED);
case LFUN_SELFINSERT:
if (!cmd.argument.empty()) {
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
if (cmd.argument.size() == 1) {
if (cur.interpret(cmd.argument[0]))
return DispatchResult(true, true);
#if 0
//
-// this needs to bee incorporated
+// this needs to be incorporated
//
- //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
- // << " arg: '" << cmd.argument
- // << "' x: '" << cmd.x
- // << " y: '" << cmd.y
- // << "' 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" << endl;
- return lfunMousePress(cur, cmd);
- case LFUN_MOUSE_MOTION:
- //lyxerr << "Mouse motion" << endl;
- return lfunMouseMotion(cur, cmd);
- case LFUN_MOUSE_RELEASE:
- //lyxerr << "Mouse single release" << endl;
- return lfunMouseRelease(cur, cmd);
- case LFUN_MOUSE_DOUBLE:
- //lyxerr << "Mouse double" << endl;
- return dispatch(cur, FuncRequest(LFUN_WORDSEL));
- default:
- break;
- }
-
DispatchResult result(true);
- string argument = cmd.argument;
bool was_macro = cur.inMacroMode();
cur.normalize();
cur.touch();
-
- switch (cmd.action) {
-
- case LFUN_MATH_MUTATE:
- case LFUN_MATH_DISPLAY:
- case LFUN_MATH_NUMBER:
- case LFUN_MATH_NONUMBER:
- case LFUN_CELL_SPLIT:
- case LFUN_BREAKLINE:
- case LFUN_DELETE_LINE_FORWARD:
- case LFUN_INSERT_LABEL:
- case LFUN_MATH_EXTERN:
- case LFUN_TABULAR_FEATURE:
- case LFUN_PASTESELECTION:
- case LFUN_MATH_LIMITS:
- recordUndo(cur, Undo::ATOMIC);
- cur.dispatch(cmd);
- break;
+#endif
// case LFUN_GETXY:
// sprintf(dispatch_buffer, "%d %d",);
istringstream is(cmd.argument.c_str());
is >> x >> y;
cur.setScreenPos(x, y);
- break;
- }
-
- case LFUN_PASTE: {
- size_t n = 0;
- istringstream is(cmd.argument.c_str());
- is >> n;
- if (was_macro)
- cur.macroModeClose();
- recordUndo(cur, Undo::ATOMIC);
- cur.selPaste(n);
- break;
+ return DispatchResult(true, true);
}
case LFUN_CUT:
- recordUndo(cur, Undo::DELETE);
+ //recordUndo(cur, Undo::DELETE);
cur.selCut();
- break;
+ return DispatchResult(true, true);
case LFUN_COPY:
cur.selCopy();
- break;
+ return DispatchResult(true, true);
// Special casing for superscript in case of LyX handling
if (cmd.argument.empty()) {
// do superscript if LyX handles
// deadkeys
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.script(true);
}
- break;
+ return DispatchResult(true, true);
case LFUN_UMLAUT:
case LFUN_ACUTE:
case LFUN_TIE:
case LFUN_OGONEK:
case LFUN_HUNG_UMLAUT:
- break;
+ return DispatchResult(true, true);
// Math fonts
case LFUN_FREEFONT_APPLY:
case LFUN_FREEFONT_UPDATE:
handleFont2(cur, cmd.argument);
- break;
-
- case LFUN_BOLD: handleFont(cur, cmd.argument, "mathbf"); break;
- case LFUN_SANS: handleFont(cur, cmd.argument, "mathsf"); break;
- case LFUN_EMPH: handleFont(cur, cmd.argument, "mathcal"); break;
- case LFUN_ROMAN: handleFont(cur, cmd.argument, "mathrm"); break;
- case LFUN_CODE: handleFont(cur, cmd.argument, "texttt"); break;
- case LFUN_FRAK: handleFont(cur, cmd.argument, "mathfrak"); break;
- case LFUN_ITAL: handleFont(cur, cmd.argument, "mathit"); break;
- case LFUN_NOUN: handleFont(cur, cmd.argument, "mathbb"); break;
- //case LFUN_FREEFONT_APPLY: handleFont(cur, cmd.argument, "textrm"); break;
- case LFUN_DEFAULT: handleFont(cur, cmd.argument, "textnormal"); break;
+ return DispatchResult(true, true);
+
+ case LFUN_BOLD:
+ handleFont(cur, cmd.argument, "mathbf");
+ return DispatchResult(true, true);
+ case LFUN_SANS:
+ handleFont(cur, cmd.argument, "mathsf");
+ return DispatchResult(true, true);
+ case LFUN_EMPH:
+ handleFont(cur, cmd.argument, "mathcal");
+ return DispatchResult(true, true);
+ case LFUN_ROMAN:
+ handleFont(cur, cmd.argument, "mathrm");
+ return DispatchResult(true, true);
+ case LFUN_CODE:
+ handleFont(cur, cmd.argument, "texttt");
+ return DispatchResult(true, true);
+ case LFUN_FRAK:
+ handleFont(cur, cmd.argument, "mathfrak");
+ return DispatchResult(true, true);
+ case LFUN_ITAL:
+ handleFont(cur, cmd.argument, "mathit");
+ return DispatchResult(true, true);
+ case LFUN_NOUN:
+ handleFont(cur, cmd.argument, "mathbb");
+ return DispatchResult(true, true);
+ //case LFUN_FREEFONT_APPLY:
+ handleFont(cur, cmd.argument, "textrm");
+ return DispatchResult(true, true);
+ case LFUN_DEFAULT:
+ handleFont(cur, cmd.argument, "textnormal");
+ return DispatchResult(true, true);
case LFUN_MATH_MODE:
+#if 1
+ cur.macroModeClose();
+ cur.selClearOrDel();
+ cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
+ cur.posLeft();
+ cur.pushLeft(cur.nextInset());
+#else
if (cur.currentMode() == InsetBase::TEXT_MODE)
cur.niceInsert(MathAtom(new MathHullInset("simple")));
else
handleFont(cur, cmd.argument, "textrm");
//cur.owner()->message(_("math text mode toggled"));
- break;
+#endif
+ return DispatchResult(true, true);
case LFUN_MATH_SIZE:
#if 0
if (!arg.empty()) {
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.setSize(arg);
}
#endif
- break;
+ return DispatchResult(true, true);
case LFUN_INSERT_MATRIX: {
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
unsigned int m = 1;
unsigned int n = 1;
string v_align;
string h_align;
- istringstream is(argument);
+ istringstream is(cmd.argument);
is >> m >> n >> v_align >> h_align;
- m = max(1u, m);
- n = max(1u, n);
+ if (m < 1)
+ m = 1;
+ if (n < 1)
+ n = 1;
v_align += 'c';
cur.niceInsert(
MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
- break;
+ return DispatchResult(true, true);
}
case LFUN_MATH_DELIM: {
- //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'" << endl;
+ lyxerr << "MathNestInset::LFUN_MATH_DELIM" << endl;
string ls;
- string rs = split(cmd.argument, ls, ' ');
+ string rs = lyx::support::split(cmd.argument, ls, ' ');
// Reasonable default values
if (ls.empty())
ls = '(';
if (rs.empty())
rs = ')';
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.handleNest(MathAtom(new MathDelimInset(ls, rs)));
- break;
+ return DispatchResult(true, true);
}
case LFUN_SPACE_INSERT:
case LFUN_MATH_SPACE:
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.insert(MathAtom(new MathSpaceInset(",")));
- break;
+ return DispatchResult(true, true);
case LFUN_UNDO:
- cur.bv().owner()->message(_("Invalid action in math mode!"));
- break;
-
-
- case LFUN_EXEC_COMMAND:
- result = DispatchResult(false);
- break;
+#warning look here
+ //cur.bv().owner()->message(_("Invalid action in math mode!"));
+ return DispatchResult(true, true);
case LFUN_INSET_ERT:
// interpret this as if a backslash was typed
- recordUndo(cur, Undo::ATOMIC);
+ //recordUndo(cur, Undo::ATOMIC);
cur.interpret('\\');
- break;
-
- case LFUN_BREAKPARAGRAPH:
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- case LFUN_BREAKPARAGRAPH_SKIP:
- argument = "\n";
- // fall through
+ return DispatchResult(true, true);
// 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:
- recordUndo(cur, Undo::ATOMIC);
- cur.niceInsert(argument);
- break;
-
- case LFUN_INSET_TOGGLE:
- cur.lockToggle();
- break;
+ //recordUndo(cur, Undo::ATOMIC);
+ cur.niceInsert(cmd.argument);
+ return DispatchResult(true, true);
case LFUN_DIALOG_SHOW:
- result = DispatchResult(false);
- break;
+ return DispatchResult(false);
case LFUN_DIALOG_SHOW_NEW_INSET: {
- string const & name = argument;
+ string const & name = cmd.argument;
string data;
+#if 0
if (name == "ref") {
RefInset tmp(name);
data = tmp.createDialogStr(name);
}
-
+#endif
if (data.empty())
- result = DispatchResult(false);
- else
- cur.bv().owner()->getDialogs().show(name, data, 0);
- break;
+ return DispatchResult(false);
+ cur.bv().owner()->getDialogs().show(name, data, 0);
+ return DispatchResult(true, true);
}
case LFUN_INSET_APPLY: {
if (base) {
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
- result = base->dispatch(cur, fr);
- } else {
- MathArray ar;
- if (createMathInset_fromDialogStr(cmd.argument, ar)) {
- cur.insert(ar);
- result = DispatchResult(true, true);
- } else {
- result = DispatchResult(false);
- }
+ return base->dispatch(cur, fr);
+ }
+ MathArray ar;
+ if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+ cur.insert(ar);
+ return DispatchResult(true, true);
}
- break;
+ return DispatchResult(false);
}
+#warning look here
+#if 0
+
case LFUN_WORD_REPLACE:
- case LFUN_WORD_FIND: {
- result =
+ case LFUN_WORD_FIND:
+ return
searchForward(&cur.bv(), cmd.getArg(0), false, false)
? DispatchResult(true, true) : DispatchResult(false);
- break;
- }
-
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
- case LFUN_MATH_DELIM: {
- MathHullInset * f = new MathHullInset;
- if (openNewInset(cur, f)) {
- cur.inset()->dispatch(cur, FuncRequest(LFUN_MATH_MUTATE, "simple"));
- cur.inset()->dispatch(cur, cmd);
- }
- break;
- }
-
- default:
- result = DispatchResult(false);
- }
-
- if (result == DispatchResult(true, true))
- cur.bv().update();
cur.normalize();
cur.touch();
#endif
default:
- return MathInset::priv_dispatch(cur, cmd);
+ return MathDimInset::priv_dispatch(cur, cmd);
}
}
-void MathNestInset::metricsMarkers(int) const
+void MathNestInset::edit(LCursor & cur, bool left)
{
- dim_.wid += 2;
- dim_.asc += 1;
+ cur.push(this);
+ cur.idx() = left ? 0 : cur.lastidx();
+ cur.pos() = left ? 0 : cur.lastpos();
+ cur.resetAnchor();
}
-void MathNestInset::metricsMarkers2(int) const
+void MathNestInset::edit(LCursor & cur, int x, int y)
{
- dim_.wid += 2;
- dim_.asc += 1;
- dim_.des += 1;
+ int idx_min = 0;
+ int dist_min = 1000000;
+ for (idx_type i = 0; i < nargs(); ++i) {
+ int d = cell(i).dist(x, y);
+ if (d < dist_min) {
+ dist_min = d;
+ idx_min = i;
+ }
+ }
+ MathArray & ar = cell(idx_min);
+ cur.push(this);
+ cur.idx() = idx_min;
+ cur.pos() = ar.x2pos(x - ar.xo());
+ lyxerr << "found cell : " << idx_min << " pos: " << cur.pos() << endl;
+ if (dist_min == 0) {
+ // hit inside cell
+ for (pos_type i = 0, n = ar.size(); i < n; ++i)
+ if (ar[i]->covers(x, y))
+ ar[i].nucleus()->edit(cur, x, y);
+ }
}
-void MathNestInset::drawMarkers(PainterInfo & pi, int x, int y) const
+DispatchResult
+MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest const & cmd)
{
- if (!editing(pi.base.bv))
- return;
- int t = x + dim_.width() - 1;
- int d = y + dim_.descent();
- pi.pain.line(x, d - 3, x, d, LColor::mathframe);
- pi.pain.line(t, d - 3, t, d, LColor::mathframe);
- pi.pain.line(x, d, x + 3, d, LColor::mathframe);
- pi.pain.line(t - 3, d, t, d, LColor::mathframe);
+ //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 DispatchResult(true, true);
+ }
+
+ if (cmd.button() == mouse_button::button2) {
+ MathArray ar;
+ asArray(cur.bv().getClipboard(), ar);
+ cur.selClear();
+ cur.setScreenPos(cmd.x, cmd.y);
+ cur.insert(ar);
+ cur.bv().update();
+ return DispatchResult(true, true);
+ }
+
+ if (cmd.button() == mouse_button::button3) {
+ // try to dispatch to enclosed insets first
+ cur.bv().owner()->getDialogs().show("mathpanel");
+ return DispatchResult(true, true);
+ }
+
+ return DispatchResult(false);
}
-void MathNestInset::drawMarkers2(PainterInfo & pi, int x, int y) const
+DispatchResult
+MathNestInset::lfunMousePress(LCursor & cur, FuncRequest const & cmd)
{
- if (!editing(pi.base.bv))
- return;
- drawMarkers(pi, x, y);
- int t = x + dim_.width() - 1;
- int a = y - dim_.ascent();
- pi.pain.line(x, a + 3, x, a, LColor::mathframe);
- pi.pain.line(t, a + 3, t, a, LColor::mathframe);
- pi.pain.line(x, a, x + 3, a, LColor::mathframe);
- pi.pain.line(t - 3, a, t, a, LColor::mathframe);
+ lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
+ if (cmd.button() == mouse_button::button1) {
+ first_x = cmd.x;
+ first_y = cmd.y;
+ cur.selClear();
+ //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
+ lyxerr << "lfunMousePress: setting cursor to: " << cur << endl;
+ cur.bv().cursor() = cur;
+ return DispatchResult(true, true);
+ }
+
+ if (cmd.button() == mouse_button::button2) {
+ return priv_dispatch(cur, FuncRequest(LFUN_PASTESELECTION));
+ }
+
+ if (cmd.button() == mouse_button::button3) {
+ return DispatchResult(true, true);
+ }
+
+ return DispatchResult(true, true);
+}
+
+
+DispatchResult
+MathNestInset::lfunMouseMotion(LCursor & cur, FuncRequest const & cmd)
+{
+ // only select with button 1
+ if (cmd.button() != mouse_button::button1)
+ return DispatchResult(true, true);
+
+ if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
+ return DispatchResult(true, true);
+
+ first_x = cmd.x;
+ first_y = cmd.y;
+
+ if (!cur.selection())
+ cur.selBegin();
+
+ //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
+ cur.bv().cursor().cursor_ = cur.cursor_;
+ cur.bv().cursor().selection() = true;
+ return DispatchResult(true, true);
}
projects / lyx.git / blobdiff