X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.h;h=2f25d0ade3b899420c191e3994924b73199122b3;hb=ca66e175c9705045793ba3cc2ba95909e5ef5a93;hp=993f0a24bbcca4436a96e85ae31b39cb282edc64;hpb=fc3de8c1509c4fec4b924c711488f67d964bf8d6;p=lyx.git

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 993f0a24bb..2f25d0ade3 100644
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -21,6 +21,8 @@
 
 namespace lyx {
 
+class LyXErr;
+
 /**
  * This class encapsulates a LyX action and its argument
  * in order to pass it around easily.
@@ -35,6 +37,7 @@ public:
 		TOOLBAR, // A toolbar icon
 		KEYBOARD, // a keyboard binding
 		COMMANDBUFFER, 
+		LYXSERVER,
 		TOC
 	};
 
@@ -58,36 +61,46 @@ public:
 	FuncRequest(FuncRequest const & cmd, std::string const & arg,
 		    Origin o = INTERNAL);
 
-	/// access to button
-	mouse_button::state button() const;
+	/// access the whole argument
+	docstring const & argument() const { return argument_; }
+	///
+	FuncCode action() const { return action_ ; }
+	///
+	void setAction(FuncCode act) { action_ = act; }
+	///
+	Origin origin() const { return origin_; }
+	///
+	void setOrigin(Origin o) { origin_ = o; }
+	///
+	int x() const { return x_; }
+	///
+	int y() const { return y_; }
+	///
+	void set_y(int y) { y_ = y; }
+	/// 
+	mouse_button::state button() const { return button_; }
 
 	/// argument parsing, extract argument i as std::string
 	std::string getArg(unsigned int i) const;
-
 	/// argument parsing, extract argument i as std::string,
 	/// eating all characters up to the end of the command line
 	std::string getLongArg(unsigned int i) const;
 
-	/// access the whole argument
-	docstring const & argument() const { return argument_; }
-
 	/// 
 	static FuncRequest const unknown;
 	/// 
 	static FuncRequest const noaction;
-public:  // should be private
-	/// the action
-	FuncCode action;
 private:
+	/// the action
+	FuncCode action_;
 	/// the action's string argument
 	docstring argument_;
-public:  // should be private
 	/// who initiated the action
-	Origin origin;
+	Origin origin_;
 	/// the x coordinate of a mouse press
-	int x;
+	int x_;
 	/// the y coordinate of a mouse press
-	int y;
+	int y_;
 	/// some extra information (like button number)
 	mouse_button::state button_;
 };
@@ -97,6 +110,8 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
 
 std::ostream & operator<<(std::ostream &, FuncRequest const &);
 
+LyXErr & operator<<(LyXErr &, FuncRequest const &);
+
 
 } // namespace lyx