updates to minipage inset

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index b5dab5d5f171fa10cfcf23bacd74fb8bcb7e2885..e14b164512f986c46b8e1488b13b79060a3fadb1 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,26 +33,40 @@ 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:
+    ///
+    /// numbers need because of test if codeA < codeB
     ///
     enum UpdateCodes {
+       ///
        NONE = 0,
-       INIT,
-       FULL,
-       CURSOR_PAR,
-       CURSOR,
-       SELECTION,
-       DRAW_FRAME,
-       CLEAR_FRAME
+       ///
+       CURSOR = 1,
+       ///
+       CLEAR_FRAME = 2,
+       ///
+       DRAW_FRAME = 4,
+       ///
+       SELECTION = 8,
+       ///
+       CURSOR_PAR = 16,
+       ///
+       FULL = 32,
+       ///
+       INIT = 64
     };
     ///
     enum DrawFrame {
+       ///
        NEVER = 0,
+       ///
        LOCKED,
+       ///
        ALWAYS
     };
     ///
@@ -62,9 +77,9 @@ public:
     ///
     ~InsetText();
     ///
-    Inset * Clone() const;
+    Inset * Clone(Buffer const &) const;
     ///
-    InsetText & operator= (InsetText const & it);
+    InsetText & operator=(InsetText const & it);
     ///
     void clear();
     ///
@@ -84,7 +99,9 @@ public:
     ///
     void update(BufferView *, LyXFont const &, bool =false);
     ///
-    char const * EditMessage() const;
+    void SetUpdateStatus(BufferView *, int what);
+    ///
+    string const EditMessage() const;
     ///
     void Edit(BufferView *, int, int, unsigned int);
     ///
@@ -108,16 +125,16 @@ public:
     ///
     void InsetKeyPress(XKeyEvent *);
     ///
-    UpdatableInset::RESULT LocalDispatch(BufferView *, int, string const &);
+    UpdatableInset::RESULT LocalDispatch(BufferView *, kb_action, string 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;
     ///
@@ -125,7 +142,7 @@ public:
     ///
     void GetCursorPos(BufferView *, int & x, int & y) const;
     ///
-    int InsetInInsetY();
+    unsigned int InsetInInsetY();
     ///
     void ToggleInsetCursor(BufferView *);
     ///
@@ -145,30 +162,34 @@ public:
     ///
     void SetParagraphData(LyXParagraph *);
     ///
+    void SetText(string const &);
+    ///
     void SetAutoBreakRows(bool);
     ///
     void SetDrawFrame(BufferView *, DrawFrame);
     ///
     void SetFrameColor(BufferView *, LColor::color);
     ///
-//    LyXFont GetDrawFont(BufferView *, LyXParagraph *, int pos) const;
+    LyXText * getLyXText(BufferView const *, bool const recursive=false) const;
     ///
-    LyXText * getLyXText(BufferView *) const;
     void deleteLyXText(BufferView *, bool recursive=true) const;
+    ///
     void resizeLyXText(BufferView *) const;
-
+    ///
     LyXParagraph * par;
     ///
-    mutable UpdateCodes need_update;
+    mutable int need_update;
 
 protected:
     ///
-    void UpdateLocal(BufferView *, UpdateCodes, bool mark_dirty);
-
+    void UpdateLocal(BufferView *, int what, bool mark_dirty);
+    ///
     mutable int drawTextXOffset;
+    ///
     mutable int drawTextYOffset;
     ///
     bool autoBreakRows;
+    ///
     DrawFrame drawFrame;
     ///
     LColor::color frame_color;
@@ -181,13 +202,24 @@ 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 moveRightIntern(BufferView *, bool behind,
+                                          bool activate_inset = true,
+                                          bool selecting = false);
+    ///
+    UpdatableInset::RESULT moveLeftIntern(BufferView *, bool behind, 
+                                         bool activate_inset = true,
+                                         bool selecting = false);
+
     ///
     UpdatableInset::RESULT moveUp(BufferView *);
     ///
@@ -195,16 +227,25 @@ 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;
+    ///
+    bool cboundary(BufferView *) const;
+    ///
     Row * crow(BufferView *) const;
 
     /// This instead of a macro
@@ -217,15 +258,22 @@ private:
     mutable bool locked;
     ///
     mutable int insetAscent;
+    ///
     mutable int insetDescent;
+    ///
     mutable int insetWidth;
+    ///
     mutable int last_width;
+    ///
     mutable int last_height;
+    ///
     mutable int top_y;
     ///
     LyXParagraph * inset_par;
     ///
-    int inset_pos;
+    LyXParagraph::size_type inset_pos;
+    ///
+    bool inset_boundary;
     ///
     mutable int inset_x;
     ///