Alfredo's second patch

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 3e0c025597ddebbca8f6056d78eac2f0a52dbd05..761d1911dcc66306ebe973eaf8eb5bc2efabf190 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -13,22 +13,18 @@
 #include "BufferView.h"
 #include "frontends/Timeout.h"
 #include "frontends/key_state.h"
-#include "frontends/mouse_state.h"
 #include "frontends/LyXKeySym.h"
-#include "box.h"
-#include "insets/insetspecialchar.h"
 #include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
+class Change;
 class LyXView;
 class WorkArea;
 class LyXScreen;
+class FuncRequest;
 
 ///
 struct BufferView::Pimpl : public boost::signals::trackable {
@@ -37,8 +33,6 @@ struct BufferView::Pimpl : public boost::signals::trackable {
              int xpos, int ypos, int width, int height);
        ///
        Painter & painter() const;
-       /// return the work area for this bview
-       WorkArea & workarea() const;
        /// return the screen for this bview
        LyXScreen & screen() const;
        ///
@@ -53,6 +47,8 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void update();
        //
        void update(LyXText *, BufferView::UpdateCodes);
+       /// update the toplevel lyx text
+       void update(BufferView::UpdateCodes);
        /**
         * Repaint pixmap. Used for when we've made a visible
         * change but don't need the full update() logic
@@ -65,26 +61,11 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        void scrollDocView(int value);
        /**
-        * Returns an inset if inset was hit, or 0 if not.
-        *
-        * If hit, the coordinates are changed relative to the inset.
+        * Wheel mouse scroll, move by multiples of text->defaultRowHeight().
         */
-       Inset * checkInsetHit(LyXText *, int & x, int & y);
-       /// wheel mouse scroll
-       int scroll(long time);
-       ///
-       void workAreaKeyPress(LyXKeySymPtr key,
-                             key_modifier::state state);
-       ///
-       void workAreaMotionNotify(int x, int y, mouse_button::state state);
-       ///
-       void workAreaButtonPress(int x, int y, mouse_button::state button);
+       void scroll(int lines);
        ///
-       void workAreaButtonRelease(int x, int y, mouse_button::state button);
-       ///
-       void doubleClick(int x, int y, mouse_button::state button);
-       ///
-       void tripleClick(int x, int y, mouse_button::state button);
+       void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
        ///
        void selectionRequested();
        ///
@@ -93,6 +74,8 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void cursorToggle();
        ///
        bool available() const;
+       /// get the change at the cursor position
+       Change const getCurrentChange();
        ///
        void beforeChange(LyXText *);
        ///
@@ -118,26 +101,17 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        bool insertInset(Inset * inset, string const & lout = string());
        ///
-       void updateInset(Inset * inset, bool mark_dirty);
-       ///
+       void updateInset(Inset * inset);
+       /// a function should be executed from the workarea
+       bool workAreaDispatch(FuncRequest const & ev);
+       /// a function should be executed
        bool dispatch(FuncRequest const & ev);
 private:
-       /**
-        * Return the on-screen dimensions of the inset at the cursor.
-        * Pre-condition: the cursor must be at an inset.
-        */
-       Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const;
-       /**
-        * check if the given co-ordinates are inside an inset at the
-        * given cursor, if one exists. If so, the inset is returned,
-        * and the co-ordinates are made relative. Otherwise, 0 is returned.
-        */
-       Inset * checkInset(LyXText const & text, LyXCursor const & cursor,
-                          int & x, int & y) const;
+       /// track changes for the document
+       void trackChanges();
+
        ///
        friend class BufferView;
-       ///
-       void hfill();
 
        ///
        BufferView * bv_;
@@ -175,5 +149,7 @@ private:
        Inset * getInsetByCode(Inset::Code code);
        ///
        void MenuInsertLyXFile(string const & filen);
+       /// our workarea
+       WorkArea & workarea() const;
 };
 #endif // BUFFERVIEW_PIMPL_H