fix compilation bug

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 33e75ff208f1f9486134af96ee2893ab27ffeca2..e011a08990783a5bcca3d6c504d0e3e83dc12e17 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -11,26 +11,21 @@
 #define BUFFERVIEW_PIMPL_H
 
 #include "BufferView.h"
-#include "commandtags.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 {
        ///
@@ -38,18 +33,10 @@ 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;
        ///
        void buffer(Buffer *);
-       ///
-       void resize(int xpos, int ypos, int width, int height);
-       ///
-       void resize();
-       ///
-       void redraw();
        /// Return true if the cursor was fitted.
        bool fitCursor();
        ///
@@ -60,35 +47,23 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void update();
        //
        void update(LyXText *, BufferView::UpdateCodes);
-       /// Update pixmap of screen
-       void updateScreen();
+       /**
+        * Repaint pixmap. Used for when we've made a visible
+        * change but don't need the full update() logic
+        */
+       void repaint();
        ///
-       void workAreaExpose();
+       void workAreaResize();
        ///
        void updateScrollbar();
        ///
        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 scroll(int lines);
        ///
-       void workAreaMotionNotify(int x, int y, mouse_button::state state);
-       ///
-       void workAreaButtonPress(int x, int y, mouse_button::state button);
-       ///
-       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();
        ///
@@ -96,11 +71,9 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        void cursorToggle();
        ///
-       void cursorPrevious(LyXText *);
-       ///
-       void cursorNext(LyXText *);
-       ///
        bool available() const;
+       /// get the change at the cursor position
+       Change const getCurrentChange();
        ///
        void beforeChange(LyXText *);
        ///
@@ -110,7 +83,7 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        bool isSavedPosition(unsigned int i);
        ///
-       void setState();
+       void switchKeyMap();
        ///
        void insetUnlock();
        ///
@@ -128,38 +101,14 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        void updateInset(Inset * inset, bool mark_dirty);
        ///
-       bool Dispatch(kb_action action, string const & argument);
+       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;
-       /// open and lock an updatable inset
-       bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
-       ///
-       void specialChar(InsetSpecialChar::Kind);
-       ///
-       void newline();
-       ///
-       void hfill();
-       ///
-       void smartQuote();
-       ///
-       void insertAndEditInset(Inset *);
-       ///
-       void gotoInset(std::vector<Inset::Code> const & codes,
-                      bool same_content);
-       ///
-       void gotoInset(Inset::Code codes, bool same_content);
+
        ///
        BufferView * bv_;
        ///
@@ -173,8 +122,6 @@ private:
        ///
        Timeout cursor_timeout;
        ///
-       void pasteClipboard(bool asPara);
-       ///
        void stuffClipboard(string const &) const;
        ///
        bool using_xterm_cursor;
@@ -194,11 +141,11 @@ private:
        };
        ///
        std::vector<Position> saved_positions;
-       ///
-       void moveCursorUpdate(bool selecting, bool fitcur = true);
        /// Get next inset of this class from current cursor position
        Inset * getInsetByCode(Inset::Code code);
        ///
        void MenuInsertLyXFile(string const & filen);
+       /// our workarea
+       WorkArea & workarea() const;
 };
 #endif // BUFFERVIEW_PIMPL_H