Alfredo's second patch

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 18b010d8b4d683f0922c5f6d5103879c4af22d15..28007f08e68e871ba424cfb55ea9ac25fd430b31 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -6,7 +6,19 @@
  * \author André Pönitz
  */
 
+#include <config.h>
+
 #include "funcrequest.h"
+#include "BufferView.h"
+#include "lyxfunc.h" // only for setMessage()
+#include "frontends/LyXView.h"
+#include "debug.h"
+#include "Lsstream.h"
+
+
+using std::vector;
+using std::getline;
+
 
 FuncRequest::FuncRequest()
        : view_(0), action(LFUN_UNKNOWN_ACTION)
@@ -23,6 +35,12 @@ FuncRequest::FuncRequest(kb_action act, string const & arg)
 {}
 
 
+FuncRequest::FuncRequest
+               (kb_action act, int ax, int ay, mouse_button::state button)
+       : view_(0), action(act), argument(), x(ax), y(ay), button_(button)
+{}
+
+
 FuncRequest::FuncRequest(BufferView * view, kb_action act)
        : view_(view), action(act)
 {}
@@ -34,8 +52,20 @@ FuncRequest::FuncRequest(BufferView * view, kb_action act, string const & arg)
 
 
 FuncRequest::FuncRequest
-               (BufferView * view, kb_action act, int ax, int ay, int aextra)
-       : view_(view), action(act), argument(), x(ax), y(ay), extra(aextra)
+               (BufferView * view, kb_action act, int ax, int ay, mouse_button::state but)
+       : view_(view), action(act), argument(), x(ax), y(ay), button_(but)
+{}
+
+
+FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg)
+       : view_(cmd.view_), action(cmd.action), argument(arg),
+         x(cmd.x), y(cmd.y), button_(cmd.button_)
+{}
+
+
+FuncRequest::FuncRequest(FuncRequest const & cmd, BufferView * view)
+       : view_(view), action(cmd.action), argument(cmd.argument),
+         x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
 
 
@@ -49,3 +79,53 @@ 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 << "'\n";
+}
+
+
+void FuncRequest::errorMessage(string const & msg) const
+{
+       if (view_)
+               view_->owner()->getLyXFunc().setErrorMessage(msg);
+       else
+               lyxerr  << "Dropping error message '" << msg << "'\n";
+}
+
+
+void split(vector<string> & args, string str)
+{
+       istringstream is(str);
+       while (is) {
+               char c;
+               string s;
+               is >> c;
+               if (c == '"')
+                       getline(is, s, '"');
+               else {
+                       is.putback(c);
+                       is >> s;
+               }
+               args.push_back(s);
+       }
+}
+
+
+string FuncRequest::getArg(int i) const
+{
+       vector<string> args;
+       split(args, argument);
+       return i < args.size() ? args[i] : string();
+}