]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetcollapsable.C
* src/LyXAction.C: mark goto-clear-bookmark as working without buffer
[lyx.git] / src / insets / insetcollapsable.C
index 7f24b59882c4a8eaafd3d5338f6255a6dca48947..aec1bf69ec0fdc5901a2008e87fd99723f979d08 100644 (file)
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "insetcollapsable.h"
-#include "insettext.h"
 
+#include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
-#include "dimension.h"
+#include "dispatchresult.h"
+#include "FloatList.h"
+#include "FuncStatus.h"
 #include "gettext.h"
-#include "lyxfont.h"
+#include "LColor.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "WordLangTuple.h"
 #include "funcrequest.h"
-#include "buffer.h"
 #include "metricsinfo.h"
+#include "paragraph.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
-#include "frontends/LyXView.h"
 
-#include "support/LAssert.h"
-#include "support/LOstream.h"
 
-using namespace lyx::support;
+namespace lyx {
+
+using graphics::PreviewLoader;
 
-using std::vector;
-using std::ostream;
 using std::endl;
+using std::string;
 using std::max;
+using std::min;
+using std::ostream;
 
-namespace grfx = lyx::graphics;
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
-       : UpdatableInset(), collapsed_(collapsed), inset(bp),
-         button_length(0), button_top_y(0), button_bottom_y(0),
-         label("Label"),
-#if 0
-       autocollapse(false),
-#endif
-         oldWidth(0), in_update(false), first_after_edit(false)
+InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 {
-       inset.setOwner(this);
-       inset.setAutoBreakRows(true);
-       inset.setDrawFrame(0, InsetText::ALWAYS);
-       inset.setFrameColor(0, LColor::collapsableframe);
-       setInsetName("Collapsable");
+       return (autoOpen_ && status_ != Inlined) ? Open : status_;
 }
 
 
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
-       : UpdatableInset(in), collapsed_(in.collapsed_),
-         framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
-         button_length(0), button_top_y(0), button_bottom_y(0),
-         label(in.label),
-#if 0
-         autocollapse(in.autocollapse),
-#endif
-         oldWidth(0), in_update(false), first_after_edit(false)
+InsetCollapsable::InsetCollapsable
+               (BufferParams const & bp, CollapseStatus status)
+       : InsetText(bp), label(from_ascii("Label")), status_(status),
+         openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
-       inset.init(&(in.inset));
-       inset.setOwner(this);
+       setAutoBreakRows(true);
+       setDrawFrame(true);
+       setFrameColor(LColor::collapsableframe);
+       setInsetName(from_ascii("Collapsable"));
+       setButtonLabel();
 }
 
 
-bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs):
+       InsetText(rhs),         
+       labelfont_(rhs.labelfont_),
+       button_dim(rhs.button_dim),
+       topx(rhs.topx),
+       topbaseline(rhs.topbaseline),
+       label(rhs.label),
+       status_(rhs.status_),
+       openinlined_(rhs.openinlined_),
+       autoOpen_(rhs.autoOpen_),
+       textdim_(rhs.textdim_),
+       // the sole purpose of this copy constructor
+       mouse_hover_(false)
 {
-       if (!insetAllowed(in->lyxCode())) {
-               lyxerr << "InsetCollapsable::InsertInset: "
-                       "Unable to insert inset." << endl;
-               return false;
-       }
-       return inset.insertInset(bv, in);
 }
 
 
-void InsetCollapsable::write(Buffer const * buf, ostream & os) const
+void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 {
-       os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
-       inset.writeParagraphData(buf, os);
+       os << "status ";
+       switch (status_) {
+       case Open:
+               os << "open";
+               break;
+       case Collapsed:
+               os << "collapsed";
+               break;
+       case Inlined:
+               os << "inlined";
+               break;
+       }
+       os << "\n";
+       text_.write(buf, os);
 }
 
 
