X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=6a783e7c231b8f3d73e7bbc86c1ba1de9c2bf4f3;hb=ab254289c832cd045c56e6012d14b048618cb833;hp=3300eef6bb11dda58eb8b5b0ec821a64fc239bdf;hpb=a0e6ddd7f4ddb8511864ac297c3416173f1dff2b;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 3300eef6bb..6a783e7c23 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -16,8 +16,10 @@
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
+#include "LString.h"
 #include "undo.h"
+#include "commandtags.h"
+#include "insets/inset.h"
 #include <boost/utility.hpp>
 
 class LyXView;
@@ -27,9 +29,11 @@ class Buffer;
 class LyXScreen;
 class WorkArea;
 class Language;
+class Painter;
+class UpdatableInset;
 
 ///
-class BufferView : public noncopyable {
+class BufferView : boost::noncopyable {
 public:
 	///
 	enum UpdateCodes {
@@ -54,8 +58,6 @@ public:
 	///
 	LyXScreen * screen() const;
 	///
-	WorkArea * workarea() const;
-	///
 	void buffer(Buffer * b);
 	///
 	void resize(int, int, int, int);
@@ -68,7 +70,7 @@ public:
 	///
 	void update();
 	//
-	void update(UpdateCodes uc);
+	void update(LyXText *, UpdateCodes uc);
 	///
 	void updateScrollbar();
 	///
@@ -79,11 +81,6 @@ public:
 	///
 	int resizeCurrentBuffer();
 	///
-	void gotoInset(std::vector<Inset::Code> const & codes,
-		       bool same_content);
-	///
-	void gotoInset(Inset::Code codes, bool same_content);
-	///
 	void cursorPrevious(LyXText *);
 	///
 	void cursorNext(LyXText *);
@@ -92,7 +89,7 @@ public:
 	///
 	LyXView * owner() const;
 	///
-	void beforeChange();
+	void beforeChange(LyXText *);
         ///
         void savePosition(unsigned int i);
         ///
@@ -118,8 +115,6 @@ public:
 	///
 	void updateInset(Inset * inset, bool mark_dirty);
 	///
-	bool inset_slept;
-	///
 	int slx;
 	///
 	int sly;
@@ -152,35 +147,9 @@ public:
 	///
 	void copyEnvironment();
 	///
-	void hfill();
-	///
-	void protectedBlank();
-	///
-	void newline();
-	///
-	void menuSeparator();
-	///
-	void endOfSentenceDot();
-	///
-	void ldots();
-	///
-	void hyphenationPoint();
-	///
 	void menuUndo();
 	///
 	void menuRedo();
-#ifndef NEW_INSETS
-	///
-	void toggleFloat();
-	///
-	void openStuff();
-#endif
-	///
-	void insertNote();
-#ifndef NEW_INSETS
-	///
-	void allFloats(char flag, char figmar);
-#endif
 	/// removes all autodeletable insets
 	bool removeAutoInsets();
 	///
@@ -191,10 +160,9 @@ public:
 	    Placie it in a layout of lout,
 	    if no_table make sure that it doesn't end up in a table.
 	*/
-	bool insertInset(Inset * inset, string const & lout = string(),
-			 bool no_table = false);
-	/// open and lock an updatable inset
-	bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
+	//bool insertInset(Inset * inset, string const & lout = string(),
+	//		 bool no_table = false);
+	bool insertInset(Inset * inset, string const & lout = string());
 	/** Inserts a lyx file at cursor position.
 	    @return #false# if it fails.
 	*/
@@ -238,24 +206,6 @@ public:
 
 	///
 	void pushIntoUpdateList(Inset * i);
-#if 0
-	///
-	void workAreaExpose();
-	///
-	void workAreaButtonPress(int x, int y, unsigned int button);
-	///
-	void workAreaButtonRelease(int x, int y, unsigned int button);
-	///
-	void workAreaMotionNotify(int x, int y, unsigned int state);
-	///
-	void doubleClick(int x, int y, unsigned int button);
-	///
-	void tripleClick(int x, int y, unsigned int button);
-	///
-	void enterView();
-	///
-	void leaveView();
-#endif
 	///
 	bool ChangeInsets(Inset::Code code, string const & from, 
 			  string const & to);
@@ -264,9 +214,13 @@ public:
 	///
 	bool ChangeCitationsIfUnique(string const & from, string const & to);
 	///
+	string const getClipboard() const;
+	///
 	void pasteClipboard(bool asPara);
 	///
 	void stuffClipboard(string const &) const;
+	///
+	bool Dispatch(kb_action action, string const & argument);
 private:
 	struct Pimpl;
 	///