X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=8d72e59c0c50569ef4bd798a69763499a30f5cb0;hb=eb395d9d313c1bc07ff48b47e080442f095dc97a;hp=b65afe81638f13d23bd71624d02a8d3f3121bb1f;hpb=bae36d14f78a3cddbceb9ccc03f892da29627889;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index b65afe8163..8d72e59c0c 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -1,7 +1,8 @@
 // -*- C++ -*-
-/** \file
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+/**
+ * \file BufferView.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
  *
  *  \author Lars Gullik Bjønnes
 */
@@ -15,7 +16,6 @@
 
 #include "LString.h"
 #include "undo.h"
-#include "commandtags.h"
 
 #include "insets/inset.h"
 
@@ -29,6 +29,8 @@ class LyXScreen;
 class Language;
 class Painter;
 class UpdatableInset;
+class WordLangTuple;
+class WorkArea;
 
 ///
 class BufferView : boost::noncopyable {
@@ -44,7 +46,7 @@ public:
 		///
 		CHANGE = 4
 	};
-					    
+
 	///
 	BufferView(LyXView * owner, int , int , int, int);
 	///
@@ -52,19 +54,23 @@ public:
 	///
 	Buffer * buffer() const;
 	///
-	Painter & painter();
+	Painter & painter() const;
 	///
-	LyXScreen * screen() const;
+	LyXScreen & screen() const;
+	/// return the work area for this bview
+	WorkArea & workarea() const;
 	///
 	void buffer(Buffer * b);
 	///
-	void resize(int, int, int, int);
-	///
 	void resize();
+	/**
+	 * Repaint the pixmap. Used for when we don't want
+	 * to go through the full update() logic, just a simple
+	 * repaint of the whole screen.
+	 */
+	void repaint();
 	///
-	void redraw();
-	///
-	void fitCursor();
+	bool fitCursor();
 	///
 	void update();
 	//
@@ -73,24 +79,18 @@ public:
 	void updateScrollbar();
 	///
 	Inset * checkInsetHit(LyXText *, int & x, int & y);
-	/// 
-	void redoCurrentBuffer();
-	///
-	int resizeCurrentBuffer();
 	///
-	void cursorPrevious(LyXText *);
+	void redoCurrentBuffer();
 	///
-	void cursorNext(LyXText *);
-	/// 
 	bool available() const;
 	///
 	LyXView * owner() const;
 	///
 	void beforeChange(LyXText *);
-        ///
-        void savePosition(unsigned int i);
-        ///
-        void restorePosition(unsigned int i);
+	///
+	void savePosition(unsigned int i);
+	///
+	void restorePosition(unsigned int i);
 	///
 	bool isSavedPosition(unsigned int i);
 	/** This holds the mapping between buffer paragraphs and screen rows.
@@ -108,7 +108,7 @@ public:
 	///
 	UpdatableInset * theLockingInset() const;
 	///
-	void theLockingInset(UpdatableInset * inset); 
+	void theLockingInset(UpdatableInset * inset);
 	///
 	void updateInset(Inset * inset, bool mark_dirty);
 	///
@@ -118,26 +118,16 @@ public:
 	///
 	void insetUnlock();
 	///
-	void insetSleep();
-	///
-	void insetWakeup();
-	///
 	void replaceWord(string const & replacestring);
 	///
 	void endOfSpellCheck();
 	///
 	void selectLastWord();
-	///
-	string const nextWord(float & value);
+	/// return the next word
+	WordLangTuple const nextWord(float & value);
 	///
 	bool gotoLabel(string const & label);
 	///
-	void paste();
-	///
-	void cut(bool realcut = true);
-	///
-	void copy();
-	///
 	void pasteEnvironment();
 	///
 	void copyEnvironment();
@@ -152,15 +142,11 @@ public:
 	///
 	void setCursorFromRow(int row);
 	/** Insert an inset into the buffer.
-	    Placie it in a layout of lout,
+	    Place 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);
 	bool insertInset(Inset * inset, string const & lout = string());
-	/** Inserts a lyx file at cursor position.
-	    \return #false# if it fails.
-	*/
+	/// Inserts a lyx file at cursor position. return #false# if it fails
 	bool insertLyXFile(string const & file);
 	///
 	bool lockInset(UpdatableInset * inset);
@@ -169,7 +155,7 @@ public:
 	///
 	void hideLockedInsetCursor();
 	///
-	void fitLockedInsetCursor(int x, int y, int asc, int desc);
+	bool fitLockedInsetCursor(int x, int y, int asc, int desc);
 	///
 	int unlockInset(UpdatableInset * inset);
 	///
@@ -184,23 +170,17 @@ public:
 	void toggleToggle();
 	///
 	void center();
-	
-	///
-	bool focus() const;
 	///
-	void focus(bool);
-	///
-	bool active() const;
-	///
-	bool belowMouse() const;
-	/// A callback for the slider in the scrollbar.
-	void scrollCB(double);
+	int scroll(long time);
+
+	/// Scroll the view by a number of pixels
+	void scrollDocView(int);
 
 	///
-	void setState();
+	void switchKeyMap();
 
 	///
-	bool ChangeInsets(Inset::Code code, string const & from, 
+	bool ChangeInsets(Inset::Code code, string const & from,
 			  string const & to);
 	///
 	bool ChangeRefsIfUnique(string const & from, string const & to);
@@ -209,11 +189,10 @@ public:
 	///
 	string const getClipboard() const;
 	///
-	void pasteClipboard(bool asPara);
-	///
 	void stuffClipboard(string const &) const;
 	///
-	bool Dispatch(kb_action action, string const & argument);
+	bool dispatch(FuncRequest const & argument);
+
 private:
 	///
 	struct Pimpl;