-void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
+void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
 {
+       bool token_found = false;
        if (lex.isOK()) {
                lex.next();
                string const token = lex.getString();
-               if (token == "collapsed") {
+               if (token == "status") {
                        lex.next();
-                       collapsed_ = lex.getBool();
+                       string const tmp_token = lex.getString();
+
+                       if (tmp_token == "inlined") {
+                               status_ = Inlined;
+                               token_found = true;
+                       } else if (tmp_token == "collapsed") {
+                               status_ = Collapsed;
+                               token_found = true;
+                       } else if (tmp_token == "open") {
+                               status_ = Open;
+                               token_found = true;
+                       } else {
+                               lyxerr << "InsetCollapsable::read: Missing status!"
+                                      << endl;
+                               // Take countermeasures
+                               lex.pushToken(token);
+                       }
                } else {
-                       lyxerr << "InsetCollapsable::Read: Missing collapsed!"
-                              << endl;
-                       // Take countermeasures
+                       lyxerr << "InsetCollapsable::read: Missing 'status'-tag!"
+                                  << endl;
+                       // take countermeasures
                        lex.pushToken(token);
                }
        }
-       inset.read(buf, lex);
-}
+       InsetText::read(buf, lex);
 
+       if (!token_found)
+               status_ = isOpen() ? Open : Collapsed;
 
-void InsetCollapsable::dimension_collapsed(Dimension & dim) const
-{
-       font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
-       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+       setButtonLabel();
 }
 
 
-int InsetCollapsable::height_collapsed() const
+Dimension InsetCollapsable::dimensionCollapsed() const
 {
        Dimension dim;
-       font_metrics::buttonText(label, labelfont, dim.wid, dim.asc, dim.des);
-       return dim.asc + dim.des;
-}
-
-
-void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-       dimension_collapsed(dim);
-       if (collapsed_)
-               return;
-       Dimension insetdim;
-       inset.metrics(mi, insetdim);
-       dim.des += insetdim.height() + TEXT_TO_BOTTOM_OFFSET;
-       dim.wid = max(dim.wid, insetdim.wid);
+       theFontMetrics(labelfont_).buttonText(
+               label, dim.wid, dim.asc, dim.des);
+       return dim;
 }
 
 
-void InsetCollapsable::draw_collapsed(PainterInfo & pi, int x, int y) const
+bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       pi.pain.buttonText(x + TEXT_TO_INSET_OFFSET, y, label, labelfont);
-}
-
-
-void InsetCollapsable::draw(PainterInfo & pi, int x, int y, bool inlined) const
-{
-       Assert(pi.base.bv);
-       cache(pi.base.bv);
-
-       if (nodraw())
-               return;
+       autoOpen_ = mi.base.bv->cursor().isInside(this);
+       mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
 
-       Dimension dim_collapsed;
-       dimension_collapsed(dim_collapsed);
-
-       int const aa    = ascent(pi.base.bv, pi.base.font);
-       button_length   = dim_collapsed.width();
-       button_top_y    = -aa;
-       button_bottom_y = -aa + dim_collapsed.height();
-
-       if (!isOpen()) {
-               draw_collapsed(pi, x, y);
-               return;
-       }
-
-       int old_x = x;
-
-       if (!owner())
-               x += scroll();
-
-       top_x = x;
-       top_baseline = y;
-
-       int const bl = y - aa + dim_collapsed.ascent();
-
-       if (inlined) {
-               inset.draw(pi, x, y);
+       if (status() == Inlined) {
+               InsetText::metrics(mi, dim);
        } else {
-               draw_collapsed(pi, old_x, bl);
-               int const yy = bl + dim_collapsed.descent()
-                       + inset.ascent(pi.base.bv, pi.base.font);
-               inset.draw(pi, x, yy);
-       }
-}
-
-
-void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
-{
-       // by default, we are not inlined-drawing
-       draw(pi, x, y, false);
-}
-
-
-Inset::EDITABLE InsetCollapsable::editable() const
-{
-       return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
-}
-
-
-void InsetCollapsable::insetUnlock(BufferView * bv)
-{
-#if 0
-       if (autocollapse) {
-               if (change_label_with_text) {
-                       draw_label = get_new_label();
-               } else {
-                       draw_label = label;
-               }
-               collapsed_ = true;
-       }
-#endif
-       inset.insetUnlock(bv);
-       if (scroll())
-               scroll(bv, 0.0F);
-       bv->updateInset(this);
-}
-
-
-FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       FuncRequest cmd1 = cmd;
-       cmd1.y = ascent(cmd.view(), font) + cmd.y -
-           (height_collapsed() + inset.ascent(cmd.view(), font));
-       return cmd1;
-}
-
-
-void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
-{
-       bool ret = false;
-       BufferView * bv = cmd.view();
-
-       if (collapsed_ && cmd.button() != mouse_button::button3) {
-               collapsed_ = false;
-               inset.setUpdateStatus(InsetText::FULL);
-               bv->updateInset(this);
-               bv->buffer()->markDirty();
-               return;
-       }
-
-       if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
-           (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y))
-       {
-               if (collapsed_) {
-                       collapsed_ = false;
-                       inset.setUpdateStatus(InsetText::FULL);
-                       bv->updateInset(this);
-                       bv->buffer()->markDirty();
-               } else {
-                       collapsed_ = true;
-                       bv->unlockInset(this);
-                       bv->updateInset(this);
-                       bv->buffer()->markDirty();
+               dim = dimensionCollapsed();
+               if (status() == Open) {
+                       InsetText::metrics(mi, textdim_);
+                       // This expression should not contain mi.base.texwidth
+                       openinlined_ = !hasFixedWidth() 
+                               && textdim_.wid < 0.5 * mi.base.bv->workWidth();
+                       if (openinlined_) {
+                               // Correct for button width, and re-fit
+                               mi.base.textwidth -= dim.wid;
+                               InsetText::metrics(mi, textdim_);
+                               dim.wid += textdim_.wid;
+                               dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
+                               dim.asc = textdim_.asc;
+                       } else {
+                               dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
+                               dim.wid = max(dim.wid, textdim_.wid);
+                       }
                }
-       } else if (!collapsed_ && (cmd.y > button_bottom_y)) {
-               ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
        }
-       if (cmd.button() == mouse_button::button3 && !ret)
-               showInsetDialog(bv);
-}
-
-
-int InsetCollapsable::latex(Buffer const * buf, ostream & os,
-                           LatexRunParams const & runparams) const
-{
-       return inset.latex(buf, os, runparams);
-}
-
-
-int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
-{
-       return inset.ascii(buf, os, ll);
-}
-
-
-int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
-{
-       return inset.linuxdoc(buf, os);
-}
-
-
-int InsetCollapsable::docbook(Buffer const * buf, ostream & os, bool mixcont) const
-{
-       return inset.docbook(buf, os, mixcont);
+       dim.asc += TEXT_TO_INSET_OFFSET;
+       dim.des += TEXT_TO_INSET_OFFSET;
+       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
+       mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+       bool const changed = dim_ != dim;
+       dim_ = dim;
+       return changed;
 }
 
 
