insetcharstyle drawing cosmetics

[lyx.git] / src / insets / insetbase.C

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index b24bb93356217a65ee3feb35961d723b07d5f107..f40b4d52a777b35d0c5266c63ffb2ad3654af1a8 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -13,6 +13,7 @@
 #include "insetbase.h"
 
 #include "buffer.h"
+#include "coordcache.h"
 #include "BufferView.h"
 #include "LColor.h"
 #include "cursor.h"
@@ -25,10 +26,96 @@
 
 #include "frontends/Painter.h"
 
+#include <map>
+
+
+namespace {
+
+struct InsetName {
+       InsetName(std::string const & n, InsetBase::Code c)
+               : name(n), code(c) {}
+       std::string name;
+       InsetBase::Code code;
+};
+
+
+typedef std::map<std::string, InsetBase::Code> TranslatorMap;
+
+
+TranslatorMap const build_translator()
+{
+       InsetName const insetnames[] = {
+               InsetName("toc", InsetBase::TOC_CODE),
+               InsetName("quote", InsetBase::QUOTE_CODE),
+               InsetName("ref", InsetBase::REF_CODE),
+               InsetName("url", InsetBase::URL_CODE),
+               InsetName("htmlurl", InsetBase::HTMLURL_CODE),
+               InsetName("separator", InsetBase::SEPARATOR_CODE),
+               InsetName("ending", InsetBase::ENDING_CODE),
+               InsetName("label", InsetBase::LABEL_CODE),
+               InsetName("note", InsetBase::NOTE_CODE),
+               InsetName("accent", InsetBase::ACCENT_CODE),
+               InsetName("math", InsetBase::MATH_CODE),
+               InsetName("index", InsetBase::INDEX_CODE),
+               InsetName("include", InsetBase::INCLUDE_CODE),
+               InsetName("graphics", InsetBase::GRAPHICS_CODE),
+               InsetName("bibitem", InsetBase::BIBITEM_CODE),
+               InsetName("bibtex", InsetBase::BIBTEX_CODE),
+               InsetName("text", InsetBase::TEXT_CODE),
+               InsetName("ert", InsetBase::ERT_CODE),
+               InsetName("foot", InsetBase::FOOT_CODE),
+               InsetName("margin", InsetBase::MARGIN_CODE),
+               InsetName("float", InsetBase::FLOAT_CODE),
+               InsetName("wrap", InsetBase::WRAP_CODE),
+               InsetName("specialchar", InsetBase::SPECIALCHAR_CODE),
+               InsetName("tabular", InsetBase::TABULAR_CODE),
+               InsetName("external", InsetBase::EXTERNAL_CODE),
+               InsetName("caption", InsetBase::CAPTION_CODE),
+               InsetName("mathmacro", InsetBase::MATHMACRO_CODE),
+               InsetName("error", InsetBase::ERROR_CODE),
+               InsetName("cite", InsetBase::CITE_CODE),
+               InsetName("float_list", InsetBase::FLOAT_LIST_CODE),
+               InsetName("index_print", InsetBase::INDEX_PRINT_CODE),
+               InsetName("optarg", InsetBase::OPTARG_CODE),
+               InsetName("environment", InsetBase::ENVIRONMENT_CODE),
+               InsetName("hfill", InsetBase::HFILL_CODE),
+               InsetName("newline", InsetBase::NEWLINE_CODE),
+               InsetName("line", InsetBase::LINE_CODE),
+               InsetName("branch", InsetBase::BRANCH_CODE),
+               InsetName("box", InsetBase::BOX_CODE),
+               InsetName("charstyle", InsetBase::CHARSTYLE_CODE),
+               InsetName("vspace", InsetBase::VSPACE_CODE),
+               InsetName("mathmacroarg", InsetBase::MATHMACROARG_CODE),
+       };
+
+       std::size_t const insetnames_size =
+               sizeof(insetnames) / sizeof(insetnames[0]);
+
+       std::map<std::string, InsetBase::Code> data;
+       for (std::size_t i = 0; i != insetnames_size; ++i) {
+               InsetName const & var = insetnames[i];
+               data[var.name] = var.code;
+       }
+
+       return data;
+}
+
+} // namespace anon
+
+
+InsetBase::Code InsetBase::translate(std::string const & name)
+{
+       static TranslatorMap const translator = build_translator();
+
+       TranslatorMap::const_iterator it = translator.find(name);
+       return it == translator.end() ? NO_CODE : it->second;
+}
 
 
 void InsetBase::dispatch(LCursor & cur, FuncRequest & cmd)
 {
+       cur.needsUpdate();
+       cur.dispatched();
        priv_dispatch(cur, cmd);
 }
 
