X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettabular.h;h=b6a6f93970afbe7cb5beb1799c06f86e05c2b3eb;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=763cc75d6790cea70e6a0dae42e5f2e961a36897;hpb=0ca871014add94c501cb423d8dc65c1405f4d141;p=lyx.git diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 763cc75d67..b6a6f93970 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,7 +34,6 @@ #include "inset.h" #include "tabular.h" -#include "frontends/mouse_state.h" class FuncStatus; class LyXLex; @@ -56,18 +42,16 @@ class BufferView; class Buffer; class BufferParams; class Paragraph; +class CursorSlice; + class InsetTabular : public UpdatableInset { public: /// InsetTabular(Buffer const &, int rows = 1, int columns = 1); /// - InsetTabular(InsetTabular const &); - /// ~InsetTabular(); /// - virtual std::auto_ptr clone() const; - /// void read(Buffer const &, LyXLex &); /// void write(Buffer const &, std::ostream &) const; @@ -78,13 +62,7 @@ public: /// std::string const editMessage() const; /// - void updateLocal(BufferView *) const; - /// - int insetInInsetY() const; - /// - bool insertInset(BufferView *, InsetOld *); - /// - bool insetAllowed(InsetOld::Code code) const; + bool insetAllowed(InsetBase::Code) const { return true; } /// bool isTextInset() const { return true; } /** returns true if, when outputing LaTeX, font changes should @@ -108,38 +86,26 @@ public: /// void validate(LaTeXFeatures & features) const; /// - InsetOld::Code lyxCode() const { return InsetOld::TABULAR_CODE; } + Code lyxCode() const { return InsetBase::TABULAR_CODE; } /// get the absolute screen x,y of the cursor - void getCursorPos(int & x, int & y) const; + void getCursorPos(LCursor const & cur, 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 openLayoutDialog(BufferView *) const; /// bool showInsetDialog(BufferView *) const; - /// - 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; + /// number of cells + size_t nargs() 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(int) const; /// - ParagraphList * getParagraphs(int) const; - /// - int numParagraphs() const; + boost::shared_ptr cell(int); /// LyXText * getText(int) const; @@ -148,124 +114,81 @@ public: // this should return true if we have a "normal" cell, otherwise true. // "normal" means without width set! - bool forceDefaultParagraphs(InsetOld const * in) const; + bool forceDefaultParagraphs(InsetBase const * in) const; /// void addPreview(lyx::graphics::PreviewLoader &) const; - // - // Public structures and variables - /// - mutable LyXTabular tabular; - - /// are some cells selected ? - bool hasSelection() const { return has_selection; } - /// 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) const; /// can we go further down on mouse click? bool descendable() const { return true; } + + // + // Public structures and variables + /// + mutable LyXTabular tabular; + protected: + InsetTabular(InsetTabular const &); + + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); + /// - virtual - DispatchResult - priv_dispatch(FuncRequest const &, idx_type &, pos_type &); + bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const; private: - /// - void lfunMousePress(FuncRequest const &); - /// - void lfunMouseRelease(FuncRequest const &); - /// - void lfunMouseMotion(FuncRequest const &); - /// - void calculate_dimensions_of_cells(MetricsInfo & mi) const; + virtual std::auto_ptr doClone() 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; - /// - void setPos(BufferView *, int x, int y) const; - /// - DispatchResult moveRight(BufferView *, bool lock); + int row, int cell) const; /// - DispatchResult moveLeft(BufferView *, bool lock); + void drawCellSelection(PainterInfo &, int x, int baseline, + int row, int column, int cell) const; /// - DispatchResult moveUp(BufferView *, bool lock); - /// - DispatchResult moveDown(BufferView *, bool lock); + InsetBase * setPos(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; /// - 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(BufferView *); + bool copySelection(LCursor & cur); /// - bool pasteSelection(BufferView *); + bool pasteSelection(LCursor & cur); /// - bool cutSelection(BufferParams const & bp); + void cutSelection(LCursor & cur); /// - bool isRightToLeft(BufferView *); + bool isRightToLeft(LCursor & cur) const; /// - void getSelection(int & scol, int & ecol, int & srow, int & erow) const; + void getSelection(LCursor & cur, + int & rs, int & re, int & cs, int & ce) const; /// - bool insertAsciiString(BufferView *, std::string const & buf, bool usePaste); + bool insertAsciiString(BufferView &, std::string const & buf, bool usePaste); + /// are we operating on several cells? + bool tablemode(LCursor & cur) 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 int actrow; - /// mutable int first_visible_cell; - /// - mutable int in_reset_pos; }; @@ -282,8 +205,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: