X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fscreen.C;h=5ef3ad3aac364591c23dbe1fe1c0feed5030697c;hb=664eb7ff45dbb4fabc22ec0b56798031a82335b1;hp=452fe295eb10683cb8bbcb4766c1976a79aaef7b;hpb=a0cf758d5a79140045c2a90e2ff5878e0b391bcc;p=lyx.git

diff --git a/src/screen.C b/src/screen.C
index 452fe295eb..5ef3ad3aac 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -14,51 +14,48 @@
 #pragma implementation "lyxscreen.h"
 #endif
 
+#include <algorithm>
+
 #include "lyxscreen.h"
 #include "lyxtext.h"
 #include "lyxrow.h"
-#include "BufferView.h"
 #include "Painter.h"
+#include "WorkArea.h"
+#include "buffer.h"
+#include "font.h"
+#include "insets/insettext.h"
+#include "ColorHandler.h"
+#include "language.h"
+
+using std::max;
+using std::min;
 
+namespace {
 
-static
 GC createGC()
 {
 	XGCValues val;
-	val.foreground = BlackPixel(fl_display, 
-				    DefaultScreen(fl_display));
+	val.foreground = BlackPixel(fl_get_display(), 
+				    DefaultScreen(fl_get_display()));
 	
-	val.function=GXcopy;
+	val.function = GXcopy;
 	val.graphics_exposures = false;
 	val.line_style = LineSolid;
 	val.line_width = 0;
-	return XCreateGC(fl_display, RootWindow(fl_display, 0), 
+	return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0), 
 			 GCForeground | GCFunction | GCGraphicsExposures
 			 | GCLineWidth | GCLineStyle , &val);
 }
 
+} // namespace anon
+
 
 // Constructor