@@ -40,7 +127,7 @@ void InsetBase::priv_dispatch(LCursor & cur, FuncRequest &)
 }
 
 
-bool InsetBase::getStatus(LCursor &, FuncRequest const &, FuncStatus &)
+bool InsetBase::getStatus(LCursor &, FuncRequest const &, FuncStatus &) const
 {
        return false;
 }
@@ -52,10 +139,10 @@ void InsetBase::edit(LCursor &, bool)
 }
 
 
-InsetBase * InsetBase::editXY(LCursor &, int x, int y)
+InsetBase * InsetBase::editXY(LCursor &, int x, int y) const
 {
        lyxerr << "InsetBase: editXY x:" << x << " y: " << y << std::endl;
-       return this;
+       return const_cast<InsetBase*>(this);
 }
 
 
@@ -143,7 +230,7 @@ void InsetBase::markErased()
 {}
 
 
-void InsetBase::getCursorPos(CursorSlice const &, int & x, int & y) const
+void InsetBase::getCursorPos(LCursor const &, int & x, int & y) const
 {
        lyxerr << "InsetBase::getCursorPos called directly" << std::endl;
        x = 100;
@@ -151,18 +238,18 @@ void InsetBase::getCursorPos(CursorSlice const &, int & x, int & y) const
 }
 
 
-void InsetBase::metricsMarkers(Dimension & dim, int) const
+void InsetBase::metricsMarkers(Dimension & dim, int framesize) const
 {
-       dim.wid += 2;
-       dim.asc += 1;
+       dim.wid += 2 * framesize;
+       dim.asc += framesize;
 }
 
 
-void InsetBase::metricsMarkers2(Dimension & dim, int) const
+void InsetBase::metricsMarkers2(Dimension & dim, int framesize) const
 {
-       dim.wid += 2;
-       dim.asc += 1;
-       dim.des += 1;
+       dim.wid += 2 * framesize;
+       dim.asc += framesize;
+       dim.des += framesize;
 }
 
 
@@ -201,9 +288,27 @@ bool InsetBase::editing(BufferView * bv) const
 }
 
 
+int InsetBase::xo() const
+{
+       return theCoords.insets_.x(this);
+}
+
+
+int InsetBase::yo() const
+{
+       return theCoords.insets_.y(this);
+}
+
+
 bool InsetBase::covers(int x, int y) const
 {
-       return x >= xo()
+       //lyxerr << "InsetBase::covers, x: " << x << " y: " << y
+       //      << " xo: " << xo() << " yo: " << yo()
+       //      << " x1: " << xo() << " x2: " << xo() + width()
+       //      << " y1: " << yo() - ascent() << " y2: " << yo() + descent()
+       //      << std::endl;
+       return theCoords.insets_.has(this)
+                       && x >= xo()
                        && x <= xo() + width()
                        && y >= yo() - ascent()
                        && y <= yo() + descent();
@@ -229,5 +334,3 @@ bool isHighlyEditableInset(InsetBase const * inset)
 {
        return inset && inset->editable() == InsetBase::HIGHLY_EDITABLE;
 }
-
-