-void InsetCollapsable::update(BufferView * bv, bool reinit)
+bool InsetCollapsable::setMouseHover(bool mouse_hover)
 {
-       if (in_update) {
-               if (reinit && owner()) {
-                       owner()->update(bv, true);
-               }
-               return;
-       }
-       in_update = true;
-       inset.update(bv, reinit);
-       if (reinit && owner()) {
-               owner()->update(bv, true);
-       }
-       in_update = false;
+       mouse_hover_ = mouse_hover;
+       return true;
 }
 
 
-Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-       //lyxerr << "InsetCollapsable::localDispatch: " << cmd.action << "\n";
-       BufferView * bv = cmd.view();
-       switch (cmd.action) {
-               case LFUN_INSET_EDIT: {
-                       if (!cmd.argument.empty()) {
-                               UpdatableInset::localDispatch(cmd);
-                               if (collapsed_) {
-                                       collapsed_ = false;
-                                       if (bv->lockInset(this)) {
-                                               inset.setUpdateStatus(InsetText::FULL);
-                                               bv->updateInset(this);
-                                               bv->buffer()->markDirty();
-                                               inset.localDispatch(cmd);
-                                               first_after_edit = true;
-                                       }
-                               } else {
-                                       if (bv->lockInset(this))
-                                               inset.localDispatch(cmd);
-                               }
-                               return DISPATCHED;
-                       }
-
-#ifdef WITH_WARNINGS
-#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
-#endif
-                       if (cmd.button() == mouse_button::button3)
-                               return DISPATCHED;
-
-                       UpdatableInset::localDispatch(cmd);
-
-                       if (collapsed_) {
-                               collapsed_ = false;
-                               // set this only here as it should be recollapsed only if
-                               // it was already collapsed!
-                               first_after_edit = true;
-                               if (!bv->lockInset(this))
-                                       return DISPATCHED;
-                               bv->updateInset(this);
-                               bv->buffer()->markDirty();
-                               inset.localDispatch(cmd);
+       const int xx = x + TEXT_TO_INSET_OFFSET;
+       if (status() == Inlined) {
+               InsetText::draw(pi, xx, y);
+       } else {
+               Dimension dimc = dimensionCollapsed();
+               int const top  = y - ascent() + TEXT_TO_INSET_OFFSET;
+               button_dim.x1 = xx + 0;
+               button_dim.x2 = xx + dimc.width();
+               button_dim.y1 = top;
+               button_dim.y2 = top + dimc.height();
+
+               pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_, mouse_hover_);
+
+               if (status() == Open) {
+                       int textx, texty;
+                       if (openinlined_) {
+                               textx = xx + dimc.width();
+                               texty = top + textdim_.asc;
                        } else {
-                               FuncRequest cmd1 = cmd;
-                               if (!bv->lockInset(this))
-                                       return DISPATCHED;
-                               if (cmd.y <= button_bottom_y) {
-                                       cmd1.y = 0;
-                               } else {
-                                       LyXFont font(LyXFont::ALL_SANE);
-                                       cmd1.y = ascent(bv, font) + cmd.y -
-                                               (height_collapsed() + inset.ascent(bv, font));
-                               }
-                               inset.localDispatch(cmd);
+                               textx = xx;
+                               texty = top + dimc.height() + textdim_.asc;
                        }
-                       return DISPATCHED;
+                       InsetText::draw(pi, textx, texty);
                }
-
-               case LFUN_MOUSE_PRESS:
-                       if (!collapsed_ && cmd.y > button_bottom_y)
-                               inset.localDispatch(adjustCommand(cmd));
-                       return DISPATCHED;
-
-               case LFUN_MOUSE_MOTION:
-                       if (!collapsed_ && cmd.y > button_bottom_y)
-                               inset.localDispatch(adjustCommand(cmd));
-                       return DISPATCHED;
-
-               case LFUN_MOUSE_RELEASE:
-                       lfunMouseRelease(cmd);
-                       return DISPATCHED;
-
-               default:
-                       UpdatableInset::RESULT result = inset.localDispatch(cmd);
-                       if (result >= FINISHED)
-                               bv->unlockInset(this);
-                       first_after_edit = false;
-                       return result;
        }
+       setPosCache(pi, x, y);
 }
 
 
-bool InsetCollapsable::lockInsetInInset(BufferView * bv, UpdatableInset * in)
+void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
 {
-       if (&inset == in)
-               return true;
-       return inset.lockInsetInInset(bv, in);
-}
-
-
-bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
-                                         bool lr)
-{
-       if (&inset == in) {
-               bv->unlockInset(this);
-               return true;
+       x += TEXT_TO_INSET_OFFSET;
+       if (status() == Open) {
+               if (openinlined_)
+                       x += dimensionCollapsed().wid;
+               else
+                       y += dimensionCollapsed().des + textdim_.asc;
        }
-       return inset.unlockInsetInInset(bv, in, lr);
+       if (status() != Collapsed)
+               InsetText::drawSelection(pi, x, y);
 }
 
 
-bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
+void InsetCollapsable::cursorPos(BufferView const & bv, 
+               CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-       if (in == this)
-               return true;
-       return inset.updateInsetInInset(bv, in);
-}
-
+       BOOST_ASSERT(status() != Collapsed);
 
-int InsetCollapsable::insetInInsetY() const
-{
-       return inset.insetInInsetY() - (top_baseline - inset.y());
-}
-
-
-void InsetCollapsable::validate(LaTeXFeatures & features) const
-{
-       inset.validate(features);
-}
-
-
-void InsetCollapsable::getCursor(BufferView & bv, int & x, int & y) const
-{
-       inset.getCursor(bv, x, y);
-}
+       InsetText::cursorPos(bv, sl, boundary, x, y);
 
-
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
-{
-       inset.getCursorPos(bv, x , y);
-}
-
-
-UpdatableInset * InsetCollapsable::getLockingInset() const
-{
-       UpdatableInset * in = inset.getLockingInset();
-       if (const_cast<InsetText *>(&inset) == in)
-               return const_cast<InsetCollapsable *>(this);
-       return in;
-}
-
-
-UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(Inset::Code c)
-{
-       if (c == lyxCode())
-               return this;
-       return inset.getFirstLockingInsetOfType(c);
-}
-
-
-void InsetCollapsable::setFont(BufferView * bv, LyXFont const & font,
-                              bool toggleall, bool selectall)
-{
-       inset.setFont(bv, font, toggleall, selectall);
+       if (status() == Open) {
+               if (openinlined_)
+                       x += dimensionCollapsed().wid;
+               else
+                       y += dimensionCollapsed().height() - ascent()
+                               + TEXT_TO_INSET_OFFSET + textdim_.asc;
+       }
+       x += TEXT_TO_INSET_OFFSET;
 }
 
 
-LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
-                                      bool const recursive) const
+InsetBase::EDITABLE InsetCollapsable::editable() const
 {
-       return inset.getLyXText(bv, recursive);
+       return status() != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
-void InsetCollapsable::deleteLyXText(BufferView * bv, bool recursive) const
+bool InsetCollapsable::descendable() const
 {
-       inset.deleteLyXText(bv, recursive);
+       return status() != Collapsed;
 }
 
 
-void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const
+bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
 {
-       inset.resizeLyXText(bv, force);
-       LyXFont font(LyXFont::ALL_SANE);
-       oldWidth = width(bv, font);
+       return button_dim.contains(cmd.x, cmd.y);
 }
 
 
-void InsetCollapsable::getLabelList(std::vector<string> & list) const
+docstring const InsetCollapsable::getNewLabel(docstring const & l) const
 {
-       inset.getLabelList(list);
+       docstring label;
+       pos_type const max_length = 15;
+       pos_type const p_siz = paragraphs().begin()->size();
+       pos_type const n = min(max_length, p_siz);
+       pos_type i = 0;
+       pos_type j = 0;
+       for (; i < n && j < p_siz; ++j) {
+               if (paragraphs().begin()->isInset(j))
+                       continue;
+               label += paragraphs().begin()->getChar(j);
+               ++i;
+       }
+       if (paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
+               label += "...";
+       }
+       return label.empty() ? l : label;
 }
 
 
-bool InsetCollapsable::nodraw() const
+void InsetCollapsable::edit(LCursor & cur, bool left)
 {
-       return inset.nodraw();
+       //lyxerr << "InsetCollapsable: edit left/right" << endl;
+       cur.push(*this);
+       InsetText::edit(cur, left);
 }
 
 
-int InsetCollapsable::scroll(bool recursive) const
+InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y)
 {
-       int sx = UpdatableInset::scroll(false);
-
-       if (recursive)
-               sx += inset.scroll(recursive);
-
-       return sx;
+       //lyxerr << "InsetCollapsable: edit xy" << endl;
+       if (status() == Collapsed || (button_dim.contains(x, y) && status() != Inlined))
+               return this;
+       cur.push(*this);
+       return InsetText::editXY(cur, x, y);
 }
 
 
