Account for old versions of Pygments

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 497c3b0ba1d38d7897eb558a40d802987b91e164..224ba27894f6b1ecaeaeb1475bd91d9732188aa0 100644 (file)
--- 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>
@@ -30,58 +31,48 @@ FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
 
 FuncRequest::FuncRequest(Origin o)
        : action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
-         button_(mouse_button::none)
+         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)
-       : argument_(arg), action_(act), 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)
-       : argument_(from_utf8(arg)), action_(act), 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)
-       : argument_(arg), action_(cmd.action_), 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)
-       : argument_(from_utf8(arg)), action_(cmd.action_), origin_(o),
-         x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
-{}
-
-
-mouse_button::state FuncRequest::button() const
-{
-       return 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);
@@ -91,7 +82,7 @@ void splitArg(vector<string> & args, string const & str,
                        getline(is, s);
                        args.push_back(trim(s));
                        return;
-               }               
+               }
 
                char c;
                string s;
@@ -130,19 +121,26 @@ 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();
 }
 
 
 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