* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "FuncRequest.h"
+#include "LyXAction.h"
#include <iostream>
#include <sstream>
#include <vector>
-using std::getline;
-using std::istringstream;
-using std::vector;
-using std::string;
-
+using namespace std;
namespace lyx {
+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),
{}
-FuncRequest::FuncRequest(kb_action act, Origin o)
+FuncRequest::FuncRequest(FuncCode act, Origin o)
: action(act), origin(o), x(0), y(0), button_(mouse_button::none)
{}
-FuncRequest::FuncRequest(kb_action act, docstring const & arg, 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)
{}
-FuncRequest::FuncRequest(kb_action act, string const & 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::FuncRequest(kb_action act, int ax, int ay,
+FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
mouse_button::state but, Origin o)
: action(act), origin(o), x(ax), y(ay), button_(but)
{}
}
-void split(vector<string> & args, string const & str)
+void splitArg(vector<string> & args, string const & str)
{
istringstream is(str);
while (is) {
string FuncRequest::getArg(unsigned int i) const
{
vector<string> args;
- split(args, to_utf8(argument_));
+ splitArg(args, to_utf8(argument_));
return i < args.size() ? args[i] : string();
}
}
-std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
+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;