/**
* \file FormMathsPanel.C
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author Alejandro Aguilar Sierra
- * \author Pablo De Napoli, pdenapo@dm.uba.ar
- * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming <leeming@lyx.org>
+ * \author Pablo De Napoli
+ * \author John Levon
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-#include "frontends/LyXView.h"
+#include "ControlMath.h"
#include "FormMathsPanel.h"
#include "forms/form_maths_panel.h"
-#include "MathsSymbols.h"
-#include "funcrequest.h"
-
-#include "forms/form_maths_deco.h"
-#include "forms/form_maths_delim.h"
-#include "forms/form_maths_matrix.h"
-#include "forms/form_maths_space.h"
-#include "forms/form_maths_style.h"
+#include "xformsBC.h"
#include "FormMathsBitmap.h"
-#include "FormMathsDeco.h"
#include "FormMathsDelim.h"
#include "FormMathsMatrix.h"
#include "FormMathsSpace.h"
#include "FormMathsStyle.h"
+#include "forms/form_maths_delim.h"
+#include "forms/form_maths_matrix.h"
+#include "forms/form_maths_space.h"
+#include "forms/form_maths_style.h"
+
#include FORMS_H_LOCATION
-#include <boost/bind.hpp>
#include "deco.xpm"
#include "delim.xpm"
#include "arrows.xbm"
#include "bop.xbm"
#include "brel.xbm"
+#include "deco.xbm"
#include "dots.xbm"
#include "greek.xbm"
#include "misc.xbm"
#include "ams_nrel.xbm"
#include "ams_ops.xbm"
-using std::vector;
-
-FormMathsPanel::FormMathsPanel(LyXView & lv, Dialogs & d)
- : FormBaseBD(lv, d, _("Maths Panel"), false),
- active_(0), bc_(_("Close"))
-{
- deco_.reset( new FormMathsDeco( lv, d, *this));
- delim_.reset( new FormMathsDelim( lv, d, *this));
- matrix_.reset(new FormMathsMatrix(lv, d, *this));
- space_.reset( new FormMathsSpace( lv, d, *this));
- style_.reset( new FormMathsStyle( lv, d, *this));
-
- typedef vector<string> StringVec;
-
- StringVec latex(nr_latex_arrow);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_arrow[i];
- }
- arrow_.reset(new FormMathsBitmap(lv, d, *this, _("Arrows"), latex));
-
- latex.resize(nr_latex_bop);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_bop[i];
- }
- boperator_.reset(new FormMathsBitmap(lv, d, *this, _("Binary Ops"), latex));
-
- latex.resize(nr_latex_brel);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_brel[i];
- }
- brelats_.reset(new FormMathsBitmap(lv, d, *this, _("Bin Relations"), latex));
-
- latex.resize(nr_latex_greek);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_greek[i];
- }
- greek_.reset(new FormMathsBitmap(lv, d, *this, _("Greek"), latex));
-
- latex.resize(nr_latex_misc);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_misc[i];
- }
- misc_.reset(new FormMathsBitmap(lv, d, *this, _("Misc"), latex));
-
- latex.resize(nr_latex_dots);
- for (StringVec::size_type i = 0; i<latex.size(); ++i) {
- latex[i] = latex_dots[i];
- }
- dots_.reset(new FormMathsBitmap(lv, d, *this, _("Dots"), latex));
-
- latex.resize(nr_latex_varsz);
- for (StringVec::size_type i = 0; i<latex.size(); ++i) {
- latex[i] = latex_varsz[i];
- }
- varsize_.reset(new FormMathsBitmap(lv, d, *this, _("Big Operators"), latex));
-
- latex.resize(nr_latex_ams_misc);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_ams_misc[i];
- }
- ams_misc_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Misc"), latex));
-
- latex.resize(nr_latex_ams_arrows);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_ams_arrows[i];
- }
- ams_arrows_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Arrows"), latex));
-
- latex.resize(nr_latex_ams_rel);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_ams_rel[i];
- }
- ams_rel_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Relations"), latex));
-
- latex.resize(nr_latex_ams_nrel);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_ams_nrel[i];
- }
- ams_nrel_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Negated Rel"), latex));
-
- latex.resize(nr_latex_ams_ops);
- for (StringVec::size_type i = 0; i < latex.size(); ++i) {
- latex[i] = latex_ams_ops[i];
- }
- ams_ops_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Operators"), latex));
-
- //showUnderMouse(false);
-}
+typedef FormCB<ControlMath, FormDB<FD_maths_panel> > base_class;
-FL_FORM * FormMathsPanel::form() const
-{
- if (dialog_.get())
- return dialog_->form;
- return 0;
-}
+FormMathsPanel::FormMathsPanel()
+ : base_class(_("Maths Panel"))
+{}
-void FormMathsPanel::setActive(FormMathsSub * a) const
+FormMathsBitmap * FormMathsPanel::addDaughter(void * key,
+ string const & title,
+ char const * const * data,
+ int size)
{
- active_ = a;
+ char const * const * const end = data + size;
+ FormMathsBitmap * const view =
+ new FormMathsBitmap(title, std::vector<string>(data, end));
+
+ controller().addDaughter(key, view,
+ new xformsBC(controller().bc()),
+ new IgnorantPolicy);
+ return view;
}
fl_set_pixmap_data(dialog_->button_equation,
const_cast<char**>(equation));
- arrow_->addBitmap(20, 5, 4, arrow_width, arrow_height, arrow_bits);
- arrow_->addBitmap(7, 2, 4, larrow_width, larrow_height, larrow_bits,
+ controller().addDaughter(dialog_->button_delim,
+ new FormMathsDelim,
+ new xformsBC(controller().bc()),
+ new OkApplyCancelReadOnlyPolicy);
+ controller().addDaughter(dialog_->button_matrix,
+ new FormMathsMatrix,
+ new xformsBC(controller().bc()),
+ new OkApplyCancelReadOnlyPolicy);
+ controller().addDaughter(dialog_->button_space,
+ new FormMathsSpace,
+ new xformsBC(controller().bc()),
+ new IgnorantPolicy);
+ controller().addDaughter(dialog_->button_style,
+ new FormMathsStyle,
+ new xformsBC(controller().bc()),
+ new IgnorantPolicy);
+
+ FormMathsBitmap * bitmap;
+ bitmap = addDaughter(dialog_->button_deco,
+ _("Maths Decorations & Accents"),
+ latex_deco, nr_latex_deco);
+ bitmap->addBitmap(12, 3, 4, deco1_width, deco1_height, deco1_bits);
+ bitmap->addBitmap(10, 4, 3, deco2_width, deco2_height, deco2_bits);
+
+ bitmap = addDaughter(dialog_->button_arrow, _("Arrows"),
+ latex_arrow, nr_latex_arrow);
+ bitmap->addBitmap(20, 5, 4, arrow_width, arrow_height, arrow_bits);
+ bitmap->addBitmap(7, 2, 4, larrow_width, larrow_height, larrow_bits,
false);
- arrow_->addBitmap(4, 2, 2, darrow_width, darrow_height, darrow_bits);
-
- boperator_->addBitmap(31, 4, 8, bop_width, bop_height, bop_bits);
-
- brelats_->addBitmap(35, 4, 9, brel_width, brel_height, brel_bits);
-
- greek_->addBitmap(11, 6, 2, Greek_width, Greek_height, Greek_bits);
- greek_->addBitmap(28, 7, 4, greek_width, greek_height, greek_bits);
-
- misc_->addBitmap(29, 5, 6, misc_width, misc_height, misc_bits);
- misc_->addBitmap(5, 5, 1, misc4_width, misc4_height, misc4_bits);
- misc_->addBitmap(6, 3, 2, misc2_width, misc2_height, misc2_bits, false);
- misc_->addBitmap(4, 2, 2, misc3_width, misc3_height, misc3_bits);
-
- dots_->addBitmap(4, 4, 1, dots_width, dots_height, dots_bits);
-
- varsize_->addBitmap(14, 3, 5, varsz_width, varsz_height, varsz_bits);
-
- ams_misc_->addBitmap(9, 5, 2, ams1_width, ams1_height, ams1_bits);
- ams_misc_->addBitmap(26, 3, 9, ams7_width, ams7_height, ams7_bits);
-
- ams_arrows_->addBitmap(32, 3, 11, ams2_width, ams2_height, ams2_bits);
- ams_arrows_->addBitmap(6, 3, 2, ams3_width, ams3_height, ams3_bits);
-
- ams_rel_->addBitmap(66, 6, 11, ams_rel_width, ams_rel_height, ams_rel_bits);
-
- ams_nrel_->addBitmap(51, 6, 9, ams_nrel_width, ams_nrel_height, ams_nrel_bits);
-
- ams_ops_->addBitmap(23, 3, 8, ams_ops_width, ams_ops_height, ams_ops_bits);
-
- bc().setCancel(dialog_->button_close);
+ bitmap->addBitmap(4, 2, 2, darrow_width, darrow_height, darrow_bits);
+
+ bitmap = addDaughter(dialog_->button_boperator, _("Binary Ops"),
+ latex_bop, nr_latex_bop);
+ bitmap->addBitmap(31, 4, 8, bop_width, bop_height, bop_bits);
+
+ bitmap = addDaughter(dialog_->button_brelats, _("Bin Relations"),
+ latex_brel, nr_latex_brel);
+ bitmap->addBitmap(35, 4, 9, brel_width, brel_height, brel_bits);
+
+ bitmap = addDaughter(dialog_->button_greek, _("Greek"),
+ latex_greek, nr_latex_greek);
+ bitmap->addBitmap(11, 6, 2, Greek_width, Greek_height, Greek_bits);
+ bitmap->addBitmap(28, 7, 4, greek_width, greek_height, greek_bits);
+
+ bitmap = addDaughter(dialog_->button_misc,_("Misc"),
+ latex_misc, nr_latex_misc);
+ bitmap->addBitmap(29, 5, 6, misc_width, misc_height, misc_bits);
+ bitmap->addBitmap(5, 5, 1, misc4_width, misc4_height, misc4_bits);
+ bitmap->addBitmap(6, 3, 2, misc2_width, misc2_height, misc2_bits,
+ false);
+ bitmap->addBitmap(4, 2, 2, misc3_width, misc3_height, misc3_bits);
+
+ bitmap = addDaughter(dialog_->button_dots, _("Dots"),
+ latex_dots, nr_latex_dots);
+ bitmap->addBitmap(4, 4, 1, dots_width, dots_height, dots_bits);
+
+ bitmap = addDaughter(dialog_->button_varsize, _("Big Operators"),
+ latex_varsz, nr_latex_varsz);
+ bitmap->addBitmap(14, 3, 5, varsz_width, varsz_height, varsz_bits);
+
+ bitmap = addDaughter(dialog_->button_ams_misc, _("AMS Misc"),
+ latex_ams_misc, nr_latex_ams_misc);
+ bitmap->addBitmap(9, 5, 2, ams1_width, ams1_height, ams1_bits);
+ bitmap->addBitmap(26, 3, 9, ams7_width, ams7_height, ams7_bits);
+
+ bitmap = addDaughter(dialog_->button_ams_arrows, _("AMS Arrows"),
+ latex_ams_arrows, nr_latex_ams_arrows);
+ bitmap->addBitmap(32, 3, 11, ams2_width, ams2_height, ams2_bits);
+ bitmap->addBitmap(6, 3, 2, ams3_width, ams3_height, ams3_bits);
+
+ bitmap = addDaughter(dialog_->button_ams_brel, _("AMS Relations"),
+ latex_ams_rel, nr_latex_ams_rel);
+ bitmap->addBitmap(66, 6, 11, ams_rel_width, ams_rel_height,
+ ams_rel_bits);
+
+ bitmap = addDaughter(dialog_->button_ams_nrel, _("AMS Negated Rel"),
+ latex_ams_nrel, nr_latex_ams_nrel);
+ bitmap->addBitmap(51, 6, 9, ams_nrel_width, ams_nrel_height,
+ ams_nrel_bits);
+
+ bitmap = addDaughter(dialog_->button_ams_ops, _("AMS Operators"),
+ latex_ams_ops, nr_latex_ams_ops);
+ bitmap->addBitmap(23, 3, 8, ams_ops_width, ams_ops_height,
+ ams_ops_bits);
}
-bool FormMathsPanel::input(FL_OBJECT *, long data)
+ButtonPolicy::SMInput FormMathsPanel::input(FL_OBJECT * ob, long)
{
- MathsCallbackValues const val = static_cast<MathsCallbackValues>(data);
-
- switch (val) {
- case MM_GREEK:
- if (active_ && active_ != greek_.get())
- active_->hide();
- greek_->show();
- break;
-
- case MM_ARROW:
- if (active_ && active_ != arrow_.get())
- active_->hide();
- arrow_->show();
- break;
-
- case MM_BOP:
- if (active_ && active_ != boperator_.get())
- active_->hide();
- boperator_->show();
- break;
-
- case MM_BRELATS:
- if (active_ && active_ != brelats_.get())
- active_->hide();
- brelats_->show();
- break;
-
- case MM_MISC:
- if (active_ && active_ != misc_.get())
- active_->hide();
- misc_->show();
- break;
-
- case MM_DOTS:
- if (active_ && active_ != dots_.get())
- active_->hide();
- dots_->show();
- break;
-
- case MM_VARSIZE:
- if (active_ && active_ != varsize_.get())
- active_->hide();
- varsize_->show();
- break;
-
- case MM_AMS_MISC:
- if (active_ && active_ != ams_misc_.get())
- active_->hide();
- ams_misc_->show();
- break;
-
- case MM_AMS_ARROWS:
- if (active_ && active_ != ams_arrows_.get())
- active_->hide();
- ams_arrows_->show();
- break;
-
- case MM_AMS_BREL:
- if (active_ && active_ != ams_rel_.get())
- active_->hide();
- ams_rel_->show();
- break;
-
- case MM_AMS_NREL:
- if (active_ && active_ != ams_nrel_.get())
- active_->hide();
- ams_nrel_->show();
- break;
-
- case MM_AMS_OPS:
- if (active_ && active_ != ams_ops_.get())
- active_->hide();
- ams_ops_->show();
- break;
-
- case MM_FRAC:
- insertSymbol("frac");
- break;
-
- case MM_SQRT:
- insertSymbol("sqrt");
- break;
-
- case MM_SUPER:
- lv_.dispatch(FuncRequest(LFUN_SUPERSCRIPT));
- break;
-
- case MM_SUB:
- lv_.dispatch(FuncRequest(LFUN_SUBSCRIPT));
- break;
-
- case MM_SUBSUPER:
- lv_.dispatch(FuncRequest(LFUN_SUBSCRIPT));
- lv_.dispatch(FuncRequest(LFUN_LEFT));
- lv_.dispatch(FuncRequest(LFUN_SUPERSCRIPT));
- break;
-
- case MM_DELIM:
- if (active_ && active_ != delim_.get())
- active_->hide();
- delim_->show();
- break;
-
- case MM_MATRIX:
- if (active_ && active_ != matrix_.get())
- active_->hide();
- matrix_->show();
- break;
-
- case MM_DECO:
- if (active_ && active_ != deco_.get())
- active_->hide();
- deco_->show();
- break;
-
- case MM_SPACE:
- if (active_ && active_ != space_.get())
- active_->hide();
- space_->show();
- break;
-
- case MM_STYLE:
- if (active_ && active_ != style_.get())
- active_->hide();
- style_->show();
- break;
-
- case MM_EQU:
- mathDisplay();
- break;
-
- case MM_FUNC:
+ if (ob == dialog_->button_arrow ||
+ ob == dialog_->button_boperator ||
+ ob == dialog_->button_brelats ||
+ ob == dialog_->button_greek ||
+ ob == dialog_->button_misc ||
+ ob == dialog_->button_dots ||
+ ob == dialog_->button_varsize ||
+ ob == dialog_->button_ams_misc ||
+ ob == dialog_->button_ams_arrows ||
+ ob == dialog_->button_ams_brel ||
+ ob == dialog_->button_ams_nrel ||
+ ob == dialog_->button_ams_ops ||
+ ob == dialog_->button_delim ||
+ ob == dialog_->button_matrix ||
+ ob == dialog_->button_deco ||
+ ob == dialog_->button_space ||
+ ob == dialog_->button_style) {
+ controller().showDaughter(ob);
+
+ } else if (ob == dialog_->button_super) {
+ controller().dispatchFunc(LFUN_SUPERSCRIPT);
+
+ } else if (ob == dialog_->button_sub) {
+ controller().dispatchFunc(LFUN_SUBSCRIPT);
+
+// } else if (ob == dialog_->???) {
+// controller().dispatchFunc(LFUN_SUBSCRIPT);
+// controller().dispatchFunc(LFUN_LEFT);
+// controller().dispatchFunc(LFUN_SUPERSCRIPT);
+
+ } else if (ob == dialog_->button_equation) {
+ controller().dispatchFunc(LFUN_MATH_DISPLAY);
+
+ } else if (ob == dialog_->button_frac) {
+ controller().insertSymbol("frac");
+
+ } else if (ob == dialog_->button_sqrt) {
+ controller().insertSymbol("sqrt");
+
+ } else if (ob == dialog_->browser_funcs) {
int const i = fl_get_browser(dialog_->browser_funcs) - 1;
- insertSymbol(function_names[i]);
- break;
+ controller().insertSymbol(function_names[i]);
}
- return true;
-}
-
-
-void FormMathsPanel::insertSymbol(string const & sym, bool bs) const
-{
- if (bs)
- lv_.dispatch(FuncRequest(LFUN_INSERT_MATH, '\\' + sym));
- else
- lv_.dispatch(FuncRequest(LFUN_INSERT_MATH, sym));
-}
-
-
-void FormMathsPanel::dispatchFunc(kb_action action) const
-{
- lv_.dispatch(FuncRequest(action));
-}
-
-
-void FormMathsPanel::mathDisplay() const
-{
- lv_.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
-}
-
-
-
-FormMathsSub::FormMathsSub(LyXView & lv, Dialogs & d, FormMathsPanel const & p,
- string const & t, bool allowResize)
- : FormBaseBD(lv, d, t, allowResize), parent_(p), bc_(_("Close"))
-{}
-
-
-void FormMathsSub::connect()
-{
- parent_.setActive(this);
- FormBaseBD::connect();
-}
-
-
-void FormMathsSub::disconnect()
-{
- parent_.setActive(0);
- FormBaseBD::disconnect();
+ return ButtonPolicy::SMI_VALID;
}
projects / lyx.git / blobdiff