#include <config.h>
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "buffer.h"
#include "cursor.h"
#include "coordcache.h"
#include "mathed/InsetMath.h"
#include "mathed/InsetMathScript.h"
#include "mathed/MathMacroTable.h"
-#include "mathed/MathParser.h"
#include "support/limited_stack.h"
#include <sstream>
#include <limits>
+#include <map>
-using lyx::char_type;
-using lyx::docstring;
-using lyx::pit_type;
+namespace lyx {
using std::string;
using std::vector;
int xo;
int yo;
InsetBase const * inset = &it.inset();
- Point o = theCoords.getInsets().xy(inset);
- inset->cursorPos(it.top(), c.boundary(), xo, yo);
+ 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_;
{
BOOST_ASSERT(!cursor.empty());
InsetBase & inset = cursor[0].inset();
+ BufferView & bv = cursor.bv();
- CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
+ 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));
for ( ; it != et; it.forwardPos(true)) {
// avoid invalid nesting when selecting
if (!cursor.selection() || positionable(it, cursor.anchor_)) {
- Point p = bv_funcs::getPos(it, false);
+ 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) {
// avoid invalid nesting when selecting
if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE
&& (!cur.selection() || positionable(it, cur.anchor_))) {
- Point p = bv_funcs::getPos(it, false);
+ 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) {
// 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);
}
}
{
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;
}
void LCursor::getPos(int & x, int & y) const
{
- Point p = bv_funcs::getPos(*this, boundary());
+ Point p = bv_funcs::getPos(bv(), *this, boundary());
x = p.x_;
y = p.y_;
}
+Row const & LCursor::textRow() const
+{
+ ParagraphMetrics const & pm = bv().parMetrics(text(), pit());
+ BOOST_ASSERT(!pm.rows().empty());
+ return pm.getRow(pos(), boundary());
+}
+
+
void LCursor::resetAnchor()
{
anchor_ = *this;
}
-void LCursor::setSelection(DocIterator const & where, size_t n)
+void LCursor::setSelection(DocIterator const & where, int n)
{
setCursor(where);
selection() = true;
-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;
}
return os;
}
-
+} // namespace lyx
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
#include "mathed/InsetMathChar.h"
-#include "mathed/MathFactory.h"
#include "mathed/InsetMathGrid.h"
-#include "mathed/MathMacroArgument.h"
-#include "mathed/MathMLStream.h"
#include "mathed/InsetMathScript.h"
-#include "mathed/MathSupport.h"
#include "mathed/InsetMathUnknown.h"
+#include "mathed/MathFactory.h"
+#include "mathed/MathStream.h"
+#include "mathed/MathSupport.h"
+
+
+namespace lyx {
//#define FILEDEBUG 1
}
-void LCursor::insert(string const & str)
+void LCursor::insert(docstring const & str)
{
for_each(str.begin(), str.end(),
boost::bind(static_cast<void(LCursor::*)(char_type)>
//lyxerr << "LCursor::insert char '" << c << "'" << endl;
BOOST_ASSERT(!empty());
if (inMathed()) {
- lyx::cap::selClearOrDel(*this);
+ 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 const 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()) {
{
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()) {
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;
}
return false;
InsetMathUnknown * p = activeMacro();
p->finalize();
- string const s = p->name();
+ docstring const s = p->name();
--pos();
cell().erase(pos());
// prevent entering of recursive macros
// FIXME: this is only a weak attempt... only prevents immediate
// recursion
- string const name = s.substr(1);
+ 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;
InsetMathNest * const in = inset().asInsetMath()->asNestInset();
- if (in && in->interpret(*this, s))
+ 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()
{
- // For now this is good enough. A better solution would be to
- // avoid this rebreak by setting cursorX only after drawing
- bottom().text()->redoParagraph(bottom().pit());
int x;
int y;
getPos(x, y);
lyxerr << "this should not really happen - 2: "
<< pos() << ' ' << lastpos() << " in idx: " << idx()
<< " in atom: '";
- WriteStream wi(lyxerr, false, true);
+ odocstringstream os;
+ WriteStream wi(os, false, true);
inset().asInsetMath()->write(wi);
- lyxerr << endl;
+ lyxerr << to_utf8(os.str()) << endl;
pos() = lastpos();
}
}
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 = createInsetMath(font);
+ MathAtom at = createInsetMath(from_utf8(font));
at.nucleus()->cell(0) = MathArray(bt, bt + pos());
cell().erase(bt, bt + pos());
popLeft();
size_t const endpos = selEnd().pos();
if (startpit == endpit)
- return lyx::from_utf8(pars[startpit].asString(buffer, startpos, endpos, label));
+ 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)
// Last paragraph in selection
result += pars[endpit].asString(buffer, 0, endpos, label);
- return lyx::from_utf8(result);
+ return result;
}
if (inMathed())
- return lyx::from_utf8(lyx::cap::grabSelection(*this));
+ 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 string();
+ return docstring();
}
-string LCursor::getPossibleLabel()
+docstring LCursor::getPossibleLabel()
{
- return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
+ return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
}
}
-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);
}
lyxerr << "correcting cursor to level " << depth() << endl;
}
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff