]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetminipage.C
My patch from yesterday
[lyx.git] / src / insets / insetminipage.C
index b4085bfc0d49f084bab13c4c09c33bb18ac22376..c763d727a161ec9c8ce4e2d10a9e623d1a4399de 100644 (file)
@@ -1,31 +1,33 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *          Copyright 1998 The LyX Team.
+/**
+ * \file insetminipage.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *======================================================*/
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetminipage.h"
+#include "insettext.h"
+
+#include "BufferView.h"
+#include "debug.h"
+#include "funcrequest.h"
 #include "gettext.h"
 #include "lyxfont.h"
-#include "BufferView.h"
-#include "LyXView.h"
-#include "frontends/Dialogs.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
-#include "insets/insettext.h"
+
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+
 #include "support/LOstream.h"
 #include "support/lstrings.h"
-#include "debug.h"
-#include "gettext.h"
-#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;
@@ -59,9 +61,8 @@ using std::endl;
 // have to output "" for minipages.
 // (Lgb)
 
-InsetMinipage::InsetMinipage()
-       : InsetCollapsable(), pos_(center),
-         inner_pos_(inner_center)
+InsetMinipage::InsetMinipage(BufferParams const & bp)
+       : InsetCollapsable(bp)
 {
        setLabel(_("minipage"));
        LyXFont font(LyXFont::ALL_SANE);
@@ -72,21 +73,22 @@ InsetMinipage::InsetMinipage()
 #if 0
        setAutoCollapse(false);
 #endif
+
+#if 0
 #ifdef WITH_WARNINGS
 #warning Remove this color definitions before 1.2.0 final!
 #endif
        // just for experimentation :)
        setBackgroundColor(LColor::green);
+#endif
+
        inset.setFrameColor(0, LColor::blue);
        setInsetName("Minipage");
-       width_ = "100%"; // set default to 100% of column_width
 }
 
 
 InsetMinipage::InsetMinipage(InsetMinipage const & in, bool same_id)
-       : InsetCollapsable(in, same_id),
-         pos_(in.pos_), inner_pos_(in.inner_pos_),
-         height_(in.height_), width_(in.width_)
+       : InsetCollapsable(in, same_id), params_(in.params_)
 {}
 
 
@@ -98,29 +100,62 @@ Inset * InsetMinipage::clone(Buffer const &, bool same_id) const
 
 InsetMinipage::~InsetMinipage()
 {
-       hideDialog();
+       InsetMinipageMailer mailer(*this);
+       mailer.hideDialog();
 }
 
 
-void InsetMinipage::write(Buffer const * buf, ostream & os) const 
+dispatch_result InsetMinipage::localDispatch(FuncRequest const & cmd)
 {
-       os << getInsetName() << "\n"
-          << "position " << pos_ << "\n"
-          << "inner_position " << inner_pos_ << "\n"
-          << "height \"" << height_ << "\"\n"
-          << "width \"" << width_ << "\"\n";
-       InsetCollapsable::write(buf, os);
+       Inset::RESULT result = UNDISPATCHED;
+
+       switch (cmd.action) {
+       case LFUN_INSET_MODIFY: {
+               InsetMinipage::Params params;
+               InsetMinipageMailer::string2params(cmd.argument, params);
+
+               params_.pos   = params.pos;
+               params_.width = params.width;
+
+               // FIXME: what magical mysterious commands are actually
+               // needed here to update the bloody size of the inset !!!
+               cmd.view()->updateInset(this);
+               result = DISPATCHED;
+       }
+       break;
+
+       case LFUN_INSET_DIALOG_UPDATE: {
+               InsetMinipageMailer mailer(*this);
+               mailer.updateDialog(cmd.view());
+       }
+       break;
+
+       default:
+               result = InsetCollapsable::localDispatch(cmd);
+       }
+
+       return result;
 }
 
 
