X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=5522450a055e3f48dbaf4a2bde6cd87899801cda;hb=72f30959c17d06ed778f107f77c6357f1e4d3258;hp=320c7d18a72bb5d69faec66ea7a62974c39dcf47;hpb=10f096880fec5afc402fc0910ff44220de0398c9;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 320c7d18a7..5522450a05 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -1,18 +1,27 @@
 // -*- C++ -*-
+/**
+ * \file BufferView_pimpl.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author various
+ */
 
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include <boost/smart_ptr.hpp>
-
 #include "BufferView.h"
-#include "UpdateInset.h"
-#include "commandtags.h"
 #include "frontends/Timeout.h"
-#include "WorkArea.h"
+#include "frontends/key_state.h"
+#include "frontends/mouse_state.h"
+#include "frontends/LyXKeySym.h"
+#include "box.h"
 #include "insets/insetspecialchar.h"
 #include "support/types.h"
 
+#include <boost/scoped_ptr.hpp>
+#include <boost/signals/trackable.hpp>
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -22,20 +31,18 @@ class WorkArea;
 class LyXScreen;
 
 ///
-struct BufferView::Pimpl : public SigC::Object {
+struct BufferView::Pimpl : public boost::signals::trackable {
 	///
 	Pimpl(BufferView * i, LyXView * o,
 	      int xpos, int ypos, int width, int height);
 	///
-	Painter & painter();
+	Painter & painter() const;
+	/// return the work area for this bview
+	WorkArea & workarea() const;
+	/// return the screen for this bview
+	LyXScreen & screen() const;
 	///
 	void buffer(Buffer *);
-	///
-	void resize(int xpos, int ypos, int width, int height);
-	///
-	void resize();
-	///
-	void redraw();
 	/// Return true if the cursor was fitted.
 	bool fitCursor();
 	///
@@ -46,37 +53,42 @@ struct BufferView::Pimpl : public SigC::Object {
 	void update();
 	//
 	void update(LyXText *, BufferView::UpdateCodes);
-  	/// Update pixmap of screen
-	void updateScreen();
+	/**
+	 * Repaint pixmap. Used for when we've made a visible
+	 * change but don't need the full update() logic
+	 */
+	void repaint();
 	///
-	void workAreaExpose();
+	void workAreaResize();
 	///
 	void updateScrollbar();
 	///
-	void scrollCB(double value);
+	void scrollDocView(int 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);
+	/// wheel mouse scroll
+	int scroll(long time);
 	///
-	Inset * checkInsetHit(LyXText *, int & x, int & y,
-			      unsigned int button);
-	/// 
-	int scrollUp(long time);
+	void workAreaKeyPress(LyXKeySymPtr key,
+			      key_modifier::state state);
 	///
-	int scrollDown(long time);
+	void workAreaMotionNotify(int x, int y, mouse_button::state state);
 	///
-	void workAreaKeyPress(KeySym, unsigned int state);
+	void workAreaButtonPress(int x, int y, mouse_button::state button);
 	///
-	void workAreaMotionNotify(int x, int y, unsigned int state);
+	void workAreaButtonRelease(int x, int y, mouse_button::state button);
 	///
-	void workAreaButtonPress(int x, int y, unsigned int button);
+	void doubleClick(int x, int y, mouse_button::state button);
 	///
-	void workAreaButtonRelease(int x, int y, unsigned int button);
+	void tripleClick(int x, int y, mouse_button::state button);
 	///
-	void doubleClick(int x, int y, unsigned int button);
+	void selectionRequested();
 	///
-	void tripleClick(int x, int y, unsigned int button);
-	///
-	void enterView();
-	///
-	void leaveView();
+	void selectionLost();
 	///
 	void cursorToggle();
 	///
@@ -94,22 +106,10 @@ struct BufferView::Pimpl : public SigC::Object {
 	///
 	bool isSavedPosition(unsigned int i);
 	///
-	void setState();
-	///
-	void insetSleep();
-	///
-	void insetWakeup();
+	void switchKeyMap();
 	///
 	void insetUnlock();
 	///
-	bool focus() const;
-	///
-	void focus(bool);
-	///
-	bool active() const;
-	///
-	bool belowMouse() const;
-	///
 	void showCursor();
 	///
 	void hideCursor();
@@ -124,19 +124,27 @@ struct BufferView::Pimpl : public SigC::Object {
 	///
 	void updateInset(Inset * inset, bool mark_dirty);
 	///
-	bool Dispatch(kb_action action, string const & argument);
+	bool dispatch(FuncRequest const & ev);
 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();
-	///
 	void hfill();
 	///
 	void smartQuote();
@@ -156,14 +164,10 @@ private:
 	///
 	boost::scoped_ptr<LyXScreen> screen_;
 	///
-	long current_scrollbar_value;
+	boost::scoped_ptr<WorkArea> workarea_;
 	///
 	Timeout cursor_timeout;
 	///
-	WorkArea workarea_;
-	///
-	UpdateInset updatelist;
-	///
 	void pasteClipboard(bool asPara);
 	///
 	void stuffClipboard(string const &) const;
@@ -186,12 +190,10 @@ private:
 	///
 	std::vector<Position> saved_positions;
 	///
-	void moveCursorUpdate(bool selecting);
-	/// Get next inset of this class from current cursor position  
+	void moveCursorUpdate(bool selecting, bool fitcur = true);
+	/// Get next inset of this class from current cursor position
 	Inset * getInsetByCode(Inset::Code code);
 	///
 	void MenuInsertLyXFile(string const & filen);
-	///
-	bool inset_slept;
 };
-#endif
+#endif // BUFFERVIEW_PIMPL_H