remove unused code

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 28958ad5797766e1ad54c19fdcf8cb99c82f8cce..5522450a055e3f48dbaf4a2bde6cd87899801cda 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -11,10 +11,10 @@
 #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"
@@ -28,11 +28,8 @@
 
 class LyXView;
 class WorkArea;
-class LScreen;
+class LyXScreen;
 
-// FIXME: remove
-#include <X11/Xlib.h>
- 
 ///
 struct BufferView::Pimpl : public boost::signals::trackable {
        ///
@@ -43,15 +40,9 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        /// return the work area for this bview
        WorkArea & workarea() const;
        /// return the screen for this bview
-       LScreen & screen() const;
+       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();
        ///
@@ -62,26 +53,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);
        ///
@@ -113,14 +106,10 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        bool isSavedPosition(unsigned int i);
        ///
-       void setState();
+       void switchKeyMap();
        ///
        void insetUnlock();
        ///
-       bool focus() const;
-       ///
-       void focus(bool);
-       ///
        void showCursor();
        ///
        void hideCursor();
@@ -135,7 +124,7 @@ 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.
@@ -143,11 +132,12 @@ private:
         */
        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.
+        * 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;
+       Inset * checkInset(LyXText const & text, LyXCursor const & cursor,
+                          int & x, int & y) const;
        ///
        friend class BufferView;
        /// open and lock an updatable inset
@@ -155,8 +145,6 @@ private:
        ///
        void specialChar(InsetSpecialChar::Kind);
        ///
-       void newline();
-       ///
        void hfill();
        ///
        void smartQuote();
@@ -174,12 +162,10 @@ private:
        ///
        Buffer * buffer_;
        ///
-       boost::scoped_ptr<LScreen> screen_;
+       boost::scoped_ptr<LyXScreen> screen_;
        ///
        boost::scoped_ptr<WorkArea> workarea_;
        ///
-       long current_scrollbar_value;
-       ///
        Timeout cursor_timeout;
        ///
        void pasteClipboard(bool asPara);
@@ -210,4 +196,4 @@ private:
        ///
        void MenuInsertLyXFile(string const & filen);
 };
-#endif
+#endif // BUFFERVIEW_PIMPL_H