updates to minipage inset

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 349caf60ea26059c12ef32fa51469327f8c7d1d8..e14b164512f986c46b8e1488b13b79060a3fadb1 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -39,24 +39,26 @@ class LyXScreen;
  */
 class InsetText : public UpdatableInset {
 public:
+    ///
+    /// numbers need because of test if codeA < codeB
     ///
     enum UpdateCodes {
        ///
        NONE = 0,
        ///
-       INIT,
+       CURSOR = 1,
        ///
-       FULL,
+       CLEAR_FRAME = 2,
        ///
-       CURSOR_PAR,
+       DRAW_FRAME = 4,
        ///
-       CURSOR,
+       SELECTION = 8,
        ///
-       SELECTION,
+       CURSOR_PAR = 16,
        ///
-       DRAW_FRAME,
+       FULL = 32,
        ///
-       CLEAR_FRAME
+       INIT = 64
     };
     ///
     enum DrawFrame {
@@ -97,6 +99,8 @@ public:
     ///
     void update(BufferView *, LyXFont const &, bool =false);
     ///
+    void SetUpdateStatus(BufferView *, int what);
+    ///
     string const EditMessage() const;
     ///
     void Edit(BufferView *, int, int, unsigned int);
@@ -121,7 +125,7 @@ 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;
@@ -130,7 +134,7 @@ public:
     ///
     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;
     ///
@@ -158,13 +162,15 @@ public:
     ///
     void SetParagraphData(LyXParagraph *);
     ///
+    void SetText(string const &);
+    ///
     void SetAutoBreakRows(bool);
     ///
     void SetDrawFrame(BufferView *, DrawFrame);
     ///
     void SetFrameColor(BufferView *, LColor::color);
     ///
-    LyXText * getLyXText(BufferView *) const;
+    LyXText * getLyXText(BufferView const *, bool const recursive=false) const;
     ///
     void deleteLyXText(BufferView *, bool recursive=true) const;
     ///
@@ -172,11 +178,11 @@ public:
     ///
     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;
     ///
@@ -206,6 +212,15 @@ private:
     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 *);
     ///
     UpdatableInset::RESULT moveDown(BufferView *);
@@ -229,6 +244,8 @@ private:
     ///
     LyXParagraph * cpar(BufferView *) const;
     ///
+    bool cboundary(BufferView *) const;
+    ///
     Row * crow(BufferView *) const;
 
     /// This instead of a macro
@@ -256,6 +273,8 @@ private:
     ///
     LyXParagraph::size_type inset_pos;
     ///
+    bool inset_boundary;
+    ///
     mutable int inset_x;
     ///
     mutable int inset_y;