X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.h;h=ccb7301474e953025e62e096d8528bcb35f96388;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=3f38ae51be84832108538edc1b9905076d53ea5d;hpb=e5ec07d51302346f2bd7598de39f8199fd2918d6;p=lyx.git

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 3f38ae51be..ccb7301474 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -13,14 +13,12 @@
 #define INSETTEXT_H
 
 #include "Inset.h"
-#include "Font.h"
+
+#include "ColorCode.h"
 #include "Text.h"
 
 #include "support/types.h"
 
-#include "frontends/mouse_state.h"
-
-
 namespace lyx {
 
 class Buffer;
@@ -28,7 +26,6 @@ class BufferParams;
 class BufferView;
 class CursorSlice;
 class Dimension;
-class Color_color;
 class ParagraphList;
 class InsetTabular;
 
@@ -43,6 +40,11 @@ public:
 	explicit InsetText(BufferParams const &);
 	///
 	InsetText();
+	///
+	InsetText(InsetText const &);
+
+	///
+	Dimension const dimension(BufferView const &) const;
 
 	/// empty inset to empty par
 	void clear();
@@ -51,7 +53,7 @@ public:
 	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
-	bool metrics(MetricsInfo & mi, Dimension & dim) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
@@ -61,9 +63,9 @@ public:
 	///
 	bool canTrackChanges() const { return true; }
 	///
-	InsetText * asTextInset() { return this; }
+	InsetText * asInsetText() { return this; }
 	///
-	InsetText const * asTextInset() const { return this; }
+	InsetText const * asInsetText() const { return this; }
 	///
 	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
@@ -77,7 +79,7 @@ public:
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
 	///
-	Code lyxCode() const { return TEXT_CODE; }
+	InsetCode lyxCode() const { return TEXT_CODE; }
 	///
 	void setText(docstring const &, Font const &, bool trackChanges);
 	///
@@ -87,9 +89,9 @@ public:
 	///
 	void setDrawFrame(bool);
 	///
-	Color_color frameColor() const;
+	ColorCode frameColor() const;
 	///
-	void setFrameColor(Color_color);
+	void setFrameColor(ColorCode);
 	///
 	bool showInsetDialog(BufferView *) const;
 	///
@@ -113,7 +115,7 @@ public:
 	void addPreview(graphics::PreviewLoader &) const;
 
 	///
-	void edit(Cursor & cur, bool left);
+	void edit(Cursor & cur, bool front, EntryDirection entry_from);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 
@@ -124,41 +126,57 @@ public:
 	///
 	ParagraphList const & paragraphs() const;
 	///
-	bool insetAllowed(Code) const { return true; }
+	bool insetAllowed(InsetCode) const { return true; }
 	///
 	bool allowSpellCheck() const { return true; }
 	/// should paragraph indendation be ommitted in any case?
 	bool neverIndent(Buffer const &) const;
 	///
-	InsetText(InsetText const &);
+	virtual bool isMacroScope(Buffer const &) const { return true; }
+	///
+	virtual bool allowMultiPar() const { return true; }
 
 	// Update the counters of this inset and of its contents
 	virtual void updateLabels(Buffer const &, ParIterator const &);
 	///
 	virtual Inset * clone() const;
 
+	///
+	bool completionSupported(Cursor const &) const;
+	///
+	bool inlineCompletionSupported(Cursor const & cur) const;
+	///
+	bool automaticInlineCompletion() const;
+	///
+	bool automaticPopupCompletion() const;
+	///
+	CompletionList const * completionList(Cursor const & cur) const;
+	///
+	docstring completionPrefix(Cursor const & cur) const;
+	///
+	bool insertCompletion(Cursor & cur, docstring const & s, bool finished);
+	///
+	void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
+
 protected:
 	///
 	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 
 private:
 	///
-	void init();
-
+	void setParagraphOwner();
 	///
 	bool drawFrame_;
-	/** We store the Color::color value as an int to get Color.h out
-	 *  of the header file.
-	 */
-	int frame_color_;
+	///
+	ColorCode frame_color_;
 	///
 	mutable pit_type old_pit;
+	///
+	docstring previousWord(Buffer const & buffer, CursorSlice const & sl) const;
 
 public:
 	///
 	mutable Text text_;
-	///
-	static int border_;
 };
 
 } // namespace lyx