X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=a8d8859cc51e050986d6968fddb0bdf9d8070a8a;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=2d36142421fc5c0e2cd67927b0bef59efae3e879;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 2d36142421..a8d8859cc5 100644
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -11,12 +11,18 @@
 #include <config.h>
 
 #include "FuncRequest.h"
+#include "LyXAction.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+
+#include <climits>
 #include <iostream>
 #include <sstream>
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -24,63 +30,69 @@ FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
 FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
 
 FuncRequest::FuncRequest(Origin o)
-	: action(LFUN_NOACTION), 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), 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)
+	: action_(act), argument_(arg), origin_(o), x_(0), y_(0),
+	  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)
+	: action_(act), argument_(from_utf8(arg)), origin_(o), x_(0), y_(0),
+	  button_(mouse_button::none), modifier_(NoModifier)
 {}
 
 
 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 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_)
+	: action_(cmd.action()), argument_(arg), origin_(o),
+	  x_(cmd.x_), y_(cmd.y_), button_(cmd.button_), modifier_(NoModifier)
 {}
 
 
-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_)
-{}
-
-
-mouse_button::state FuncRequest::button() const
-{
-	return button_;
-}
-
+namespace {
 
-void splitArg(vector<string> & args, string const & str)
+// Extracts arguments from str into args. Arguments are delimted by
+// whitespace or by double quotes.
+// We extract at most max + 1 arguments, treating args[max] as
+// continuing to eol.
+void splitArg(vector<string> & args, string const & str,
+		unsigned int max = UINT_MAX)
 {
 	istringstream is(str);
 	while (is) {
+		if (args.size() == max) {
+			string s;
+			getline(is, s);
+			args.push_back(trim(s));
+			return;
+		}
+
 		char c;
 		string s;
 		is >> c;
 		if (is) {
 			if (c == '"')
+				// get quote delimited argument
 				getline(is, s, '"');
 			else {
+				// get whitespace delimited argument
 				is.putback(c);
 				is >> s;
 			}
@@ -89,6 +101,7 @@ void splitArg(vector<string> & args, string const & str)
 	}
 }
 
+}
 
 string FuncRequest::getArg(unsigned int i) const
 {
@@ -98,20 +111,36 @@ string FuncRequest::getArg(unsigned int i) const
 }
 
 
+string FuncRequest::getLongArg(unsigned int i) const
+{
+	vector<string> args;
+	splitArg(args, to_utf8(argument_), i);
+	return i < args.size() ? args[i] : string();
+}
+
+
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 {
-	return lhs.action == rhs.action && lhs.argument() == rhs.argument();
+	return lhs.action() == rhs.action() && lhs.argument() == rhs.argument();
 }
 
 
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
 	return os
-		<< " action: " << cmd.action
+		<< " action: " << cmd.action()
+		<< " [" << lyxaction.getActionName(cmd.action()) << "] "
 		<< " arg: '" << to_utf8(cmd.argument()) << "'"
-		<< " x: " << cmd.x
-		<< " y: " << cmd.y;
+		<< " x: " << cmd.x()
+		<< " y: " << cmd.y();
 }
 
 
+LyXErr & operator<<(LyXErr &l, FuncRequest const &fr)
+{
+	ostringstream oss;
+	oss << fr;
+	return l << oss.str();
+}
+
 } // namespace lyx