cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / funcrequest.h

diff --git a/src/funcrequest.h b/src/funcrequest.h
index d38ed13bfc04bcde45730507352ea4cbb399efcb..2671d9beee865f34be29a16565a8273caf1bdc50 100644 (file)
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -15,7 +15,8 @@
 #include "lfuns.h"
 #include "frontends/mouse_state.h"
 
-#include <string>
+#include "support/docstring.h"
+
 #include <iosfwd>
 
 
@@ -25,16 +26,33 @@
  */
 class FuncRequest {
 public:
-       /// just for putting thes things in std::container
-       FuncRequest();
+       /// Where the request came from
+       enum Origin {
+               INTERNAL,
+               UI, // The menu or the toolbar
+               KEYBOARD, // a keyboard binding
+               COMMANDBUFFER
+       };
+
+       /// just for putting these things in std::container
+       explicit FuncRequest(Origin o = INTERNAL);
        /// actions without extra argument
-       explicit FuncRequest(kb_action act);
+       explicit FuncRequest(kb_action act, Origin o = INTERNAL);
        /// actions without extra argument
-       FuncRequest(kb_action act, int x, int y, mouse_button::state button);
+       FuncRequest(kb_action act, int x, int y, mouse_button::state button,
+                   Origin o = INTERNAL);
        /// actions with extra argument
-       FuncRequest(kb_action act, std::string const & arg);
+       FuncRequest(kb_action act, lyx::docstring const & arg,
+                   Origin o = INTERNAL);
+       /// actions with extra argument. FIXME: remove this
+       FuncRequest(kb_action act, std::string const & arg,
+                   Origin o = INTERNAL);
        /// for changing requests a bit
-       FuncRequest(FuncRequest const & cmd, std::string const & arg);
+       FuncRequest(FuncRequest const & cmd, lyx::docstring const & arg,
+                   Origin o = INTERNAL);
+       /// for changing requests a bit. FIXME: remove this
+       FuncRequest(FuncRequest const & cmd, std::string const & arg,
+                   Origin o = INTERNAL);
 
        /// access to button
        mouse_button::state button() const;
@@ -42,11 +60,18 @@ public:
        /// argument parsing, extract argument i as std::string
        std::string getArg(unsigned int i) const;
 
+       /// access the whole argument
+       lyx::docstring const & argument() const { return argument_; }
+
 public:  // should be private
        /// the action
        kb_action action;
-       /// the action's std::string argument
-       std::string argument;
+private:
+       /// the action's string argument
+       lyx::docstring argument_;
+public:  // should be private
+       /// who initiated the action
+       Origin origin;
        /// the x coordinate of a mouse press
        int x;
        /// the y coordinate of a mouse press