-LyXScreen::LyXScreen(BufferView * o, Window window,
-		     Pixmap p,
-		     Dimension width, 
-		     Dimension height,
-		     Dimension offset_x,
-		     Dimension offset_y,
-		     LyXText *text_ptr)
-	: owner(o), text(text_ptr), _window(window), 
-	_width(width), _height(height),
-	_offset_x(offset_x), _offset_y(offset_y)
+LyXScreen::LyXScreen(WorkArea & o)
+	: owner(o), force_clear(true)
 {
-	first = 0;
-   
-	/* the cursor isnt yet visible */ 
+	// the cursor isnt yet visible
 	cursor_visible = false;
-	screen_refresh_y = -1;
-
-	/* create the foreground pixmap */
-	foreground = p;
-
 	cursor_pixmap = 0;
 	cursor_pixmap_x = 0;
 	cursor_pixmap_y = 0;
@@ -70,244 +67,269 @@ LyXScreen::LyXScreen(BufferView * o, Window window,
 }
 
 
-// Destructor
-LyXScreen::~LyXScreen() {}
+void LyXScreen::setCursorColor() 
+{
+	if (!lyxColorHandler.get()) return;
+
+	GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
+	
+	XGCValues val;
+	XGetGCValues(fl_get_display(),
+		     gc, GCForeground, &val);
+	XChangeGC(fl_get_display(), gc_copy, GCForeground, &val);
+}
 
 
-void LyXScreen::Redraw()
+void LyXScreen::Redraw(LyXText * text, BufferView * bv)
 {
-	DrawFromTo(0, _height);
-	screen_refresh_y = -1;
-	expose(0, 0, _width, _height);
+	DrawFromTo(text, bv, 0, owner.height());
+	expose(0, 0, owner.workWidth(), owner.height());
 	if (cursor_visible) {
 		cursor_visible = false;
-		ShowCursor();
+		ShowCursor(text, bv);
 	}
 }
 
 
 void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 {
-	XCopyArea(fl_display,
-		  foreground,
-		  _window,
+	XCopyArea(fl_get_display(),
+		  owner.getPixmap(),
+		  owner.getWin(),
 		  gc_copy,
 		  x, y,
 		  exp_width, exp_height,
-		  x+_offset_x, y+_offset_y);
+		  x + owner.xpos(),
+		  y + owner.ypos());
 }
 
 
-void LyXScreen::DrawFromTo(int y1, int y2)
+void LyXScreen::DrawFromTo(LyXText * text, BufferView * bv,
+			   int y1, int y2, int y_offset, int x_offset)
 {
-	long y_text = first + y1;
+	int y_text = text->first + y1;
    
-	/* get the first needed row */ 
+	// get the first needed row 
 	Row * row = text->GetRowNearY(y_text);
-	/* y_text is now the real beginning of the row */
+	// y_text is now the real beginning of the row
    
-	long y = y_text - first;
-	/* y1 is now the real beginning of row on the screen */
+	int y = y_text - text->first;
+	// y1 is now the real beginning of row on the screen
 	
 	while (row != 0 && y < y2) {
-
-		text->GetVisibleRow(y, row, y + first);
-		y += row->height;
-		row = row -> next;
-
+		LyXText::text_status st = bv->text->status;
+		do {
+			bv->text->status = st;
+			text->GetVisibleRow(bv, y + y_offset,
+					    x_offset, row, y + text->first);
+		} while (bv->text->status == LyXText::CHANGED_IN_DRAW);
+		bv->text->status = st;
+		y += row->height();
+		row = row->next();
 	}
-   
-	/* maybe we have to clear the screen at the bottom */ 
-	if (y < y2) {
-		owner->painter().fillRectangle(0, y, _width, y2 - y,
+	force_clear = false;
+
+	// maybe we have to clear the screen at the bottom
+	if ((y < y2) && text->bv_owner) {
+		owner.getPainter().fillRectangle(0, y,
+						 owner.workWidth(),
+						 y2 - y,
 					       LColor::bottomarea);
 	}
 }
 
 
-void LyXScreen::DrawOneRow(Row * row, long & y_text)
+void LyXScreen::DrawOneRow(LyXText * text, BufferView * bv, Row * row,
+			   int y_text, int y_offset, int x_offset)
 {
-	long y = y_text - first;
-      
-	if (y + row->height > 0 && y - row->height <= _height) {
-		/* ok there is something visible */
-		text->GetVisibleRow(y, row, y + first);
+	int const y = y_text - text->first + y_offset;
+
+	if (((y + row->height()) > 0) &&
+	    ((y - row->height()) <= static_cast<int>(owner.height()))) {
+		// ok there is something visible
+		LyXText::text_status st = bv->text->status;
+		do {
+			bv->text->status = st;
+			text->GetVisibleRow(bv, y, x_offset, row,
+					    y + text->first);
+		} while (bv->text->status == LyXText::CHANGED_IN_DRAW);
+		bv->text->status = st;
 	}
-	y_text+= row->height;
+	force_clear = false;
 }
 
 
 /* draws the screen, starting with textposition y. uses as much already
 * printed pixels as possible */
-void LyXScreen::Draw(long  y)
+void LyXScreen::Draw(LyXText * text, BufferView * bv, unsigned int y)
 {
 	if (cursor_visible) HideCursor();
 
-	if (y < 0) y = 0;
-	long old_first = first;
-	first = y;
-
-	/* is any optimiziation possible? */ 
-	if ((y - old_first) < _height 
-	    && (old_first - y) < _height) {
-		if (first < old_first) {
-			DrawFromTo(0, old_first - first);
-			XCopyArea (fl_display,
-				   _window,
-				   _window,
+	int const old_first = text->first;
+	text->first = y;
+
+	// is any optimiziation possible?
+	if ((y - old_first) < owner.height()
+	    && (old_first - y) < owner.height()) {
+		if (text->first < old_first) {
+			DrawFromTo(text, bv, 0, old_first - text->first);
+			XCopyArea (fl_get_display(),
+				   owner.getWin(),
+				   owner.getWin(),
 				   gc_copy,
-				   _offset_x, _offset_y, 
-				   _width , _height - old_first + first,
-				   _offset_x, _offset_y + old_first - first);
+				   owner.xpos(),
+				   owner.ypos(),
+				   owner.workWidth(),
+				   owner.height() - old_first + text->first,
+				   owner.xpos(),
+				   owner.ypos() + old_first - text->first
+				);
 			// expose the area drawn
-			expose(0, 0, _width, old_first - first);
+			expose(0, 0,
+			       owner.workWidth(),
+			       old_first - text->first);
 		} else  {
-			DrawFromTo(_height + old_first - first, _height);
-			XCopyArea (fl_display,
-				   _window,
-				   _window,
+			DrawFromTo(text, bv,
+				   owner.height() + old_first - text->first,
+				   owner.height());
+			XCopyArea (fl_get_display(),
+				   owner.getWin(),
+				   owner.getWin(),
 				   gc_copy,
-				   _offset_x, _offset_y + first - old_first, 
-				   _width , _height + old_first - first, 
-				   _offset_x, _offset_y);
+				   owner.xpos(),
+				   owner.ypos() + text->first - old_first,
+				   owner.workWidth(),
+				   owner.height() + old_first - text->first,
+				   owner.xpos(),
+				   owner.ypos());
 			// expose the area drawn
-			expose(0, _height + old_first - first, 
-			       _width, first - old_first);
+			expose(0, owner.height() + old_first - text->first,
+			       owner.workWidth(), text->first - old_first);
 		}
 	} else {
-		/* make a dumb new-draw */ 
-		DrawFromTo(0, _height);
-		expose(0, 0, _width, _height);
+		// make a dumb new-draw 
+		DrawFromTo(text, bv, 0, owner.height());
+		expose(0, 0, owner.workWidth(), owner.height());
 	}
 }
 
 
-void LyXScreen::ShowCursor()
+void LyXScreen::ShowCursor(LyXText const * text, BufferView const * bv)
 {
-	long x = 0;
-	long y1 = 0;
-	long y2 = 0;
-   
-	if (cursor_visible) return;
-   
-	x = text->cursor.x;
-	
-	y1 = text->cursor.y - text->real_current_font.maxAscent() - first;
-	if (y1 < 0) y1 = 0;
-	
-	y2 = text->cursor.y + text->real_current_font.maxDescent() - first;
-	if (y2 > _height) y2 = _height;
-
-	// Secure against very strange situations
-	if (y2 < y1) y2 = y1;
-
-	if (cursor_pixmap){
-		XFreePixmap(fl_display, cursor_pixmap);
-		cursor_pixmap = 0;
-	}
-   
-	if (y2 > 0 && y1 < _height) {
-		cursor_pixmap_w = 1;
-		cursor_pixmap_h = y2 - y1 + 1;
-		cursor_pixmap_x = x;
-		cursor_pixmap_y = y1;
-		cursor_pixmap = 
-			XCreatePixmap(fl_display,
-				      fl_root,
-				      cursor_pixmap_w,
-				      cursor_pixmap_h,
-				      fl_get_visual_depth());
-		XCopyArea(fl_display,
-			  _window,
-			  cursor_pixmap,
-			  gc_copy,
-			  _offset_x + cursor_pixmap_x, 
-			  _offset_y + cursor_pixmap_y,
-			  cursor_pixmap_w, cursor_pixmap_h,
-			  0, 0);
-		XDrawLine(fl_display,
-			  _window, gc_copy,
-			  x + _offset_x,
-			  y1 + _offset_y,
-			  x + _offset_x,
-			  y2 + _offset_y);
-		cursor_visible = true;
+	if (!cursor_visible) {
+		Cursor_Shape shape = BAR_SHAPE;
+		if (text->real_current_font.language() !=
+		    bv->buffer()->params.language
+		    || text->real_current_font.isVisibleRightToLeft()
+		    != bv->buffer()->params.language->RightToLeft())
+			shape = (text->real_current_font.isVisibleRightToLeft())
+				? REVERSED_L_SHAPE : L_SHAPE;
+		ShowManualCursor(text, text->cursor.x(), text->cursor.y(),
+				 lyxfont::maxAscent(text->real_current_font),
+				 lyxfont::maxDescent(text->real_current_font),
+				 shape);
 	}
 }
 
 
-/* returns 1 if first has changed, otherwise 0 */ 
-int LyXScreen::FitManualCursor(long /*x*/, long y, int asc, int desc)
+/* returns true if first has changed, otherwise false */ 
+bool LyXScreen::FitManualCursor(LyXText * text, BufferView * bv,
+				int /*x*/, int y, int asc, int desc)
 {
-	long  newtop = first;
+	int newtop = text->first;
   
-	if (y + desc  - first >= _height)
-		newtop = y - 3*_height / 4;   /* the scroll region must be so big!! */
-	else if (y - asc < first 
-		 && first > 0) {
-		newtop = y - _height / 4;
+	if (y + desc - text->first >= static_cast<int>(owner.height()))
+		newtop = y - 3 * owner.height() / 4;  // the scroll region must be so big!!
+	else if (y - asc < static_cast<int>(text->first)
+		&& text->first > 0) {
+		newtop = y - owner.height() / 4;
 	}
-	if (newtop < 0)
-		newtop = 0;
+
+	newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
   
-	if (newtop != first){
-		Draw(newtop);
-		first = newtop;
-		return 1;
+	if (newtop != static_cast<int>(text->first)) {
+		Draw(text, bv, newtop);
+		text->first = newtop;
+		return true;
 	}
-	return 0;
-}
-
-
-void  LyXScreen::HideManualCursor()
-{
-	HideCursor();
+	return false;
 }
 
 
-void  LyXScreen::ShowManualCursor(long x, long y, int asc, int desc)
+void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
+				 int asc, int desc, Cursor_Shape shape)
 {
-	long y1 = 0;
-	long y2 = 0;
+	// Update the cursor color.
+	setCursorColor();
 	
-	y1 = y - first - asc;
-	if (y1 < 0)
-		y1 = 0;
-	y2 = y -first + desc;
-	if (y2 > _height)
-		y2 = _height;
+	int const y1 = max(y - text->first - asc, 0);
+	int const y_tmp = min(y - text->first + desc,
+			      static_cast<int>(owner.height()));
 
+	// Secure against very strange situations
+	int const y2 = max(y_tmp, y1);
+	
 	if (cursor_pixmap){
-		XFreePixmap(fl_display, cursor_pixmap);
+		XFreePixmap(fl_get_display(), cursor_pixmap);
 		cursor_pixmap = 0;
 	}
-		
-	if (y2 > 0 && y1 < _height) {
-		cursor_pixmap_w = 1;
+
+	if (y2 > 0 && y1 < int(owner.height())) {
 		cursor_pixmap_h = y2 - y1 + 1;
-		cursor_pixmap_x = x,
-			cursor_pixmap_y = y1;
+		cursor_pixmap_y = y1;
+
+		switch (shape) {
+		case BAR_SHAPE:
+			cursor_pixmap_w = 1;
+			cursor_pixmap_x = x;
+			break;
+		case L_SHAPE:
+			cursor_pixmap_w = cursor_pixmap_h/3;
+			cursor_pixmap_x = x;
+			break;
+		case REVERSED_L_SHAPE:
+			cursor_pixmap_w = cursor_pixmap_h/3;
+			cursor_pixmap_x = x - cursor_pixmap_w + 1;
+			break;
+		}
+
 		cursor_pixmap = 
-			XCreatePixmap (fl_display,
+			XCreatePixmap (fl_get_display(),
 				       fl_root,
 				       cursor_pixmap_w,
 				       cursor_pixmap_h,
 				       fl_get_visual_depth());
-		XCopyArea (fl_display,
-			   _window,
+		XCopyArea (fl_get_display(),
+			   owner.getWin(),
 			   cursor_pixmap,
 			   gc_copy,
-			   _offset_x + cursor_pixmap_x,
-			   _offset_y + cursor_pixmap_y,
+			   owner.xpos() + cursor_pixmap_x,
+			   owner.ypos() + cursor_pixmap_y,
 			   cursor_pixmap_w,
 			   cursor_pixmap_h,
 			   0, 0);
-		XDrawLine(fl_display,
-			  _window, gc_copy,
-			  x+_offset_x,
-			  y1+_offset_y,
-			  x+_offset_x,
-			  y2+_offset_y);
+		XDrawLine(fl_get_display(),
+			  owner.getWin(),
+			  gc_copy,
+			  x + owner.xpos(),
+			  y1 + owner.ypos(),
+			  x + owner.xpos(),
+			  y2 + owner.ypos());
+		switch (shape) {
+		case BAR_SHAPE:
+			break;
+		case L_SHAPE:
+		case REVERSED_L_SHAPE:
+			int const rectangle_h = (cursor_pixmap_h + 10) / 20;
+			XFillRectangle(fl_get_display(),
+				       owner.getWin(),
+				       gc_copy,
+				       cursor_pixmap_x + owner.xpos(),
+				       y2 - rectangle_h + 1 + owner.ypos(),
+				       cursor_pixmap_w - 1, rectangle_h);
+			break;
+		}
+
 	}
 	cursor_visible = true;
 }
@@ -318,197 +340,156 @@ void LyXScreen::HideCursor()
 	if (!cursor_visible) return;
 
 	if (cursor_pixmap){
-		XCopyArea (fl_display, 
+		XCopyArea (fl_get_display(), 
 			   cursor_pixmap,
-			   _window,
+			   owner.getWin(),
 			   gc_copy,
 			   0, 0, 
 			   cursor_pixmap_w, cursor_pixmap_h,
-			   cursor_pixmap_x + _offset_x,
-			   cursor_pixmap_y + _offset_y);
+			   cursor_pixmap_x + owner.xpos(),
+			   cursor_pixmap_y + owner.ypos());
 	}
 	cursor_visible = false;
 }
 
 
-void LyXScreen::CursorToggle()
+void LyXScreen::CursorToggle(LyXText const * text, BufferView const * bv)
 {
 	if (cursor_visible)
 		HideCursor();
 	else
-		ShowCursor();
+		ShowCursor(text, bv);
 }
 
 
 /* returns a new top so that the cursor is visible */ 
-long LyXScreen::TopCursorVisible()
+unsigned int LyXScreen::TopCursorVisible(LyXText const * text)
 {
-	long newtop = first;
-
-	if (text->cursor.y
-	    - text->cursor.row->baseline
-	    + text->cursor.row->height
-	    - first >= _height) {
-		if (text->cursor.row->height < _height
-		    && text->cursor.row->height > _height/4)
-			newtop = text->cursor.y
-				+ text->cursor.row->height
-				- text->cursor.row->baseline - _height;
+	int newtop = text->first;
+
+	if (text->cursor.y()
+	    - text->cursor.row()->baseline()
+	    + text->cursor.row()->height()
+	    - text->first >= owner.height()) {
+		if (text->cursor.row()->height() < owner.height()
+		    && text->cursor.row()->height() > owner.height() / 4)
+			newtop = text->cursor.y()
+				+ text->cursor.row()->height()
+				- text->cursor.row()->baseline() - owner.height();
 		else
-			newtop = text->cursor.y
-				- 3*_height / 4;   /* the scroll region must be so big!! */
-	} else if (text->cursor.y - text->cursor.row->baseline < first 
-		   && first > 0) {
-		if (text->cursor.row->height < _height
-		    && text->cursor.row->height > _height/4)
-			newtop = text->cursor.y - text->cursor.row->baseline;
+			newtop = text->cursor.y()
+				- 3 * owner.height() / 4;   /* the scroll region must be so big!! */
+	} else if (static_cast<int>((text->cursor.y()) - text->cursor.row()->baseline()) <
+		   text->first && text->first > 0)
+	{
+		if (text->cursor.row()->height() < owner.height()
+		    && text->cursor.row()->height() > owner.height() / 4)
+			newtop = text->cursor.y() - text->cursor.row()->baseline();
 		else {
-			newtop = text->cursor.y - _height / 4;
-			if (newtop > first)
-				newtop = first;
+			newtop = text->cursor.y() - owner.height() / 4;
+			newtop = min(newtop, int(text->first));
 		}
 	}
-	if (newtop < 0)
-		newtop = 0;
-	
+
+	newtop = max(newtop, 0);
+
 	return newtop;
 }
 
 
 /* scrolls the screen so that the cursor is visible, if necessary.
-* returns 1 if a change was made, otherwise 0 */ 
-int LyXScreen::FitCursor()
+* returns true if a change was made, otherwise false */ 
+bool LyXScreen::FitCursor(LyXText * text, BufferView * bv)
 {
-	/* is a change necessary */ 
-	long  newtop = TopCursorVisible();
-	int result = (newtop != first);
+	// Is a change necessary?
+	int const newtop = TopCursorVisible(text);
+	bool const result = (newtop != text->first);
 	if (result)
-		Draw(newtop);
+		Draw(text, bv, newtop);
 	return result;
 }
 
    
-void LyXScreen::Update()
+void LyXScreen::Update(LyXText * text, BufferView * bv,
+		       int y_offset, int x_offset)
 {
-	long y = 0;
-
-	if (text->status == LyXText::NEED_MORE_REFRESH
-	    || screen_refresh_y > -1 ) {
-		if (screen_refresh_y > -1
-		    && screen_refresh_y < text->refresh_y)
-			y = screen_refresh_y;
-		else
-			y = text->refresh_y;
-		
-		if (y < first) y = first;
-		
-		DrawFromTo(y - first, _height);
+	switch (text->status) {
+	case LyXText::NEED_MORE_REFRESH:
+	{
+		int const y = max(int(text->refresh_y - text->first), 0);
+		DrawFromTo(text, bv, y, owner.height(), y_offset, x_offset);
 		text->refresh_y = 0;
 		text->status = LyXText::UNCHANGED;
-		screen_refresh_y = -1;
-		expose(0, y-first, _width, _height - (y - first));
-	} else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
-		/* ok I will update the current cursor row */
-		y = text->refresh_y;
-		DrawOneRow(text->refresh_row, y);
-		text->status = LyXText::UNCHANGED;
-		expose(0, text->refresh_y-first,
-		       _width, text->refresh_row->height);
+		expose(0, y, owner.workWidth(), owner.height() - y);
 	}
-}
-
-
-void LyXScreen::SmallUpdate()
-{
-	Row * row = 0;
-	long y = 0;
-	long y2 = 0;
-	
-	if (text->status == LyXText::NEED_MORE_REFRESH){
-		/* ok I will update till the current cursor row */
-		row = text->refresh_row;
-		y = text->refresh_y;
-		y2 = y;
-      
-		if (y > text->cursor.y) {
-			Update();
-			return;
-		}
-	 
-		while (row && row != text->cursor.row && y < first + _height) {
-			DrawOneRow(row, y);
-			row = row->next;
-		}
-      
-		DrawOneRow(row, y);
-		screen_refresh_y = y;
-		screen_refresh_row = row->next;
+	break;
+	case LyXText::NEED_VERY_LITTLE_REFRESH:
+	{
+		// ok I will update the current cursor row
+		DrawOneRow(text, bv, text->refresh_row, text->refresh_y,
+			   y_offset, x_offset);
 		text->status = LyXText::UNCHANGED;
-		// Is the right regin exposed?
-		expose(0, y2-first, _width, y-y2);
-	} else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
-		/* ok I will update the current cursor row */
-		row = text->refresh_row;
-		y = text->refresh_y;
-		DrawOneRow(row, y);
-		text->status = LyXText::UNCHANGED;
-		expose(0, text->refresh_y - first,
-		       _width, row->height);
+		expose(0, text->refresh_y - text->first + y_offset,
+		       owner.workWidth(), text->refresh_row->height());
+	}
+	break;
+	case LyXText::CHANGED_IN_DRAW: // just to remove the warning
+	case LyXText::UNCHANGED:
+		// Nothing needs done
+		break;
 	}
 }
 
 
-void LyXScreen::ToggleSelection(bool kill_selection)
+void LyXScreen::ToggleSelection(LyXText * text, BufferView * bv,
+				bool kill_selection,
+				int y_offset, int x_offset)
 {
-	/* only if there is a selection */ 
-	if (!text->selection)
-		return;
+	// only if there is a selection
+	if (!text->selection) return;
+
+	int const bottom = min(
+		max(static_cast<int>(text->sel_end_cursor.y()
+				     - text->sel_end_cursor.row()->baseline()
+				     + text->sel_end_cursor.row()->height()),
+		    text->first),
+		static_cast<int>(text->first + owner.height()));
+	int const top = min(
+		max(static_cast<int>(text->sel_start_cursor.y() -
+				     text->sel_start_cursor.row()->baseline()),
+		    text->first),
+		static_cast<int>(text->first + owner.height()));
 
-	long top = text->sel_start_cursor.y
-		- text->sel_start_cursor.row->baseline;
-	long bottom = text->sel_end_cursor.y
-		- text->sel_end_cursor.row->baseline 
-		+ text->sel_end_cursor.row->height;
-	
-	if (top - first < 0)
-		top = first;
-	if (bottom - first < 0)
-		bottom = first;
-	
-	if (bottom - first > _height)
-		bottom = first + _height;
-	if (top - first > _height)
-		top = first + _height;
-	
 	if (kill_selection)
 		text->selection = 0;
-	DrawFromTo(top - first, bottom - first);
-	expose(0, top - first, _width, bottom - first - (top - first));
+	DrawFromTo(text, bv, top - text->first, bottom - text->first,
+		   y_offset, x_offset);
+	expose(0, top - text->first,
+	       owner.workWidth(),
+	       bottom - text->first - (top - text->first));
 }
   
    
-void LyXScreen::ToggleToggle()
+void LyXScreen::ToggleToggle(LyXText * text, BufferView * bv,
+			     int y_offset, int x_offset)
 {
-	if (text->toggle_cursor.par == text->toggle_end_cursor.par
-	    && text->toggle_cursor.pos == text->toggle_end_cursor.pos)
+	if (text->toggle_cursor.par() == text->toggle_end_cursor.par()
+	    && text->toggle_cursor.pos() == text->toggle_end_cursor.pos())
 		return;
 	
-	long top = text->toggle_cursor.y
-		- text->toggle_cursor.row->baseline;
-	long bottom = text->toggle_end_cursor.y
-		- text->toggle_end_cursor.row->baseline 
-		+ text->toggle_end_cursor.row->height;
-	
-	if (top - first < 0)
-		top = first;
-	if (bottom - first < 0)
-		bottom = first;
-	
-	if (bottom - first > _height)
-		bottom = first + _height;
-	if (top - first > _height)
-		top = first + _height;
+	int const top_tmp = text->toggle_cursor.y()
+		- text->toggle_cursor.row()->baseline();
+	int const bottom_tmp = text->toggle_end_cursor.y()
+		- text->toggle_end_cursor.row()->baseline() 
+		+ text->toggle_end_cursor.row()->height();
 	
-	DrawFromTo(top - first, bottom - first);
-	expose(0, top - first, _width, bottom - first - (top - first));
+	int const bottom = min(max(bottom_tmp, text->first),
+		     static_cast<int>(text->first + owner.height()));
+	int const top = min(max(top_tmp, text->first),
+		  static_cast<int>(text->first + owner.height()));
+
+	DrawFromTo(text, bv, top - text->first, bottom - text->first, y_offset,
+		   x_offset);
+	expose(0, top - text->first, owner.workWidth(),
+	       bottom - text->first - (top - text->first));
 }