* 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.
*/
#include "Dimension.h"
-#include "support/types.h"
-
-#include <map>
+#include <unordered_map>
namespace lyx {
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)
- {}
-
- Point(int x, int y);
-
- int x_, y_;
-};
-
-
struct Geometry {
- Point pos;
+ Point pos = {-10000, -10000 };
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;
+ 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
data_[thing].dim = dim;
}
+ Geometry & geometry(T const * thing)
+ {
+ checkDim(thing, "geometry");
+ return data_.find(thing)->second;
+ }
+
Geometry const & geometry(T const * thing) const
{
- check(thing, "geometry");
+ checkDim(thing, "geometry");
return data_.find(thing)->second;
}
Dimension const & dim(T const * thing) const
{
- check(thing, "dim");
+ checkDim(thing, "dim");
return data_.find(thing)->second.dim;
}
}
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();
}
private:
friend class CoordCache;
+#ifdef ENABLE_ASSERTIONS
+ 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());
}
+#else
+ void checkDim(T const *, char const * const ) const {}
- typedef std::map<T const *, Geometry> cache_type;
- cache_type data_;
+ void check(T const *, char const *) const {}
+#endif
-public:
- cache_type const & getData() const { return data_; }
+ typedef std::unordered_map<T const *, Geometry> cache_type;
+ cache_type data_;
};
/**
* 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 dimension part is built in BufferView::updateMetrics() and the
+ * The dimension part is built in BufferView::updateMetrics() and the
* diverse Inset::metrics() calls.
* The individual points are added at drawing time in
- * BufferView::updateMetrics(). The math inset position are cached 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
void clear();
/// A map from MathData to position on the screen
- CoordCacheBase<MathData> & arrays() { return arrays_; }
- CoordCacheBase<MathData> const & getArrays() const { return arrays_; }
+ typedef CoordCacheBase<MathData> Arrays;
+ Arrays & arrays() { return arrays_; }
+ Arrays const & getArrays() const { return arrays_; }
/// A map from insets to positions on the screen
- CoordCacheBase<Inset> & insets() { return insets_; }
- CoordCacheBase<Inset> const & getInsets() const { return insets_; }
+ typedef CoordCacheBase<Inset> 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<MathData> arrays_;
+ Arrays arrays_;
// All insets
- CoordCacheBase<Inset> insets_;
+ Insets insets_;
};
} // namespace lyx