-void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
+void InsetMinipage::Params::write(ostream & os) const
+{
+       os << "Minipage" << '\n'
+          << "position " << pos << '\n'
+          << "inner_position " << inner_pos << '\n'
+          << "height \"" << height.asString() << "\"\n"
+          << "width \"" << width.asString() << "\"\n";
+}
+
+
+void InsetMinipage::Params::read(LyXLex & lex)
 {
        if (lex.isOK()) {
                lex.next();
                string const token = lex.getString();
                if (token == "position") {
                        lex.next();
-                       pos_ = static_cast<Position>(lex.getInteger());
+                       pos = static_cast<Position>(lex.getInteger());
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'position'-tag!"
                                   << endl;
@@ -133,7 +168,7 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                string const token = lex.getString();
                if (token == "inner_position") {
                        lex.next();
-                       inner_pos_ = static_cast<InnerPosition>(lex.getInteger());
+                       inner_pos = static_cast<InnerPosition>(lex.getInteger());
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'inner_position'-tag!"
                                   << endl;
@@ -146,7 +181,7 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                string const token = lex.getString();
                if (token == "height") {
                        lex.next();
-                       height_ = lex.getString();
+                       height = LyXLength(lex.getString());
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'height'-tag!"
                                   << endl;
@@ -159,7 +194,7 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                string const token = lex.getString();
                if (token == "width") {
                        lex.next();
-                       width_ = lex.getString();
+                       width = LyXLength(lex.getString());
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'width'-tag!"
                                   << endl;
@@ -167,6 +202,19 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
        }
+}
+
+
+void InsetMinipage::write(Buffer const * buf, ostream & os) const
+{
+       params_.write(os);
+       InsetCollapsable::write(buf, os);
+}
+
+
+void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
+{
+       params_.read(lex);
        InsetCollapsable::read(buf, lex);
 }
 
@@ -178,7 +226,7 @@ int InsetMinipage::ascent(BufferView * bv, LyXFont const & font) const
        else {
                // Take placement into account.
                int i = 0;
-               switch (pos_) {
+               switch (params_.pos) {
                case top:
                        i = InsetCollapsable::ascent(bv, font);
                        break;
@@ -202,7 +250,7 @@ int InsetMinipage::descent(BufferView * bv, LyXFont const & font) const
        else {
                // Take placement into account.
                int i = 0;
-               switch (pos_) {
+               switch (params_.pos) {
                case top:
                        i = InsetCollapsable::descent(bv, font);
                        break;
@@ -229,20 +277,20 @@ int InsetMinipage::latex(Buffer const * buf,
                         ostream & os, bool fragile, bool fp) const
 {
        string s_pos;
-       switch (pos_) {
+       switch (params_.pos) {
        case top:
-               s_pos += "t";
+               s_pos += 't';
                break;
        case center:
-               s_pos += "c";
+               s_pos += 'c';
                break;
        case bottom:
-               s_pos += "b";
+               s_pos += 'b';
                break;
        }
        os << "\\begin{minipage}[" << s_pos << "]{"
-          << LyXLength(width_).asLatexString() << "}%\n";
-       
+          << params_.width.asLatexString() << "}%\n";
+
        int i = inset.latex(buf, os, fragile, fp);
 
        os << "\\end{minipage}%\n";
@@ -259,92 +307,101 @@ bool InsetMinipage::insetAllowed(Inset::Code code) const
 }
 
 
-InsetMinipage::Position InsetMinipage::pos() const 
+bool InsetMinipage::showInsetDialog(BufferView * bv) const
 {
-       return pos_;
+       if (!inset.showInsetDialog(bv)) {
+               InsetMinipage * tmp = const_cast<InsetMinipage *>(this);
+               InsetMinipageMailer mailer(*tmp);
+               mailer.showDialog(bv);
+       }
+
+       return true;
 }
 
 
-void InsetMinipage::pos(InsetMinipage::Position p)
+int InsetMinipage::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
+       const
 {
-       if (pos_ != p) {
-               pos_ = p;
-               need_update = FULL;
+       if (owner() &&
+           static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
+               return -1;
+       }
+       if (!params_.width.zero()) {
+               int ww1 = latexTextWidth(bv);
+               int ww2 = InsetCollapsable::getMaxWidth(bv, inset);
+               if (ww2 > 0 && ww2 < ww1) {
+                       return ww2;
+               }
+               return ww1;
        }
+       // this should not happen!
+       return InsetCollapsable::getMaxWidth(bv, inset);
 }
 
 
-InsetMinipage::InnerPosition InsetMinipage::innerPos() const
+int InsetMinipage::latexTextWidth(BufferView * bv) const
 {
-       return inner_pos_;
+       return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
 }
 
 
-void InsetMinipage::innerPos(InsetMinipage::InnerPosition ip)
-{
-       inner_pos_ = ip;
-}
-
+InsetMinipage::Params::Params()
+       : pos(center),
+         inner_pos(inner_center),
+         width(100, LyXLength::PCW)
+{}
 
-string const & InsetMinipage::height() const
-{
-       return height_;
-}
 
+string const InsetMinipageMailer:: name_("minipage");
 
-void InsetMinipage::height(string const & ll)
-{
-       if (height_ != ll) {
-               height_ = ll;
-               need_update = FULL;
-       }
-}
+InsetMinipageMailer::InsetMinipageMailer(InsetMinipage & inset)
+       : inset_(inset)
+{}
 
 
-string const & InsetMinipage::width() const
+string const InsetMinipageMailer::inset2string() const
 {
-       return width_;
+       return params2string(inset_.params());
 }
 
 
-void InsetMinipage::width(string const & ll)
+void InsetMinipageMailer::string2params(string const & in,
+                                       InsetMinipage::Params & params)
 {
-       if (ll != width_) {
-               width_ = ll;
-               need_update = FULL;
-       }
-}
+       params = InsetMinipage::Params();
 
+       istringstream data(in);
+       LyXLex lex(0,0);
+       lex.setStream(data);
 
-bool InsetMinipage::showInsetDialog(BufferView * bv) const
-{
-       if (!inset.showInsetDialog(bv))
-               bv->owner()->getDialogs()->showMinipage(const_cast<InsetMinipage *>(this));
-       return true;
-}
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != "minipage")
+                       return;
+       }
 
+       // This is part of the inset proper that is usually swallowed
+       // by Buffer::readInset
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != "Minipage")
+                       return;
+       }
 
-void InsetMinipage::insetButtonRelease(BufferView * bv, int x, int y,
-                                       int button)
-{
-       if (button == 3) {
-               showInsetDialog(bv);
-               return;
+       if (lex.isOK()) {
+               params.read(lex);
        }
-       InsetCollapsable::insetButtonRelease(bv, x, y, button);
 }
 
 
-int InsetMinipage::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
-       const
+string const
+InsetMinipageMailer::params2string(InsetMinipage::Params const & params)
 {
-       if (!width_.empty()) {
-               int ww1 = VSpace(width_).inPixels(bv);
-               int ww2 = InsetCollapsable::getMaxWidth(bv, inset);
-               if (ww2 > 0 && ww2 < ww1)
-                       return ww2;
-               return ww1;
-       }
-       // this should not happen!
-       return InsetCollapsable::getMaxWidth(bv, inset);
+       ostringstream data;
+       data << name_ << ' ';
+       params.write(data);
+
+       return data.str();
 }