prepare for 1.1.6pre2

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 7174d2a55e9901d4565ecafbebb889fd3eaf25ef..cfa525aea591a4ad1f26d9108da1a97ee8e1527e 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -6,6 +6,7 @@
  *
  *           Copyright 1998 The LyX Team.
  *
+ *
  *======================================================
  */
 // The pristine updatable inset: Text
@@ -32,45 +33,63 @@ class LyXText;
 class LyXScreen;
 
 /**
- * A text inset is like a TeX box to write full text
- * (including styles and other insets) in a given space. 
+ A text inset is like a TeX box to write full text
+ (including styles and other insets) in a given space. 
+ @author: Jürgen Vigna
  */
 class InsetText : public UpdatableInset {
 public:
-    ///
-    enum { TEXT_TO_INSET_OFFSET = 2 };
     ///
     enum UpdateCodes {
+       ///
        NONE = 0,
+       ///
        INIT,
+       ///
        FULL,
+       ///
        CURSOR_PAR,
+       ///
        CURSOR,
-       SELECTION
+       ///
+       SELECTION,
+       ///
+       DRAW_FRAME,
+       ///
+       CLEAR_FRAME
+    };
+    ///
+    enum DrawFrame {
+       ///
+       NEVER = 0,
+       ///
+       LOCKED,
+       ///
+       ALWAYS
     };
     ///
-    explicit
     InsetText();
     ///
+    explicit
     InsetText(InsetText const &);
     ///
     ~InsetText();
     ///
-    Inset * Clone() const;
+    Inset * Clone(Buffer const &) const;
     ///
-    InsetText & operator= (InsetText const & it);
+    InsetText & operator=(InsetText const & it);
     ///
-    void clear() const { par->clearContents(); }
+    void clear();
     ///
     void Read(Buffer const *, LyXLex &);
     ///
     void Write(Buffer const *, std::ostream &) const;
     ///
-    int ascent(Painter &, LyXFont const &) const;
+    int ascent(BufferView *, LyXFont const &) const;
     ///
-    int descent(Painter &, LyXFont const &) const;
+    int descent(BufferView *, LyXFont const &) const;
     ///
-    int width(Painter &, LyXFont const & f) const;
+    int width(BufferView *, LyXFont const & f) const;
     ///
     int textWidth(Painter &) const;
     ///
@@ -78,7 +97,7 @@ public:
     ///
     void update(BufferView *, LyXFont const &, bool =false);
     ///
-    char const * EditMessage() const;
+    string const EditMessage() const;
     ///
     void Edit(BufferView *, int, int, unsigned int);
     ///
@@ -104,13 +123,14 @@ public:
     ///
     UpdatableInset::RESULT LocalDispatch(BufferView *, int, string const &);
     ///
-    int Latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const;
+    int Latex(Buffer const *, std::ostream &,
+             bool fragile, bool free_spc) const;
     ///
-    int Ascii(Buffer const *, std::ostream &) const { return 0; }
+    int Ascii(Buffer const *, std::ostream &, int linelen) const;
     ///
     int Linuxdoc(Buffer const *, std::ostream &) const { return 0; }
     ///
-    int DocBook(Buffer const *, std::ostream &) const { return 0; }
+    int DocBook(Buffer const *, std::ostream &) const ;
     ///
     void Validate(LaTeXFeatures & features) const;
     ///
@@ -118,7 +138,7 @@ public:
     ///
     void GetCursorPos(BufferView *, int & x, int & y) const;
     ///
-    int InsetInInsetY();
+    unsigned int InsetInInsetY();
     ///
     void ToggleInsetCursor(BufferView *);
     ///
@@ -130,36 +150,41 @@ public:
     ///
     void SetFont(BufferView *, LyXFont const &, bool toggleall = false);
     ///
+    int getMaxWidth(Painter &, UpdatableInset const *) const;
+    ///
     void init(InsetText const * ins = 0);
     ///
+    void WriteParagraphData(Buffer const *, std::ostream &) const;
+    ///
     void SetParagraphData(LyXParagraph *);
     ///
     void SetAutoBreakRows(bool);
     ///
-    void SetDrawLockedFrame(bool);
+    void SetDrawFrame(BufferView *, DrawFrame);
     ///
-    void SetFrameColor(LColor::color);
-    ///
-    LyXFont GetDrawFont(BufferView *, LyXParagraph *, int pos) const;
+    void SetFrameColor(BufferView *, LColor::color);
     ///
     LyXText * getLyXText(BufferView *) const;
-    void deleteLyXText(BufferView *);
-
+    ///
+    void deleteLyXText(BufferView *, bool recursive=true) const;
+    ///
+    void resizeLyXText(BufferView *) const;
+    ///
     LyXParagraph * par;
+    ///
+    mutable UpdateCodes need_update;
 
 protected:
     ///
     void UpdateLocal(BufferView *, UpdateCodes, bool mark_dirty);
     ///
-    void WriteParagraphData(Buffer const *, std::ostream &) const;
-    ///
-    virtual int getMaxTextWidth(Painter &, UpdatableInset const *) const;
-
     mutable int drawTextXOffset;
+    ///
     mutable int drawTextYOffset;
     ///
     bool autoBreakRows;
-    bool drawLockedFrame;
+    ///
+    DrawFrame drawFrame;
     ///
     LColor::color frame_color;
 
@@ -171,13 +196,15 @@ private:
     ///
     int BeginningOfMainBody(Buffer const *, LyXParagraph * par) const;
     ///
-    void ShowInsetCursor(BufferView *);
+    void ShowInsetCursor(BufferView *, bool show=true);
     ///
     void HideInsetCursor(BufferView *);
     ///
-    UpdatableInset::RESULT moveRight(BufferView *, bool activate_inset = true);
+    UpdatableInset::RESULT moveRight(BufferView *, bool activate_inset = true,
+                                    bool selecting = false);
     ///
-    UpdatableInset::RESULT moveLeft(BufferView *, bool activate_inset = true);
+    UpdatableInset::RESULT moveLeft(BufferView *, bool activate_inset = true,
+                                   bool selecting = false);
     ///
     UpdatableInset::RESULT moveUp(BufferView *);
     ///
@@ -185,34 +212,49 @@ private:
     ///
     void SetCharFont(Buffer const *, int pos, LyXFont const & font);
     ///
-    string getText(int);
+    string const getText(int);
+    ///
+    bool checkAndActivateInset(BufferView * bv, bool behind);
     ///
     bool checkAndActivateInset(BufferView * bv, int x = 0, int y = 0,
                               int button = 0);
+    void removeNewlines();
+
     ///
     int cx(BufferView *) const;
+    ///
     int cy(BufferView *) const;
-    int cpos(BufferView *) const;
+    ///
+    LyXParagraph::size_type cpos(BufferView *) const;
+    ///
     LyXParagraph * cpar(BufferView *) const;
+    ///
     Row * crow(BufferView *) const;
 
-       /// This instead of a macro
-       LyXText * TEXT(BufferView * bv) const {
-               return getLyXText(bv);
-       }
+    /// This instead of a macro
+    LyXText * TEXT(BufferView * bv) const {
+       return getLyXText(bv);
+    }
        
     /* Private structures and variables */
     ///
     mutable bool locked;
     ///
-    int insetAscent;
-    int insetDescent;
-    int insetWidth;
+    mutable int insetAscent;
+    ///
+    mutable int insetDescent;
+    ///
+    mutable int insetWidth;
+    ///
     mutable int last_width;
+    ///
     mutable int last_height;
+    ///
     mutable int top_y;
     ///
-    int inset_pos;
+    LyXParagraph * inset_par;
+    ///
+    LyXParagraph::size_type inset_pos;
     ///
     mutable int inset_x;
     ///
@@ -224,8 +266,6 @@ private:
     ///
     mutable float xpos;
     ///
-    mutable UpdateCodes need_update;
-    ///
     UpdatableInset * the_locking_inset;
     ///
     LyXParagraph * old_par;