#include <config.h>
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "buffer.h"
#include "cursor.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "paragraph_funcs.h"
#include "pariterator.h"
-#include "insets/updatableinset.h"
#include "insets/insettabular.h"
#include "insets/insettext.h"
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
-#include "mathed/math_macrotable.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathMacroTable.h"
#include "support/limited_stack.h"
-#include "frontends/LyXView.h"
-
#include <boost/assert.hpp>
+#include <boost/bind.hpp>
#include <boost/current_function.hpp>
#include <sstream>
+#include <limits>
+#include <map>
-using lyx::par_type;
+namespace lyx {
using std::string;
using std::vector;
using std::isalpha;
#endif
using std::min;
-using std::swap;
+using std::for_each;
namespace {
- bool positionable
- (DocIterator const & cursor, DocIterator const & anchor)
+ bool
+ positionable(DocIterator const & cursor, DocIterator const & anchor)
{
// avoid deeper nested insets when selecting
- if (cursor.size() > anchor.size())
+ if (cursor.depth() > anchor.depth())
return false;
// anchor might be deeper, should have same path then
- for (size_t i = 0; i < cursor.size(); ++i)
+ for (size_t i = 0; i < cursor.depth(); ++i)
if (&cursor[i].inset() != &anchor[i].inset())
return false;
// Find position closest to (x, y) in cell given by iter.
+ // Used only in mathed
DocIterator bruteFind2(LCursor const & c, int x, int y)
{
- double best_dist = 1e10;
+ double best_dist = std::numeric_limits<double>::max();
DocIterator result;
DocIterator it = c;
- it.back().pos() = 0;
+ it.top().pos() = 0;
DocIterator et = c;
- et.back().pos() = et.back().asMathInset()->cell(et.back().idx()).size();
- for (int i = 0; ; ++i) {
- int xo, yo;
- LCursor cur = c;
- cur.setCursor(it);
- cur.inset().getCursorPos(cur, xo, yo);
+ et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
+ for (size_t i = 0; ; ++i) {
+ int xo;
+ int yo;
+ InsetBase const * inset = &it.inset();
+ std::map<InsetBase const *, Point> const & data =
+ c.bv().coordCache().getInsets().getData();
+ std::map<InsetBase const *, Point>::const_iterator I = data.find(inset);
+
+ // FIXME: in the case where the inset is not in the cache, this
+ // means that no part of it is visible on screen. In this case
+ // we don't do elaborate search and we just return the forwarded
+ // DocIterator at its beginning.
+ if (I == data.end()) {
+ it.top().pos() = 0;
+ return it;
+ }
+
+ Point o = I->second;
+ inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo);
+ // Convert to absolute
+ xo += o.x_;
+ yo += o.y_;
double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
- lyxerr[Debug::DEBUG] << "i: " << i << " d: " << d << " best: " << best_dist << endl;
+ lyxerr[Debug::DEBUG] << "i: " << i << " d: " << d
+ << " best: " << best_dist << endl;
if (d <= best_dist) {
best_dist = d;
result = it;
int x, int y, int xlow, int xhigh, int ylow, int yhigh)
{
BOOST_ASSERT(!cursor.empty());
- par_type beg, end;
- CursorSlice bottom = cursor[0];
- LyXText * text = bottom.text();
- BOOST_ASSERT(text);
- getParsInRange(text->paragraphs(), ylow, yhigh, beg, end);
+ InsetBase & inset = cursor[0].inset();
+ BufferView & bv = cursor.bv();
+
+ CoordCache::InnerParPosCache const & cache =
+ bv.coordCache().getParPos().find(cursor.bottom().text())->second;
+ // Get an iterator on the first paragraph in the cache
+ DocIterator it(inset);
+ it.push_back(CursorSlice(inset));
+ it.pit() = cache.begin()->first;
+ // Get an iterator after the last paragraph in the cache
+ DocIterator et(inset);
+ et.push_back(CursorSlice(inset));
+ et.pit() = boost::prior(cache.end())->first;
+ if (et.pit() >= et.lastpit())
+ et = doc_iterator_end(inset);
+ else
+ ++et.pit();
- DocIterator it = doc_iterator_begin(cursor.bv().buffer()->inset());
- DocIterator et = doc_iterator_end(cursor.bv().buffer()->inset());
- //lyxerr << "x: " << x << " y: " << y << endl;
- //lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
- //lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
+ double best_dist = std::numeric_limits<double>::max();;
+ DocIterator best_cursor = et;
- it.par() = beg;
- //et.par() = text->parOffset(end);
+ for ( ; it != et; it.forwardPos(true)) {
+ // avoid invalid nesting when selecting
+ if (!cursor.selection() || positionable(it, cursor.anchor_)) {
+ Point p = bv_funcs::getPos(bv, it, false);
+ int xo = p.x_;
+ int yo = p.y_;
+ if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
+ double const dx = xo - x;
+ double const dy = yo - y;
+ double const d = dx * dx + dy * dy;
+ // '<=' in order to take the last possible position
+ // this is important for clicking behind \sum in e.g. '\sum_i a'
+ if (d <= best_dist) {
+ // lyxerr << "*" << endl;
+ best_dist = d;
+ best_cursor = it;
+ }
+ }
+ }
+ }
- double best_dist = 10e10;
- DocIterator best_cursor = it;
+ if (best_cursor != et) {
+ cursor.setCursor(best_cursor);
+ return true;
+ }
+
+ return false;
+ }
+
+
+ /// moves position closest to (x, y) in given box
+ bool bruteFind3(LCursor & cur, int x, int y, bool up)
+ {
+ BufferView & bv = cur.bv();
+ int ylow = up ? 0 : y + 1;
+ int yhigh = up ? y - 1 : bv.workHeight();
+ int xlow = 0;
+ int xhigh = bv.workWidth();
+
+// FIXME: bit more work needed to get 'from' and 'to' right.
+ pit_type from = cur.bottom().pit();
+ //pit_type to = cur.bottom().pit();
+ //lyxerr << "Pit start: " << from << endl;
+
+ //lyxerr << "bruteFind3: x: " << x << " y: " << y
+ // << " xlow: " << xlow << " xhigh: " << xhigh
+ // << " ylow: " << ylow << " yhigh: " << yhigh
+ // << endl;
+ InsetBase & inset = bv.buffer()->inset();
+ DocIterator it = doc_iterator_begin(inset);
+ it.pit() = from;
+ DocIterator et = doc_iterator_end(inset);
+
+ double best_dist = std::numeric_limits<double>::max();
+ DocIterator best_cursor = et;
for ( ; it != et; it.forwardPos()) {
// avoid invalid nesting when selecting
- if (!cursor.selection() || positionable(it, cursor.anchor_)) {
- int xo = 0, yo = 0;
- LCursor cur = cursor;
- cur.setCursor(it);
- cur.inset().getCursorPos(cur, xo, yo);
+ if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE
+ && (!cur.selection() || positionable(it, cur.anchor_))) {
+ Point p = bv_funcs::getPos(bv, it, false);
+ int xo = p.x_;
+ int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
- double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
- //lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
+ double const dx = xo - x;
+ double const dy = yo - y;
+ double const d = dx * dx + dy * dy;
+ //lyxerr << "itx: " << xo << " ity: " << yo << " d: " << d
+ // << " dx: " << dx << " dy: " << dy
+ // << " idx: " << it.idx() << " pos: " << it.pos()
+ // << " it:\n" << it
+ // << endl;
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
if (d <= best_dist) {
}
//lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
- if (best_dist < 1e10)
- cursor.setCursor(best_cursor);
- return best_dist < 1e10;
+ if (best_cursor == et)
+ return false;
+ cur.setCursor(best_cursor);
+ return true;
}
-
} // namespace anon
+// be careful: this is called from the bv's constructor, too, so
+// bv functions are not yet available!
LCursor::LCursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1),
- selection_(false), mark_(false)
+ selection_(false), mark_(false), logicalpos_(false)
{}
void LCursor::dispatch(FuncRequest const & cmd0)
{
- lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+ lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+ << " cmd: " << cmd0 << '\n'
+ << *this << endl;
if (empty())
return;
+ fixIfBroken();
FuncRequest cmd = cmd0;
LCursor safe = *this;
- for (; size(); pop()) {
- lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+ for (; depth(); pop()) {
+ lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: "
+ << cmd0 << endl << *this << endl;
BOOST_ASSERT(pos() <= lastpos());
BOOST_ASSERT(idx() <= lastidx());
- BOOST_ASSERT(par() <= lastpar());
+ BOOST_ASSERT(pit() <= lastpit());
// The common case is 'LFUN handled, need update', so make the
// LFUN handler's life easier by assuming this as default value.
// The handler can reset the update and val flags if necessary.
- disp_.update(true);
+ disp_.update(Update::FitCursor | Update::Force);
disp_.dispatched(true);
inset().dispatch(*this, cmd);
if (disp_.dispatched())
if (!disp_.dispatched()) {
lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
operator=(safe);
+ disp_.update(Update::None);
disp_.dispatched(false);
}
}
}
-bool LCursor::getStatus(FuncRequest const & cmd, FuncStatus & status)
-{
- // This is, of course, a mess. Better create a new doc iterator and use
- // this in Inset::getStatus. This might require an additional
- // BufferView * arg, though (which should be avoided)
- LCursor safe = *this;
- bool res = false;
- for ( ; size(); pop()) {
- //lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
- if (idx() > lastidx()) {
- lyxerr << "wrong idx " << idx() << ", max is " << lastidx()
- << ". Trying to correct this." << endl;
- idx() = lastidx();
- }
- if (par() > lastpar()) {
- lyxerr << "wrong par " << par() << ", max is " << lastpar()
- << ". Trying to correct this." << endl;
- par() = lastpar();
- }
- if (pos() > lastpos()) {
- lyxerr << "wrong pos " << pos() << ", max is " << lastpos()
- << ". Trying to correct this." << endl;
- pos() = lastpos();
- }
-
- // The inset's getStatus() will return 'true' if it made
- // a definitive decision on whether it want to handle the
- // request or not. The result of this decision is put into
- // the 'status' parameter.
- if (inset().getStatus(*this, cmd, status)) {
- res = true;
- break;
- }
- }
- operator=(safe);
- return res;
-}
-
-
BufferView & LCursor::bv() const
{
BOOST_ASSERT(bv_);
void LCursor::pop()
{
- BOOST_ASSERT(size() >= 1);
+ BOOST_ASSERT(depth() >= 1);
pop_back();
}
{
BOOST_ASSERT(!empty());
//lyxerr << "Leaving inset to the right" << endl;
+ const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0;
inset().notifyCursorLeaves(*this);
if (depth() == 1)
return false;
pop();
- ++pos();
+ pos() += lastpos() - lp + 1;
return true;
}
int LCursor::currentMode()
{
BOOST_ASSERT(!empty());
- for (int i = size() - 1; i >= 0; --i) {
+ for (int i = depth() - 1; i >= 0; --i) {
int res = operator[](i).inset().currentMode();
if (res != InsetBase::UNDECIDED_MODE)
return res;
}
-void LCursor::getDim(int & asc, int & des) const
-{
- if (inMathed()) {
- BOOST_ASSERT(inset().asMathInset());
- //inset().asMathInset()->getCursorDim(asc, des);
- asc = 10;
- des = 10;
- } else if (inTexted()) {
- Row const & row = textRow();
- asc = row.baseline();
- des = row.height() - asc;
- } else {
- lyxerr << "should this happen?" << endl;
- asc = 10;
- des = 10;
- }
-}
-
-
void LCursor::getPos(int & x, int & y) const
{
- x = 0;
- y = 0;
- if (!empty())
- inset().getCursorPos(*this, x, y);
+ Point p = bv_funcs::getPos(bv(), *this, boundary());
+ x = p.x_;
+ y = p.y_;
}
-void LCursor::paste(string const & data)
+Row const & LCursor::textRow() const
{
- dispatch(FuncRequest(LFUN_PASTE, data));
+ ParagraphMetrics const & pm = bv().parMetrics(text(), pit());
+ BOOST_ASSERT(!pm.rows().empty());
+ return pm.getRow(pos(), boundary());
}
CursorSlice LCursor::anchor() const
{
- BOOST_ASSERT(anchor_.size() >= size());
- CursorSlice normal = anchor_[size() - 1];
- if (size() < anchor_.size() && back() <= normal) {
+ BOOST_ASSERT(anchor_.depth() >= depth());
+ CursorSlice normal = anchor_[depth() - 1];
+ if (depth() < anchor_.depth() && top() <= normal) {
// anchor is behind cursor -> move anchor behind the inset
++normal.pos();
}
CursorSlice LCursor::selBegin() const
{
if (!selection())
- return back();
- return anchor() < back() ? anchor() : back();
+ return top();
+ return anchor() < top() ? anchor() : top();
}
CursorSlice LCursor::selEnd() const
{
if (!selection())
- return back();
- return anchor() > back() ? anchor() : back();
+ return top();
+ return anchor() > top() ? anchor() : top();
}
{
if (!selection())
return *this;
- return anchor() < back() ? anchor_ : *this;
+ DocIterator di = (anchor() < top() ? anchor_ : *this);
+ di.resize(depth());
+ return di;
}
{
if (!selection())
return *this;
- return anchor() > back() ? anchor_ : *this;
+ DocIterator di = (anchor() > top() ? anchor_ : *this);
+ if (di.depth() > depth()) {
+ di.resize(depth());
+ ++di.pos();
+ }
+ return di;
}
void LCursor::setSelection()
{
selection() = true;
- // a selection with no contents is not a selection
+ // A selection with no contents is not a selection
#ifdef WITH_WARNINGS
#warning doesnt look ok
#endif
- if (par() == anchor().par() && pos() == anchor().pos())
+ if (pit() == anchor().pit() && pos() == anchor().pos())
selection() = false;
}
-void LCursor::setSelection(DocIterator const & where, size_t n)
+void LCursor::setSelection(DocIterator const & where, int n)
{
setCursor(where);
selection() = true;
selection() = false;
mark() = false;
resetAnchor();
- bv().unsetXSel();
}
-void LCursor::info(std::ostream & os) const
+void LCursor::info(odocstream & os) const
{
for (int i = 1, n = depth(); i < n; ++i) {
operator[](i).inset().infoize(os);
os << " ";
}
- if (pos() != 0)
- prevInset()->infoize2(os);
+ if (pos() != 0) {
+ InsetBase const * inset = prevInset();
+ // prevInset() can return 0 in certain case.
+ if (inset)
+ prevInset()->infoize2(os);
+ }
// overwite old message
os << " ";
}
-void LCursor::selHandle(bool sel)
+bool LCursor::selHandle(bool sel)
{
//lyxerr << "LCursor::selHandle" << endl;
if (sel == selection())
- return;
+ return false;
resetAnchor();
selection() = sel;
+ cap::saveSelection(*this);
+ return true;
}
std::ostream & operator<<(std::ostream & os, LCursor const & cur)
{
os << "\n cursor: | anchor:\n";
- for (size_t i = 0, n = cur.size(); i != n; ++i) {
- os << " " << cur.operator[](i) << " | ";
- if (i < cur.anchor_.size())
+ for (size_t i = 0, n = cur.depth(); i != n; ++i) {
+ os << " " << cur[i] << " | ";
+ if (i < cur.anchor_.depth())
os << cur.anchor_[i];
else
os << "-------------------------------";
os << "\n";
}
- for (size_t i = cur.size(), n = cur.anchor_.size(); i < n; ++i) {
+ for (size_t i = cur.depth(), n = cur.anchor_.depth(); i < n; ++i) {
os << "------------------------------- | " << cur.anchor_[i] << "\n";
}
os << " selection: " << cur.selection_
return os;
}
-
+} // namespace lyx
///////////////////////////////////////////////////////////////////
//
// The part below is the non-integrated rest of the original math
// cursor. This should be either generalized for texted or moved
-// back to mathed (in most cases to MathNestInset).
+// back to mathed (in most cases to InsetMathNest).
//
///////////////////////////////////////////////////////////////////
-#include "mathed/math_charinset.h"
-#include "mathed/math_factory.h"
-#include "mathed/math_gridinset.h"
-#include "mathed/math_macroarg.h"
-#include "mathed/math_mathmlstream.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_support.h"
-#include "mathed/math_unknowninset.h"
+#include "mathed/InsetMathChar.h"
+#include "mathed/InsetMathGrid.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/InsetMathUnknown.h"
+#include "mathed/MathFactory.h"
+#include "mathed/MathStream.h"
+#include "mathed/MathSupport.h"
+
+
+namespace lyx {
//#define FILEDEBUG 1
bool LCursor::isInside(InsetBase const * p)
{
- for (unsigned i = 0; i < depth(); ++i)
+ for (size_t i = 0; i != depth(); ++i)
if (&operator[](i).inset() == p)
return true;
return false;
}
+void LCursor::leaveInset(InsetBase const & inset)
+{
+ for (size_t i = 0; i != depth(); ++i) {
+ if (&operator[](i).inset() == &inset) {
+ resize(i);
+ return;
+ }
+ }
+}
+
+
bool LCursor::openable(MathAtom const & t) const
{
if (!t->isActive())
return true;
// we can't move into anything new during selection
- if (depth() >= anchor_.size())
+ if (depth() >= anchor_.depth())
return false;
if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset()))
return false;
void LCursor::markInsert()
{
- insert(char(0));
+ insert(char_type(0));
}
}
-void LCursor::insert(string const & str)
+void LCursor::insert(docstring const & str)
{
- //lyxerr << "LCursor::insert str '" << str << "'" << endl;
- for (string::const_iterator it = str.begin(); it != str.end(); ++it)
- insert(*it);
+ for_each(str.begin(), str.end(),
+ boost::bind(static_cast<void(LCursor::*)(char_type)>
+ (&LCursor::insert), this, _1));
}
-void LCursor::insert(char c)
+void LCursor::insert(char_type c)
{
//lyxerr << "LCursor::insert char '" << c << "'" << endl;
BOOST_ASSERT(!empty());
if (inMathed()) {
- lyx::cap::selClearOrDel(*this);
- insert(new MathCharInset(c));
+ cap::selClearOrDel(*this);
+ insert(new InsetMathChar(c));
} else {
text()->insertChar(*this, c);
}
{
//lyxerr << "LCursor::insert MathAtom '" << t << "'" << endl;
macroModeClose();
- lyx::cap::selClearOrDel(*this);
+ cap::selClearOrDel(*this);
plainInsert(t);
}
}
-void LCursor::niceInsert(string const & t)
+void LCursor::niceInsert(docstring const & t)
{
MathArray ar;
asArray(t, ar);
void LCursor::niceInsert(MathAtom const & t)
{
macroModeClose();
- string safe = lyx::cap::grabAndEraseSelection(*this);
+ docstring const safe = cap::grabAndEraseSelection(*this);
plainInsert(t);
// enter the new inset and move the contents of the selection if possible
if (t->isActive()) {
// be careful here: don't use 'pushLeft(t)' as this we need to
// push the clone, not the original
pushLeft(*nextInset());
- paste(safe);
+ // We may not use niceInsert here (recursion)
+ MathArray ar;
+ asArray(safe, ar);
+ insert(ar);
}
}
{
macroModeClose();
if (selection())
- lyx::cap::eraseSelection(*this);
+ cap::eraseSelection(*this);
cell().insert(pos(), ar);
pos() += ar.size();
}
autocorrect() = false;
if (selection()) {
- lyx::cap::selDel(*this);
+ cap::eraseSelection(*this);
return true;
}
if (pos() == 0) {
- if (inset().nargs() == 1 && depth() == 1 && lastpos() == 0)
+ // If empty cell, and not part of a big cell
+ if (lastpos() == 0 && inset().nargs() == 1) {
+ popLeft();
+ // Directly delete empty cell: [|[]] => [|]
+ if (inMathed()) {
+ plainErase();
+ resetAnchor();
+ return true;
+ }
+ // [|], can not delete from inside
return false;
- pullArg();
- return true;
+ } else {
+ // move to left
+ popLeft();
+ return true;
+ }
}
if (inMacroMode()) {
- MathUnknownInset * p = activeMacro();
+ InsetMathUnknown * p = activeMacro();
if (p->name().size() > 1) {
p->setName(p->name().substr(0, p->name().size() - 1));
return true;
return true;
if (selection()) {
- lyx::cap::selDel(*this);
+ cap::eraseSelection(*this);
return true;
}
// special behaviour when in last position of cell
if (pos() == lastpos()) {
bool one_cell = inset().nargs() == 1;
- if (one_cell && depth() == 1 && lastpos() == 0)
+ if (one_cell && lastpos() == 0) {
+ popLeft();
+ // Directly delete empty cell: [|[]] => [|]
+ if (inMathed()) {
+ plainErase();
+ resetAnchor();
+ return true;
+ }
+ // [|], can not delete from inside
return false;
+ }
// remove markup
- if (one_cell)
- pullArg();
- else
+ if (!one_cell)
inset().idxGlue(idx());
return true;
}
// 'clever' UI hack: only erase large items if previously slected
- if (pos() != lastpos() && inset().nargs() > 0) {
+ if (pos() != lastpos() && nextAtom()->nargs() > 0) {
resetAnchor();
selection() = true;
++pos();
}
-void LCursor::macroModeClose()
+bool LCursor::macroModeClose()
{
if (!inMacroMode())
- return;
- MathUnknownInset * p = activeMacro();
+ return false;
+ InsetMathUnknown * p = activeMacro();
p->finalize();
- string s = p->name();
+ docstring const s = p->name();
--pos();
cell().erase(pos());
// do nothing if the macro name is empty
if (s == "\\")
- return;
-
- string const name = s.substr(1);
+ return false;
// prevent entering of recursive macros
// FIXME: this is only a weak attempt... only prevents immediate
// recursion
+ docstring const name = s.substr(1);
InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
if (macro && macro->getInsetName() == name)
lyxerr << "can't enter recursive macro" << endl;
- plainInsert(createMathInset(name));
+ InsetMathNest * const in = inset().asInsetMath()->asNestInset();
+ if (in && in->interpretString(*this, s))
+ return true;
+ plainInsert(createInsetMath(name));
+ return true;
}
-string LCursor::macroName()
+docstring LCursor::macroName()
{
- return inMacroMode() ? activeMacro()->name() : string();
+ return inMacroMode() ? activeMacro()->name() : docstring();
}
{
//lyxerr << "LCursor::handleNest: " << c << endl;
MathAtom t = a;
- asArray(lyx::cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
+ asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
insert(t);
posLeft();
pushLeft(*nextInset());
}
+void LCursor::setTargetX()
+{
+ int x;
+ int y;
+ getPos(x, y);
+ x_target_ = x;
+}
+
+
bool LCursor::inMacroMode() const
{
if (pos() == 0)
return false;
- MathUnknownInset const * p = prevAtom()->asUnknownInset();
+ InsetMathUnknown const * p = prevAtom()->asUnknownInset();
return p && !p->final();
}
-MathUnknownInset * LCursor::activeMacro()
+InsetMathUnknown * LCursor::activeMacro()
{
return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0;
}
void LCursor::normalize()
{
- if (idx() >= nargs()) {
+ if (idx() > lastidx()) {
lyxerr << "this should not really happen - 1: "
<< idx() << ' ' << nargs()
<< " in: " << &inset() << endl;
+ idx() = lastidx();
}
- idx() = min(idx(), lastidx());
if (pos() > lastpos()) {
lyxerr << "this should not really happen - 2: "
<< pos() << ' ' << lastpos() << " in idx: " << idx()
<< " in atom: '";
- WriteStream wi(lyxerr, false, true);
- inset().asMathInset()->write(wi);
- lyxerr << endl;
+ odocstringstream os;
+ WriteStream wi(os, false, true);
+ inset().asInsetMath()->write(wi);
+ lyxerr << to_utf8(os.str()) << endl;
+ pos() = lastpos();
}
- pos() = min(pos(), lastpos());
}
int yo = 0;
getPos(xo, yo);
- // check if we had something else in mind, if not, this is the future goal
+ // check if we had something else in mind, if not, this is the future
+ // target
if (x_target() == -1)
x_target() = xo;
else
if (!selection()) {
// try left
if (pos() != 0) {
- MathScriptInset const * p = prevAtom()->asScriptInset();
+ InsetMathScript const * p = prevAtom()->asScriptInset();
if (p && p->has(up)) {
--pos();
- push(inset());
- idx() = up; // the superscript has index 1
+ push(*const_cast<InsetMathScript*>(p));
+ idx() = p->idxOfScript(up);
pos() = lastpos();
- //lyxerr << "updown: handled by scriptinset to the left" << endl;
return true;
}
}
// try right
if (pos() != lastpos()) {
- MathScriptInset const * p = nextAtom()->asScriptInset();
+ InsetMathScript const * p = nextAtom()->asScriptInset();
if (p && p->has(up)) {
- push(inset());
- idx() = up;
+ push(*const_cast<InsetMathScript*>(p));
+ idx() = p->idxOfScript(up);
pos() = 0;
- //lyxerr << "updown: handled by scriptinset to the right" << endl;
return true;
}
}
}
- // try current cell for e.g. text insets
- if (inset().idxUpDown2(*this, up))
- return true;
+// FIXME: Switch this on for more robust movement
+#if 0
+ return bruteFind3(*this, xo, yo, up);
+
+#else
//xarray().boundingBox(xlow, xhigh, ylow, yhigh);
//if (up)
// yhigh = yo - 4;
//}
// try to find an inset that knows better then we
- while (1) {
+ while (true) {
//lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
// ask inset first
if (inset().idxUpDown(*this, up)) {
+ //lyxerr << "idxUpDown triggered" << endl;
// try to find best position within this inset
if (!selection())
setCursor(bruteFind2(*this, xo, yo));
}
// no such inset found, just take something "above"
- //lyxerr << "updown: handled by strange case" << endl;
if (!popLeft()) {
+ //lyxerr << "updown: popleft failed (strange case)" << endl;
int ylow = up ? 0 : yo + 1;
int yhigh = up ? yo - 1 : bv().workHeight();
return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
}
// any improvement so far?
- int xnew, ynew;
+ //lyxerr << "updown: popLeft succeeded" << endl;
+ int xnew;
+ int ynew;
getPos(xnew, ynew);
if (up ? ynew < yo : ynew > yo)
return true;
// we should not come here.
BOOST_ASSERT(false);
+#endif
}
void LCursor::handleFont(string const & font)
{
lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
- string safe;
+ docstring safe;
if (selection()) {
macroModeClose();
- safe = lyx::cap::grabAndEraseSelection(*this);
+ safe = cap::grabAndEraseSelection(*this);
}
if (lastpos() != 0) {
} else {
// cursor in between. split cell
MathArray::iterator bt = cell().begin();
- MathAtom at = createMathInset(font);
+ MathAtom at = createInsetMath(from_utf8(font));
at.nucleus()->cell(0) = MathArray(bt, bt + pos());
cell().erase(bt, bt + pos());
popLeft();
}
-void LCursor::message(string const & msg) const
+void LCursor::message(docstring const & msg) const
{
- bv().owner()->getLyXFunc().setMessage(msg);
+ theLyXFunc().setMessage(msg);
}
-void LCursor::errorMessage(string const & msg) const
+void LCursor::errorMessage(docstring const & msg) const
{
- bv().owner()->getLyXFunc().setErrorMessage(msg);
+ theLyXFunc().setErrorMessage(msg);
}
-string LCursor::selectionAsString(bool label) const
+docstring LCursor::selectionAsString(bool label) const
{
if (!selection())
- return string();
+ return docstring();
if (inTexted()) {
Buffer const & buffer = *bv().buffer();
- ParagraphList & pars = text()->paragraphs();
+ ParagraphList const & pars = text()->paragraphs();
// should be const ...
- par_type startpit = selBegin().par();
- par_type endpit = selEnd().par();
+ pit_type startpit = selBegin().pit();
+ pit_type endpit = selEnd().pit();
size_t const startpos = selBegin().pos();
size_t const endpos = selEnd().pos();
return pars[startpit].asString(buffer, startpos, endpos, label);
// First paragraph in selection
- string result = pars[startpit].
+ docstring result = pars[startpit].
asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
// The paragraphs in between (if any)
- for (par_type pit = startpit + 1; pit != endpit; ++pit) {
- Paragraph & par = pars[pit];
+ for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
+ Paragraph const & par = pars[pit];
result += par.asString(buffer, 0, par.size(), label) + "\n\n";
}
return result;
}
-#ifdef WITH_WARNINGS
-#warning and mathed?
-#endif
- return string();
+ if (inMathed())
+ return cap::grabSelection(*this);
+
+ return docstring();
}
-string LCursor::currentState()
+docstring LCursor::currentState()
{
if (inMathed()) {
- std::ostringstream os;
+ odocstringstream os;
info(os);
return os.str();
}
if (inTexted())
- return text()->currentState(*this);
+ return text()->currentState(*this);
- return string();
+ return docstring();
}
-string LCursor::getPossibleLabel()
+docstring LCursor::getPossibleLabel()
{
- return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
+ return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
}
int s = 0;
// go up until first non-0 text is hit
// (innermost text is 0 in mathed)
- for (s = size() - 1; s >= 0; --s)
+ for (s = depth() - 1; s >= 0; --s)
if (operator[](s).text())
break;
CursorSlice const & sl = operator[](s);
- LyXText & text = *sl.text();
- LyXFont font = text.getPar(sl.par()).getFont(
- bv().buffer()->params(), sl.pos(), outerFont(sl.par(), text.paragraphs()));
+ LyXText const & text = *sl.text();
+ LyXFont font = text.getPar(sl.pit()).getFont(
+ bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
return font.language()->encoding();
}
}
-void LCursor::needsUpdate()
+void LCursor::updateFlags(Update::flags f)
{
- disp_.update(true);
+ disp_.update(f);
}
void LCursor::noUpdate()
{
- disp_.update(false);
+ disp_.update(Update::None);
+}
+
+
+LyXFont LCursor::getFont() const
+{
+ // HACK. far from being perfect...
+ int s = 0;
+ // go up until first non-0 text is hit
+ // (innermost text is 0 in mathed)
+ for (s = depth() - 1; s >= 0; --s)
+ if (operator[](s).text())
+ break;
+ CursorSlice const & sl = operator[](s);
+ LyXText const & text = *sl.text();
+ LyXFont font = text.getPar(sl.pit()).getFont(
+ bv().buffer()->params(),
+ sl.pos(),
+ outerFont(sl.pit(), text.paragraphs()));
+
+ return font;
+}
+
+
+void LCursor::fixIfBroken()
+{
+ // find out last good level
+ LCursor copy = *this;
+ size_t newdepth = depth();
+ while (!copy.empty()) {
+ if (copy.idx() > copy.lastidx()) {
+ lyxerr << "wrong idx " << copy.idx()
+ << ", max is " << copy.lastidx()
+ << " at level " << copy.depth()
+ << ". Trying to correct this." << endl;
+ newdepth = copy.depth() - 1;
+ }
+ else if (copy.pit() > copy.lastpit()) {
+ lyxerr << "wrong pit " << copy.pit()
+ << ", max is " << copy.lastpit()
+ << " at level " << copy.depth()
+ << ". Trying to correct this." << endl;
+ newdepth = copy.depth() - 1;
+ }
+ else if (copy.pos() > copy.lastpos()) {
+ lyxerr << "wrong pos " << copy.pos()
+ << ", max is " << copy.lastpos()
+ << " at level " << copy.depth()
+ << ". Trying to correct this." << endl;
+ newdepth = copy.depth() - 1;
+ }
+ copy.pop();
+ }
+ // shrink cursor to a size where everything is valid, possibly
+ // leaving insets
+ while (depth() > newdepth) {
+ pop();
+ lyxerr << "correcting cursor to level " << depth() << endl;
+ }
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff