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 7dbea916305364e01dd7a9a339312a2bedd96c5f..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 "BackStack.h"
+#include "commandtags.h"
+#include "frontends/Timeout.h"
+#include "WorkArea.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -15,7 +19,9 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 
-struct BufferView::Pimpl {
+///
+struct BufferView::Pimpl : public SigC::Object {
+       ///
        Pimpl(BufferView * i, LyXView * o,
              int xpos, int ypos, int width, int height);
        ///
@@ -29,17 +35,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 gotoError();
+       //
+       void update(LyXText *, BufferView::UpdateCodes);
        /// Update pixmap of screen
        void updateScreen();
        ///
@@ -49,22 +53,21 @@ struct BufferView::Pimpl {
        ///
        void scrollCB(double value);
        ///
-       void create_view();
-       ///
-       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);
        ///
        void workAreaButtonRelease(int x, int y, unsigned int button);
        ///
-       void workAreaSelectionNotify(Window win, XEvent * event);
-       ///
        void doubleClick(int x, int y, unsigned int button);
        ///
        void tripleClick(int x, int y, unsigned int button);
@@ -75,17 +78,19 @@ struct BufferView::Pimpl {
        ///
        void cursorToggle();
        ///
-       void cursorPrevious();
+       void cursorPrevious(LyXText *);
        ///
-       void cursorNext();
+       void cursorNext(LyXText *);
        ///
        bool available() const;
        ///
-       void beforeChange();
+       void beforeChange(LyXText *);
        ///
-       void savePosition();
+       void savePosition(unsigned int i);
        ///
-       void restorePosition();
+       void restorePosition(unsigned int i);
+       ///
+       bool isSavedPosition(unsigned int i);
        ///
        void setState();
        ///
@@ -113,32 +118,82 @@ struct BufferView::Pimpl {
        ///
        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;
        ///
-       bool lyx_focus;
+       Timeout cursor_timeout;
        ///
-       bool work_area_focus;
+       WorkArea workarea_;
        ///
-       FL_OBJECT * figinset_canvas;
-       ///
-       FL_OBJECT * timer_cursor;
-        ///
-        BackStack backstack;
+       UpdateInset updatelist;
        ///
-       int last_click_x, last_click_y;
+       void pasteClipboard(bool asPara);
        ///
-       WorkArea * workarea;
+       void stuffClipboard(string const &) const;
        ///
-       UpdateInset updatelist;
-private:
        bool using_xterm_cursor;
+       ///
+       struct Position {
+               /// Filename
+                string filename;
+                /// Cursor paragraph Id
+                int par_id;
+                /// Cursor position
+                LyXParagraph::size_type par_pos;
+               ///
+               Position() : par_id(0), par_pos(0) {}
+               ///
+               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