fix to checkInsetHit() from John

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 1a96bd100bf9be810caf7aaede70127f499a10c3..27c4961b068da93bc4bdf15233140c4e73bb298d 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -3,9 +3,16 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
+#include <boost/smart_ptr.hpp>
+
 #include "BufferView.h"
 #include "UpdateInset.h"
-#include "Timeout.h"
+#include "commandtags.h"
+#include "frontends/Timeout.h"
+#include "WorkArea.h"
+#include "box.h"
+#include "insets/insetspecialchar.h"
+#include "support/types.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -15,12 +22,8 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Object;
-#endif
-
 ///
-struct BufferView::Pimpl : public Object {
+struct BufferView::Pimpl : public SigC::Object {
        ///
        Pimpl(BufferView * i, LyXView * o,
              int xpos, int ypos, int width, int height);
@@ -35,7 +38,7 @@ struct BufferView::Pimpl : public Object {
        ///
        void redraw();
        /// Return true if the cursor was fitted.
-       bool fitCursor(LyXText *);
+       bool fitCursor();
        ///
        void redoCurrentBuffer();
        ///
@@ -43,7 +46,7 @@ struct BufferView::Pimpl : public Object {
        ///
        void update();
        //
-       void update(BufferView::UpdateCodes);
+       void update(LyXText *, BufferView::UpdateCodes);
        /// Update pixmap of screen
        void updateScreen();
        ///
@@ -52,9 +55,12 @@ struct BufferView::Pimpl : public Object {
        void updateScrollbar();
        ///
        void scrollCB(double value);
-       ///
-       Inset * checkInsetHit(LyXText *, int & x, int & y,
-                             unsigned int button);
+       /**
+        * 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);
        ///
@@ -84,7 +90,7 @@ struct BufferView::Pimpl : public Object {
        ///
        bool available() const;
        ///
-       void beforeChange();
+       void beforeChange(LyXText *);
        ///
        void savePosition(unsigned int i);
        ///
@@ -118,48 +124,89 @@ struct BufferView::Pimpl : public Object {
        ///
        void center();
        ///
+       bool insertInset(Inset * inset, string const & lout = string());
+       ///
+       void updateInset(Inset * inset, bool mark_dirty);
+       ///
+       bool Dispatch(kb_action action, string const & argument);
+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; 
+       ///
+       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();
+       ///
+       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_;
        ///
        LyXView * owner_;
        ///
        Buffer * buffer_;
        ///
-       LyXScreen * screen_;
+       boost::scoped_ptr<LyXScreen> screen_;
        ///
        long current_scrollbar_value;
        ///
-       FL_OBJECT * figinset_canvas;
-       ///
        Timeout cursor_timeout;
-        ///
-       int last_click_x;
-       ///
-       int last_click_y;
        ///
-       WorkArea * workarea_;
+       WorkArea workarea_;
        ///
        UpdateInset updatelist;
        ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;
-private:
        ///
        bool using_xterm_cursor;
-
+       ///
        struct Position {
                /// Filename
-                string filename;
-                /// Cursor paragraph Id
-                int par_id;
-                /// Cursor position
-                int par_pos;
+               string filename;
+               /// Cursor paragraph Id
+               int par_id;
+               /// Cursor position
+               lyx::pos_type par_pos;
                ///
                Position() : par_id(0), par_pos(0) {}
                ///
-               Position(string const & f, int id, int pos)
-                        : filename(f), par_id(id), par_pos(pos) {}
+               Position(string const & f, int id, lyx::pos_type pos)
+                       : filename(f), par_id(id), par_pos(pos) {}
        };
+       ///
        std::vector<Position> saved_positions;
+       ///
+       void moveCursorUpdate(bool selecting);
+       /// Get next inset of this class from current cursor position  
+       Inset * getInsetByCode(Inset::Code code);
+       ///
+       void MenuInsertLyXFile(string const & filen);
+       ///
+       bool inset_slept;
 };
 #endif