X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=9391bb6d2f791b52b4f672af8fe611f5f0d022e9;hb=98c966c64594611e469313314abd1e59524adb4a;hp=5f43f3334ccc1a7a1ccfcd81acab8e86f7245dd4;hpb=cd6e293ed7c588748fe0cf5927f46dc5e9ae6e35;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 5f43f3334c..9391bb6d2f 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -6,10 +6,10 @@
 #include <boost/smart_ptr.hpp>
 
 #include "BufferView.h"
-#include "UpdateInset.h"
 #include "commandtags.h"
 #include "frontends/Timeout.h"
 #include "WorkArea.h"
+#include "box.h"
 #include "insets/insetspecialchar.h"
 #include "support/types.h"
 
@@ -23,8 +23,6 @@ class LyXScreen;
 
 ///
 struct BufferView::Pimpl : public SigC::Object {
-	/// position in a paragraph
-	typedef lyx::pos_type pos_type;
 	///
 	Pimpl(BufferView * i, LyXView * o,
 	      int xpos, int ypos, int width, int height);
@@ -48,7 +46,7 @@ struct BufferView::Pimpl : public SigC::Object {
 	void update();
 	//
 	void update(LyXText *, BufferView::UpdateCodes);
-  	/// Update pixmap of screen
+	/// Update pixmap of screen
 	void updateScreen();
 	///
 	void workAreaExpose();
@@ -56,10 +54,13 @@ struct BufferView::Pimpl : public SigC::Object {
 	void updateScrollbar();
 	///
 	void scrollCB(double value);
+	/**
+	 * Returns an inset if inset was hit, or 0 if not.
+	 *
+	 * If hit, the coordinates are changed relative to the inset.
+	 */
+	Inset * checkInsetHit(LyXText *, int & x, int & y);
 	///
-	Inset * checkInsetHit(LyXText *, int & x, int & y,
-			      unsigned int button);
-	/// 
 	int scrollUp(long time);
 	///
 	int scrollDown(long time);
@@ -76,6 +77,10 @@ struct BufferView::Pimpl : public SigC::Object {
 	///
 	void tripleClick(int x, int y, unsigned int button);
 	///
+	void selectionRequested();
+	///
+	void selectionLost();
+	///
 	void enterView();
 	///
 	void leaveView();
@@ -128,13 +133,22 @@ struct BufferView::Pimpl : public SigC::Object {
 	///
 	bool Dispatch(kb_action action, string const & argument);
 private:
+	/**
+	 * Return the on-screen dimensions of the inset at the cursor.
+	 * Pre-condition: the cursor must be at an inset.
+	 */
+	Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const;
+	/**
+	 * check if the given co-ordinates are inside an inset at the given cursor,
+	 * if one exists. If so, the inset is returned, and the co-ordinates are
+	 * made relative. Otherwise, 0 is returned.
+	 */
+	Inset * checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const;
 	///
 	friend class BufferView;
 	/// open and lock an updatable inset
 	bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
 	///
-	void protectedBlank(LyXText * lt);
-	/// 
 	void specialChar(InsetSpecialChar::Kind);
 	///
 	void newline();
@@ -164,8 +178,6 @@ private:
 	///
 	WorkArea workarea_;
 	///
-	UpdateInset updatelist;
-	///
 	void pasteClipboard(bool asPara);
 	///
 	void stuffClipboard(string const &) const;
@@ -178,18 +190,18 @@ private:
 		/// Cursor paragraph Id
 		int par_id;
 		/// Cursor position
-		pos_type par_pos;
+		lyx::pos_type par_pos;
 		///
 		Position() : par_id(0), par_pos(0) {}
 		///
-		Position(string const & f, int id, pos_type pos)
+		Position(string const & f, int id, lyx::pos_type pos)
 			: filename(f), par_id(id), par_pos(pos) {}
 	};
 	///
 	std::vector<Position> saved_positions;
 	///
 	void moveCursorUpdate(bool selecting);
-	/// Get next inset of this class from current cursor position  
+	/// Get next inset of this class from current cursor position
 	Inset * getInsetByCode(Inset::Code code);
 	///
 	void MenuInsertLyXFile(string const & filen);