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

diff --git a/src/BufferView.h b/src/BufferView.h
index 6b47eda9f5..e13893664a 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -17,29 +17,44 @@
 #endif
 
 #include FORMS_H_LOCATION
-#include "BackStack.h"
-#include "LaTeX.h"
 #include "undo.h"
+#include <boost/utility.hpp>
 
 class LyXView;
+class LyXText;
+class TeXErrors;
 class Buffer;
 class LyXScreen;
-class Inset;
-class LyXText;
 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);
 	///
 	~BufferView();
 	///
-	Buffer * buffer() const { return buffer_; }
+	Buffer * buffer() const;
 	///
 	Painter & painter();
 	///
+	LyXScreen * screen() const;
+	///
+	WorkArea * workarea() const;
+	///
 	void buffer(Buffer * b);
 	///
 	void resize(int, int, int, int);
@@ -48,16 +63,17 @@ public:
 	///
 	void redraw();
 	///
-	void fitCursor();
+	void fitCursor(LyXText *);
 	///
 	void update();
-	///
-	void update(signed char f);
-	///
-	void smallUpdate(signed char f);
+	//
+	void update(UpdateCodes uc);
 	///
 	void updateScrollbar();
 	///
+	Inset * checkInsetHit(LyXText *, int & x, int & y,
+			      unsigned int button);
+	/// 
 	void redoCurrentBuffer();
 	///
 	int resizeCurrentBuffer();
@@ -70,20 +86,26 @@ public:
 	/// 
 	bool available() const;
 	///
-	LyXView * owner() const { return owner_; }
+	LyXView * owner() const;
 	///
 	void beforeChange();
         ///
         void savePosition();
         ///
         void restorePosition();
+	///
+	bool NoSavedPositions();
 	/** This holds the mapping between buffer paragraphs and screen rows.
 	    This should be private...but not yet. (Lgb)
 	*/
 	LyXText * text;
 	///
+	int workWidth() const;
+	///
 	UpdatableInset * the_locking_inset;
 	///
+	void updateInset(Inset * inset, bool mark_dirty);
+	///
 	bool inset_slept;
 	///
 	int slx;
@@ -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. */
-	void insertInset(Inset * inset, string const & lout = string(),
+	/** 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);
 	///
-	int lockInset(UpdatableInset * inset);
+	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);
 	///
@@ -183,77 +212,55 @@ public:
 	///
 	void center();
 	
-private:
-	friend class WorkArea;
-	
-	/// Update pixmap of screen
-	void updateScreen();
-	///
-	void workAreaExpose();
-	///
-	void scrollUpOnePage();
-	///
-	void scrollDownOnePage();
-	///
-	void create_view();
-	///
-	Inset * checkInsetHit(int & x, int & y);
-	/// 
-	int scrollUp(long time);
-	///
-	int scrollDown(long time);
-
-public:
 	///
 	bool focus() const;
 	///
 	void focus(bool);
 	///
 	bool active() const;
-	/// A callback for the up arrow in the scrollbar.
-	void upCB(long time, int button);
+	///
+	bool belowMouse() const;
 	/// A callback for the slider in the scrollbar.
 	void scrollCB(double);
-	/// A callback for the down arrow in the scrollbar.
-	void downCB(long time, int button);
-
-	///
-	static void cursorToggleCB(FL_OBJECT * ob, long);
 
 	///
 	void setState();
 
-private:
 	///
-	void workAreaMotionNotify(int x, int y, unsigned int state);
+	void pushIntoUpdateList(Inset * i);
+	///
+	void workAreaExpose();
 	///
 	void workAreaButtonPress(int x, int y, unsigned int button);
 	///
 	void workAreaButtonRelease(int x, int y, unsigned int button);
 	///
-	void workAreaSelectionNotify(Window win, XEvent * event);
-	///
-	LyXView * owner_;
+	void workAreaMotionNotify(int x, int y, unsigned int state);
 	///
-	Buffer * buffer_;
+	void doubleClick(int x, int y, unsigned int button);
 	///
-	LyXScreen * screen;
+	void tripleClick(int x, int y, unsigned int button);
 	///
-	long current_scrollbar_value;
+	void enterView();
 	///
-	bool lyx_focus;
+	void leaveView();
 	///
-	bool work_area_focus;
+	bool ChangeRefs(string const & from, string const & to);
 	///
-	FL_OBJECT * figinset_canvas;
+	void pasteClipboard(bool asPara);
 	///
-	FL_OBJECT * timer_cursor;
-        ///
-        BackStack backstack;
+	void stuffClipboard(string const &) const;
+private:
+	struct Pimpl;
 	///
-	int last_click_x, last_click_y;
+	friend struct BufferView::Pimpl;
 	///
-	WorkArea * workarea;
+	Pimpl * pimpl_;
 };
 
+
+///
+BufferView::UpdateCodes operator|(BufferView::UpdateCodes uc1,
+				  BufferView::UpdateCodes uc2);
+
 #endif