A couple of minor bug fixes and cleanups

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index a2f41d22212ffec7c9aee905b723bb3ce6557339..05a390b28fed8b7aa3e659f5fe6e0e9e753b2c4a 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -1,13 +1,21 @@
 // -*- 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 "BufferView.h"
 #include "commandtags.h"
-#include "frontends/mouse_state.h"
-#include "frontends/key_state.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"
@@ -22,9 +30,6 @@
 class LyXView;
 class WorkArea;
 class LyXScreen;
-
-// FIXME: remove
-#include <X11/Xlib.h>
  
 ///
 struct BufferView::Pimpl : public boost::signals::trackable {
@@ -32,17 +37,13 @@ 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();
        ///
@@ -53,26 +54,28 @@ 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 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);
+       /// wheel mouse scroll
+       int scroll(long time);
        ///
-       int scrollUp(long time);
-       ///
-       int scrollDown(long time);
-       ///
-       void workAreaKeyPress(KeySym, key_modifier::state state);
+       void workAreaKeyPress(LyXKeySymPtr key,
+                             key_modifier::state state);
        ///
        void workAreaMotionNotify(int x, int y, mouse_button::state state);
        ///
@@ -88,10 +91,6 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        void selectionLost();
        ///
-       void enterView();
-       ///
-       void leaveView();
-       ///
        void cursorToggle();
        ///
        void cursorPrevious(LyXText *);
@@ -109,19 +108,9 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        bool isSavedPosition(unsigned int i);
        ///
        void setState();
-#if 0
-       ///
-       void insetSleep();
-       ///
-       void insetWakeup();
-#endif
        ///
        void insetUnlock();
        ///
-       bool focus() const;
-       ///
-       void focus(bool);
-       ///
        void showCursor();
        ///
        void hideCursor();
@@ -179,8 +168,6 @@ private:
        ///
        boost::scoped_ptr<WorkArea> workarea_;
        ///
-       long current_scrollbar_value;
-       ///
        Timeout cursor_timeout;
        ///
        void pasteClipboard(bool asPara);
@@ -210,7 +197,5 @@ private:
        Inset * getInsetByCode(Inset::Code code);
        ///
        void MenuInsertLyXFile(string const & filen);
-       ///
-       bool inset_slept;
 };
-#endif
+#endif // BUFFERVIEW_PIMPL_H