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

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index b0a45d1461..5522450a05 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -11,10 +11,10 @@
 #define BUFFERVIEW_PIMPL_H
 
 #include "BufferView.h"
-#include "commandtags.h"
 #include "frontends/Timeout.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"
@@ -28,11 +28,8 @@
 
 class LyXView;
 class WorkArea;
-class LScreen;
+class LyXScreen;
 
-// FIXME: remove
-#include <X11/Xlib.h>
- 
 ///
 struct BufferView::Pimpl : public boost::signals::trackable {
 	///
@@ -43,15 +40,9 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	/// return the work area for this bview
 	WorkArea & workarea() const;
 	/// return the screen for this bview
-	LScreen & screen() const;
+	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();
 	///
@@ -62,10 +53,13 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	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();
 	///
@@ -79,7 +73,8 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	/// wheel mouse scroll
 	int scroll(long time);
 	///
-	void workAreaKeyPress(KeySym key, key_modifier::state state);
+	void workAreaKeyPress(LyXKeySymPtr key,
+			      key_modifier::state state);
 	///
 	void workAreaMotionNotify(int x, int y, mouse_button::state state);
 	///
@@ -111,14 +106,10 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	///
 	bool isSavedPosition(unsigned int i);
 	///
-	void setState();
+	void switchKeyMap();
 	///
 	void insetUnlock();
 	///
-	bool focus() const;
-	///
-	void focus(bool);
-	///
 	void showCursor();
 	///
 	void hideCursor();
@@ -133,7 +124,7 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	///
 	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.
@@ -141,11 +132,12 @@ private:
 	 */
 	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.
+	 * 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;
+	Inset * checkInset(LyXText const & text, LyXCursor const & cursor,
+			   int & x, int & y) const;
 	///
 	friend class BufferView;
 	/// open and lock an updatable inset
@@ -153,8 +145,6 @@ private:
 	///
 	void specialChar(InsetSpecialChar::Kind);
 	///
-	void newline();
-	///
 	void hfill();
 	///
 	void smartQuote();
@@ -172,7 +162,7 @@ private:
 	///
 	Buffer * buffer_;
 	///
-	boost::scoped_ptr<LScreen> screen_;
+	boost::scoped_ptr<LyXScreen> screen_;
 	///
 	boost::scoped_ptr<WorkArea> workarea_;
 	///