Update credits

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index eeebca2891c6346a79582809b060aaed1ab4485d..1597027311851e1dc1b7c9464a73c1f55a50695a 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -13,8 +13,10 @@
 #include "FuncRequest.h"
 #include "LyXAction.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
+#include <climits>
 #include <iostream>
 #include <sstream>
 #include <vector>
@@ -26,57 +28,49 @@ 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)
 {}
 
 
 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_)
 {}
 
 
-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, unsigned int max)
+// 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.
+void splitArg(vector<string> & args, string const & str,
+               unsigned int max = UINT_MAX)
 {
        istringstream is(str);
        while (is) {
@@ -85,15 +79,17 @@ void splitArg(vector<string> & args, string const & str, unsigned int max)
                        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;
                        }
@@ -102,12 +98,12 @@ void splitArg(vector<string> & args, string const & str, unsigned int max)
        }
 }
 
-}
+} // namespace
 
 string FuncRequest::getArg(unsigned int i) const
 {
        vector<string> args;
-       splitArg(args, to_utf8(argument_), string::npos);
+       splitArg(args, to_utf8(argument_));
        return i < args.size() ? args[i] : string();
 }
 
@@ -122,19 +118,32 @@ string FuncRequest::getLongArg(unsigned int i) const
 
 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();
+}
+
+
+bool operator!=(FuncRequest const & lhs, FuncRequest const & rhs)
+{
+       return !(lhs == 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;
+               << " x: " << cmd.x()
+               << " y: " << cmd.y();
 }
 
 
+LyXErr & operator<<(LyXErr &l, FuncRequest const &fr)
+{
+       ostringstream oss;
+       oss << fr;
+       return l << oss.str();
+}
+
 } // namespace lyx