#include "bufferview_funcs.h"
-#include "Author.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Language.h"
#include "Color.h"
#include "Lexer.h"
-#include "Row.h"
-#include "Paragraph.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
#include "frontends/alert.h"
#include <sstream>
-
-namespace lyx {
-
-using support::bformat;
-
using std::istringstream;
using std::ostringstream;
using std::string;
using std::find;
+namespace lyx {
+
+using support::bformat;
+
namespace bv_funcs {
// Set data using font and toggle
int y = 0;
int lastw = 0;
- // Addup ontribution of nested insets, from inside to outside,
- // keeping the outer paragraph for a special handling below
+ // Addup contribution of nested insets, from inside to outside,
+ // keeping the outer paragraph for a special handling below
for (size_t i = dit.depth() - 1; i >= 1; --i) {
CursorSlice const & sl = dit[i];
int xx = 0;
// of xx:yy
if (sl.text()) {
bool boundary_i = boundary && i + 1 == dit.depth();
- bool rtl = sl.text()->isRTL(*bv.buffer(), sl, boundary_i);
+ bool rtl = bv.textMetrics(sl.text()).isRTL(sl, boundary_i);
if (rtl)
x -= lastw;
}
-
+
// remember width for the case that sl.inset() is positioned in an RTL inset
- lastw = sl.inset().width();
+ if (i && dit[i - 1].text()) {
+ // If this Inset is inside a Text Inset, retrieve the Dimension
+ // from the containing text instead of using Inset::dimension() which
+ // might not be implemented.
+ // FIXME (Abdel 23/09/2007): this is a bit messy because of the
+ // elimination of Inset::dim_ cache. This coordOffset() method needs
+ // to be rewritten in light of the new design.
+ Dimension const & dim = bv.parMetrics(dit[i - 1].text(),
+ dit[i - 1].pit()).insetDimension(&sl.inset());
+ lastw = dim.wid;
+ } else {
+ Dimension const dim = sl.inset().dimension(bv);
+ lastw = dim.wid;
+ }
//lyxerr << "Cursor::getPos, i: "
// << i << " x: " << xx << " y: " << y << endl;
// Add contribution of initial rows of outermost paragraph
CursorSlice const & sl = dit[0];
- ParagraphMetrics const & pm = bv.parMetrics(sl.text(), sl.pit());
+ TextMetrics const & tm = bv.textMetrics(sl.text());
+ ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
BOOST_ASSERT(!pm.rows().empty());
y -= pm.rows()[0].ascent();
#if 1
y += pm.rows()[rit].height();
y += pm.rows()[rend].ascent();
+ TextMetrics const & bottom_tm = bv.textMetrics(dit.bottom().text());
+
// Make relative position from the nested inset now bufferview absolute.
- int xx = dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
+ int xx = bottom_tm.cursorX(dit.bottom(), boundary && dit.depth() == 1);
x += xx;
// In the RTL case place the nested inset at the left of the cursor in
// the outer paragraph
bool boundary_1 = boundary && 1 == dit.depth();
- bool rtl = dit.bottom().text()->isRTL(*bv.buffer(), dit.bottom(), boundary_1);
+ bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
if (rtl)
x -= lastw;
Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
{
CursorSlice const & bot = dit.bottom();
- CoordCache::ParPosCache::const_iterator cache_it =
- bv.coordCache().getParPos().find(bot.text());
- if (cache_it == bv.coordCache().getParPos().end())
+ TextMetrics const & tm = bv.textMetrics(bot.text());
+ if (!tm.has(bot.pit()))
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(bv, dit, boundary); // offset from outer paragraph
- p.y_ += it->second.y_;
+ p.y_ += tm.parMetrics(bot.pit()).position();
return p;
}
// FIXME: This does not work within mathed!
CurStatus status(BufferView const * bv, DocIterator const & dit)
{
- CoordCache::InnerParPosCache const & cache =
- bv->coordCache().getParPos().find(dit.bottom().text())->second;
-
- if (cache.find(dit.bottom().pit()) != cache.end())
- return CUR_INSIDE;
- else if (dit.bottom().pit() < bv->anchor_ref())
+ // FIXME: it's be better to have something like TextMetrics::status().
+ TextMetrics const & tm = bv->textMetrics(dit.bottom().text());
+ int par_pos = tm.parPosition(dit.bottom().pit());
+ if (par_pos < 0)
return CUR_ABOVE;
- else
+ else if (par_pos > bv->workHeight())
return CUR_BELOW;
+
+ return CUR_INSIDE;
}
namespace {
if (inset
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
&& (contents.empty() ||
- static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
+ static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
dit = tmpdit;
return true;
}