multicol; small stuff

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index d2353d443691b7b55191b0d8a12c7386d0fda1d6..1482b175cb5cd591c24f3bbab848f1500391a76d 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -2,24 +2,17 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
-#include "commandtags.h" // for kb_action enum
 #include "FuncStatus.h"
 #include "kbsequence.h"
+#include "commandtags.h"
 #include "LString.h"
 
-#include "frontends/mouse_state.h"
-#include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
-
 #include <boost/signals/trackable.hpp>
 
 class LyXView;
 class LyXText;
+class FuncRequest;
+class BufferView;
 
 
 /** This class encapsulates all the LyX command operations.
@@ -35,11 +28,11 @@ public:
        LyXFunc(LyXView *);
 
        /// LyX dispatcher, executes lyx actions.
-       void dispatch(kb_action ac, string argument = string(), bool verbose = false);
+       void dispatch(FuncRequest const &, bool verbose = false);
 
        /// Dispatch via a string argument
        void dispatch(string const & s, bool verbose = false);
- 
+
        /// Dispatch via a pseudo action, also displaying shortcut/command name
        void dispatch(int ac, bool verbose = false);
 
@@ -53,8 +46,7 @@ public:
        /// can contain the string argument.
        FuncStatus getStatus(int ac) const;
        ///
-       FuncStatus getStatus(kb_action action,
-                            string const & argument = string()) const;
+       FuncStatus getStatus(FuncRequest const & action) const;
 
        /// The last key was meta
        bool wasMetaKey() const;
@@ -76,9 +68,14 @@ public:
 
 private:
        ///
-       LyXView * owner;
+       BufferView * view() const;
+
        ///
-       static int psd_idx;
+       LyXView * owner;
+
+       /// the last character added to the key sequence, in ISO encoded form
+       char encoded_last_key;
+
        ///
        kb_sequence keyseq;
        ///
@@ -89,10 +86,6 @@ private:
        void moveCursorUpdate(bool flag = true, bool selecting = false);
        ///
        void setupLocalKeymap();
-       ///
-       kb_action lyx_dead_action;
-       ///
-       kb_action lyx_calling_dead_action;
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;
 
@@ -105,7 +98,7 @@ private:
        mutable string status_buffer;
 
        /// send a post-dispatch status message
-       void sendDispatchMessage(string const & msg, kb_action ac, string const & arg, bool verbose);
+       void sendDispatchMessage(string const & msg, FuncRequest const & ev, bool verbose);
 
        // I think the following should be moved to BufferView. (Asger)