X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.h;h=6942650e1906291412a33bab54609e0619353d68;hb=cb52251ccff29d6cbfa13ab90a96be566e3f41ac;hp=c5fd86a6c1f2904fd90ae282b0eec8dab46fe79a;hpb=90ef01a0ed13693d2d62cf2248fe5d0969e829da;p=lyx.git diff --git a/src/lyxfunc.h b/src/lyxfunc.h index c5fd86a6c1..6942650e19 100644 --- a/src/lyxfunc.h +++ b/src/lyxfunc.h @@ -6,13 +6,17 @@ #pragma interface #endif -#include "commandtags.h" -#include "kbmap.h" -#include "tex-accent.h" -#include "LyXAction.h" -#include "insets/lyxinset.h" +#include +#include + +#include "commandtags.h" // for kb_action enum +#include "func_status.h" +#include "kbsequence.h" #include "LString.h" + class LyXView; +class LyXText; + /** This class encapsulates all the LyX command operations. This is the class of the LyX's "high level event handler". @@ -20,64 +24,63 @@ class LyXView; keyboard or from the GUI. All GUI objects, including buttons and menus should use this class and never call kernel functions directly. */ -class LyXFunc { +class LyXFunc : public SigC::Object { public: /// - LyXFunc(LyXView*); - /// - ~LyXFunc(); + explicit + LyXFunc(LyXView *); - /// LyX distpatcher, executes lyx actions. - string Dispatch(int action, char const* arg = 0); + /// LyX dispatcher, executes lyx actions. + string const dispatch(int action, string const & arg = string()); /// The same but uses the name of a lyx command. - string Dispatch(string const &cmd); + string const dispatch(string const & cmd); - /// A keyboard event is processed to execute a lyx action. - int processKeyEvent(XEvent *ev); - + /// + void miniDispatch(string const & cmd); + + /// + void initMiniBuffer(); + + /// + void processKeySym(KeySym k, unsigned int state); + + /// we need one internall which is called from inside LyXAction and + /// can contain the string argument. + func_status::value_type getStatus(int ac) const; + /// + func_status::value_type getStatus(int ac, + string const & not_to_use_arg) const; + /// The last key was meta - bool wasMetaKey(); + bool wasMetaKey() const; - // These can't be global because are part of the internat state (ale970227) + // These can't be global because are part of the + // internal state (ale970227) /// Get the current keyseq string - string keyseqStr(int l = 190); + string const keyseqStr() const; /// Is the key sequence uncomplete? - bool keyseqUncomplete(); + bool keyseqUncomplete() const; /// get options for the current keyseq - string keyseqOptions(int l = 190); - - /// Returns the name of a funcion given a keyseq - char const* getFunc(char*) - { /* unimplemented */ return 0; } - - /// Return a string with the keybind to an action, if any - char const* getKeybind(int) - { /* unimplemented */ return 0; } + string const keyseqOptions() const; /// True if lyxfunc reports an error bool errorStat() const { return errorstat; } /// Buffer to store result messages - void setMessage(string const &m); + void setMessage(string const & m); /// Buffer to store result messages - void setErrorMessage(string const &); + void setErrorMessage(string const &) const; /// Buffer to store result messages - string getMessage() const { return dispatch_buffer; } - /// Get next inset of this class from current cursor position - Inset* getInsetByCode(Inset::Code); - + string const getMessage() const { return dispatch_buffer; } + /// Handle a accented char keysequenze + void handleKeyFunc(kb_action action); /// Should a hint message be displayed? void setHintMessage(bool); - private: /// - LyXView *owner; - /// - static kb_func_table* lyx_func_table; - /// - static kb_func_table *lyx_func_args; + LyXView * owner; /// static int psd_idx; /// @@ -87,7 +90,7 @@ private: /// unsigned meta_fake_bit; /// - void moveCursorUpdate(bool selecting = false); + void moveCursorUpdate(bool flag = true, bool selecting = false); /// void setupLocalKeymap(); /// @@ -95,37 +98,36 @@ private: /// kb_action lyx_calling_dead_action; /// Error status, only Dispatch can change this flag - bool errorstat; + mutable bool errorstat; /** Buffer to store messages and result data. Is there a - good reason to have this one as static in Dispatch? (Ale) - */ - string dispatch_buffer; + good reason to have this one as static in Dispatch? (Ale) + */ + mutable string dispatch_buffer; /// Command name and shortcut information string commandshortcut; // I think the following should be moved to BufferView. (Asger) /// - void MenuNew(bool fromTemplate); + void menuNew(bool fromTemplate); /// - void MenuOpen(); + void open(string const &); /// - void doImportLaTeX(bool); + void doImport(string const &); /// - void doImportASCII(bool); - + void closeBuffer(); /// - void MenuInsertLyXFile(string const &); - + void reloadBuffer(); /// - void CloseBuffer(); + // This return or directly text (default) of getLyXText() /// - void reloadBuffer(); - /// This is the same for all lyxfunc objects + LyXText * TEXT(bool) const; + /// + // This is the same for all lyxfunc objects static bool show_sc; }; @@ -133,38 +135,39 @@ private: /*-------------------- inlines --------------------------*/ inline -bool LyXFunc::wasMetaKey() +bool LyXFunc::wasMetaKey() const { return (meta_fake_bit != 0); } inline -string LyXFunc::keyseqStr(int l) +string const LyXFunc::keyseqStr() const { - char text[200]; - keyseq.print(text, l, true); - string tmp(text); - return tmp; + // Why not just remove this function + string text; + keyseq.print(text, true); + return text; } inline -string LyXFunc::keyseqOptions(int l) +string const LyXFunc::keyseqOptions() const { - char text[200]; - keyseq.printOptions(text, l); - string tmp(text); - return tmp; + // Why not just remove this function + string text; + keyseq.printOptions(text); + return text; } inline -bool LyXFunc::keyseqUncomplete() +bool LyXFunc::keyseqUncomplete() const { return (keyseq.length > 0); } + inline void LyXFunc::setHintMessage(bool hm) {