#include <config.h>
#include "funcrequest.h"
-#include "BufferView.h"
-#include "lyxfunc.h" // only for setMessage()
-#include "frontends/LyXView.h"
-#include "debug.h"
-#include "support/std_sstream.h"
-using std::endl;
-using std::getline;
+#include <iostream>
+#include <sstream>
+#include <vector>
-using std::istringstream;
-using std::vector;
+namespace lyx {
-FuncRequest::FuncRequest()
- : view_(0), action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
-{}
-
-
-FuncRequest::FuncRequest(kb_action act)
- : view_(0), action(act), x(0), y(0), button_(mouse_button::none)
-{}
+using std::getline;
+using std::istringstream;
+using std::vector;
+using std::string;
-FuncRequest::FuncRequest(kb_action act, string const & arg)
- : view_(0), action(act), argument(arg), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(Origin o)
+ : action(LFUN_NOACTION), origin(o), x(0), y(0),
+ button_(mouse_button::none)
{}
-FuncRequest::FuncRequest
- (kb_action act, int ax, int ay, mouse_button::state button)
- : view_(0), action(act), x(ax), y(ay), button_(button)
+FuncRequest::FuncRequest(kb_action act, Origin o)
+ : action(act), origin(o), x(0), y(0), button_(mouse_button::none)
{}
-FuncRequest::FuncRequest(BufferView * view, kb_action act)
- : view_(view), action(act), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(kb_action act, docstring const & arg, Origin o)
+ : action(act), argument_(arg), origin(o), x(0), y(0),
+ button_(mouse_button::none)
{}
-FuncRequest::FuncRequest(BufferView * view, kb_action act, string const & arg)
- : view_(view), action(act), argument(arg), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(kb_action act, string const & arg, Origin o)
+ : action(act), argument_(from_utf8(arg)), origin(o), x(0), y(0),
+ button_(mouse_button::none)
{}
-FuncRequest::FuncRequest
- (BufferView * view, kb_action act, int ax, int ay, mouse_button::state but)
- : view_(view), action(act), x(ax), y(ay), button_(but)
+FuncRequest::FuncRequest(kb_action act, int ax, int ay,
+ mouse_button::state but, Origin o)
+ : action(act), origin(o), x(ax), y(ay), button_(but)
{}
-FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg)
- : view_(cmd.view_), action(cmd.action), argument(arg),
+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, BufferView * view)
- : view_(view), action(cmd.action), argument(cmd.argument),
+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_)
{}
-BufferView * FuncRequest::view() const
-{
- return view_;
-}
-
-
-void FuncRequest::setView(BufferView * view)
-{
- view_ = view;
-}
-
-
mouse_button::state FuncRequest::button() const
{
return button_;
}
-void FuncRequest::message(string const & msg) const
-{
- if (view_)
- view_->owner()->getLyXFunc().setMessage(msg);
- else
- lyxerr << "Dropping message '" << msg << "'" << endl;
-}
-
-
-void FuncRequest::errorMessage(string const & msg) const
-{
- if (view_)
- view_->owner()->getLyXFunc().setErrorMessage(msg);
- else
- lyxerr << "Dropping error message '" << msg << "'" << endl;
-}
-
-
-void split(vector<string> & args, string str)
+void split(vector<string> & args, string const & str)
{
istringstream is(str);
while (is) {
char c;
string s;
is >> c;
- if (c == '"')
- getline(is, s, '"');
- else {
- is.putback(c);
- is >> s;
+ if (is) {
+ if (c == '"')
+ getline(is, s, '"');
+ else {
+ is.putback(c);
+ is >> s;
+ }
+ args.push_back(s);
}
- args.push_back(s);
}
}
string FuncRequest::getArg(unsigned int i) const
{
vector<string> args;
- split(args, argument);
+ split(args, to_utf8(argument_));
return i < args.size() ? args[i] : string();
}
+
+
+bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
+{
+ return lhs.action == rhs.action && lhs.argument() == rhs.argument();
+}
+
+
+std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
+{
+ return os
+ << " action: " << cmd.action
+ << " arg: '" << to_utf8(cmd.argument()) << "'"
+ << " x: " << cmd.x
+ << " y: " << cmd.y;
+}
+
+
+} // namespace lyx