X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=25ea41a82f4029034cb29fad64447200fa6a2f84;hb=21eb2c4f74c5665e6516cf900acf4f5acba21c69;hp=39d34e341fb89a0091261eae5e6e622228a065d2;hpb=c1221f989000b424a6c83b9c23c642bee7a66c81;p=lyx.git

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 39d34e341f..25ea41a82f 100644
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -13,6 +13,7 @@
 #include "FuncRequest.h"
 #include "LyXAction.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <climits>
@@ -29,54 +30,45 @@ FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
 FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
 
 FuncRequest::FuncRequest(Origin o)
-	: argument_(), action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
-	  button_(mouse_button::none)
+	: origin_(o)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-	: argument_(), 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)
-	: argument_(arg), action_(act), 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)
-	: argument_(from_utf8(arg)), action_(act), 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)
-	: argument_(), 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)
 {}
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o)
-	: argument_(arg), action_(cmd.action()), origin_(o),
-	  x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
-{}
-
-
-FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg, Origin o)
-	: argument_(from_utf8(arg)), action_(cmd.action()), origin_(o),
+	: action_(cmd.action()), argument_(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 
+// We extract at most max + 1 arguments, treating args[max] as
 // continuing to eol.
-void splitArg(vector<string> & args, string const & str, 
+void splitArg(vector<string> & args, string const & str,
 		unsigned int max = UINT_MAX)
 {
 	istringstream is(str);
@@ -86,7 +78,7 @@ void splitArg(vector<string> & args, string const & str,
 			getline(is, s);
 			args.push_back(trim(s));
 			return;
-		}		
+		}
 
 		char c;
 		string s;
@@ -105,7 +97,7 @@ void splitArg(vector<string> & args, string const & str,
 	}
 }
 
-}
+} // namespace
 
 string FuncRequest::getArg(unsigned int i) const
 {
@@ -122,7 +114,6 @@ string FuncRequest::getLongArg(unsigned int i) const
 	return i < args.size() ? args[i] : string();
 }
 
-
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 {
 	return lhs.action() == rhs.action() && lhs.argument() == rhs.argument();
@@ -132,12 +123,19 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
 	return os
-		<< " action: " << cmd.action() 
-		<< " [" << lyxaction.getActionName(cmd.action()) << "] " 
+		<< " action: " << cmd.action()
+		<< " [" << lyxaction.getActionName(cmd.action()) << "] "
 		<< " arg: '" << to_utf8(cmd.argument()) << "'"
 		<< " x: " << cmd.x()
 		<< " y: " << cmd.y();
 }
 
 
+LyXErr & operator<<(LyXErr &l, FuncRequest const &fr)
+{
+	ostringstream oss;
+	oss << fr;
+	return l << oss.str();
+}
+
 } // namespace lyx