X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=68a19e76b251f04324946ce3636f14c56c201d4e;hb=98c966c64594611e469313314abd1e59524adb4a;hp=c54820c3b19e8a95d77c1ab3e07753a7b336e412;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git

diff --git a/src/BufferView.C b/src/BufferView.C
index c54820c3b1..68a19e76b2 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -1,11 +1,10 @@
-// -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -18,6 +17,7 @@
 #include "BufferView.h"
 #include "BufferView_pimpl.h"
 #include "lyxtext.h"
+#include "lyxscreen.h"
 
 
 BufferView::BufferView(LyXView * o, int xpos, int ypos,
@@ -25,8 +25,6 @@ BufferView::BufferView(LyXView * o, int xpos, int ypos,
 	: pimpl_(new Pimpl(this, o, xpos, ypos, width, height))
 {
 	text = 0;
-	the_locking_inset = 0;
-	inset_slept = false;
 }
 
 
@@ -43,19 +41,19 @@ Buffer * BufferView::buffer() const
 }
 
 
-LyXView * BufferView::owner() const
+LyXScreen * BufferView::screen() const
 {
-	return pimpl_->owner_;
+	return pimpl_->screen_.get();
 }
 
 
-void BufferView::pushIntoUpdateList(Inset * i)
+LyXView * BufferView::owner() const
 {
-	pimpl_->updatelist.push(i);
+	return pimpl_->owner_;
 }
 
 
-Painter & BufferView::painter() 
+Painter & BufferView::painter()
 {
 	return pimpl_->painter();
 }
@@ -85,9 +83,9 @@ void BufferView::redraw()
 }
 
 
-void BufferView::fitCursor()
+bool BufferView::fitCursor()
 {
-	pimpl_->fitCursor();
+	return pimpl_->fitCursor();
 }
 
 
@@ -103,106 +101,39 @@ void BufferView::updateScrollbar()
 }
 
 
-void BufferView::redoCurrentBuffer()
-{
-	pimpl_->redoCurrentBuffer();
-}
-
-
-int BufferView::resizeCurrentBuffer()
-{
-	return pimpl_->resizeCurrentBuffer();
-}
-
-
-void BufferView::gotoError()
-{
-	pimpl_->gotoError();
-}
-
-
-#if 0
-extern "C" {
-	void C_BufferView_CursorToggleCB(FL_OBJECT * ob, long buf)
-	{
-		BufferView::cursorToggleCB(ob, buf);
-	}
-}
-#endif
-
-void BufferView::enterView()
-{
-	pimpl_->enterView();
-}
-
-
-void BufferView::leaveView()
-{
-	pimpl_->leaveView();
-}
-
-
-// Callback for scrollbar slider
 void BufferView::scrollCB(double value)
 {
 	pimpl_->scrollCB(value);
 }
 
 
-void BufferView::workAreaMotionNotify(int x, int y, unsigned int state)
-{
-	pimpl_->workAreaMotionNotify(x, y, state);
-}
-
-
-///  Single-click on work area
-void BufferView::workAreaButtonPress(int xpos, int ypos, unsigned int button)
-{
-	pimpl_->workAreaButtonPress(xpos, ypos, button);
-}
-
-
-void BufferView::doubleClick(int x, int y, unsigned int button) 
-{
-	pimpl_->doubleClick(x, y, button);
-}
-
-
-void BufferView::tripleClick(int x, int y, unsigned int button)
-{
-	pimpl_->tripleClick(x, y, button);
-}
-
-
-void BufferView::workAreaButtonRelease(int x, int y, unsigned int button)
+Inset * BufferView::checkInsetHit(LyXText * text, int & x, int & y)
 {
-	pimpl_->workAreaButtonRelease(x, y, button);
+	return pimpl_->checkInsetHit(text, x, y);
 }
 
 
-void BufferView::workAreaExpose()
+void BufferView::redoCurrentBuffer()
 {
-	pimpl_->workAreaExpose();
+	pimpl_->redoCurrentBuffer();
 }
 
 
-//  // Callback for cursor timer
-void BufferView::cursorToggleCB(void * ob)
+int BufferView::resizeCurrentBuffer()
 {
-	BufferView * view = static_cast<BufferView*>(ob);
-	view->pimpl_->cursorToggle();
+	return pimpl_->resizeCurrentBuffer();
 }
 
 
-void BufferView::cursorPrevious()
+void BufferView::cursorPrevious(LyXText * text)
 {
-	pimpl_->cursorPrevious();
+	pimpl_->cursorPrevious(text);
 }
 
 
-void BufferView::cursorNext()
+void BufferView::cursorNext(LyXText * text)
 {
-	pimpl_->cursorNext();
+	pimpl_->cursorNext(text);
 }
 
 
@@ -212,33 +143,33 @@ bool BufferView::available() const
 }
 
 
-void BufferView::beforeChange()
+void BufferView::beforeChange(LyXText * text)
 {
-	pimpl_->beforeChange();
+	pimpl_->beforeChange(text);
 }
 
 
-void BufferView::savePosition()
+void BufferView::savePosition(unsigned int i)
 {
-	pimpl_->savePosition();
+	pimpl_->savePosition(i);
 }
 
 
-void BufferView::restorePosition()
+void BufferView::restorePosition(unsigned int i)
 {
-	pimpl_->restorePosition();
+	pimpl_->restorePosition(i);
 }
 
 
-bool BufferView::NoSavedPositions()
+bool BufferView::isSavedPosition(unsigned int i)
 {
-	return pimpl_->NoSavedPositions();
+	return pimpl_->isSavedPosition(i);
 }
 
 
-void BufferView::update(signed char f)
+void BufferView::update(LyXText * text, UpdateCodes f)
 {
-	pimpl_->update(f);
+	pimpl_->update(text, f);
 }
 
 
@@ -268,29 +199,29 @@ void BufferView::insetUnlock()
 
 bool BufferView::focus() const
 {
-  	return pimpl_->focus();
+	return pimpl_->focus();
 }
 
 
 void BufferView::focus(bool f)
 {
-  	pimpl_->focus(f);
+	pimpl_->focus(f);
 }
 
 
 bool BufferView::active() const
 {
-  	return pimpl_->active();
+	return pimpl_->active();
 }
 
 
-unsigned short BufferView::paperWidth() const
+int BufferView::workWidth() const
 {
-    return text->paperWidth();
+    return pimpl_->workarea_.workWidth();
 }
 
 
-bool BufferView::belowMouse() const 
+bool BufferView::belowMouse() const
 {
 	return pimpl_->belowMouse();
 }
@@ -320,7 +251,7 @@ void BufferView::toggleToggle()
 }
 
 
-void BufferView::center() 
+void BufferView::center()
 {
 	pimpl_->center();
 }
@@ -332,7 +263,26 @@ void BufferView::pasteClipboard(bool asPara)
 }
 
 
+string const BufferView::getClipboard() const
+{
+	return pimpl_->workarea_.getClipboard();
+}
+
+
 void BufferView::stuffClipboard(string const & stuff) const
 {
 	pimpl_->stuffClipboard(stuff);
 }
+
+
+BufferView::UpdateCodes operator|(BufferView::UpdateCodes uc1,
+				  BufferView::UpdateCodes uc2)
+{
+	return static_cast<BufferView::UpdateCodes>
+		(static_cast<int>(uc1) | static_cast<int>(uc2));
+}
+
+bool BufferView::Dispatch(kb_action action, string const & argument)
+{
+	return pimpl_->Dispatch(action, argument);
+}