X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffuncrequest.h;h=355499992da6bfc9961508dff37b45eaab9b1342;hb=87cd77d1fc819bc8f14982fc6b20091720c011f5;hp=5ebe6fa9d1d429110d4b14c73c89d047f8a3ed75;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/funcrequest.h b/src/funcrequest.h
index 5ebe6fa9d1..355499992d 100644
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -14,9 +14,10 @@
 
 #include "lfuns.h"
 #include "frontends/mouse_state.h"
-#include "support/std_string.h"
 
-class BufferView;
+#include <string>
+#include <iosfwd>
+
 
 /**
  * This class encapsulates a LyX action and its argument
@@ -24,49 +25,41 @@ class BufferView;
  */
 class FuncRequest {
 public:
-	/// just for putting thes things in std::container
-	FuncRequest();
+	/// Where the request came from
+	enum Origin {
+		INTERNAL,
+		UI, // The menu or the toolbar
+		KEYBOARD, // a keyboard binding
+		COMMANDBUFFER
+	};
+
+	/// just for putting these things in std::container
+	explicit FuncRequest(Origin o = INTERNAL);
 	/// actions without extra argument
-	explicit FuncRequest(kb_action act);
+	explicit FuncRequest(kb_action act, Origin o = INTERNAL);
 	/// actions without extra argument
-	FuncRequest(kb_action act, int x, int y, mouse_button::state button);
+	FuncRequest(kb_action act, int x, int y, mouse_button::state button,
+		    Origin o = INTERNAL);
 	/// actions with extra argument
-	FuncRequest(kb_action act, string const & arg);
-	/// actions without extra argument
-	FuncRequest(BufferView * bv, kb_action act);
-	/// actions with extra argument
-	FuncRequest(BufferView * bv, kb_action act, string const & arg);
-	/// for mouse events
-	FuncRequest(BufferView * bv, kb_action act,
-		int x, int y, mouse_button::state button);
-	/// for changing requests a bit
-	FuncRequest(FuncRequest const & cmd, string const & arg);
+	FuncRequest(kb_action act, std::string const & arg,
+		    Origin o = INTERNAL);
 	/// for changing requests a bit
-	FuncRequest(FuncRequest const & cmd, BufferView * bv);
+	FuncRequest(FuncRequest const & cmd, std::string const & arg,
+		    Origin o = INTERNAL);
 
-	/// access to the view
-	BufferView * view() const;
-	/// access to the view
-	void setView(BufferView * bv);
 	/// access to button
 	mouse_button::state button() const;
 
-	/// output a message
-	void message(string const & msg) const;
-	/// output an error message
-	void errorMessage(string const & msg) const;
+	/// argument parsing, extract argument i as std::string
+	std::string getArg(unsigned int i) const;
 
-	/// argument parsing, extract argument i as string
-	string getArg(int i) const;
-
-private:
-	/// the BufferView we are talking to
-	BufferView * view_;
-public:  // should be private, too...
+public:  // should be private
 	/// the action
 	kb_action action;
-	/// the action's string argument
-	string argument;
+	/// the action's std::string argument
+	std::string argument;
+	/// who initiated the action
+	Origin origin;
 	/// the x coordinate of a mouse press
 	int x;
 	/// the y coordinate of a mouse press
@@ -75,4 +68,9 @@ public:  // should be private, too...
 	mouse_button::state button_;
 };
 
+
+bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
+
+std::ostream & operator<<(std::ostream &, FuncRequest const &);
+
 #endif // FUNCREQUEST_H