#include "support/docstring.h"
+#include "frontends/KeyModifier.h"
#include "frontends/mouse_state.h"
namespace lyx {
+class LyXErr;
+
/**
* This class encapsulates a LyX action and its argument
* in order to pass it around easily.
MENU, // A menu entry
TOOLBAR, // A toolbar icon
KEYBOARD, // a keyboard binding
- COMMANDBUFFER,
+ COMMANDBUFFER,
LYXSERVER,
TOC
};
explicit FuncRequest(FuncCode act, Origin o = INTERNAL);
/// actions without extra argument
FuncRequest(FuncCode act, int x, int y, mouse_button::state button,
- Origin o = INTERNAL);
+ KeyModifier modifier, Origin o = INTERNAL);
/// actions with extra argument
FuncRequest(FuncCode act, docstring const & arg,
Origin o = INTERNAL);
/// for changing requests a bit
FuncRequest(FuncRequest const & cmd, 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 the whole argument
docstring const & argument() const { return argument_; }
int y() const { return y_; }
///
void set_y(int y) { y_ = y; }
- ///
+ ///
mouse_button::state button() const { return button_; }
+ ///
+ KeyModifier modifier() { return modifier_; }
/// argument parsing, extract argument i as std::string
std::string getArg(unsigned int i) const;
/// 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;
private:
/// the action
int y_;
/// some extra information (like button number)
mouse_button::state button_;
+ ///
+ KeyModifier modifier_;
};
std::ostream & operator<<(std::ostream &, FuncRequest const &);
+LyXErr & operator<<(LyXErr &, FuncRequest const &);
+
} // namespace lyx