#include "FuncRequest.h"
#include "LyXAction.h"
+#include "support/debug.h"
#include "support/lstrings.h"
#include <climits>
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), view_origin_(nullptr), x_(0), y_(0),
+ button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
{}
FuncRequest::FuncRequest(FuncCode act, Origin o)
- : action_(act), origin_(o), x_(0), y_(0),
- button_(mouse_button::none)
+ : action_(act), origin_(o), view_origin_(nullptr), x_(0), y_(0),
+ button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
{}
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), view_origin_(nullptr), x_(0), y_(0),
+ button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
{}
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), view_origin_(nullptr), x_(0), y_(0),
+ button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
{}
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), view_origin_(nullptr), x_(ax), y_(ay),
+ button_(but), modifier_(modifier), allow_async_(true)
{}
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_)
+ : action_(cmd.action()), argument_(arg),
+ origin_(o), view_origin_(nullptr), x_(cmd.x_), y_(cmd.y_),
+ button_(cmd.button_), modifier_(NoModifier), allow_async_(true)
{}
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
// continuing to eol.
}
}
-}
+} // namespace
string FuncRequest::getArg(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();
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