X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.C;h=21ca38df6c5f569c926d1714fdae411304a1423b;hb=a4e4ebc7eb7752c688ae2d87a2e89728d3d66ff9;hp=c6ba6bf51eaf4439e836a44e48a22da90e2fa501;hpb=a654de29ea80901be5321f603008f0e6a82a0ec9;p=lyx.git

diff --git a/src/insets/inset.C b/src/insets/inset.C
index c6ba6bf51e..21ca38df6c 100644
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -1,30 +1,35 @@
-/* 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"
-#include "debug.h"
+
 #include "BufferView.h"
-#include "support/lstrings.h"
-#include "Painter.h"
-#include "commandtags.h"
-#include "support/lstrings.h"
+#include "debug.h"
+#include "funcrequest.h"
 #include "gettext.h"
-#include "lyxfont.h"
 #include "lyxcursor.h"
+#include "lyxfont.h"
 #include "lyxtext.h"
+#include "WordLangTuple.h"
+
+#include "frontends/Painter.h"
+#include "frontends/mouse_state.h"
+
+#include "support/lstrings.h"
+#include "support/lstrings.h"
 
 using std::endl;
 
@@ -34,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)
@@ -51,12 +58,6 @@ Inset::Inset(Inset const & in, bool same_id)
 }
 
 
-bool Inset::deletable() const
-{
-	return true;
-}
-
-
 bool Inset::directWrite() const
 {
 	return false;
@@ -69,6 +70,10 @@ Inset::EDITABLE Inset::editable() const
 }
 
 
+void Inset::edit(BufferView *, int, int, mouse_button::state)
+{}
+
+
 void Inset::validate(LaTeXFeatures &) const
 {}
 
@@ -79,12 +84,14 @@ bool Inset::autoDelete() const
 }
 
 
-void Inset::edit(BufferView *, int, int, unsigned int)
+void Inset::edit(BufferView *, bool)
 {}
 
 
-void Inset::edit(BufferView *, bool)
-{}
+Inset::RESULT Inset::localDispatch(FuncRequest const &)
+{
+	return UNDISPATCHED;
+}
 
 
 #if 0
@@ -172,34 +179,6 @@ UpdatableInset::UpdatableInset(UpdatableInset const & in, bool same_id)
 {}
 
 
-void UpdatableInset::insetButtonPress(BufferView *, int x, int y, int button)
-{
-	lyxerr[Debug::INFO] << "Inset Button Press x=" << x
-		       << ", y=" << y << ", button=" << button << endl;
-}
-
-
-bool UpdatableInset::insetButtonRelease(BufferView *, int x, int y, int button)
-{
-	lyxerr[Debug::INFO] << "Inset Button Release x=" << x
-		       << ", y=" << y << ", button=" << button << endl;
-	return false;
-}
-
-
-void UpdatableInset::insetKeyPress(XKeyEvent *)
-{
-	lyxerr[Debug::INFO] << "Inset Keypress" << endl;
-}
-
-
-void UpdatableInset::insetMotionNotify(BufferView *, int x, int y, int state)
-{
-	lyxerr[Debug::INFO] << "Inset Motion Notify x=" << x
-		       << ", y=" << y << ", state=" << state << endl;
-}
-
-
 void UpdatableInset::insetUnlock(BufferView *)
 {
 	lyxerr[Debug::INFO] << "Inset Unlock" << endl;
@@ -229,7 +208,7 @@ void UpdatableInset::fitInsetCursor(BufferView *) const
 {}
 
 
-void UpdatableInset::edit(BufferView *, int, int, unsigned int)
+void UpdatableInset::edit(BufferView *, int, int, mouse_button::state)
 {}
 
 
@@ -305,19 +284,20 @@ void UpdatableInset::scroll(BufferView * bv, int offset) const
 
 
 ///  An updatable inset could handle lyx editing commands
-UpdatableInset::RESULT
-UpdatableInset::localDispatch(BufferView * bv,
-			      kb_action action, string const & arg)
+Inset::RESULT UpdatableInset::localDispatch(FuncRequest const & ev)
 {
-	if (!arg.empty() && (action==LFUN_SCROLL_INSET)) {
-		if (arg.find('.') != arg.npos) {
-			float const xx = static_cast<float>(strToDbl(arg));
-			scroll(bv, xx);
+	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(ev.view(), xx);
 		} else {
-			int const xx = strToInt(arg);
-			scroll(bv, xx);
+			int const xx = strToInt(ev.argument);
+			scroll(ev.view(), xx);
 		}
-		bv->updateInset(this, false);
+		ev.view()->updateInset(this, false);
 
 		return DISPATCHED;
 	}
@@ -364,16 +344,24 @@ LyXCursor const & Inset::cursor(BufferView * bv) const
 }
 
 
-string const UpdatableInset::selectNextWordToSpellcheck(BufferView *bv,
-					    float & value) const
+WordLangTuple const
+UpdatableInset::selectNextWordToSpellcheck(BufferView *bv, float & value) const
 {
 	// we have to unlock ourself in this function by default!
 	bv->unlockInset(const_cast<UpdatableInset *>(this));
 	value = 0;
-	return string();
+	return WordLangTuple();
 }
 
 
+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)
 {