X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=0935b06278fb2c65c168e51ff912080f8a071714;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=c8c5d1d43b7deeb14e257521c2bc196de70e24ed;hpb=85c782bde8b99402657ed7267b17dce30e24f69e;p=lyx.git diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index c8c5d1d43b..0935b06278 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -31,6 +31,7 @@ #include "output_xhtml.h" #include "Text.h" #include "TextClass.h" +#include "TocBackend.h" #include "frontends/Application.h" #include "frontends/Painter.h" @@ -60,6 +61,11 @@ public: static InsetName insetnames[INSET_CODE_SIZE]; +// This list should be kept in sync with the list of dialogs in +// src/frontends/qt4/GuiView.cpp, I.e., if a dialog goes with an +// inset, the dialog should have the same name as the inset. +// Changes should be also recorded in LFUN_DIALOG_SHOW doxygen +// docs in LyXAction.cpp. static void build_translator() { static bool passed = false; @@ -89,6 +95,9 @@ static void build_translator() insetnames[FLOAT_CODE] = InsetName("float", _("Float")); insetnames[WRAP_CODE] = InsetName("wrap"); insetnames[SPECIALCHAR_CODE] = InsetName("specialchar"); + insetnames[IPA_CODE] = InsetName("ipa"); + insetnames[IPACHAR_CODE] = InsetName("ipachar"); + insetnames[IPADECO_CODE] = InsetName("ipadeco"); insetnames[TABULAR_CODE] = InsetName("tabular", _("Table")); insetnames[EXTERNAL_CODE] = InsetName("external"); insetnames[CAPTION_CODE] = InsetName("caption"); @@ -97,7 +106,7 @@ static void build_translator() insetnames[FLOAT_LIST_CODE] = InsetName("floatlist"); insetnames[INDEX_PRINT_CODE] = InsetName("index_print"); insetnames[NOMENCL_PRINT_CODE] = InsetName("nomencl_print"); - insetnames[OPTARG_CODE] = InsetName("optarg"); + insetnames[ARG_CODE] = InsetName("optarg"); insetnames[NEWLINE_CODE] = InsetName("newline"); insetnames[LINE_CODE] = InsetName("line"); insetnames[BRANCH_CODE] = InsetName("branch", _("Branch")); @@ -108,8 +117,9 @@ static void build_translator() insetnames[MATH_MACROARG_CODE] = InsetName("mathmacroarg"); insetnames[LISTINGS_CODE] = InsetName("listings"); insetnames[INFO_CODE] = InsetName("info", _("Info")); - insetnames[COLLAPSABLE_CODE] = InsetName("collapsable"); + insetnames[COLLAPSIBLE_CODE] = InsetName("collapsible"); insetnames[NEWPAGE_CODE] = InsetName("newpage"); + insetnames[SCRIPT_CODE] = InsetName("script"); insetnames[CELL_CODE] = InsetName("tablecell"); insetnames[MATH_AMSARRAY_CODE] = InsetName("mathamsarray"); insetnames[MATH_ARRAY_CODE] = InsetName("matharray"); @@ -117,6 +127,8 @@ static void build_translator() insetnames[MATH_BOLDSYMBOL_CODE] = InsetName("mathboldsymbol"); insetnames[MATH_BOX_CODE] = InsetName("mathbox"); insetnames[MATH_BRACE_CODE] = InsetName("mathbrace"); + insetnames[MATH_CANCEL_CODE] = InsetName("mathcancel"); + insetnames[MATH_CANCELTO_CODE] = InsetName("mathcancelto"); insetnames[MATH_CASES_CODE] = InsetName("mathcases"); insetnames[MATH_CHAR_CODE] = InsetName("mathchar"); insetnames[MATH_COLOR_CODE] = InsetName("mathcolor"); @@ -161,8 +173,8 @@ static void build_translator() insetnames[MATH_UNDERSET_CODE] = InsetName("mathunderset"); insetnames[MATH_UNKNOWN_CODE] = InsetName("mathunknown"); insetnames[MATH_XARROW_CODE] = InsetName("mathxarrow"); - insetnames[MATH_XYARROW_CODE] = InsetName("mathxyarrow"); insetnames[MATH_XYMATRIX_CODE] = InsetName("mathxymatrix"); + insetnames[MATH_DIAGRAM_CODE] = InsetName("mathdiagram"); insetnames[MATH_MACRO_CODE] = InsetName("mathmacro"); passed = true; @@ -175,17 +187,22 @@ void Inset::setBuffer(Buffer & buffer) } +void Inset::resetBuffer() +{ + buffer_ = nullptr; +} + + Buffer & Inset::buffer() { if (!buffer_) { odocstringstream s; - lyxerr << "Inset: " << this - << " LyX Code: " << lyxCode() - << " name: " << insetName(lyxCode()) - << std::endl; - s << "LyX Code: " << lyxCode() << " name: " << name(); - LASSERT(false, /**/); - throw ExceptionMessage(BufferException, + string const iname = insetName(lyxCode()); + LYXERR0("Inset: " << this << " LyX Code: " << lyxCode() + << " name: " << iname); + s << "LyX Code: " << lyxCode() << " name: " << from_ascii(iname); + LATTEST(false); + throw ExceptionMessage(BufferException, from_ascii("Inset::buffer_ member not initialized!"), s.str()); } return *buffer_; @@ -198,19 +215,26 @@ Buffer const & Inset::buffer() const } -bool Inset::isBufferValid() const +bool Inset::isBufferLoaded() const { return buffer_ && theBufferList().isLoaded(buffer_); } -docstring Inset::name() const +bool Inset::isBufferValid() const +{ + return buffer_ + && (isBufferLoaded() || buffer_->isInternal() || buffer_->isClone()); +} + + +docstring Inset::layoutName() const { return from_ascii("unknown"); } -bool Inset::isFreeSpacing() const +bool Inset::isFreeSpacing() const { return getLayout().isFreeSpacing(); } @@ -221,15 +245,16 @@ bool Inset::allowEmpty() const return getLayout().isKeepEmpty(); } -bool Inset::forceLTR() const + +bool Inset::forceLTR(OutputParams const &) const { return getLayout().forceLTR(); } -void Inset::initView() + +bool Inset::isInToc() const { - if (isLabeled()) - buffer().updateLabels(); + return getLayout().isInToc(); } @@ -239,9 +264,20 @@ docstring Inset::toolTip(BufferView const &, int, int) const } -docstring Inset::contextMenu(BufferView const &, int, int) const +void Inset::forOutliner(docstring &, size_t const, bool const) const { - return docstring(); +} + + +string Inset::contextMenu(BufferView const &, int, int) const +{ + return contextMenuName(); +} + + +string Inset::contextMenuName() const +{ + return string(); } @@ -262,14 +298,14 @@ InsetCode insetCode(string const & name) } -string insetName(InsetCode c) +string insetName(InsetCode c) { build_translator(); return insetnames[c].name; } -docstring insetDisplayName(InsetCode c) +docstring insetDisplayName(InsetCode c) { build_translator(); return insetnames[c].display_name; @@ -280,10 +316,11 @@ void Inset::dispatch(Cursor & cur, FuncRequest & cmd) { if (buffer_ == 0) { lyxerr << "Unassigned buffer_ member in Inset::dispatch()" << std::endl; - lyxerr << "LyX Code: " << lyxCode() << " name: " << insetName(lyxCode()) << std::endl; + lyxerr << "LyX Code: " << lyxCode() << " name: " + << insetName(lyxCode()) << std::endl; } else if (cur.buffer() != buffer_) lyxerr << "cur.buffer() != buffer_ in Inset::dispatch()" << std::endl; - cur.updateFlags(Update::Force | Update::FitCursor); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); cur.dispatched(); doDispatch(cur, cmd); } @@ -314,12 +351,12 @@ bool Inset::showInsetDialog(BufferView * bv) const void Inset::doDispatch(Cursor & cur, FuncRequest &cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_MOUSE_RELEASE: // if the derived inset did not explicitly handle mouse_release, // we assume we request the settings dialog if (!cur.selection() && cmd.button() == mouse_button::button1 - && hasSettings()) { + && clickable(cur.bv(), cmd.x(), cmd.y()) && hasSettings()) { FuncRequest tmpcmd(LFUN_INSET_SETTINGS); dispatch(cur, tmpcmd); } @@ -334,7 +371,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd) break; default: - cur.noUpdate(); + cur.noScreenUpdate(); cur.undispatched(); break; } @@ -352,7 +389,7 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd, // Dialogs::checkStatus() ensures that the dialog is deactivated if // LFUN_INSET_APPLY is disabled. - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: // Allow modification of our data. // This needs to be handled in the doDispatch method of our @@ -373,10 +410,19 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd, flag.setEnabled(enable); return true; } else { - flag.setEnabled(false); return false; } + case LFUN_IN_MATHMACROTEMPLATE: + // By default we're not in a InsetMathMacroTemplate inset + flag.setEnabled(false); + return true; + + case LFUN_IN_IPA: + // By default we're not in an IPA inset + flag.setEnabled(false); + return true; + default: break; } @@ -481,9 +527,19 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const } +void Inset::drawBackground(PainterInfo & pi, int x, int y) const +{ + if (pi.full_repaint && backgroundColor(pi) == Color_none) + return; + Dimension const dim = dimension(*pi.base.bv); + pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des, + pi.backgroundColor(this)); +} + + void Inset::drawMarkers(PainterInfo & pi, int x, int y) const { - ColorCode pen_color = mouseHovered() || editing(pi.base.bv)? + ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)? Color_mathframe : Color_mathcorners; Dimension const dim = dimension(*pi.base.bv); @@ -494,24 +550,6 @@ void Inset::drawMarkers(PainterInfo & pi, int x, int y) const pi.pain.line(t, d - 3, t, d, pen_color); pi.pain.line(x, d, x + 3, d, pen_color); pi.pain.line(t - 3, d, t, d, pen_color); - setPosCache(pi, x, y); -} - - -void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const -{ - ColorCode pen_color = mouseHovered() || editing(pi.base.bv)? - Color_mathframe : Color_mathcorners; - - drawMarkers(pi, x, y); - Dimension const dim = dimension(*pi.base.bv); - int const t = x + dim.width() - 1; - int const a = y - dim.ascent(); - pi.pain.line(x, a + 3, x, a, pen_color); - pi.pain.line(t, a + 3, t, a, pen_color); - pi.pain.line(x, a, x + 3, a, pen_color); - pi.pain.line(t - 3, a, t, a, pen_color); - setPosCache(pi, x, y); } @@ -543,7 +581,7 @@ InsetLayout const & Inset::getLayout() const { if (!buffer_) return DocumentClass::plainInsetLayout(); - return buffer().params().documentClass().insetLayout(name()); + return buffer().params().documentClass().insetLayout(layoutName()); } @@ -572,26 +610,25 @@ ColorCode Inset::labelColor() const } -void Inset::setPosCache(PainterInfo const & pi, int x, int y) const -{ - //LYXERR("Inset: set position cache to " << x << " " << y); - pi.base.bv->coordCache().insets().add(this, x, y); -} - - -void Inset::setDimCache(MetricsInfo const & mi, Dimension const & dim) const +Buffer const * Inset::updateFrontend() const { - mi.base.bv->coordCache().insets().add(this, dim); + //FIXME (Abdel 03/12/10): see bugs #6814 and #6949 + // If the Buffer is null and we end up here this is most probably because we + // are in the CutAndPaste stack. See InsetGraphics, RenderGraphics and + // RenderPreview. + if (!buffer_) + return 0; + return theApp() ? theApp()->updateInset(this) : 0; } -Buffer const * Inset::updateFrontend() const +bool Inset::resetFontEdit() const { - return theApp() ? theApp()->updateInset(this) : 0; + return getLayout().resetsFont() || !inheritFont(); } -docstring Inset::completionPrefix(Cursor const &) const +docstring Inset::completionPrefix(Cursor const &) const { return docstring(); }