X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=cd47c55595785f5f59b827938ece3e68e2b00060;hb=abc145f250142e01016f486f2c585d84b343ed8c;hp=e84cfa96f8c5e78122223be26bfc7fc5e7997de9;hpb=a37feaf8967cdb47908d2b6b75a80fa77cfe8378;p=lyx.git

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index e84cfa96f8..cd47c55595 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,49 @@ FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
 FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
 
 FuncRequest::FuncRequest(Origin o)
-	: action_(LFUN_NOACTION), argument_(), origin_(o), x_(0), y_(0),
-	  button_(mouse_button::none)
+	: action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
+	  button_(mouse_button::none), modifier_(NoModifier)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-	: action_(act), argument_(), origin_(o), x_(0), y_(0),
-	button_(mouse_button::none)
+	: action_(act), origin_(o), x_(0), y_(0),
+	button_(mouse_button::none), modifier_(NoModifier)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
 	: action_(act), argument_(arg), origin_(o), x_(0), y_(0),
-	  button_(mouse_button::none)
+	  button_(mouse_button::none), modifier_(NoModifier)
 {}
 
 
 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)
+	  button_(mouse_button::none), modifier_(NoModifier)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
-			 mouse_button::state but, Origin o)
-	: action_(act), argument_(), origin_(o), x_(ax), y_(ay), button_(but)
+			 mouse_button::state but, KeyModifier modifier, Origin o)
+	: action_(act), origin_(o), x_(ax), y_(ay), button_(but),
+	  modifier_(modifier)
 {}
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o)
 	: action_(cmd.action()), argument_(arg), origin_(o),
-	  x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
-{}
-
-
-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_)
+	  x_(cmd.x_), y_(cmd.y_), button_(cmd.button_), modifier_(NoModifier)
 {}
 
 
 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 +82,7 @@ void splitArg(vector<string> & args, string const & str,
 			getline(is, s);
 			args.push_back(trim(s));
 			return;
-		}		
+		}
 
 		char c;
 		string s;
@@ -105,7 +101,7 @@ void splitArg(vector<string> & args, string const & str,
 	}
 }
 
-}
+} // namespace
 
 string FuncRequest::getArg(unsigned int i) const
 {
@@ -132,12 +128,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