More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index eae9c2a4afd5bdfa06d4589862f2ee950eba0c88..7eaef53b6d3cffeb37ef0492aaed15112641377c 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -16,7 +16,13 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 
-struct BufferView::Pimpl {
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
+
+///
+struct BufferView::Pimpl : public Object {
+       ///
        Pimpl(BufferView * i, LyXView * o,
              int xpos, int ypos, int width, int height);
        ///
@@ -30,15 +36,15 @@ struct BufferView::Pimpl {
        ///
        void redraw();
        /// Return true if the cursor was fitted.
-       bool fitCursor();
+       bool fitCursor(LyXText *);
        ///
        void redoCurrentBuffer();
        ///
        int resizeCurrentBuffer();
        ///
        void update();
-       ///
-       void update(signed char f);
+       //
+       void update(BufferView::UpdateCodes);
        ///
        void gotoError();
        /// Update pixmap of screen
@@ -49,17 +55,16 @@ struct BufferView::Pimpl {
        void updateScrollbar();
        ///
        void scrollCB(double value);
-#if 0
-       ///
-       void create_view();
-#endif
        ///
-       Inset * checkInsetHit(int & x, int & y, unsigned int button);
+       Inset * checkInsetHit(LyXText *, int & x, int & y,
+                             unsigned int button);
        /// 
        int scrollUp(long time);
        ///
        int scrollDown(long time);
        ///
+       void workAreaKeyPress(KeySym, unsigned int state);
+       ///
        void workAreaMotionNotify(int x, int y, unsigned int state);
        ///
        void workAreaButtonPress(int x, int y, unsigned int button);
@@ -76,9 +81,9 @@ struct BufferView::Pimpl {
        ///
        void cursorToggle();
        ///
-       void cursorPrevious();
+       void cursorPrevious(LyXText *);
        ///
-       void cursorNext();
+       void cursorNext(LyXText *);
        ///
        bool available() const;
        ///
@@ -122,27 +127,21 @@ struct BufferView::Pimpl {
        ///
        Buffer * buffer_;
        ///
-       LyXScreen * screen;
+       LyXScreen * screen_;
        ///
        long current_scrollbar_value;
        ///
-       bool lyx_focus;
-       ///
-       bool work_area_focus;
-       ///
        FL_OBJECT * figinset_canvas;
-#if 0
        ///
-       FL_OBJECT * timer_cursor;
-#else
        Timeout cursor_timeout;
-#endif
         ///
         BackStack backstack;
        ///
-       int last_click_x, last_click_y;
+       int last_click_x;
+       ///
+       int last_click_y;
        ///
-       WorkArea * workarea;
+       WorkArea * workarea_;
        ///
        UpdateInset updatelist;
        ///
@@ -150,6 +149,7 @@ struct BufferView::Pimpl {
        ///
        void stuffClipboard(string const &) const;
 private:
+       ///
        bool using_xterm_cursor;
 };
 #endif