X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=1597027311851e1dc1b7c9464a73c1f55a50695a;hb=437f0822f7dd4b9ca8a50526a6dac2d85818a6ee;hp=c912b3a0ae14094b8a425da79722a19dfd9af27d;hpb=0ef36860c380626cc0930b34144794166fc1adb6;p=lyx.git

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index c912b3a0ae..1597027311 100644
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -28,34 +28,32 @@ namespace lyx {
 
 FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
 FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
+FuncRequest const FuncRequest::prefix(LFUN_COMMAND_PREFIX);
 
 FuncRequest::FuncRequest(Origin o)
-	: action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
-	  button_(mouse_button::none)
+	: origin_(o)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-	: action_(act), origin_(o), x_(0), y_(0),
-	button_(mouse_button::none)
+	: action_(act), origin_(o)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
-	: action_(act), argument_(arg), origin_(o), x_(0), y_(0),
-	  button_(mouse_button::none)
+	: action_(act), argument_(arg), origin_(o)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o)
-	: action_(act), argument_(from_utf8(arg)), origin_(o), x_(0), y_(0),
-	  button_(mouse_button::none)
+	: FuncRequest(act, from_utf8(arg), o)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
-			 mouse_button::state but, Origin o)
-	: action_(act), origin_(o), x_(ax), y_(ay), button_(but)
+			 mouse_button::state button, KeyModifier modifier, Origin o)
+	: action_(act), origin_(o),
+	  x_(ax), y_(ay), button_(button), modifier_(modifier)
 {}
 
 
@@ -65,15 +63,9 @@ FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin
 {}
 
 
-FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg, Origin o)
-	: action_(cmd.action()), argument_(from_utf8(arg)), origin_(o),
-	  x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
-{}
-
-
 namespace {
 
-// Extracts arguments from str into args. Arguments are delimted by
+// Extracts arguments from str into args. Arguments are delimited by
 // whitespace or by double quotes.
 // We extract at most max + 1 arguments, treating args[max] as
 // continuing to eol.
@@ -106,7 +98,7 @@ void splitArg(vector<string> & args, string const & str,
 	}
 }
 
-}
+} // namespace
 
 string FuncRequest::getArg(unsigned int i) const
 {
@@ -130,6 +122,12 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 }
 
 
+bool operator!=(FuncRequest const & lhs, FuncRequest const & rhs)
+{
+	return !(lhs == rhs);
+}
+
+
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
 	return os