prepare for 1.1.6pre2

[lyx.git] / src / insets / lyxinset.h

diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h
index 05a9b7586b0aeac1fb9120ba2046b2052f60eb44..da544af9be8ef8a69550b5836c5b1829ccce3b2c 100644 (file)
--- a/src/insets/lyxinset.h
+++ b/src/insets/lyxinset.h
@@ -103,20 +103,29 @@ public:
                ///
                THEOREM_CODE, // 30
                ///
-               CAPTION_CODE
+               CAPTION_CODE,
+               ///
+               MATHMACRO_CODE
        };
 
        ///
-       enum { TEXT_TO_INSET_OFFSET = 2 };
+       enum {
+               ///
+               TEXT_TO_INSET_OFFSET = 2
+       };
 
+       ///
        enum EDITABLE {
-           NOT_EDITABLE = 0,
-           IS_EDITABLE,
-           HIGHLY_EDITABLE
+               ///
+               NOT_EDITABLE = 0,
+               ///
+               IS_EDITABLE,
+               ///
+               HIGHLY_EDITABLE
        };
 
        ///
-       Inset() { owner_ = 0; top_x = top_baseline = 0; }
+       Inset() { owner_ = 0; top_x = top_baseline = 0; scx = 0; }
        ///
        virtual ~Inset() {}
        ///
@@ -132,9 +141,9 @@ public:
        virtual void update(BufferView *, LyXFont const &, bool = false)
                {}
        ///
-       virtual LyXFont ConvertFont(LyXFont const & font) const;
+       virtual LyXFont const ConvertFont(LyXFont const & font) const;
        /// what appears in the minibuffer when opening
-       virtual const char * EditMessage() const;
+       virtual string const EditMessage() const;
        ///
        virtual void Edit(BufferView *, int x, int y, unsigned int button);
        ///
@@ -164,7 +173,8 @@ public:
        virtual int Latex(Buffer const *, std::ostream &, bool fragile,
                          bool free_spc) const = 0;
        ///
-       virtual int Ascii(Buffer const *, std::ostream &) const = 0;
+       virtual int Ascii(Buffer const *,
+                         std::ostream &, int linelen = 0) const = 0;
        ///
        virtual int Linuxdoc(Buffer const *, std::ostream &) const = 0;
        ///
@@ -177,12 +187,12 @@ public:
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual Inset::Code LyxCode() const { return NO_CODE; }
   
-       virtual std::vector<string> getLabelList() const {
+       virtual std::vector<string> const getLabelList() const {
                return std::vector<string>();
        }
 
        ///
-       virtual Inset * Clone() const = 0;
+       virtual Inset * Clone(Buffer const &) const = 0;
 
        /// returns true to override begin and end inset in file
        virtual bool DirectWrite() const;
@@ -198,28 +208,34 @@ public:
        ///
        virtual bool InsertInsetAllowed(Inset *) const { return false; }
        ///
-       virtual void setInsetName(const char * s) { name = s; }
+       void setInsetName(string const & s) { name = s; }
        ///
-       virtual string getInsetName() const { return name; }
+       string const getInsetName() const { return name; }
        ///
-       virtual void setOwner(Inset * inset) { owner_ = inset; }
+       void setOwner(Inset * inset) { owner_ = inset; }
        ///
-       virtual Inset * owner() const { return owner_; }
+       Inset * owner() const { return owner_; }
        ///
        int x() const { return top_x; }
        ///
        int y() const { return top_baseline; }
+       //
+       // because we could have fake text insets and have to call this
+       // inside them without cast!!!
        ///
-       /// because we could have fake text insets and have to call this
-       /// inside them without cast!!!
        virtual LyXText * getLyXText(BufferView *) const;
-       virtual void deleteLyXText(BufferView *, bool =true) const {}
+       ///
+       virtual void deleteLyXText(BufferView *, bool = true) const {}
+       ///
        virtual void resizeLyXText(BufferView *) const {}
+       /// returns the actuall scroll-value
+       int scroll() const { return scx; }
 
 protected:
        ///
        mutable int top_x;
        mutable int top_baseline;
+       mutable int scx;
 
 private:
        ///
@@ -283,14 +299,14 @@ public:
        }
 
        ///
-       UpdatableInset() { scx = mx_scx = 0; }
+       UpdatableInset() {}
        ///
        virtual EDITABLE Editable() const;
    
        /// may call ToggleLockedInsetCursor
        virtual void ToggleInsetCursor(BufferView *);
        ///
-       virtual void ShowInsetCursor(BufferView *);
+       virtual void ShowInsetCursor(BufferView *, bool show=true);
        ///
        virtual void HideInsetCursor(BufferView *);
        ///
@@ -324,7 +340,7 @@ public:
        virtual UpdatableInset * GetFirstLockingInsetOfType(Inset::Code c)
                { return (c == LyxCode()) ? this : 0; }
        ///
-       virtual int InsetInInsetY() { return 0; }
+       virtual unsigned int InsetInInsetY() { return 0; }
        ///
        virtual bool UpdateInsetInInset(BufferView *, Inset *)
                { return false; }
@@ -341,14 +357,16 @@ public:
        virtual bool isCursorVisible() const { return cursor_visible; }
        ///
        virtual int getMaxWidth(Painter & pain, UpdatableInset const *) const;
+       ///
+       int scroll() const { return scx; }
 
 protected:
        ///
        mutable bool cursor_visible;
 
-private:
-       ///
-       int mx_scx;
-       mutable int scx;
+       // scrolls to absolute position in bufferview-workwidth * sx units
+       void scroll(BufferView *, float sx) const;
+       // scrolls offset pixels
+       void scroll(BufferView *, int offset) const;
 };
 #endif