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

diff --git a/src/BufferView.h b/src/BufferView.h
index a673802f76..8d72e59c0c 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -1,13 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file BufferView.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
  *
- * ====================================================== */
+ *  \author Lars Gullik Bjønnes
+*/
 
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
@@ -18,7 +16,9 @@
 
 #include "LString.h"
 #include "undo.h"
-#include "commandtags.h"
+
+#include "insets/inset.h"
+
 #include <boost/utility.hpp>
 
 class LyXView;
@@ -26,8 +26,11 @@ class LyXText;
 class TeXErrors;
 class Buffer;
 class LyXScreen;
-class WorkArea;
 class Language;
+class Painter;
+class UpdatableInset;
+class WordLangTuple;
+class WorkArea;
 
 ///
 class BufferView : boost::noncopyable {
@@ -43,7 +46,7 @@ public:
 		///
 		CHANGE = 4
 	};
-					    
+
 	///
 	BufferView(LyXView * owner, int , int , int, int);
 	///
@@ -51,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(LyXText *);
+	bool fitCursor();
 	///
 	void update();
 	//
@@ -71,31 +78,19 @@ public:
 	///
 	void updateScrollbar();
 	///
-	Inset * checkInsetHit(LyXText *, int & x, int & y,
-			      unsigned int button);
-	/// 
-	void redoCurrentBuffer();
-	///
-	int resizeCurrentBuffer();
-	///
-	void gotoInset(std::vector<Inset::Code> const & codes,
-		       bool same_content);
+	Inset * checkInsetHit(LyXText *, int & x, int & y);
 	///
-	void gotoInset(Inset::Code codes, bool same_content);
-	///
-	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.
@@ -113,40 +108,26 @@ public:
 	///
 	UpdatableInset * theLockingInset() const;
 	///
-	void theLockingInset(UpdatableInset * inset); 
+	void theLockingInset(UpdatableInset * inset);
 	///
 	void updateInset(Inset * inset, bool mark_dirty);
 	///
-	bool inset_slept;
-	///
 	int slx;
 	///
 	int sly;
 	///
 	void insetUnlock();
 	///
-	void insetSleep();
-	///
-	void insetWakeup();
-	///
 	void replaceWord(string const & replacestring);
 	///
 	void endOfSpellCheck();
 	///
 	void selectLastWord();
-	///
-	string const nextWord(float & value);
-	///
-	void insertCorrectQuote();
+	/// return the next word
+	WordLangTuple const nextWord(float & value);
 	///
 	bool gotoLabel(string const & label);
 	///
-	void paste();
-	///
-	void cut();
-	///
-	void copy();
-	///
 	void pasteEnvironment();
 	///
 	void copyEnvironment();
@@ -161,14 +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);
-	/** Inserts a lyx file at cursor position.
-	    @return #false# if it fails.
-	*/
+	bool insertInset(Inset * inset, string const & lout = string());
+	/// Inserts a lyx file at cursor position. return #false# if it fails
 	bool insertLyXFile(string const & file);
 	///
 	bool lockInset(UpdatableInset * inset);
@@ -177,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);
 	///
@@ -192,25 +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);
 
-	///
-	void setState();
+	/// Scroll the view by a number of pixels
+	void scrollDocView(int);
 
 	///
-	void pushIntoUpdateList(Inset * i);
+	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);
@@ -219,12 +189,12 @@ 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;
 	///
 	friend struct BufferView::Pimpl;