In for a penny, in for a pound. Consistent use of // -*- C++ -*-

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index d51bf0f12974544476cb5a5861b4733da61df0b5..f1234753cf994ca39185ffb3adf664ef7614f5e4 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -3,9 +3,13 @@
 #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"
 
 #ifdef __GNUG__
 #pragma interface
@@ -15,12 +19,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);
@@ -43,7 +43,7 @@ struct BufferView::Pimpl : public Object {
        ///
        void update();
        //
-       void update(BufferView::UpdateCodes);
+       void update(LyXText *, BufferView::UpdateCodes);
        /// Update pixmap of screen
        void updateScreen();
        ///
@@ -84,7 +84,7 @@ struct BufferView::Pimpl : public Object {
        ///
        bool available() const;
        ///
-       void beforeChange();
+       void beforeChange(LyXText *);
        ///
        void savePosition(unsigned int i);
        ///
@@ -118,35 +118,60 @@ 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:
+       ///
+       friend class BufferView;
+       /// open and lock an updatable inset
+       bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
+       ///
+       void protectedBlank(LyXText * lt);
+       ///
+       void newline();
+       ///
+       void hfill();
+       ///
+       void menuSeparator();
+       ///
+       void endOfSentenceDot();
+       ///
+       void ldots();
+       ///
+       void hyphenationPoint();
+       ///
+       void insertNote();
+       ///
+       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;
@@ -160,6 +185,15 @@ private:
                Position(string const & f, int id, LyXParagraph::size_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