First step towards unified insets...

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index cb155122b711d67a8e5998011a573c8f71369441..21ca38df6c5f569c926d1714fdae411304a1423b 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -1,18 +1,18 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file inset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Alejandro Aguilar Sierra
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
  *
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "inset.h"
 
@@ -39,14 +39,16 @@ using std::endl;
 unsigned int Inset::inset_id = 0;
 
 Inset::Inset()
-       : top_x(0), topx_set(false), top_baseline(0), scx(0),
+       :       InsetBase(),
+               top_x(0), topx_set(false), top_baseline(0), scx(0),
          id_(inset_id++), owner_(0), par_owner_(0),
          background_color_(LColor::inherit)
 {}
 
 
 Inset::Inset(Inset const & in, bool same_id)
-       : top_x(0), topx_set(false), top_baseline(0), scx(0), owner_(0),
+       :       InsetBase(),
+               top_x(0), topx_set(false), top_baseline(0), scx(0), owner_(0),
          name_(in.name_), background_color_(in.background_color_)
 {
        if (same_id)
@@ -56,12 +58,6 @@ Inset::Inset(Inset const & in, bool same_id)
 }
 
 
-bool Inset::deletable() const
-{
-       return true;
-}
-
-
 bool Inset::directWrite() const
 {
        return false;
@@ -74,6 +70,10 @@ Inset::EDITABLE Inset::editable() const
 }
 
 
+void Inset::edit(BufferView *, int, int, mouse_button::state)
+{}
+
+
 void Inset::validate(LaTeXFeatures &) const
 {}
 
@@ -84,12 +84,14 @@ bool Inset::autoDelete() const
 }
 
 
-void Inset::edit(BufferView *, int, int, mouse_button::state)
+void Inset::edit(BufferView *, bool)
 {}
 
 
-void Inset::edit(BufferView *, bool)
-{}
+Inset::RESULT Inset::localDispatch(FuncRequest const &)
+{
+       return UNDISPATCHED;
+}
 
 
 #if 0
@@ -177,28 +179,6 @@ UpdatableInset::UpdatableInset(UpdatableInset const & in, bool same_id)
 {}
 
 
-void UpdatableInset::insetButtonPress(BufferView *, int x, int y, mouse_button::state button)
-{
-       lyxerr[Debug::INFO] << "Inset Button Press x=" << x
-                      << ", y=" << y << ", button=" << button << endl;
-}
-
-
-bool UpdatableInset::insetButtonRelease(BufferView *, int x, int y, mouse_button::state button)
-{
-       lyxerr[Debug::INFO] << "Inset Button Release x=" << x
-                      << ", y=" << y << ", button=" << button << endl;
-       return false;
-}
-
-
-void UpdatableInset::insetMotionNotify(BufferView *, int x, int y, mouse_button::state state)
-{
-       lyxerr[Debug::INFO] << "Inset Motion Notify x=" << x
-                      << ", y=" << y << ", state=" << state << endl;
-}
-
-
 void UpdatableInset::insetUnlock(BufferView *)
 {
        lyxerr[Debug::INFO] << "Inset Unlock" << endl;
@@ -304,18 +284,20 @@ void UpdatableInset::scroll(BufferView * bv, int offset) const
 
 
 ///  An updatable inset could handle lyx editing commands
-UpdatableInset::RESULT
-UpdatableInset::localDispatch(BufferView * bv, FuncRequest const & ev)
+Inset::RESULT UpdatableInset::localDispatch(FuncRequest const & ev)
 {
+       if (ev.action == LFUN_MOUSE_RELEASE)
+               return (editable() == IS_EDITABLE) ? DISPATCHED : UNDISPATCHED;
+
        if (!ev.argument.empty() && ev.action == LFUN_SCROLL_INSET) {
                if (ev.argument.find('.') != ev.argument.npos) {
                        float const xx = static_cast<float>(strToDbl(ev.argument));
-                       scroll(bv, xx);
+                       scroll(ev.view(), xx);
                } else {
                        int const xx = strToInt(ev.argument);
-                       scroll(bv, xx);
+                       scroll(ev.view(), xx);
                }
-               bv->updateInset(this, false);
+               ev.view()->updateInset(this, false);
 
                return DISPATCHED;
        }
@@ -372,6 +354,14 @@ UpdatableInset::selectNextWordToSpellcheck(BufferView *bv, float & value) const
 }
 
 
+bool UpdatableInset::nextChange(BufferView * bv, lyx::pos_type &)
+{
+       // we have to unlock ourself in this function by default!
+       bv->unlockInset(const_cast<UpdatableInset *>(this));
+       return false;
+}
+
+ 
 bool UpdatableInset::searchForward(BufferView * bv, string const &,
                                   bool, bool)
 {