-ParagraphList * InsetCollapsable::getParagraphs(int i) const
+void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       return inset.getParagraphs(i);
-}
+       //lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd
+       //      << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl;
 
+       switch (cmd.action) {
+       case LFUN_MOUSE_PRESS:
+               if (cmd.button() == mouse_button::button1 && hitButton(cmd) && status() != Inlined) {
+                       // reset selection if necessary (see bug 3060)
+                       if (cur.selection())
+                               cur.bv().cursor().clearSelection();
+                       else
+                               cur.noUpdate();
+                       cur.dispatched();
+                       break;
+               }
+               if (status() == Inlined)
+                       InsetText::doDispatch(cur, cmd);
+               else if (status() == Open && !hitButton(cmd))
+                       InsetText::doDispatch(cur, cmd);
+               else
+                       cur.undispatched();
+               break;
+
+       case LFUN_MOUSE_MOTION:
+       case LFUN_MOUSE_DOUBLE:
+       case LFUN_MOUSE_TRIPLE:
+               if (status_ == Inlined)
+                       InsetText::doDispatch(cur, cmd);
+               else if (status() && !hitButton(cmd))
+                       InsetText::doDispatch(cur, cmd);
+               else
+                       cur.undispatched();
+               break;
+
+       case LFUN_MOUSE_RELEASE:
+               if (cmd.button() == mouse_button::button3) {
+                       // Open the Inset configuration dialog
+                       showInsetDialog(&cur.bv());
+                       break;
+               }
 
-LyXCursor const & InsetCollapsable::cursor(BufferView * bv) const
-{
-       return inset.cursor(bv);
-}
+               if (status() == Inlined) {
+                       // The mouse click has to be within the inset!
+                       InsetText::doDispatch(cur, cmd);
+                       break;
+               }
 
+               if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
+                       // if we are selecting, we do not want to
+                       // toggle the inset.
+                       if (cur.selection())
+                               break;
+                       // Left button is clicked, the user asks to
+                       // toggle the inset visual state.
+                       cur.dispatched();
+                       cur.updateFlags(Update::Force | Update::FitCursor);
+                       if (status() == Collapsed) {
+                               setStatus(cur, Open);
+                               edit(cur, true);
+                       }
+                       else {
+                               setStatus(cur, Collapsed);
+                       }
+                       cur.bv().cursor() = cur;
+                       break;
+               }
 
