Alfredo's second patch

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index c9e586595671a550c6e213754770df7222128728..28007f08e68e871ba424cfb55ea9ac25fd430b31 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -6,11 +6,18 @@
  * \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()
@@ -54,13 +61,13 @@ 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_)
 {}
-       
+
 
 BufferView * FuncRequest::view() const
 {
@@ -96,3 +103,29 @@ void FuncRequest::errorMessage(string const & msg) const
        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();
+}