read the Changelog

[features.git] / src / insets / insettabular.h

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index e4534f480e5a1e32e2fdc84c6919d0fdd6ac45a9..ab4cbb06ccb7c6027c317381c3e7af09445e5304 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -58,11 +58,21 @@ class LyXLex;
 class Painter;
 class BufferView;
 class Buffer;
+class Dialogs;
 
 class InsetTabular : public UpdatableInset {
 public:
     ///
-    InsetTabular(Buffer *, int rows=1, int columns=1);
+    enum UpdateCodes {
+       NONE = 0,
+       INIT,
+       FULL,
+       CELL,
+       CURSOR,
+       SELECTION
+    };
+    ///
+    InsetTabular(Buffer *, int rows = 1, int columns = 1);
     ///
     InsetTabular(InsetTabular const &, Buffer *);
     ///
@@ -70,29 +80,33 @@ public:
     ///
     Inset * Clone() const;
     ///
-    void Read(LyXLex &);
+    void Read(Buffer const *, LyXLex &);
+    ///
+    void Write(Buffer const *, std::ostream &) const;
     ///
-    void Write(std::ostream &) const;
+    int ascent(BufferView *, LyXFont const &) const;
     ///
-    int ascent(Painter &, LyXFont const &) const;
+    int descent(BufferView *, LyXFont const &) const;
     ///
-    int descent(Painter &, LyXFont const &) const;
+    int width(BufferView *, LyXFont const & f) const;
     ///
-    int width(Painter &, LyXFont const & f) const;
+    void draw(BufferView *, const LyXFont &, int , float &, bool) const;
     ///
-    void draw(Painter & pain, const LyXFont &, int , float &) const;
+    void update(BufferView *, LyXFont const &, bool = false);
     ///
     const char * EditMessage() const;
     ///
     void Edit(BufferView *, int x, int y, unsigned int);
     ///
+    bool doClearArea() const { return !locked; };
+    ///
     void InsetUnlock(BufferView *);
     ///
-    void UpdateLocal(BufferView *, bool flag = true);
+    void UpdateLocal(BufferView *, UpdateCodes, bool mark_dirty);
     ///
     bool LockInsetInInset(BufferView *, UpdatableInset *);
     ///
-    bool UnlockInsetInInset(BufferView *, UpdatableInset *, bool lr=false);
+    bool UnlockInsetInInset(BufferView *, UpdatableInset *, bool lr = false);
     ///
     bool UpdateInsetInInset(BufferView *, Inset *);
     ///
@@ -104,6 +118,8 @@ public:
     ///
     bool InsertInset(BufferView *, Inset *);
     ///
+    bool IsTextInset() const { return true; }
+    ///
     bool display() const { return tabular->IsLongTabular(); }
     ///
     void InsetButtonRelease(BufferView *, int, int, int);
@@ -116,23 +132,23 @@ public:
     ///
     UpdatableInset::RESULT LocalDispatch(BufferView *, int, string const &);
     ///
-    int Latex(std::ostream &, bool, bool) const;
+    int Latex(Buffer const *, std::ostream &, bool, bool) const;
     ///
-    int Ascii(std::ostream &) const;
+    int Ascii(Buffer const *, std::ostream &) const;
     ///
-    int Linuxdoc(std::ostream &) const;
+    int Linuxdoc(Buffer const *, std::ostream &) const;
     ///
-    int DocBook(std::ostream &) const;
+    int DocBook(Buffer const *, std::ostream &) const;
     ///
     void Validate(LaTeXFeatures & features) const;
     ///
     Inset::Code LyxCode() const { return Inset::TABULAR_CODE; }
     ///
-    void GetCursorPos(int & x, int & y) const;
+    void GetCursorPos(BufferView *, int & x, int & y) const;
     ///
     void ToggleInsetCursor(BufferView *);
     ///
-    void TabularFeatures(BufferView * bv, int feature, string val="");
+    void TabularFeatures(BufferView * bv, int feature, string val = string());
     ///
     int GetActCell() { return actcell; }
     ///
@@ -141,6 +157,8 @@ public:
     int getMaxWidth(Painter & pain, UpdatableInset const *) const;
     ///
     Buffer * BufferOwner() const { return buffer; }
+    ///
+    void resizeLyXText(BufferView *) const;
 
     ///
     /// Public structures and variables
@@ -148,10 +166,11 @@ public:
     LyXTabular * tabular;
 
 private:
-    void calculate_width_of_cells(Painter &, LyXFont const &) const;
+    bool calculate_dimensions_of_cells(BufferView *, LyXFont const &,
+                                      bool =false) const;
     ///
-    void DrawCellLines(Painter &, int x, int baseline, int row, int cell)
-           const;
+    void DrawCellLines(Painter &, int x, int baseline,
+                      int row, int cell) const;
     ///
     void DrawCellSelection(Painter &, int x, int baseline,
                           int row, int column, int cell) const;
@@ -160,12 +179,10 @@ private:
     ///
     void HideInsetCursor(BufferView *);
     ///
-    void setPos(Painter &, int x, int y) const;
-    ///
-    bool SetCellDimensions(Painter & pain, int cell, int row);
+    void setPos(BufferView *, int x, int y) const;
     ///
-    UpdatableInset::RESULT moveRight(BufferView *, bool lock=true);
-    UpdatableInset::RESULT moveLeft(BufferView *, bool lock=true);
+    UpdatableInset::RESULT moveRight(BufferView *, bool lock = true);
+    UpdatableInset::RESULT moveLeft(BufferView *, bool lock = true);
     UpdatableInset::RESULT moveUp(BufferView *);
     UpdatableInset::RESULT moveDown(BufferView *);
     bool moveNextCell(BufferView *);
@@ -173,29 +190,27 @@ private:
     bool Delete();
     ///
     int getCellXPos(int cell) const;
-    void resetPos(Painter &) const;
+    void resetPos(BufferView *) const;
     ///
     void RemoveTabularRow();
     ///
     bool hasSelection() const {return ((sel_pos_start != sel_pos_end) ||
                                       (sel_cell_start != sel_cell_end));}
     ///
-    bool ActivateCellInset(BufferView *, int x=0, int y=0, int button=0,
+    bool ActivateCellInset(BufferView *, int x = 0, int y = 0, int button = 0,
                           bool behind = false);
     ///
     bool InsetHit(BufferView * bv, int x, int y) const;
     ///
     int GetMaxWidthOfCell(Painter &, int cell) const;
     ///
-    void recomputeTextInsets(Painter &, const LyXFont &) const;
+    void recomputeTextInsets(BufferView *, const LyXFont &) const;
 
     ///
     /// Private structures and variables
     ///
-    InsetText
-        * the_locking_inset;
-    Buffer
-        * buffer;
+    InsetText * the_locking_inset;
+    Buffer * buffer;
     mutable LyXCursor
         cursor,
        old_cursor;
@@ -210,10 +225,9 @@ private:
        oldcell,
         actcol,
         actrow;
-    bool
-        locked,
-        no_selection;
-    mutable bool
-        init_inset;
+    bool no_selection;
+    mutable bool locked;
+    mutable UpdateCodes need_update;
+    mutable Dialogs * dialogs_;
 };
 #endif