After a hiatus, I'm returning to the rewrite of InsetCommandParams, the purpose of...

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index bb5cab78ace1df3dd49e80856ad8cf98617400de..692fc732335ffd71eb2b8d02a509c7738c5adb85 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -17,7 +17,6 @@
 
 #include "KeySequence.h"
 #include "lfuns.h"
-#include "TextClassPtr.h"
 
 #include "support/docstring.h"
 
@@ -29,6 +28,7 @@ class FuncRequest;
 class FuncStatus;
 class KeySymbol;
 class Text;
+class TextClassIndex;
 
 namespace support {
 class FileName;
@@ -38,6 +38,7 @@ namespace frontend {
 class LyXView;
 }
 
+
 /** This class encapsulates all the LyX command operations.
     This is the class of the LyX's "high level event handler".
     Every user command is processed here, either invocated from
@@ -87,9 +88,14 @@ public:
        ///             not the current buffer
        void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
-       /// load a buffer into the current workarea.
-       Buffer * loadAndViewFile(support::FileName const &  name, ///< File to load.
-               bool tolastfiles = true);  ///< append to the "Open recent" menu?
+       /// cursor x position before dispatch started
+       int cursorBeforeDispatchX() const {
+               return cursorPosBeforeDispatchX_;
+       }
+       /// cursor y position before dispatch started
+       int cursorBeforeDispatchY() const {
+               return cursorPosBeforeDispatchY_;
+       }
 
 private:
        ///
@@ -108,6 +114,10 @@ private:
        ///
        KeyModifier meta_fake_bit;
 
+       /// cursor position before dispatch started
+       int cursorPosBeforeDispatchX_;
+       int cursorPosBeforeDispatchY_;
+
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;
 
@@ -120,13 +130,6 @@ private:
        void sendDispatchMessage(docstring const & msg,
                FuncRequest const & ev);
 
-       // I think the following should be moved to BufferView. (Asger)
-       ///
-       void menuNew(std::string const & argument, bool fromTemplate);
-       ///
-       void open(std::string const &);
-       ///
-       void doImport(std::string const &);
        ///
        void closeBuffer();
        ///
@@ -134,7 +137,7 @@ private:
        ///
        bool ensureBufferClean(BufferView * bv);
        ///
-       void updateLayout(TextClassPtr const & oldlayout, Buffer * buffer);
+       void updateLayout(TextClassIndex const & oldlayout, Buffer * buffer);
 };
 
 /// Implementation is in LyX.cpp