-Inset * InsetCollapsable::getInsetFromID(int id_arg) const
-{
-       if (id_arg == id())
-               return const_cast<InsetCollapsable *>(this);
-       return inset.getInsetFromID(id_arg);
+               // The mouse click is within the opened inset.
+               if (status() == Open)
+                       InsetText::doDispatch(cur, cmd);
+               break;
+
+       case LFUN_INSET_TOGGLE:
+               if (cmd.argument() == "open")
+                       setStatus(cur, Open);
+               else if (cmd.argument() == "close")
+                       setStatus(cur, Collapsed);
+               else if (cmd.argument() == "toggle" || cmd.argument().empty())
+                       if (isOpen()) {
+                               setStatus(cur, Collapsed);
+                               cur.forwardPosNoDescend();
+                       }
+                       else
+                               setStatus(cur, Open);
+               else // if assign or anything else
+                       cur.undispatched();
+               cur.dispatched();
+               break;
+
+       default:
+               InsetText::doDispatch(cur, cmd);
+               break;
+       }
 }
 
 
-void InsetCollapsable::open(BufferView * bv)
+bool InsetCollapsable::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
 {
-       if (!collapsed_) return;
-
-       collapsed_ = false;
-       bv->updateInset(this);
-}
-
+       switch (cmd.action) {
 
-void InsetCollapsable::close(BufferView * bv) const
-{
-       if (collapsed_)
-               return;
+       case LFUN_INSET_TOGGLE:
+               if (cmd.argument() == "open" || cmd.argument() == "close" ||
+                   cmd.argument() == "toggle")
+                       flag.enabled(true);
+               else
+                       flag.enabled(false);
+               return true;
 
-       collapsed_ = true;
-       bv->updateInset(const_cast<InsetCollapsable *>(this));
+       default:
+               return InsetText::getStatus(cur, cmd, flag);
+       }
 }
 
 
