X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettabular.h;h=21c7a728fa05cdd924df6f3402e71d32007f97d4;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=a13b2ec7cb325457cc73856bcdc8ee2463baf75a;hpb=2956e084bbd898e28358f8ca343ed297441e2000;p=lyx.git diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index a13b2ec7cb..21c7a728fa 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -8,21 +8,11 @@ * * Full author contact details are available in file CREDITS. */ -// This is the rewrite of the tabular (table) support. -// It will probably be a lot of work. -// One first goal could be to make the inset read the old table format -// and just output it again... no viewing at all. +// This is Juergen's rewrite of the tabular (table) support. -// When making the internal structure of tabular support I really think -// that STL containers should be used. This will separate the container from -// the rest of the code, which is a good thing. - -// Ideally the tabular support should do as the mathed and use -// LaTeX in the .lyx file too. - -// Things to think of when desingning the new tabular support: +// Things to think of when designing the new tabular support: // - color support (colortbl, color) // - decimal alignment (dcloumn) // - custom lines (hhline) @@ -34,10 +24,7 @@ // This is what I have written about tabular support in the LyX3-Tasks file: // // o rewrite of table code. Should probably be written as some -// kind of an inset. At least get the code out of the kernel. -// - colortbl -multirow -// - hhline -multicolumn -// - dcolumn +// kind of an inset. [Done] // o enhance longtable support // Lgb @@ -47,46 +34,47 @@ #include "inset.h" #include "tabular.h" -#include "frontends/mouse_state.h" +#include "mailinset.h" + +namespace lyx { class FuncStatus; class LyXLex; -class Painter; class BufferView; class Buffer; class BufferParams; class Paragraph; +class CursorSlice; -class InsetTabular : public UpdatableInset { +namespace frontend { class Painter; } + +class InsetTabular : public InsetOld { public: /// - InsetTabular(Buffer const &, int rows = 1, int columns = 1); - /// - InsetTabular(InsetTabular const &); + InsetTabular(Buffer const &, row_type rows = 1, + col_type columns = 1); /// ~InsetTabular(); /// - virtual std::auto_ptr clone() const; - /// void read(Buffer const &, LyXLex &); /// void write(Buffer const &, std::ostream &) const; /// - void metrics(MetricsInfo &, Dimension &) const; + bool metrics(MetricsInfo &, Dimension &) const; /// void draw(PainterInfo & pi, int x, int y) const; /// - std::string const editMessage() const; + void drawSelection(PainterInfo & pi, int x, int y) const; /// - void updateLocal(BufferView *) const; + virtual docstring const editMessage() const; /// - int insetInInsetY() const; + EDITABLE editable() const { return HIGHLY_EDITABLE; } /// - bool insertInset(BufferView *, InsetOld *); + bool insetAllowed(InsetBase::Code) const { return true; } /// - bool insetAllowed(InsetOld::Code code) const; + bool allowSpellCheck() const { return true; } /// - bool isTextInset() const { return true; } + bool canTrackChanges() const { return true; } /** returns true if, when outputing LaTeX, font changes should be closed before generating this inset. This is needed for insets that may contain several paragraphs */ @@ -94,187 +82,130 @@ public: /// bool display() const { return tabular.isLongTabular(); } /// - int latex(Buffer const &, std::ostream &, + int latex(Buffer const &, odocstream &, OutputParams const &) const; /// - int plaintext(Buffer const &, std::ostream &, + int plaintext(Buffer const &, odocstream &, OutputParams const &) const; /// - int linuxdoc(Buffer const &, std::ostream &, - OutputParams const &) const; - /// - int docbook(Buffer const &, std::ostream &, + int docbook(Buffer const &, odocstream &, OutputParams const &) const; /// void validate(LaTeXFeatures & features) const; /// - InsetOld::Code lyxCode() const { return InsetOld::TABULAR_CODE; } - /// get the absolute screen x,y of the cursor - void getCursorPos(BufferView *, int & x, int & y) const; + Code lyxCode() const { return InsetBase::TABULAR_CODE; } + /// get offset of this cursor slice relative to our upper left corner + void cursorPos(BufferView const & bv, CursorSlice const & sl, + bool boundary, int & x, int & y) const; /// - bool tabularFeatures(BufferView * bv, std::string const & what); + bool tabularFeatures(LCursor & cur, std::string const & what); /// - void tabularFeatures(BufferView * bv, LyXTabular::Feature feature, + void tabularFeatures(LCursor & cur, LyXTabular::Feature feature, std::string const & val = std::string()); /// - int getActCell() const { return actcell; } - /// - void setFont(BufferView *, LyXFont const &, bool toggleall = false, - bool selectall = false); - /// void openLayoutDialog(BufferView *) const; /// bool showInsetDialog(BufferView *) const; + /// number of cells + size_t nargs() const { return tabular.getNumberOfCells(); } /// - FuncStatus getStatus(std::string const & argument) const; - /// Appends \c list with all labels found within this inset. - void getLabelList(Buffer const &, std::vector & list) const; - /// - int scroll(bool recursive=true) const; - /// - void scroll(BufferView *bv, float sx) const { - UpdatableInset::scroll(bv, sx); - } - /// - void scroll(BufferView *bv, int offset) const { - UpdatableInset::scroll(bv, offset); - } + boost::shared_ptr cell(idx_type) const; /// - ParagraphList * getParagraphs(int) const; - /// - int numParagraphs() const; + boost::shared_ptr cell(idx_type); /// LyXText * getText(int) const; - /// - void markErased(); + /// set the change for the entire inset + void setChange(Change const & change); + /// accept the changes within the inset + void acceptChanges(); + /// reject the changes within the inset + void rejectChanges(); - // this should return true if we have a "normal" cell, otherwise true. + // this should return true if we have a "normal" cell, otherwise false. // "normal" means without width set! - bool forceDefaultParagraphs(InsetOld const * in) const; + /// should all paragraphs be output with "Standard" layout? + bool forceDefaultParagraphs(idx_type cell = 0) const; /// - void addPreview(lyx::graphics::PreviewLoader &) const; - - // - // Public structures and variables - /// - mutable LyXTabular tabular; - - /// are some cells selected ? - bool hasSelection() const { return has_selection; } + void addPreview(graphics::PreviewLoader &) const; /// Buffer const & buffer() const; /// set the owning buffer - void buffer(Buffer * buf); + void buffer(Buffer const * buf); /// lock cell with given index - void edit(BufferView * bv, bool); + void edit(LCursor & cur, bool left); /// - void edit(BufferView * bv, int, int); + InsetBase * editXY(LCursor & cur, int x, int y); /// can we go further down on mouse click? bool descendable() const { return true; } -protected: - /// - virtual - DispatchResult - priv_dispatch(FuncRequest const &, idx_type &, pos_type &); -private: - /// - void lfunMousePress(FuncRequest const &); - /// - void lfunMouseRelease(FuncRequest const &); - /// - void lfunMouseMotion(FuncRequest const &); - /// - void calculate_dimensions_of_cells(MetricsInfo & mi) const; + + // + // Public structures and variables /// - void drawCellLines(Painter &, int x, int baseline, - int row, int cell) const; + mutable LyXTabular tabular; + +protected: /// - void drawCellSelection(Painter &, int x, int baseline, - int row, int column, int cell) const; + InsetTabular(InsetTabular const &); /// - void setPos(BufferView *, int x, int y) const; + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// - DispatchResult moveRight(BufferView *, bool lock); + bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const; /// - DispatchResult moveLeft(BufferView *, bool lock); + int scroll() const { return scx_; } + +private: + virtual std::auto_ptr doClone() const; + /// - DispatchResult moveUp(BufferView *, bool lock); + void drawCellLines(frontend::Painter &, int x, int y, row_type row, + idx_type cell, bool erased) const; /// - DispatchResult moveDown(BufferView *, bool lock); + void setCursorFromCoordinates(LCursor & cur, int x, int y) const; + /// - bool moveNextCell(BufferView *, bool lock = false); + void moveNextCell(LCursor & cur); /// - bool movePrevCell(BufferView *, bool lock = false); + void movePrevCell(LCursor & cur); /// - int getCellXPos(int cell) const; + int getCellXPos(idx_type cell) const; /// - void resetPos(BufferView *) const; + void resetPos(LCursor & cur) const; /// void removeTabularRow(); /// - void clearSelection() const { - sel_cell_start = sel_cell_end = 0; - has_selection = false; - } - void setSelection(int start, int end) const { - sel_cell_start = start; - sel_cell_end = end; - has_selection = true; - } - /// - bool activateCellInset(BufferView *, int x = 0, int y = 0, - bool behind = false); - /// - bool hasPasteBuffer() const; + bool copySelection(LCursor & cur); /// - bool copySelection(BufferView *); + bool pasteSelection(LCursor & cur); /// - bool pasteSelection(BufferView *); + void cutSelection(LCursor & cur); /// - bool cutSelection(BufferParams const & bp); + bool isRightToLeft(LCursor & cur) const; /// - bool isRightToLeft(BufferView *); + void getSelection(LCursor & cur, row_type & rs, row_type & re, + col_type & cs, col_type & ce) const; /// - void getSelection(int & scol, int & ecol, int & srow, int & erow) const; - /// - bool insertAsciiString(BufferView *, std::string const & buf, bool usePaste); + bool insertPlaintextString(BufferView &, docstring const & buf, bool usePaste); + /// are we operating on several cells? + bool tablemode(LCursor & cur) const; + + /// return the "Manhattan distance" to nearest corner + int dist(BufferView &, idx_type cell, int x, int y) const; + /// return the cell nearest to x, y + idx_type getNearestCell(BufferView &, int x, int y) const; - // - // Private structures and variables - /// - InsetText * the_locking_inset; /// Buffer const * buffer_; /// - mutable int cursorx_; - /// - mutable int cursory_; - /// true if a set of cells are selected - mutable bool has_selection; - /// the starting cell selection nr - mutable int sel_cell_start; - /// the ending cell selection nr - mutable int sel_cell_end; - /// - mutable int actcell; - /// - mutable int actcol; + mutable idx_type first_visible_cell; /// - mutable int actrow; - /// - mutable int first_visible_cell; - /// - mutable int in_reset_pos; + mutable int scx_; }; -#include "mailinset.h" - - class InsetTabularMailer : public MailInset { public: /// @@ -285,8 +216,8 @@ public: virtual std::string const & name() const { return name_; } /// virtual std::string const inset2string(Buffer const &) const; - /// Returns the active cell if successful, else -1. - static int string2params(std::string const &, InsetTabular &); + /// + static void string2params(std::string const &, InsetTabular &); /// static std::string const params2string(InsetTabular const &); private: @@ -298,4 +229,6 @@ private: std::string const featureAsString(LyXTabular::Feature feature); +} // namespace lyx + #endif