redraw fix 1.

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index eb004f7d4fbe1d464b09bce73c25646d7ce3db28..05a390b28fed8b7aa3e659f5fe6e0e9e753b2c4a 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -1,18 +1,28 @@
 // -*- C++ -*-
+/**
+ * \file BufferView_pimpl.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author various
+ */
 
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include <boost/smart_ptr.hpp>
-
 #include "BufferView.h"
 #include "commandtags.h"
 #include "frontends/Timeout.h"
-#include "WorkArea.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
@@ -20,22 +30,20 @@
 class LyXView;
 class WorkArea;
 class LyXScreen;
-
+ 
 ///
-struct BufferView::Pimpl : public SigC::Object {
+struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        Pimpl(BufferView * i, LyXView * o,
              int xpos, int ypos, int width, int height);
        ///
-       Painter & painter();
+       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();
        ///
@@ -46,45 +54,43 @@ struct BufferView::Pimpl : public SigC::Object {
        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 scrollCB(double value);
+       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.
         */
        Inset * checkInsetHit(LyXText *, int & x, int & y);
-       /// 
-       int scrollUp(long time);
+       /// wheel mouse scroll
+       int scroll(long time);
        ///
-       int scrollDown(long time);
+       void workAreaKeyPress(LyXKeySymPtr key,
+                             key_modifier::state state);
        ///
-       void workAreaKeyPress(KeySym, unsigned int state);
+       void workAreaMotionNotify(int x, int y, mouse_button::state state);
        ///
-       void workAreaMotionNotify(int x, int y, unsigned int state);
+       void workAreaButtonPress(int x, int y, mouse_button::state button);
        ///
-       void workAreaButtonPress(int x, int y, unsigned int button);
+       void workAreaButtonRelease(int x, int y, mouse_button::state button);
        ///
-       void workAreaButtonRelease(int x, int y, unsigned int button);
+       void doubleClick(int x, int y, mouse_button::state button);
        ///
-       void doubleClick(int x, int y, unsigned int button);
-       ///
-       void tripleClick(int x, int y, unsigned int button);
+       void tripleClick(int x, int y, mouse_button::state button);
        ///
        void selectionRequested();
        ///
        void selectionLost();
        ///
-       void enterView();
-       ///
-       void leaveView();
-       ///
        void cursorToggle();
        ///
        void cursorPrevious(LyXText *);
@@ -103,20 +109,8 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        void setState();
        ///
-       void insetSleep();
-       ///
-       void insetWakeup();
-       ///
        void insetUnlock();
        ///
-       bool focus() const;
-       ///
-       void focus(bool);
-       ///
-       bool active() const;
-       ///
-       bool belowMouse() const;
-       ///
        void showCursor();
        ///
        void hideCursor();
@@ -143,14 +137,12 @@ private:
         * 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; 
+       Inset * checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const;
        ///
        friend class BufferView;
        /// open and lock an updatable inset
        bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
        ///
-       void protectedBlank(LyXText * lt);
-       /// 
        void specialChar(InsetSpecialChar::Kind);
        ///
        void newline();
@@ -174,12 +166,10 @@ private:
        ///
        boost::scoped_ptr<LyXScreen> screen_;
        ///
-       long current_scrollbar_value;
+       boost::scoped_ptr<WorkArea> workarea_;
        ///
        Timeout cursor_timeout;
        ///
-       WorkArea workarea_;
-       ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;
@@ -202,12 +192,10 @@ private:
        ///
        std::vector<Position> saved_positions;
        ///
-       void moveCursorUpdate(bool selecting);
-       /// Get next inset of this class from current cursor position  
+       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);
-       ///
-       bool inset_slept;
 };
-#endif
+#endif // BUFFERVIEW_PIMPL_H