X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fscreen.C;h=1688ccaa2574bdb00434504b00a675e2846619cc;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=edaa5e18c0e04c772bea1ea144c86e8b87bfec74;hpb=d0950acedaa91320340af398bb06d790486a2207;p=lyx.git

diff --git a/src/screen.C b/src/screen.C
index edaa5e18c0..1688ccaa25 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -23,6 +23,8 @@
 #include "WorkArea.h"
 #include "buffer.h"
 #include "font.h"
+#include "insets/insettext.h"
+#include "ColorHandler.h"
 
 using std::max;
 using std::min;
@@ -31,29 +33,25 @@ 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);
 }
 
 
 // Constructor
-LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
-	: owner(o), text(text_ptr)
+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;
-
 	cursor_pixmap = 0;
 	cursor_pixmap_x = 0;
 	cursor_pixmap_y = 0;
@@ -65,21 +63,33 @@ LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
 }
 
 
-void LyXScreen::Redraw()
+void LyXScreen::setCursorColor() 
+{
+	if (!lyxColorHandler) 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(LyXText * text)
 {
-	DrawFromTo(0, owner.height());
-	screen_refresh_y = -1;
+	DrawFromTo(text, 0, owner.height());
 	expose(0, 0, owner.workWidth(), owner.height());
 	if (cursor_visible) {
 		cursor_visible = false;
-		ShowCursor();
+		ShowCursor(text);
 	}
 }
 
 
 void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 {
-	XCopyArea(fl_display,
+	XCopyArea(fl_get_display(),
 		  owner.getPixmap(),
 		  owner.getWin(),
 		  gc_copy,
@@ -90,25 +100,33 @@ void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 }
 
 
-void LyXScreen::DrawFromTo(int y1, int y2)
+void LyXScreen::DrawFromTo(LyXText * text,
+			   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 = text->status;
+		do {
+			text->status = st;
+			text->GetVisibleRow(owner.owner(), y + y_offset,
+					    x_offset, row, y + text->first);
+		} while (text->status == LyXText::CHANGED_IN_DRAW);
+		text->status = st;
+		y += row->height();
+		row = row->next();
 	}
-   
-	/* maybe we have to clear the screen at the bottom */ 
-	if (y < y2) {
+	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,
@@ -117,85 +135,92 @@ void LyXScreen::DrawFromTo(int y1, int y2)
 }
 
 
-void LyXScreen::DrawOneRow(Row * row, long & y_text)
+void LyXScreen::DrawOneRow(LyXText * text, Row * row, int y_text,
+			   int y_offset, int x_offset)
 {
-	long y = y_text - first;
-      
-	if (y + row->height > 0 && y - row->height <= owner.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 = text->status;
+		do {
+			text->status = st;
+			text->GetVisibleRow(owner.owner(), y, x_offset, row,
+					    y + text->first);
+		} while (text->status == LyXText::CHANGED_IN_DRAW);
+		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, unsigned int y)
 {
 	if (cursor_visible) HideCursor();
 
-	if (y < 0) y = 0;
-	long old_first = first;
-	first = y;
+	int const old_first = text->first;
+	text->first = y;
 
-	/* is any optimiziation possible? */ 
+	// is any optimiziation possible?
 	if ((y - old_first) < owner.height()
 	    && (old_first - y) < owner.height()) {
-		if (first < old_first) {
-			DrawFromTo(0, old_first - first);
-			XCopyArea (fl_display,
+		if (text->first < old_first) {
+			DrawFromTo(text, 0, old_first - text->first);
+			XCopyArea (fl_get_display(),
 				   owner.getWin(),
 				   owner.getWin(),
 				   gc_copy,
 				   owner.xpos(),
 				   owner.ypos(),
 				   owner.workWidth(),
-				   owner.height() - old_first + first,
+				   owner.height() - old_first + text->first,
 				   owner.xpos(),
-				   owner.ypos() + old_first - first
+				   owner.ypos() + old_first - text->first
 				);
 			// expose the area drawn
 			expose(0, 0,
 			       owner.workWidth(),
-			       old_first - first);
+			       old_first - text->first);
 		} else  {
-			DrawFromTo(
-				owner.height() + old_first - first,
+			DrawFromTo(text,
+				   owner.height() + old_first - text->first,
 				   owner.height());
-			XCopyArea (fl_display,
+			XCopyArea (fl_get_display(),
 				   owner.getWin(),
 				   owner.getWin(),
 				   gc_copy,
 				   owner.xpos(),
-				   owner.ypos() + first - old_first,
+				   owner.ypos() + text->first - old_first,
 				   owner.workWidth(),
-				   owner.height() + old_first - first,
+				   owner.height() + old_first - text->first,
 				   owner.xpos(),
 				   owner.ypos());
 			// expose the area drawn
-			expose(0, owner.height() + old_first - first,
-			       owner.workWidth(), 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, owner.height());
+		// make a dumb new-draw 
+		DrawFromTo(text, 0, owner.height());
 		expose(0, 0, owner.workWidth(), owner.height());
 	}
 }
 
 
-void LyXScreen::ShowCursor()
+void LyXScreen::ShowCursor(LyXText const * text)
 {
 	if (!cursor_visible) {
 		Cursor_Shape shape = BAR_SHAPE;
 		if (text->real_current_font.language() !=
-		    text->buffer->params.language_info
+		    owner.owner()->buffer()->params.language
 		    || text->real_current_font.isVisibleRightToLeft()
-		    != text->buffer->params.language_info->RightToLeft)
+		    != owner.owner()->buffer()->params.language->RightToLeft())
 			shape = (text->real_current_font.isVisibleRightToLeft())
 				? REVERSED_L_SHAPE : L_SHAPE;
-		ShowManualCursor(text->cursor.x, text->cursor.y,
+		ShowManualCursor(text, text->cursor.x(), text->cursor.y(),
 				 lyxfont::maxAscent(text->real_current_font),
 				 lyxfont::maxDescent(text->real_current_font),
 				 shape);
@@ -203,49 +228,53 @@ void LyXScreen::ShowCursor()
 }
 
 
-/* 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,
+				int /*x*/, int y, int asc, int desc)
 {
-	long  newtop = first;
+	int newtop = text->first;
   
-	if (y + desc  - first >= owner.height())
-		newtop = y - 3 * owner.height() / 4;   /* the scroll region must be so big!! */
-	else if (y - asc < first 
-		 && first > 0) {
+	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, newtop);
+		text->first = newtop;
+		return true;
 	}
-	return 0;
+	return false;
 }
 
 
-void  LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
-				  Cursor_Shape shape)
+void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
+				 int asc, int desc, Cursor_Shape shape)
 {
-	long y1 = max(y - first - asc, 0L);
-	long y2 = min(y - first + desc, long(owner.height()));
+	// Update the cursor color.
+	setCursorColor();
+	
+	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
-	if (y2 < y1) y2 = y1;
-
+	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 <
-	    owner.height()) {
+	if (y2 > 0 && y1 < int(owner.height())) {
 		cursor_pixmap_h = y2 - y1 + 1;
 		cursor_pixmap_y = y1;
 
-		switch(shape) {
+		switch (shape) {
 		case BAR_SHAPE:
 			cursor_pixmap_w = 1;
 			cursor_pixmap_x = x;
@@ -261,12 +290,12 @@ void  LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
 		}
 
 		cursor_pixmap = 
-			XCreatePixmap (fl_display,
+			XCreatePixmap (fl_get_display(),
 				       fl_root,
 				       cursor_pixmap_w,
 				       cursor_pixmap_h,
 				       fl_get_visual_depth());
-		XCopyArea (fl_display,
+		XCopyArea (fl_get_display(),
 			   owner.getWin(),
 			   cursor_pixmap,
 			   gc_copy,
@@ -275,20 +304,20 @@ void  LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
 			   cursor_pixmap_w,
 			   cursor_pixmap_h,
 			   0, 0);
-		XDrawLine(fl_display,
+		XDrawLine(fl_get_display(),
 			  owner.getWin(),
 			  gc_copy,
 			  x + owner.xpos(),
 			  y1 + owner.ypos(),
 			  x + owner.xpos(),
 			  y2 + owner.ypos());
-		switch(shape) {
+		switch (shape) {
 		case BAR_SHAPE:
 			break;
 		case L_SHAPE:
 		case REVERSED_L_SHAPE:
-			int rectangle_h = (cursor_pixmap_h+10)/20;
-			XFillRectangle(fl_display,
+			int const rectangle_h = (cursor_pixmap_h + 10) / 20;
+			XFillRectangle(fl_get_display(),
 				       owner.getWin(),
 				       gc_copy,
 				       cursor_pixmap_x + owner.xpos(),
@@ -307,7 +336,7 @@ void LyXScreen::HideCursor()
 	if (!cursor_visible) return;
 
 	if (cursor_pixmap){
-		XCopyArea (fl_display, 
+		XCopyArea (fl_get_display(), 
 			   cursor_pixmap,
 			   owner.getWin(),
 			   gc_copy,
@@ -320,184 +349,140 @@ void LyXScreen::HideCursor()
 }
 
 
-void LyXScreen::CursorToggle()
+void LyXScreen::CursorToggle(LyXText const * text)
 {
 	if (cursor_visible)
 		HideCursor();
 	else
-		ShowCursor();
+		ShowCursor(text);
 }
 
 
 /* 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 >= 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();
+	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
+			newtop = text->cursor.y()
 				- 3 * owner.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 < owner.height()
-		    && text->cursor.row->height > owner.height() / 4)
-			newtop = text->cursor.y - text->cursor.row->baseline;
+	} 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 - owner.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)
 {
-	/* 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, newtop);
 	return result;
 }
 
    
-void LyXScreen::Update()
+void LyXScreen::Update(LyXText * text, int y_offset, int x_offset)
 {
-	if (text->status == LyXText::NEED_MORE_REFRESH
-	    || screen_refresh_y > -1 ) {
-		long y = 0;
-		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, owner.height());
+	switch (text->status) {
+	case LyXText::NEED_MORE_REFRESH:
+	{
+		int const y = max(int(text->refresh_y - text->first), 0);
+		DrawFromTo(text, y, owner.height(), y_offset, x_offset);
 		text->refresh_y = 0;
 		text->status = LyXText::UNCHANGED;
-		screen_refresh_y = -1;
-		expose(0, y - first,
-		       owner.workWidth(), owner.height() - (y - first));
-	} else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
-		/* ok I will update the current cursor row */
-		long y = text->refresh_y;
-		DrawOneRow(text->refresh_row, y);
-		text->status = LyXText::UNCHANGED;
-		expose(0, text->refresh_y - first,
-		       owner.workWidth(), text->refresh_row->height);
+		expose(0, y, owner.workWidth(), owner.height() - y);
 	}
-}
-
-
-void LyXScreen::SmallUpdate()
-{
-	if (text->status == LyXText::NEED_MORE_REFRESH) {
-		/* ok I will update till the current cursor row */
-		Row * row = text->refresh_row;
-		long y = text->refresh_y;
-		long y2 = y;
-      
-		if (y > text->cursor.y) {
-			Update();
-			return;
-		}
-	 
-		while (row
-		       && row != text->cursor.row
-		       && y < first + owner.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, text->refresh_row, text->refresh_y,
+			   y_offset, x_offset);
 		text->status = LyXText::UNCHANGED;
-		// Is the right regin exposed?
-		expose(0, y2 - first,
-		       owner.workWidth(), y - y2);
-	} else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
-		/* ok I will update the current cursor row */
-		long y = text->refresh_y;
-		DrawOneRow(text->refresh_row, y);
-		text->status = LyXText::UNCHANGED;
-		expose(0, text->refresh_y - first,
-		       owner.workWidth(), text->refresh_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,  bool kill_selection,
+				int y_offset, int x_offset)
 {
-	/* only if there is a selection */ 
+	// only if there is a selection
 	if (!text->selection) return;
 
-	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)
-		top = max(top, first);
-        if (bottom < first)
-		bottom = max(bottom, first);
-	
-	if (bottom > first + owner.height())
-		bottom = first + owner.height();
-	if (top > first + owner.height())
-		top = first + owner.height();
+	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()));
 
 	if (kill_selection)
 		text->selection = 0;
-	DrawFromTo(top - first, bottom - first);
-	expose(0, top - first,
+	DrawFromTo(text, top - text->first, bottom - text->first,
+		   y_offset, x_offset);
+	expose(0, top - text->first,
 	       owner.workWidth(),
-	       bottom - first - (top - first));
+	       bottom - text->first - (top - text->first));
 }
   
    
-void LyXScreen::ToggleToggle()
+void LyXScreen::ToggleToggle(LyXText * text, 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 > owner.height())
-		bottom = first + owner.height();
-	if (top - first > owner.height())
-		top = first + owner.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, owner.workWidth(),
-	       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, top - text->first, bottom - text->first, y_offset,
+		   x_offset);
+	expose(0, top - text->first, owner.workWidth(),
+	       bottom - text->first - (top - text->first));
 }