-void InsetCollapsable::setLabel(string const & l) const
+void InsetCollapsable::setLabel(docstring const & l)
 {
        label = l;
 }
 
 
-void InsetCollapsable::markErased()
+void InsetCollapsable::setStatus(LCursor & cur, CollapseStatus status)
 {
-       inset.markErased();
+       status_ = status;
+       setButtonLabel();
+       if (status_ == Collapsed)
+               cur.leaveInset(*this);
 }
 
 
-bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
+void InsetCollapsable::setLabelFont(LyXFont & font)
 {
-       bool found = inset.nextChange(bv, length);
-
-       if (first_after_edit && !found)
-               close(bv);
-       else if (!found)
-               first_after_edit = false;
-       return found;
-}
-
-
-bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
-                                    bool cs, bool mw)
-{
-       bool found = inset.searchForward(bv, str, cs, mw);
-       if (first_after_edit && !found)
-               close(bv);
-       else if (!found)
-               first_after_edit = false;
-       return found;
-}
-
-
-bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
-                                     bool cs, bool mw)
-{
-       bool found = inset.searchBackward(bv, str, cs, mw);
-       if (first_after_edit && !found)
-               close(bv);
-       else if (!found)
-               first_after_edit = false;
-       return found;
-}
-
-
-WordLangTuple const
-InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
-{
-       WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
-       if (first_after_edit && word.word().empty())
-               close(bv);
-       first_after_edit = false;
-       return word;
-}
-
-
-void InsetCollapsable::addPreview(grfx::PreviewLoader & loader) const
-{
-       inset.addPreview(loader);
+       labelfont_ = font;
 }
 
-
-void InsetCollapsable::cache(BufferView * bv) const
+docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp)
 {
-       view_ = bv->owner()->view();
+       FloatList const & floats = bp.getLyXTextClass().floats();
+       FloatList::const_iterator it = floats[type];
+       // FIXME UNICODE
+       return (it == floats.end()) ? from_ascii(type) : _(it->second.name());
 }
 
 
-BufferView * InsetCollapsable::view() const
-{
-       return view_.lock().get();
-}
+} // namespace lyx