* \author Jean-Marc Lasgouttes
* \author John Levon
* \author Angus Leeming
+ * \author Juergen Vigna
*
* Full author contact details are available in file CREDITS.
*/
#include "frontends/Alert.h"
#include "frontends/LyXView.h"
+#include "insets/insetcommand.h"
#include "insets/insettext.h"
#include "support/convert.h"
using std::istringstream;
using std::ostringstream;
using std::string;
+using std::vector;
namespace bv_funcs {
// the next two should probably go elsewhere
// this give the position relative to (0, baseline) of outermost
// paragraph
-Point coordOffset(DocIterator const & dit)
+Point coordOffset(DocIterator const & dit, bool boundary)
{
int x = 0;
int y = 0;
CursorSlice const & sl = dit[i];
int xx = 0;
int yy = 0;
- sl.inset().getCursorPos(sl, xx, yy);
+ sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
x += xx;
y += yy;
- //lyxerr << "LCursor::getPos, i: " << i << " x: " << xx << " y: " << y << endl;
+ //lyxerr << "LCursor::getPos, i: "
+ // << i << " x: " << xx << " y: " << y << endl;
}
// Add contribution of initial rows of outermost paragraph
CursorSlice const & sl = dit[0];
Paragraph const & par = sl.text()->getPar(sl.pit());
y -= par.rows()[0].ascent();
- for (size_t rit = 0, rend = par.pos2row(sl.pos()); rit != rend; ++rit)
+#if 1
+ size_t rend;
+ if (sl.pos() > 0 && dit.depth() == 1) {
+ int pos = sl.pos();
+ if (pos && boundary)
+ --pos;
+// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
+ rend = par.pos2row(pos);
+ } else
+ rend = par.pos2row(sl.pos());
+#else
+ size_t rend = par.pos2row(sl.pos());
+#endif
+ for (size_t rit = 0; rit != rend; ++rit)
y += par.rows()[rit].height();
- y += par.rows()[par.pos2row(sl.pos())].ascent();
- x += dit.bottom().text()->cursorX(dit.bottom());
- return Point(x,y);
+ y += par.rows()[rend].ascent();
+ x += dit.bottom().text()->cursorX(dit.bottom(), boundary && dit.depth() == 1);
+ // The following correction should not be there at all.
+ // The cursor looks much better with the -1, though.
+ --x;
+ return Point(x, y);
}
-Point getPos(DocIterator const & dit)
+Point getPos(DocIterator const & dit, bool boundary)
{
CursorSlice const & bot = dit.bottom();
- CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(bot.text())->second;
+ CoordCache::ParPosCache::const_iterator cache_it =
+ theCoords.getParPos().find(bot.text());
+ if (cache_it == theCoords.getParPos().end())
+ return Point(-1, -1);
+
+ CoordCache::InnerParPosCache const & cache = cache_it->second;
CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
if (it == cache.end()) {
//lyxerr << "cursor out of view" << std::endl;
return Point(-1, -1);
}
- Point p = coordOffset(dit); // offset from outer paragraph
+ Point p = coordOffset(dit, boundary); // offset from outer paragraph
p.y_ += it->second.y_;
return p;
}
return CUR_BELOW;
}
+namespace {
+
+bool findNextInset(DocIterator & dit,
+ vector<InsetBase_code> const & codes,
+ string const & contents)
+{
+ DocIterator tmpdit = dit;
+
+ while (tmpdit) {
+ InsetBase const * inset = tmpdit.nextInset();
+ if (inset
+ && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
+ && (contents.empty() ||
+ static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
+ dit = tmpdit;
+ return true;
+ }
+ tmpdit.forwardInset();
+ }
+
+ return false;
+}
+
+} // namespace anon
+
+
+bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
+ bool same_content)
+{
+ string contents;
+ DocIterator tmpdit = dit;
+ tmpdit.forwardInset();
+ if (!tmpdit)
+ return false;
+
+ if (same_content) {
+ InsetBase const * inset = tmpdit.nextInset();
+ if (inset
+ && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
+ contents = static_cast<InsetCommand const *>(inset)->getContents();
+ }
+ }
+
+ if (!findNextInset(tmpdit, codes, contents)) {
+ if (dit.depth() != 1 || dit.pit() != 0 || dit.pos() != 0) {
+ tmpdit = doc_iterator_begin(tmpdit.bottom().inset());
+ if (!findNextInset(tmpdit, codes, contents)) {
+ return false;
+ }
+ } else
+ return false;
+ }
+
+ dit = tmpdit;
+ return true;
+}
+
+
+void findInset(DocIterator & dit, InsetBase_code code, bool same_content)
+{
+ findInset(dit, vector<InsetBase_code>(1, code), same_content);
+}
+
+
+void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
+ bool same_content)
+{
+ LCursor tmpcur = bv->cursor();
+ if (!findInset(tmpcur, codes, same_content)) {
+ bv->cursor().message(_("No more insets"));
+ return;
+ }
+
+ tmpcur.clearSelection();
+ bv->setCursor(tmpcur);
+}
+
+
+void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
+{
+ gotoInset(bv, vector<InsetBase_code>(1, code), same_content);
+}
+
} // namespace bv_funcs