X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.h;h=9871819c10aa1d1a961c7c01b094b7778572fc7d;hb=2e934fc5f85b9e00ea4308000ea0674cd64c376d;hp=830a2a5634cd9aad6ec4a3dcd02ab62df8b4dd92;hpb=76dec26fec47df5b828973554b85dc91f3b564d1;p=lyx.git diff --git a/src/CoordCache.h b/src/CoordCache.h index 830a2a5634..9871819c10 100644 --- a/src/CoordCache.h +++ b/src/CoordCache.h @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -14,30 +14,52 @@ // It seems that MacOSX define the check macro. #undef check -#include "support/types.h" +#include "Dimension.h" #include namespace lyx { -class InsetBase; -class LyXText; +class Inset; +class Text; class MathData; class Paragraph; void lyxbreaker(void const * data, const char * hint, int size); -class Point { -public: - Point() - : x_(0), y_(0) - {} +struct Geometry { + Point pos; + Dimension dim; + + bool covers(int x, int y) const + { + return x >= pos.x_ + && x <= pos.x_ + dim.wid + && y >= pos.y_ - dim.asc + && y <= pos.y_ + dim.des; + } + + int squareDistance(int x, int y) const + { + int xx = 0; + int yy = 0; - Point(int x, int y); + if (x < pos.x_) + xx = pos.x_ - x; + else if (x > pos.x_ + dim.wid) + xx = x - pos.x_ - dim.wid; - int x_, y_; + if (y < pos.y_ - dim.asc) + yy = pos.y_ - dim.asc - y; + else if (y > pos.y_ + dim.des) + yy = y - pos.y_ - dim.des; + + // Optimisation: We avoid to compute the sqrt on purpose. + return xx*xx + yy*yy; + } }; + template class CoordCacheBase { public: void clear() @@ -45,115 +67,136 @@ public: data_.clear(); } - bool const empty() const + bool empty() const { return data_.empty(); } void add(T const * thing, int x, int y) { - data_[thing] = Point(x, y); + data_[thing].pos = Point(x, y); + } + + void add(T const * thing, Dimension const & dim) + { + if (!has(thing)) + data_[thing].pos = Point(-10000, -10000); + data_[thing].dim = dim; + } + + Geometry const & geometry(T const * thing) const + { + check(thing, "geometry"); + return data_.find(thing)->second; + } + + Dimension const & dim(T const * thing) const + { + checkDim(thing, "dim"); + return data_.find(thing)->second.dim; } int x(T const * thing) const { check(thing, "x"); - return data_.find(thing)->second.x_; + return data_.find(thing)->second.pos.x_; } int y(T const * thing) const { check(thing, "y"); - return data_.find(thing)->second.y_; + return data_.find(thing)->second.pos.y_; } Point xy(T const * thing) const { check(thing, "xy"); - return data_.find(thing)->second; + return data_.find(thing)->second.pos; } bool has(T const * thing) const + { + typename cache_type::const_iterator it = data_.find(thing); + + if (it == data_.end()) + return false; + return it->second.pos.x_ != -10000; + } + + bool hasDim(T const * thing) const { return data_.find(thing) != data_.end(); } -// T * find(int x, int y) const -// { -// T * -// cache_type iter -// } + bool covers(T const * thing, int x, int y) const + { + typename cache_type::const_iterator it = data_.find(thing); + return it != data_.end() && it->second.covers(x, y); + } + + int squareDistance(T const * thing, int x, int y) const + { + typename cache_type::const_iterator it = data_.find(thing); + if (it == data_.end()) + return 1000000; + return it->second.squareDistance(x, y); + } private: friend class CoordCache; + void checkDim(T const * thing, char const * hint) const + { + if (!hasDim(thing)) + lyxbreaker(thing, hint, data_.size()); + } + void check(T const * thing, char const * hint) const { if (!has(thing)) lyxbreaker(thing, hint, data_.size()); } - typedef std::map cache_type; + typedef std::map cache_type; cache_type data_; - -public: - cache_type const & getData() const { return data_; } }; /** - * A global cache that allows us to come from a paragraph in a document - * to a position point on the screen. + * A BufferView dependent cache that allows us to come from an inset in + * a document to a position point and dimension on the screen. * All points cached in this cache are only valid between subsequent * updates. (x,y) == (0,0) is the upper left screen corner, x increases * to the right, y increases downwords. - * The cache is built in BufferView::updateMetrics which is called - * from BufferView::update. The individual points are added - * while we paint them. See for instance paintPar in RowPainter.C. + * The dimension part is built in BufferView::updateMetrics() and the + * diverse Inset::metrics() calls. + * The individual points are added at drawing time in + * BufferView::draw(). The math inset position are cached in + * the diverse InsetMathXXX::draw() calls and the in-text inset position + * are cached in RowPainter::paintInset(). + * FIXME: For mathed, it would be nice if the insets did not saves their + * position themselves. That should be the duty of the containing math + * array. */ class CoordCache { public: void clear(); - Point get(LyXText const *, pit_type) const; - - /// A map from paragraph index number to screen point - typedef std::map InnerParPosCache; - /// A map from a LyXText to the map of paragraphs to screen points - typedef std::map ParPosCache; - /// A map from a CursorSlice to screen points - typedef std::map SliceCache; /// A map from MathData to position on the screen - CoordCacheBase & arrays() { return arrays_; } - CoordCacheBase const & getArrays() const { return arrays_; } + typedef CoordCacheBase Arrays; + Arrays & arrays() { return arrays_; } + Arrays const & getArrays() const { return arrays_; } /// A map from insets to positions on the screen - CoordCacheBase & insets() { return insets_; } - CoordCacheBase const & getInsets() const { return insets_; } - /// A map from (LyXText, paragraph) pair to screen positions - ParPosCache & parPos() { return pars_; } - ParPosCache const & getParPos() const { return pars_; } - /// - SliceCache & slice(bool boundary) - { - return boundary ? slices1_ : slices0_; - } - SliceCache const & getSlice(bool boundary) const - { - return boundary ? slices1_ : slices0_; - } + typedef CoordCacheBase Insets; + Insets & insets() { return insets_; } + Insets const & getInsets() const { return insets_; } /// Dump the contents of the cache to lyxerr in debugging form void dump() const; private: /// MathDatas - CoordCacheBase arrays_; + Arrays arrays_; // All insets - CoordCacheBase insets_; - /// Paragraph grouped by owning text - ParPosCache pars_; - /// Used with boundary == 0 - SliceCache slices0_; - /// Used with boundary == 1 - SliceCache slices1_; + Insets insets_; }; } // namespace lyx