Update my email and status.

[lyx.git] / src / FuncRequest.h

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 6aaad7bb8e10b16aed32218a1b5a55f1e0f004ef..2f25d0ade3b899420c191e3994924b73199122b3 100644 (file)
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -21,6 +21,8 @@
 
 namespace lyx {
 
+class LyXErr;
+
 /**
  * This class encapsulates a LyX action and its argument
  * in order to pass it around easily.
@@ -34,7 +36,9 @@ public:
                MENU, // A menu entry
                TOOLBAR, // A toolbar icon
                KEYBOARD, // a keyboard binding
-               COMMANDBUFFER
+               COMMANDBUFFER, 
+               LYXSERVER,
+               TOC
        };
 
        /// just for putting these things in std::container
@@ -57,32 +61,46 @@ public:
        FuncRequest(FuncRequest const & cmd, std::string const & arg,
                    Origin o = INTERNAL);
 
-       /// access to button
-       mouse_button::state button() const;
+       /// access the whole argument
+       docstring const & argument() const { return argument_; }
+       ///
+       FuncCode action() const { return action_ ; }
+       ///
+       void setAction(FuncCode act) { action_ = act; }
+       ///
+       Origin origin() const { return origin_; }
+       ///
+       void setOrigin(Origin o) { origin_ = o; }
+       ///
+       int x() const { return x_; }
+       ///
+       int y() const { return y_; }
+       ///
+       void set_y(int y) { y_ = y; }
+       /// 
+       mouse_button::state button() const { return button_; }
 
        /// argument parsing, extract argument i as std::string
        std::string getArg(unsigned int i) const;
-
-       /// access the whole argument
-       docstring const & argument() const { return argument_; }
+       /// argument parsing, extract argument i as std::string,
+       /// eating all characters up to the end of the command line
+       std::string getLongArg(unsigned int i) const;
 
        /// 
        static FuncRequest const unknown;
        /// 
        static FuncRequest const noaction;
-public:  // should be private
-       /// the action
-       FuncCode action;
 private:
+       /// the action
+       FuncCode action_;
        /// the action's string argument
        docstring argument_;
-public:  // should be private
        /// who initiated the action
-       Origin origin;
+       Origin origin_;
        /// the x coordinate of a mouse press
-       int x;
+       int x_;
        /// the y coordinate of a mouse press
-       int y;
+       int y_;
        /// some extra information (like button number)
        mouse_button::state button_;
 };
@@ -92,6 +110,8 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
 
 std::ostream & operator<<(std::ostream &, FuncRequest const &);
 
+LyXErr & operator<<(LyXErr &, FuncRequest const &);
+
 
 } // namespace lyx