X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBufferView_pimpl.h;h=6c6766af2b110bc82d012edca9fbc9bc06b67a29;hb=fdc1609e39461a297e092756ddd170c64208e183;hp=c14116705205133613940e28a73423e1e22153e9;hpb=340b7d232c0b26df175ba93f7d830467dd06e91e;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index c141167052..6c6766af2b 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -1,70 +1,81 @@
 // -*- C++ -*-
 /**
  * \file BufferView_pimpl.h
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author various
+ * \author Asger Alstrup
+ * \author Alfredo Braustein
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Dekel Tsur
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include "errorlist.h"
 #include "BufferView.h"
-#include "frontends/Timeout.h"
+#include "cursor.h"
+#include "errorlist.h"
+
+#include "insets/inset.h"
+
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
+#include "frontends/Timeout.h"
+
 #include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 
 class Change;
+class LyXKeySym;
 class LyXView;
 class WorkArea;
 class LyXScreen;
 class FuncRequest;
+class FuncStatus;
+
 
 ///
 struct BufferView::Pimpl : public boost::signals::trackable {
 	///
-	Pimpl(BufferView * i, LyXView * o,
-	      int xpos, int ypos, int width, int height);
+	Pimpl(BufferView & bv, LyXView * owner, int width, int height);
 	///
 	Painter & painter() const;
 	/// return the screen for this bview
 	LyXScreen & screen() const;
 	///
-	void buffer(Buffer *);
+	void setBuffer(Buffer * buf);
 	/// Return true if the cursor was fitted.
 	bool fitCursor();
 	///
 	void redoCurrentBuffer();
 	///
-	int resizeCurrentBuffer();
+	void resizeCurrentBuffer();
 	///
 	void update();
-	/**
-	 * Repaint pixmap. Used for when we've made a visible
-	 * change but don't need the full update() logic
-	 */
 	///
-	bool newFile(string const &, string const &, bool);
+	void newFile(std::string const &, std::string const &, bool);
 	///
-	bool loadLyXFile(string const &, bool);
+	bool loadLyXFile(std::string const &, bool);
 	///
 	void workAreaResize();
 	///
 	void updateScrollbar();
 	///
 	void scrollDocView(int value);
-	/**
-	 * Wheel mouse scroll, move by multiples of text->defaultRowHeight().
-	 */
+	/// Wheel mouse scroll, move by multiples of text->defaultRowHeight().
 	void scroll(int lines);
 	///
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
+	///
 	void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
 	///
 	void selectionRequested();
@@ -77,8 +88,6 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	/// get the change at the cursor position
 	Change const getCurrentChange();
 	///
-	void beforeChange(LyXText *);
-	///
 	void savePosition(unsigned int i);
 	///
 	void restorePosition(unsigned int i);
@@ -87,20 +96,20 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	///
 	void switchKeyMap();
 	///
-	void insetUnlock();
-	///
-	void toggleSelection(bool = true);
-	///
 	void center();
-	///
-	bool insertInset(InsetOld * inset, string const & lout = string());
-	///
-	void updateInset();
 	/// a function should be executed from the workarea
 	bool workAreaDispatch(FuncRequest const & ev);
+	/// return true for events that will handle
+	FuncStatus getStatus(FuncRequest const & cmd);
 	/// a function should be executed
 	bool dispatch(FuncRequest const & ev);
+	///
+	int top_y() const;
+	///
+	void top_y(int y);
 private:
+	/// the y coordinate of the top of the screen
+	int top_y_;
 	/// An error list (replaces the error insets)
 	ErrorList errorlist_;
 	/// add an error to the list
@@ -128,6 +137,7 @@ private:
 	/// notify readonly status
 	void showReadonly(bool);
 
+
 	///
 	friend class BufferView;
 
@@ -144,13 +154,13 @@ private:
 	///
 	Timeout cursor_timeout;
 	///
-	void stuffClipboard(string const &) const;
+	void stuffClipboard(std::string const &) const;
 	///
 	bool using_xterm_cursor;
 	///
 	struct Position {
 		/// Filename
-		string filename;
+		std::string filename;
 		/// Cursor paragraph Id
 		int par_id;
 		/// Cursor position
@@ -158,16 +168,24 @@ private:
 		///
 		Position() : par_id(0), par_pos(0) {}
 		///
-		Position(string const & f, int id, lyx::pos_type pos)
+		Position(std::string const & f, int id, lyx::pos_type pos)
 			: filename(f), par_id(id), par_pos(pos) {}
 	};
 	///
 	std::vector<Position> saved_positions;
 	/// Get next inset of this class from current cursor position
-	InsetOld * getInsetByCode(InsetOld::Code code);
+	InsetBase * getInsetByCode(InsetBase::Code code);
 	///
-	void MenuInsertLyXFile(string const & filen);
+	void MenuInsertLyXFile(std::string const & filen);
 	/// our workarea
 	WorkArea & workarea() const;
+	/// this is used to handle XSelection events in the right manner
+	struct {
+		CursorSlice cursor;
+		CursorSlice anchor;
+		bool set;
+	} xsel_cache_;
+	///
+	LCursor cursor_;
 };
 #endif // BUFFERVIEW_PIMPL_H