X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=e13893664aa5b8b7e1d1c411a4e983c8aa932d96;hb=2b300d130c21037e9ae9cb547024be53111d2014;hp=8960a2e1697ab544f09c443304cacf078be971c2;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 8960a2e169..e13893664a 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -18,15 +18,30 @@
 
 #include FORMS_H_LOCATION
 #include "undo.h"
+#include <boost/utility.hpp>
 
 class LyXView;
 class LyXText;
 class TeXErrors;
 class Buffer;
+class LyXScreen;
+class WorkArea;
 
 ///
-class BufferView {
+class BufferView : public noncopyable {
 public:
+	///
+	enum UpdateCodes {
+		///
+		UPDATE = 0,
+		///
+		SELECT = 1,
+		///
+		FITCUR = 2,
+		///
+		CHANGE = 4
+	};
+					    
 	///
 	BufferView(LyXView * owner, int , int , int, int);
 	///
@@ -36,6 +51,10 @@ public:
 	///
 	Painter & painter();
 	///
+	LyXScreen * screen() const;
+	///
+	WorkArea * workarea() const;
+	///
 	void buffer(Buffer * b);
 	///
 	void resize(int, int, int, int);
@@ -44,14 +63,17 @@ public:
 	///
 	void redraw();
 	///
-	void fitCursor();
+	void fitCursor(LyXText *);
 	///
 	void update();
-	///
-	void update(signed char f);
+	//
+	void update(UpdateCodes uc);
 	///
 	void updateScrollbar();
 	///
+	Inset * checkInsetHit(LyXText *, int & x, int & y,
+			      unsigned int button);
+	/// 
 	void redoCurrentBuffer();
 	///
 	int resizeCurrentBuffer();
@@ -78,7 +100,7 @@ public:
 	*/
 	LyXText * text;
 	///
-	unsigned short paperWidth() const;
+	int workWidth() const;
 	///
 	UpdatableInset * the_locking_inset;
 	///
@@ -102,7 +124,7 @@ public:
 	///
 	void selectLastWord();
 	///
-	char * nextWord(float & value);
+	string const nextWord(float & value);
 	///
 	void insertCorrectQuote();
 	///
@@ -137,37 +159,44 @@ public:
 	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();
 	///
 	void insertErrors(TeXErrors & terr);
 	///
 	void setCursorFromRow(int row);
-	/** Insert an inset into the buffer
-	    Insert inset into buffer, placing it in a layout of lout,
-	    if no_table make sure that it doesn't end up in a table. */
+	/** Insert an inset into the buffer.
+	    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
-	void open_new_inset(UpdatableInset * new_inset);
-	/// Inserts a lyx file at cursor position. Returns false if it fails.
+	bool open_new_inset(UpdatableInset * new_inset);
+	/** Inserts a lyx file at cursor position.
+	    @return #false# if it fails.
+	*/
 	bool insertLyXFile(string const & file);
 	///
 	bool lockInset(UpdatableInset * inset);
 	///
-	void showLockedInsetCursor(long x, long y, int asc, int desc);
+	void showLockedInsetCursor(int x, int y, int asc, int desc);
 	///
 	void hideLockedInsetCursor();
 	///
-	void fitLockedInsetCursor(long x, long y, int asc, int desc);
+	void fitLockedInsetCursor(int x, int y, int asc, int desc);
 	///
 	int unlockInset(UpdatableInset * inset);
 	///
@@ -194,9 +223,6 @@ public:
 	/// A callback for the slider in the scrollbar.
 	void scrollCB(double);
 
-	///
-	static void cursorToggleCB(void * ob);
-
 	///
 	void setState();
 
@@ -226,7 +252,15 @@ public:
 	void stuffClipboard(string const &) const;
 private:
 	struct Pimpl;
+	///
+	friend struct BufferView::Pimpl;
+	///
 	Pimpl * pimpl_;
 };
 
+
+///
+BufferView::UpdateCodes operator|(BufferView::UpdateCodes uc1,
+				  BufferView::UpdateCodes uc2);
+
 #endif